diff --git a/NzbDrone.Api/Frontend/IndexModule.cs b/NzbDrone.Api/Frontend/IndexModule.cs
index 2045e2973..46eac2824 100644
--- a/NzbDrone.Api/Frontend/IndexModule.cs
+++ b/NzbDrone.Api/Frontend/IndexModule.cs
@@ -24,8 +24,7 @@ namespace NzbDrone.Api.Frontend
 
             _indexCache = cacheManger.GetCache<string>(typeof(IndexModule));
             //Serve anything that doesn't have an extension
-            Get[@"^(?:.*)$"] = x => Index();
-            Get[@"/"] = x => Index();
+            Get[@"/(.*)"] = x => Index();
         }
 
         private object Index()
diff --git a/NzbDrone.Api/NzbDrone.Api.csproj b/NzbDrone.Api/NzbDrone.Api.csproj
index 56ed08026..7dd87b51a 100644
--- a/NzbDrone.Api/NzbDrone.Api.csproj
+++ b/NzbDrone.Api/NzbDrone.Api.csproj
@@ -63,13 +63,12 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.1.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Nancy, Version=0.17.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Nancy, Version=0.16.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Nancy.0.17.1\lib\net40\Nancy.dll</HintPath>
+      <HintPath>..\packages\Nancy.0.16.1\lib\net40\Nancy.dll</HintPath>
     </Reference>
-    <Reference Include="Nancy.Authentication.Basic, Version=0.17.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Nancy.Authentication.Basic.0.17.1\lib\net40\Nancy.Authentication.Basic.dll</HintPath>
+    <Reference Include="Nancy.Authentication.Basic">
+      <HintPath>..\packages\Nancy.Authentication.Basic.0.16.1\lib\net40\Nancy.Authentication.Basic.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/NzbDrone.Api/TinyIoCNancyBootstrapper.cs b/NzbDrone.Api/TinyIoCNancyBootstrapper.cs
index bd4a05712..8ed1c5795 100644
--- a/NzbDrone.Api/TinyIoCNancyBootstrapper.cs
+++ b/NzbDrone.Api/TinyIoCNancyBootstrapper.cs
@@ -20,6 +20,15 @@ namespace NzbDrone.Api
             return this.ApplicationContainer.Resolve<INancyEngine>();
         }
 
+        /// <summary>
+        /// Get the moduleKey generator
+        /// </summary>
+        /// <returns>IModuleKeyGenerator instance</returns>
+        protected override sealed IModuleKeyGenerator GetModuleKeyGenerator()
+        {
+            return this.ApplicationContainer.Resolve<IModuleKeyGenerator>();
+        }
+
         /// <summary>
         /// Create a default, unconfigured, container
         /// </summary>
@@ -79,8 +88,8 @@ namespace NzbDrone.Api
                 container.Register(
                     typeof(INancyModule),
                     moduleRegistrationType.ModuleType,
-                    moduleRegistrationType.ModuleType.FullName).
-                    AsSingleton();
+                    moduleRegistrationType.ModuleKey).
+                          AsSingleton();
             }
         }
 
@@ -147,14 +156,14 @@ namespace NzbDrone.Api
         }
 
         /// <summary>
-        /// Retreive a specific module instance from the container
+        /// Retreive a specific module instance from the container by its key
         /// </summary>
         /// <param name="container">Container to use</param>
-        /// <param name="moduleType">Type of the module</param>
+        /// <param name="moduleKey">Module key of the module</param>
         /// <returns>NancyModule instance</returns>
-        protected override sealed INancyModule GetModule(TinyIoCContainer container, Type moduleType)
+        protected override sealed INancyModule GetModuleByKey(TinyIoCContainer container, string moduleKey)
         {
-            return (INancyModule)container.Resolve(moduleType);
+            return container.Resolve<INancyModule>(moduleKey);
         }
 
         /// <summary>
diff --git a/NzbDrone.Api/packages.config b/NzbDrone.Api/packages.config
index 73b126c5b..2d743b79b 100644
--- a/NzbDrone.Api/packages.config
+++ b/NzbDrone.Api/packages.config
@@ -2,8 +2,8 @@
 <packages>
   <package id="FluentValidation" version="4.0.0.0" targetFramework="net40" />
   <package id="Microsoft.AspNet.SignalR.Core" version="1.1.1" targetFramework="net40" />
-  <package id="Nancy" version="0.17.1" targetFramework="net40" />
-  <package id="Nancy.Authentication.Basic" version="0.17.1" targetFramework="net40" />
+  <package id="Nancy" version="0.16.1" targetFramework="net40" />
+  <package id="Nancy.Authentication.Basic" version="0.16.1" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="5.0.3" targetFramework="net40" />
   <package id="NLog" version="2.0.1.2" targetFramework="net40" />
   <package id="ValueInjecter" version="2.3.3" targetFramework="net40" />
