diff --git a/src/Orchard.Web/Modules/Orchard.OpenId/Orchard.OpenId.csproj b/src/Orchard.Web/Modules/Orchard.OpenId/Orchard.OpenId.csproj
index b581c4332..7971ec25e 100644
--- a/src/Orchard.Web/Modules/Orchard.OpenId/Orchard.OpenId.csproj
+++ b/src/Orchard.Web/Modules/Orchard.OpenId/Orchard.OpenId.csproj
@@ -49,7 +49,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
+      <HintPath>..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.ActiveDirectory.GraphClient, Version=2.1.10.0, Culture=neutral, processorArchitecture=MSIL">
@@ -129,12 +129,12 @@
       <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
+      <HintPath>..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
@@ -243,7 +243,9 @@
   <ItemGroup>
     <Content Include="Scripts\twitter-admin.js" />
     <Content Include="Styles\twitter-admin.css" />
-    <Content Include="Web.config" />
+    <Content Include="Web.config">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="Module.txt" />
   </ItemGroup>
   <ItemGroup>
@@ -270,7 +272,9 @@
     <Content Include="placement.info" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="packages.config" />
+    <Content Include="packages.config">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Account\AccessDenied.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.ActiveDirectoryFederationServicesSettings.cshtml b/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.ActiveDirectoryFederationServicesSettings.cshtml
index 5e2b8a4c2..8cbe78198 100644
--- a/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.ActiveDirectoryFederationServicesSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.ActiveDirectoryFederationServicesSettings.cshtml
@@ -1,20 +1,20 @@
 @model Orchard.OpenId.Models.ActiveDirectoryFederationServicesSettingsPart
-@using Orchard.OpenId
+@using Orchard.OpenId.Constants
 
 <h2>Active Directory Federation Services Settings</h2>
 <fieldset>
     @Html.LabelFor(m => m.ClientId, T("Client Id"))
     @Html.TextBoxFor(m => m.ClientId, new { @class = "text large" })
-    <span class="hint">@T("ADFS's Client Id obtained from your ADFS configuration (e.g. {0})", Constants.DefaultAdfsClientId)</span>
+    <span class="hint">@T("ADFS's Client Id obtained from your ADFS configuration (e.g. {0})", ActiveDirectoryFederationServices.DefaultClientId)</span>
 </fieldset>
 <fieldset>
     @Html.LabelFor(m => m.MetadataAddress, T("Metadata Address"))
     @Html.TextBoxFor(m => m.MetadataAddress, new { @class = "text large" })
-    <span class="hint">@T("ADFS's Metadata Address url obtained from your ADFS configuration (e.g. {0})", Constants.DefaultAdfsMetadataAddress)</span>
+    <span class="hint">@T("ADFS's Metadata Address url obtained from your ADFS configuration (e.g. {0})", ActiveDirectoryFederationServices.DefaultMetadataAddress)</span>
 </fieldset>
 <fieldset>
     @Html.LabelFor(m => m.PostLogoutRedirectUri, T("Post Logout Redirect Uri"))
     @Html.TextBoxFor(m => m.PostLogoutRedirectUri, new { @class = "text large" })
-    <span class="hint">@T("ADFS's Post Logout Redirect url obtained from your ADFS configuration (e.g. {0})", Constants.DefaultAdfsPostLogoutRedirectUri)</span>
+    <span class="hint">@T("ADFS's Post Logout Redirect url obtained from your ADFS configuration (e.g. {0})", ActiveDirectoryFederationServices.DefaultPostLogoutRedirectUri)</span>
 </fieldset>
 <hr />
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.FacebookSettings.cshtml b/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.FacebookSettings.cshtml
index b354e3daf..3979e5f04 100644
--- a/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.FacebookSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.FacebookSettings.cshtml
@@ -1,15 +1,15 @@
 @model Orchard.OpenId.Models.FacebookSettingsPart
-@using Orchard.OpenId
+@using Orchard.OpenId.Constants
 
 <h2>Facebook Settings</h2>
 <fieldset>
     @Html.LabelFor(m => m.AppId, T("App Id"))
     @Html.TextBoxFor(m => m.AppId, new { @class = "text large" })
-    <span class="hint">@T("Facebook's App Id obtained from your facebook developer dashboard (e.g. {0})", Constants.DefaultFacebookAppId)</span>
+    <span class="hint">@T("Facebook's App Id obtained from your facebook developer dashboard (e.g. {0})", Facebook.DefaultAppId)</span>
 </fieldset>
 <fieldset>
     @Html.LabelFor(m => m.AppSecret, T("App Secret"))
     @Html.TextBoxFor(m => m.AppSecret, new { @class = "text large" })
-    <span class="hint">@T("Facebook's App Secret obtained from your facebook developer dashboard (e.g. {0})", Constants.DefaultFacebookAppSecret)</span>
+    <span class="hint">@T("Facebook's App Secret obtained from your facebook developer dashboard (e.g. {0})", Facebook.DefaultAppSecret)</span>
 </fieldset>
 <hr />
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.GoogleSettings.cshtml b/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.GoogleSettings.cshtml
index dfba84f83..b2d584159 100644
--- a/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.GoogleSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.GoogleSettings.cshtml
@@ -1,20 +1,20 @@
 @model Orchard.OpenId.Models.GoogleSettingsPart
-@using Orchard.OpenId
+@using Orchard.OpenId.Constants
 
 <h2>Google Settings</h2>
 <fieldset>
     @Html.LabelFor(m => m.ClientId, T("Client Id"))
     @Html.TextBoxFor(m => m.ClientId, new { @class = "text large" })
-    <span class="hint">@T("Google's Client Id obtained from your google dashboard (e.g. {0})", Constants.DefaultGoogleClientId)</span>
+    <span class="hint">@T("Google's Client Id obtained from your google dashboard (e.g. {0})", Google.DefaultClientId)</span>
 </fieldset>
 <fieldset>
     @Html.LabelFor(m => m.ClientSecret, T("Client Secret"))
     @Html.TextBoxFor(m => m.ClientSecret, new { @class = "text large" })
-    <span class="hint">@T("Google's Client Secret obtained from your google dashboard (e.g. {0})", Constants.DefaultGoogleClientSecret)</span>
+    <span class="hint">@T("Google's Client Secret obtained from your google dashboard (e.g. {0})", Google.DefaultClientSecret)</span>
 </fieldset>
 <fieldset>
     @Html.LabelFor(m => m.CallbackPath, T("Callback Path"))
     @Html.TextBoxFor(m => m.CallbackPath, new { @class = "text large" })
-    <span class="hint">@T("Google's Callback Path obtained from your google dashboard (case sensitive). Recommended: {0}", Constants.LogonCallbackUrl)</span>
+    <span class="hint">@T("Google's Callback Path obtained from your google dashboard (case sensitive). Recommended: {0}", General.LogonCallbackUrl)</span>
 </fieldset>
 <hr />
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.TwitterSettings.cshtml b/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.TwitterSettings.cshtml
index d4d29806f..99f674d08 100644
--- a/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.TwitterSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.OpenId/Views/EditorTemplates/Parts.TwitterSettings.cshtml
@@ -1,5 +1,5 @@
 @model Orchard.OpenId.Models.TwitterSettingsPart