diff --git a/NzbDrone.Console/NzbDrone.Console.csproj b/NzbDrone.Console/NzbDrone.Console.csproj
index ca36f6d8d..5e6425b74 100644
--- a/NzbDrone.Console/NzbDrone.Console.csproj
+++ b/NzbDrone.Console/NzbDrone.Console.csproj
@@ -83,14 +83,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Nancy, Version=0.17.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Nancy.0.17.1\lib\net40\Nancy.dll</HintPath>
-    </Reference>
-    <Reference Include="Nancy.Authentication.Basic, Version=0.17.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Nancy.Authentication.Basic.0.17.1\lib\net40\Nancy.Authentication.Basic.dll</HintPath>
-    </Reference>
     <Reference Include="NLog, Version=2.0.1.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NLog.2.0.1.2\lib\net40\NLog.dll</HintPath>
diff --git a/NzbDrone.Console/packages.config b/NzbDrone.Console/packages.config
index 1de49248b..d889a47ab 100644
--- a/NzbDrone.Console/packages.config
+++ b/NzbDrone.Console/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Nancy" version="0.17.1" targetFramework="net40" />
-  <package id="Nancy.Authentication.Basic" version="0.17.1" targetFramework="net40" />
+  <package id="Nancy" version="0.16.1" targetFramework="net40" />
+  <package id="Nancy.Authentication.Basic" version="0.16.1" targetFramework="net40" />
   <package id="NLog" version="2.0.1.2" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
index f83a90b4e..e9f35f536 100644
--- a/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
+++ b/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
@@ -56,13 +56,12 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="Nancy, Version=0.17.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Nancy.0.17.1\lib\net40\Nancy.dll</HintPath>
+    <Reference Include="Nancy">
+      <HintPath>..\packages\Nancy.0.16.1\lib\net40\Nancy.dll</HintPath>
     </Reference>
-    <Reference Include="Nancy.Owin, Version=0.17.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Nancy.Owin, Version=0.16.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Nancy.Owin.0.17.1\lib\net40\Nancy.Owin.dll</HintPath>
+      <HintPath>..\packages\Nancy.Owin.0.16.1\lib\net40\Nancy.Owin.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.5.0.3\lib\net35\Newtonsoft.Json.dll</HintPath>
diff --git a/NzbDrone.Integration.Test/packages.config b/NzbDrone.Integration.Test/packages.config
index 944360f9b..80db9bbad 100644
--- a/NzbDrone.Integration.Test/packages.config
+++ b/NzbDrone.Integration.Test/packages.config
@@ -6,8 +6,8 @@
   <package id="Microsoft.Owin.Host.HttpListener" version="1.1.0-beta2" targetFramework="net40" />
   <package id="Microsoft.Owin.Hosting" version="1.1.0-beta2" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" targetFramework="net40" />
-  <package id="Nancy" version="0.17.1" targetFramework="net40" />
-  <package id="Nancy.Owin" version="0.17.1" targetFramework="net40" />
+  <package id="Nancy" version="0.16.1" targetFramework="net40" />
+  <package id="Nancy.Owin" version="0.16.1" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="5.0.3" targetFramework="net40" />
   <package id="NLog" version="2.0.1.2" targetFramework="net40" />
   <package id="NUnit" version="2.6.2" targetFramework="net40" />
diff --git a/NzbDrone/NzbDrone.csproj b/NzbDrone/NzbDrone.csproj
index 9587c478a..905fff021 100644
--- a/NzbDrone/NzbDrone.csproj
+++ b/NzbDrone/NzbDrone.csproj
@@ -112,13 +112,12 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Microsoft.Owin.Hosting.1.1.0-beta2\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
     </Reference>
-    <Reference Include="Nancy, Version=0.17.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Nancy.0.17.1\lib\net40\Nancy.dll</HintPath>
+    <Reference Include="Nancy">
+      <HintPath>..\packages\Nancy.0.16.1\lib\net40\Nancy.dll</HintPath>
     </Reference>
-    <Reference Include="Nancy.Owin, Version=0.17.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Nancy.Owin, Version=0.16.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Nancy.Owin.0.17.1\lib\net40\Nancy.Owin.dll</HintPath>
+      <HintPath>..\packages\Nancy.Owin.0.16.1\lib\net40\Nancy.Owin.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/NzbDrone/packages.config b/NzbDrone/packages.config
index 2d3615860..4b7086895 100644
--- a/NzbDrone/packages.config
+++ b/NzbDrone/packages.config
@@ -6,8 +6,8 @@
   <package id="Microsoft.Owin" version="1.1.0-beta2" targetFramework="net40" />
   <package id="Microsoft.Owin.Host.HttpListener" version="1.1.0-beta2" targetFramework="net40" />
   <package id="Microsoft.Owin.Hosting" version="1.1.0-beta2" targetFramework="net40" />
-  <package id="Nancy" version="0.17.1" targetFramework="net40" />
-  <package id="Nancy.Owin" version="0.17.1" targetFramework="net40" />
+  <package id="Nancy" version="0.16.1" targetFramework="net40" />
+  <package id="Nancy.Owin" version="0.16.1" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
   <package id="NLog" version="2.0.1.2" targetFramework="net40" />
   <package id="NLog.Config" version="2.0.1.2" targetFramework="net40" />