-@using Orchard.OpenId;
+@using Orchard.OpenId.Constants
 @{
     Style.Include("TwitterAdmin").AtHead();
 
@@ -11,12 +11,12 @@
 <fieldset>
     @Html.LabelFor(m => m.ConsumerKey, T("Consumer Key"))
     @Html.TextBoxFor(m => m.ConsumerKey, new { @class = "text large" })
-    <span class="hint">@T("Twitter's Consumer Key obtained from your twitter dashboard (e.g. {0})", Constants.DefaultTwitterConsumerKey)</span>
+    <span class="hint">@T("Twitter's Consumer Key obtained from your twitter dashboard (e.g. {0})", Twitter.DefaultConsumerKey)</span>
 </fieldset>
 <fieldset>
     @Html.LabelFor(m => m.ConsumerSecret, T("Consumer Secret"))
     @Html.TextBoxFor(m => m.ConsumerSecret, new { @class = "text large" })
-    <span class="hint">@T("Twitter's Consumer Secret obtained from your twitter dashboard (e.g. {0})", Constants.DefaultTwitterConsumerSecret)</span>
+    <span class="hint">@T("Twitter's Consumer Secret obtained from your twitter dashboard (e.g. {0})", Twitter.DefaultConsumerSecret)</span>
 </fieldset>
 <fieldset>
     <h6 id="colExpControl" class="coll-exp-control" title="@T("Click to toggle view")">
diff --git a/src/Orchard.Web/Modules/Orchard.OpenId/Web.config b/src/Orchard.Web/Modules/Orchard.OpenId/Web.config
index a672c0116..64e2df5a3 100644
--- a/src/Orchard.Web/Modules/Orchard.OpenId/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.OpenId/Web.config
@@ -105,6 +105,10 @@
                 <assemblyIdentity name="Microsoft.IdentityModel.Protocol.Extensions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-1.0.2.33" newVersion="1.0.2.33" />
             </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+            </dependentAssembly>
         </assemblyBinding>
     </runtime>
 </configuration>
diff --git a/src/Orchard.Web/Modules/Orchard.OpenId/packages.config b/src/Orchard.Web/Modules/Orchard.OpenId/packages.config
index 426d92fcb..765e55479 100644
--- a/src/Orchard.Web/Modules/Orchard.OpenId/packages.config
+++ b/src/Orchard.Web/Modules/Orchard.OpenId/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Iesi.Collections" version="4.0.0.4000" targetFramework="net452" />
+  <package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net452" />
   <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
   <package id="Microsoft.Azure.ActiveDirectory.GraphClient" version="2.1.1" targetFramework="net452" />
@@ -21,8 +21,8 @@
   <package id="Microsoft.Owin.Security.OpenIdConnect" version="3.0.1" targetFramework="net452" />
   <package id="Microsoft.Owin.Security.Twitter" version="3.0.1" targetFramework="net452" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net452" />
-  <package id="NHibernate" version="4.0.4.4000" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
+  <package id="NHibernate" version="4.0.1.4000" targetFramework="net452" />
   <package id="Owin" version="1.0" targetFramework="net452" />
   <package id="System.IdentityModel.Tokens.Jwt" version="4.0.2.206221351" targetFramework="net452" />
   <package id="System.Spatial" version="5.6.4" targetFramework="net452" />
diff --git a/src/Orchard.sln b/src/Orchard.sln
index d39af0ee4..bac938faf 100644
--- a/src/Orchard.sln
+++ b/src/Orchard.sln
@@ -69,6 +69,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Web", "Orchard.Web\
 		{1C981BB3-26F7-494C-9005-CC27A5144233} = {1C981BB3-26F7-494C-9005-CC27A5144233}
 		{2C5EB8B3-A313-413D-BAA0-5C21D2A6EC6E} = {2C5EB8B3-A313-413D-BAA0-5C21D2A6EC6E}
 		{BAC82DB9-F4C4-4DD1-ABDB-F70E6229E6B0} = {BAC82DB9-F4C4-4DD1-ABDB-F70E6229E6B0}
+		{42E217C1-E163-4B6B-9E8F-42BEE21B6896} = {42E217C1-E163-4B6B-9E8F-42BEE21B6896}
 		{8C7FCBC2-E6E1-405E-BFB5-D8D9E67A09C4} = {8C7FCBC2-E6E1-405E-BFB5-D8D9E67A09C4}
 		{2FC1D9C8-446D-4414-B252-5E9FBE61EB63} = {2FC1D9C8-446D-4414-B252-5E9FBE61EB63}
 		{D4E8F7C8-2DB2-4C50-A422-DA1DF1E3CC73} = {D4E8F7C8-2DB2-4C50-A422-DA1DF1E3CC73}