diff --git a/src/Umbraco.Tests.Benchmarks/App.config b/src/Umbraco.Tests.Benchmarks/App.config
index dca44c497f..8af971b1f8 100644
--- a/src/Umbraco.Tests.Benchmarks/App.config
+++ b/src/Umbraco.Tests.Benchmarks/App.config
@@ -111,7 +111,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.DotNet.PlatformAbstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
index f43afa44cd..615eda6bfa 100644
--- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
+++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -141,8 +141,8 @@
     <Reference Include="System.Threading.Thread, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll</HintPath>
     </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/src/Umbraco.Tests.Benchmarks/packages.config b/src/Umbraco.Tests.Benchmarks/packages.config
index da732d629b..8c7c2d2d56 100644
--- a/src/Umbraco.Tests.Benchmarks/packages.config
+++ b/src/Umbraco.Tests.Benchmarks/packages.config
@@ -53,7 +53,7 @@
   <package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net461" />
   <package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net461" />
   <package id="System.Threading.Thread" version="4.3.0" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.3.1" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
   <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
   <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 93220d01b9..6d6bacca98 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -21,6 +21,7 @@
     <UseGlobalApplicationHostFile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <Use64BitIISExpress />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -131,8 +132,8 @@
     <Reference Include="System.Threading.Thread, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll</HintPath>
     </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Abstractions" />
diff --git a/src/Umbraco.Web.UI/config/404handlers.Release.config b/src/Umbraco.Web.UI/config/404handlers.Release.config
index 11bdbaf8ef..72a9d8a374 100644
--- a/src/Umbraco.Web.UI/config/404handlers.Release.config
+++ b/src/Umbraco.Web.UI/config/404handlers.Release.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <NotFoundHandlers>
-  <notFound assembly="umbraco" type="SearchForAlias" />
-  <notFound assembly="umbraco" type="SearchForTemplate"/>
-  <notFound assembly="umbraco" type="SearchForProfile"/>
-  <notFound assembly="umbraco" type="handle404"/>
+  <notFound assembly="Umbraco.Web" type="SearchForAlias" />
+  <notFound assembly="Umbraco.Web" type="SearchForTemplate"/>
+  <notFound assembly="Umbraco.Web" type="SearchForProfile"/>
+  <notFound assembly="Umbraco.Web" type="handle404"/>
 </NotFoundHandlers>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/404handlers.config b/src/Umbraco.Web.UI/config/404handlers.config
index 69bf6f1dd0..2c23a28efe 100644
--- a/src/Umbraco.Web.UI/config/404handlers.config
+++ b/src/Umbraco.Web.UI/config/404handlers.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <NotFoundHandlers>
-	<notFound assembly="umbraco" type="SearchForAlias" />
-	<notFound assembly="umbraco" type="SearchForTemplate"/>
-	<notFound assembly="umbraco" type="SearchForProfile"/>
-	<notFound assembly="umbraco" type="handle404"/>
+	<notFound assembly="Umbraco.Web" type="SearchForAlias" />
+	<notFound assembly="Umbraco.Web" type="SearchForTemplate"/>
+	<notFound assembly="Umbraco.Web" type="SearchForProfile"/>
+	<notFound assembly="Umbraco.Web" type="handle404"/>
 </NotFoundHandlers>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index 2dc378cbe8..5f30038bc9 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -75,7 +75,7 @@
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net461" />
   <package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net461" />
   <package id="System.Threading.Thread" version="4.3.0" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.3.1" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
   <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
   <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
diff --git a/src/Umbraco.Web.UI/umbraco/config/create/UI.xml b/src/Umbraco.Web.UI/umbraco/config/create/UI.xml
index d8d3064f7b..173c49c875 100644
--- a/src/Umbraco.Web.UI/umbraco/config/create/UI.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/create/UI.xml
@@ -4,269 +4,269 @@
     <header>Template</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <delete assembly="umbraco" type="templateTasks" />
-      <create assembly="umbraco" type="templateTasks" />
+      <delete assembly="Umbraco.Web" type="templateTasks" />
+      <create assembly="Umbraco.Web" type="templateTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="inittemplates">
     <header>Template</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="templateTasks" />
+      <create assembly="Umbraco.Web" type="templateTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="initmacros">
     <header>Macro</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="macroTasks" />
+      <create assembly="Umbraco.Web" type="macroTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="macros">
     <header>Macro</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <delete assembly="umbraco" type="macroTasks" />
+      <delete assembly="Umbraco.Web" type="macroTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="xslt">
     <header>Macro</header>
     <usercontrol>/create/xslt.ascx</usercontrol>
     <tasks>
-      <delete assembly="umbraco" type="XsltTasks" />
+      <delete assembly="Umbraco.Web" type="XsltTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="xsltFolder">
     <header>Xslt</header>
     <usercontrol>/create/xslt.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="XsltTasks" />
-      <delete assembly="umbraco" type="XsltTasks" />
+      <create assembly="Umbraco.Web" type="XsltTasks" />
+      <delete assembly="Umbraco.Web" type="XsltTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="users">
     <header>User</header>
     <usercontrol>/create/user.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="userTasks" />
-      <delete assembly="umbraco" type="userTasks" />
+      <create assembly="Umbraco.Web" type="userTasks" />
+      <delete assembly="Umbraco.Web" type="userTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="user">
     <header>User</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <delete assembly="umbraco" type="userTasks" />
+      <delete assembly="Umbraco.Web" type="userTasks" />
     </tasks>
   </nodeType>  
   <nodeType alias="initmemberGroup">
     <header>membergroup</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="MemberGroupTasks" />
+      <create assembly="Umbraco.Web" type="MemberGroupTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="initstylesheets">
     <header>Stylesheet</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="StylesheetTasks" />
+      <create assembly="Umbraco.Web" type="StylesheetTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="stylesheetsFolder">
     <header>Stylesheet</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="StylesheetTasks" />
-      <delete assembly="umbraco" type="StylesheetTasks" />
+      <create assembly="Umbraco.Web" type="StylesheetTasks" />
+      <delete assembly="Umbraco.Web" type="StylesheetTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="initxslt">
     <header>XSLT file</header>
     <usercontrol>/create/xslt.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="XsltTasks" />
+      <create assembly="Umbraco.Web" type="XsltTasks" />
     </tasks>
   </nodeType>      
   <nodeType alias="memberGroups">
     <header>membergroup</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <delete assembly="umbraco" type="MemberGroupTasks" />
+      <delete assembly="Umbraco.Web" type="MemberGroupTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="stylesheet">
     <header>Stylesheet editor egenskab</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="stylesheetPropertyTasks" />
-      <delete assembly="umbraco" type="StylesheetTasks" />
+      <create assembly="Umbraco.Web" type="stylesheetPropertyTasks" />
+      <delete assembly="Umbraco.Web" type="StylesheetTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="stylesheetProperty">
     <header>Stylesheet editor egenskab</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <delete assembly="umbraco" type="stylesheetPropertyTasks" />
+      <delete assembly="Umbraco.Web" type="stylesheetPropertyTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="dictionary">
     <header>Dictionary editor egenskab</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="dictionaryTasks" />
-      <delete assembly="umbraco" type="dictionaryTasks" />
+      <create assembly="Umbraco.Web" type="dictionaryTasks" />
+      <delete assembly="Umbraco.Web" type="dictionaryTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="initlanguages">
     <header>Language</header>
     <usercontrol>/create/language.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="languageTasks" />
+      <create assembly="Umbraco.Web" type="languageTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="languages">
     <header>Language</header>
     <usercontrol>/create/language.ascx</usercontrol>
     <tasks>
-      <delete assembly="umbraco" type="languageTasks" />
+      <delete assembly="Umbraco.Web" type="languageTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="cache">
     <tasks>
-      <delete assembly="umbraco" type="cacheTasks" />
+      <delete assembly="Umbraco.Web" type="cacheTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="initpython">
     <header>Scripting file</header>
     <usercontrol>/create/DLRScripting.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="PythonTasks" />
+      <create assembly="Umbraco.Web" type="PythonTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="python">
     <header>Macro</header>
     <usercontrol>/create/DLRScripting.ascx</usercontrol>
     <tasks>
-      <delete assembly="umbraco" type="PythonTasks" />
+      <delete assembly="Umbraco.Web" type="PythonTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="initdlrscripting">
     <header>Scripting file</header>
     <usercontrol>/create/DLRScripting.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="DLRScriptingTasks" />
+      <create assembly="Umbraco.Web" type="DLRScriptingTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="dlrscripting">
     <header>Macro</header>
     <usercontrol>/create/DLRScripting.ascx</usercontrol>
     <tasks>
-      <delete assembly="umbraco" type="DLRScriptingTasks" />
+      <delete assembly="Umbraco.Web" type="DLRScriptingTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="initscripts">
     <header>Script file</header>
     <usercontrol>/create/script.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="ScriptTasks" />
+      <create assembly="Umbraco.Web" type="ScriptTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="scriptsFolder">
     <header>Script file</header>
     <usercontrol>/create/script.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="ScriptTasks" />
-      <delete assembly="umbraco" type="ScriptTasks" />
+      <create assembly="Umbraco.Web" type="ScriptTasks" />
+      <delete assembly="Umbraco.Web" type="ScriptTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="scripts">
     <header>Macro</header>
     <usercontrol>/create/script.ascx</usercontrol>
     <tasks>
-      <delete assembly="umbraco" type="ScriptTasks" />
+      <delete assembly="Umbraco.Web" type="ScriptTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="initpackager">
     <header>Package</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="CreatedPackageTasks" />
+      <create assembly="Umbraco.Web" type="CreatedPackageTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="packager">
     <header>Package</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="CreatedPackageTasks" />
+      <create assembly="Umbraco.Web" type="CreatedPackageTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="createdPackages">
     <header>Package</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="CreatedPackageTasks" />
+      <create assembly="Umbraco.Web" type="CreatedPackageTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="createdPackageInstance">
     <header>Package</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <delete assembly="umbraco" type="CreatedPackageTasks" />
+      <delete assembly="Umbraco.Web" type="CreatedPackageTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="userTypes">
     <header>User Types</header>
     <usercontrol>/create/simple.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="cms.presentation.user.UserTypeTasks" />
-      <delete assembly="umbraco" type="cms.presentation.user.UserTypeTasks" />
+      <create assembly="Umbraco.Web" type="cms.presentation.user.UserTypeTasks" />
+      <delete assembly="Umbraco.Web" type="cms.presentation.user.UserTypeTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="partialViews">
     <header>Macro</header>
 		<usercontrol>/Create/PartialView.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="PartialViewTasks" />
-      <delete assembly="umbraco" type="PartialViewTasks" />
+      <create assembly="Umbraco.Web" type="PartialViewTasks" />
+      <delete assembly="Umbraco.Web" type="PartialViewTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="initpartialViews">
     <header>Macro</header>
     <usercontrol>/Create/PartialView.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="PartialViewTasks" />
+      <create assembly="Umbraco.Web" type="PartialViewTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="partialViewMacros">
     <header>Macro</header>
     <usercontrol>/Create/PartialViewMacro.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="PartialViewMacroTasks" />
-      <delete assembly="umbraco" type="PartialViewMacroTasks" />
+      <create assembly="Umbraco.Web" type="PartialViewMacroTasks" />
+      <delete assembly="Umbraco.Web" type="PartialViewMacroTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="initpartialViewMacros">
     <header>Macro</header>
     <usercontrol>/Create/PartialViewMacro.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="PartialViewMacroTasks" />
+      <create assembly="Umbraco.Web" type="PartialViewMacroTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="partialViewsFolder">
     <header>Macro</header>
     <usercontrol>/Create/PartialView.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="PartialViewTasks" />
-      <delete assembly="umbraco" type="PartialViewTasks" />
+      <create assembly="Umbraco.Web" type="PartialViewTasks" />
+      <delete assembly="Umbraco.Web" type="PartialViewTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="partialViewMacrosFolder">
     <header>Macro</header>
     <usercontrol>/Create/PartialViewMacro.ascx</usercontrol>
     <tasks>
-      <create assembly="umbraco" type="PartialViewMacroTasks" />
-      <delete assembly="umbraco" type="PartialViewMacroTasks" />
+      <create assembly="Umbraco.Web" type="PartialViewMacroTasks" />
+      <delete assembly="Umbraco.Web" type="PartialViewMacroTasks" />
     </tasks>
   </nodeType>
 </createUI>
diff --git a/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx b/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
index 174b7c7d13..a2421845cc 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
@@ -1,6 +1,6 @@
 <%@ Control Language="C#" AutoEventWireup="true" Inherits="umbraco.controls.Tree.TreeControl" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="umbraco" %>
+<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="Umbraco.Web" %>
 
 <umb:CssInclude ID="CssInclude1" runat="server" FilePath="Tree/Themes/umbraco/style.css" PathNameAlias="UmbracoClient" Priority="12" />
 
diff --git a/src/Umbraco.Web.UI/umbraco/create.aspx b/src/Umbraco.Web.UI/umbraco/create.aspx
index 782b7f178d..0d9a92e3b8 100644
--- a/src/Umbraco.Web.UI/umbraco/create.aspx
+++ b/src/Umbraco.Web.UI/umbraco/create.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="c#" MasterPageFile="masterpages/umbracoDialog.Master" Codebehind="CreateDialog.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.CreateDialog" %>
-<%@ Register Namespace="umbraco" TagPrefix="umb" Assembly="umbraco" %>
+<%@ Register Namespace="umbraco" TagPrefix="umb" Assembly="Umbraco.Web" %>
 
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Macros/assemblyBrowser.aspx b/src/Umbraco.Web.UI/umbraco/developer/Macros/assemblyBrowser.aspx
index 87027c0318..1e7da97b18 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Macros/assemblyBrowser.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Macros/assemblyBrowser.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" Title="Assembly Browser" Codebehind="assemblyBrowser.aspx.cs" AutoEventWireup="True"
   Inherits="umbraco.developer.assemblyBrowser" %>
-<%@ Register TagPrefix="wc1" Namespace="umbraco.controls" Assembly="umbraco" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="wc1" Namespace="umbraco.controls" Assembly="Umbraco.Web" %>
+<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="Umbraco.Web" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 
 
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltVisualize.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltVisualize.aspx
index bfeecde25d..752edf16c2 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltVisualize.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltVisualize.aspx
@@ -1,8 +1,8 @@
 <%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoDialog.Master" AutoEventWireup="true"
     CodeBehind="xsltVisualize.aspx.cs" ValidateRequest="false" Inherits="umbraco.presentation.umbraco.developer.Xslt.xsltVisualize" %>
 
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register TagPrefix="cc2" Namespace="umbraco.controls" Assembly="umbraco" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
+<%@ Register TagPrefix="cc2" Namespace="umbraco.controls" Assembly="Umbraco.Web" %>
 
 <asp:Content runat="server" ContentPlaceHolderID="head">
 
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
index 5cb9bc4ca9..05d7151f6c 100644
--- a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
+++ b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
@@ -5,8 +5,8 @@
 </asp:contentplaceholder>
 
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="umbraco" %>
-<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web.UI.JavaScript" Assembly="umbraco" %>
+<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="Umbraco.Web" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web.UI.JavaScript" Assembly="Umbraco.Web" %>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head id="Head1" runat="server">
diff --git a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master
index afd3003624..3dcd479e09 100644
--- a/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master
+++ b/src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master
@@ -5,8 +5,8 @@
 </asp:ContentPlaceHolder>
 
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="umbraco" %>
-<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web.UI.JavaScript" Assembly="umbraco" %>
+<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="Umbraco.Web" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web.UI.JavaScript" Assembly="Umbraco.Web" %>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
@@ -14,16 +14,16 @@
     <cc1:UmbracoClientDependencyLoader runat="server" ID="ClientLoader" />
 
     <umb:CssInclude ID="CssInclude1" runat="server" FilePath="assets/css/umbraco.css" PathNameAlias="UmbracoRoot" />
-    
+
     <umbClient:JsApplicationLib runat="server"/>
     <umbClient:JsJQueryCore runat="server"/>
     <umbClient:JsUmbracoApplicationCore runat="server"/>
     <umbClient:JsJQueryPlugins runat="server"/>
-    
+
     <umb:JsInclude ID="JsInclude7" runat="server" FilePath="modal/modal.js" PathNameAlias="UmbracoClient" Priority="10" />
     <umb:JsInclude ID="JsInclude3" runat="server" FilePath="ui/default.js" PathNameAlias="UmbracoClient" Priority="10" />
     <umb:JsInclude ID="JsIncludeHotkeys" runat="server" FilePath="Application/jQuery/jquery.hotkeys.js" PathNameAlias="UmbracoClient" Priority="10" />
-    
+
     <umb:JsInclude runat="server" FilePath="lib/bootstrap/js/bootstrap.2.3.2.min.js" PathNameAlias="UmbracoRoot" Priority="10" />
     <umb:JsInclude runat="server" FilePath="lib/umbraco/compat.js" PathNameAlias="UmbracoRoot" Priority="10" />
 
diff --git a/src/Umbraco.Web.UI/umbraco/settings/EditDictionaryItem.aspx b/src/Umbraco.Web.UI/umbraco/settings/EditDictionaryItem.aspx
index 09af30fd00..d1240dfc18 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/EditDictionaryItem.aspx
+++ b/src/Umbraco.Web.UI/umbraco/settings/EditDictionaryItem.aspx
@@ -1,5 +1,4 @@
-<%@ Register Namespace="umbraco" TagPrefix="umb" Assembly="umbraco" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoPage.Master" ValidateRequest="false"
     CodeBehind="EditDictionaryItem.aspx.cs" AutoEventWireup="True" Inherits="umbraco.settings.EditDictionaryItem" %>
diff --git a/src/Umbraco.Web.UI/umbraco/treeInit.aspx b/src/Umbraco.Web.UI/umbraco/treeInit.aspx
index ec0cd330bc..14677d7638 100644
--- a/src/Umbraco.Web.UI/umbraco/treeInit.aspx
+++ b/src/Umbraco.Web.UI/umbraco/treeInit.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" CodeBehind="TreeInit.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.TreeInit" %>
 <%@ Register Src="controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web.UI.JavaScript" Assembly="umbraco" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web.UI.JavaScript" Assembly="Umbraco.Web" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 7169c3cabc..cf3761d1b0 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -2,24 +2,23 @@
 <configuration>
 
   <!--
-    Define the web.config template.
-
-    This file is used when creating the initial web.config. And then transforms from
-    web.Template.[Debug|Release].config are applied.
+    Define the web.config template, which is used when creating the initial web.config,
+    and then transforms from web.Template.[Debug|Release].config are applied. Documentation
+    for web.config at http://our.umbraco.org/documentation/using-umbraco/config-files/#webconfig
   -->
 
-	<configSections>
-		<section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
-		<section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
-		<section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
-		<section name="ExamineLuceneIndexSets" type="Examine.LuceneEngine.Config.IndexSets, Examine" requirePermission="false" />
-		<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" requirePermission="false" />
+  <configSections>
+    <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
+    <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
+    <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
+    <section name="ExamineLuceneIndexSets" type="Examine.LuceneEngine.Config.IndexSets, Examine" requirePermission="false" />
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" requirePermission="false" />
 
-		<sectionGroup name="umbracoConfiguration">
-			<section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
-			<section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" />
-			<section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" />
-            <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false"/>
+    <sectionGroup name="umbracoConfiguration">
+      <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
+      <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" />
+      <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" />
+      <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false"/>
     </sectionGroup>
 
     <sectionGroup name="imageProcessor">
@@ -29,115 +28,119 @@
     </sectionGroup>
   </configSections>
 
-	<umbracoConfiguration>
-		<settings configSource="config\umbracoSettings.config" />
-		<FileSystemProviders configSource="config\FileSystemProviders.config" />
-		<dashBoard configSource="config\Dashboard.config" />
-        <HealthChecks configSource="config\HealthChecks.config" />
-	</umbracoConfiguration>
+  <umbracoConfiguration>
+    <settings configSource="config\umbracoSettings.config" />
+    <FileSystemProviders configSource="config\FileSystemProviders.config" />
+    <dashBoard configSource="config\Dashboard.config" />
+    <HealthChecks configSource="config\HealthChecks.config" />
+  </umbracoConfiguration>
 
-	<microsoft.scripting configSource="config\scripting.config" />
-	<clientDependency configSource="config\ClientDependency.config" />
-	<Examine configSource="config\ExamineSettings.config" />
-	<ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
-	<log4net configSource="config\log4net.config" />
+  <microsoft.scripting configSource="config\scripting.config" />
+  <clientDependency configSource="config\ClientDependency.config" />
+  <Examine configSource="config\ExamineSettings.config" />
+  <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
+  <log4net configSource="config\log4net.config" />
 
-	<appSettings>
-		<!--
-      Umbraco web.config configuration documentation can be found here:
-      http://our.umbraco.org/documentation/using-umbraco/config-files/#webconfig
-      -->
-		<add key="umbracoConfigurationStatus" value="" />
-		<add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
-		<add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
-		<add key="umbracoPath" value="~/umbraco" />
-		<add key="umbracoHideTopLevelNodeFromPath" value="true" />
-		<add key="umbracoUseDirectoryUrls" value="true" />
-		<add key="umbracoTimeOutInMinutes" value="20" />
-		<add key="umbracoDefaultUILanguage" value="en-US" />
-		<add key="umbracoUseSSL" value="false" />
+  <appSettings>
+    <add key="umbracoConfigurationStatus" value="" />
+    <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
+    <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
+    <add key="umbracoPath" value="~/umbraco" />
+    <add key="umbracoHideTopLevelNodeFromPath" value="true" />
+    <add key="umbracoUseDirectoryUrls" value="true" />
+    <add key="umbracoTimeOutInMinutes" value="20" />
+    <add key="umbracoDefaultUILanguage" value="en-US" />
+    <add key="umbracoUseSSL" value="false" />
 
-		<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
-		<add key="webpages:Enabled" value="false" />
-		<add key="enableSimpleMembership" value="false" />
-		<add key="autoFormsAuthentication" value="false" />
+    <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
+    <add key="webpages:Enabled" value="false" />
+    <add key="enableSimpleMembership" value="false" />
+    <add key="autoFormsAuthentication" value="false" />
 
-		<add key="log4net.Config" value="config\log4net.config" />
-		<add key="owin:appStartup" value="UmbracoDefaultOwinStartup" />
+    <add key="log4net.Config" value="config\log4net.config" />
+    <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" />
 
-    <add key="Umbraco.ModelsBuilder.Enable" value="true"/>
+    <add key="Umbraco.ModelsBuilder.Enable" value="true" />
     <add key="Umbraco.ModelsBuilder.ModelsMode" value="PureLive" />
+  </appSettings>
 
-	</appSettings>
-
+  <!--
+    Important: If you're upgrading Umbraco, do not clear the connection
+    string / provider name during your web.config merge.
+  -->
   <connectionStrings>
-		<remove name="umbracoDbDSN" />
-		<add name="umbracoDbDSN" connectionString="" providerName="" />
-		<!-- Important: If you're upgrading Umbraco, do not clear the connection string / provider name during your web.config merge. -->
-	</connectionStrings>
+    <remove name="umbracoDbDSN" />
+    <add name="umbracoDbDSN" connectionString="" providerName="" />
+  </connectionStrings>
 
-	<system.data>
-		<DbProviderFactories>
-			<remove invariant="System.Data.SqlServerCe.4.0" />
-			<add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" />
-			<remove invariant="MySql.Data.MySqlClient" />
-			<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" />
-		</DbProviderFactories>
-	</system.data>
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="System.Data.SqlServerCe.4.0" />
+      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" />
+      <remove invariant="MySql.Data.MySqlClient" />
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" />
+    </DbProviderFactories>
+  </system.data>
 
-	<system.net>
-		<mailSettings>
+  <system.net>
+    <mailSettings>
       <smtp from="noreply@example.com">
-				<network host="127.0.0.1" userName="username" password="password" />
-			</smtp>
-		</mailSettings>
-	</system.net>
+        <network host="127.0.0.1" userName="username" password="password" />
+      </smtp>
+    </mailSettings>
+  </system.net>
 
-	<system.web>
-		<customErrors mode="RemoteOnly" />
-		<trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
-		<httpRuntime requestValidationMode="2.0" enableVersionHeader="false" targetFramework="4.5" maxRequestLength="51200" fcnMode="Single" />
-		<!--
+  <system.web>
+    <customErrors mode="RemoteOnly" />
+
+    <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
+
+    <httpRuntime requestValidationMode="2.0" enableVersionHeader="false" targetFramework="4.5" maxRequestLength="51200" fcnMode="Single" />
+
+    <!--
       If you are deploying to a cloud environment that has multiple web server instances,
       you should change session state mode from "InProc" to "Custom". In addition,
       change the connection string named "DefaultConnection" to connect to an instance
       of SQL Server (including SQL Azure and SQL  Compact) instead of to SQL Server Express.
-      -->
-		<sessionState mode="InProc" customProvider="DefaultSessionProvider">
-			<providers>
-				<add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" />
-			</providers>
-		</sessionState>
-		<pages enableEventValidation="false">
-			<controls>
-				<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-				<add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
-				<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-			</controls>
+    -->
+    <sessionState mode="InProc" customProvider="DefaultSessionProvider">
+      <providers>
+        <add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" />
+     </providers>
+    </sessionState>
+
+    <pages enableEventValidation="false">
+      <controls>
+        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="Umbraco.Web" />
+        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      </controls>
       <namespaces>
         <add namespace="Umbraco.Core"/>
         <add namespace="Umbraco.Core.Services"/>
       </namespaces>
-		</pages>
-		<httpModules>
-			<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-			<add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" />
-			<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-			<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
-		</httpModules>
-		<httpHandlers>
-			<remove verb="*" path="*.asmx" />
-			<add verb="*" path="*.asmx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
-			<add verb="*" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
-			<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
-			<add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-		</httpHandlers>
+    </pages>
+
+    <httpModules>
+      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" />
+      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
+      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
+    </httpModules>
+
+    <httpHandlers>
+      <remove verb="*" path="*.asmx" />
+      <add verb="*" path="*.asmx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
+      <add verb="*" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
+      <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
+      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
+    </httpHandlers>
 
 		<compilation defaultLanguage="c#" debug="false" batch="false" targetFramework="4.6.1" numRecompilesBeforeAppRestart="50">
 			<assemblies>
 				<remove assembly="System.Web.Http" />
 				<remove assembly="System.Net.Http" />
-				<remove assembly="Umbraco.ModelsBuilder" />
+				<remove assembly="System.Runtime" />
 				<remove assembly="System.Collections" />
 				<remove assembly="System.Collections.Concurrent" />
 				<remove assembly="System.ComponentModel" />
@@ -188,9 +191,10 @@
 				<remove assembly="System.Xml.ReaderWriter" />
 				<remove assembly="System.Xml.XDocument" />
 				<remove assembly="System.Xml.XmlSerializer" />
+				<remove assembly="Umbraco.ModelsBuilder" />
 				<add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 				<add assembly="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<add assembly="Umbraco.ModelsBuilder"/>
+				<add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 				<add assembly="System.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 				<add assembly="System.Collections.Concurrent, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 				<add assembly="System.ComponentModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -218,7 +222,6 @@
 				<add assembly="System.Reflection.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 				<add assembly="System.Reflection.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 				<add assembly="System.Resources.ResourceManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 				<add assembly="System.Runtime.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 				<add assembly="System.Runtime.InteropServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 				<add assembly="System.Runtime.InteropServices.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -241,15 +244,18 @@
 				<add assembly="System.Xml.ReaderWriter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 				<add assembly="System.Xml.XDocument, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 				<add assembly="System.Xml.XmlSerializer, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<add assembly="Umbraco.ModelsBuilder"/>
 			</assemblies>
 		</compilation>
 
 		<authentication mode="Forms">
 			<forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
 		</authentication>
+
 		<authorization>
 			<allow users="?" />
 		</authorization>
+
 		<!-- Membership Provider -->
 		<membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
 			<providers>
@@ -258,6 +264,7 @@
 				<add name="UsersMembershipProvider" type="Umbraco.Web.Security.Providers.UsersMembershipProvider, Umbraco.Web" />
 			</providers>
 		</membership>
+
 		<!-- Role Provider -->
 		<roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
 			<providers>
@@ -265,139 +272,125 @@
 				<add name="UmbracoRoleProvider" type="Umbraco.Web.Security.Providers.MembersRoleProvider" />
 			</providers>
 		</roleManager>
+
 		<siteMap>
 			<providers>
 				<remove name="MySqlSiteMapProvider" />
 			</providers>
 		</siteMap>
-	</system.web>
 
-	<system.webServer>
-		<validation validateIntegratedModeConfiguration="false" />
-		<modules runAllManagedModulesForAllRequests="true">
-			<remove name="WebDAVModule" />
+  </system.web>
 
-			<remove name="UmbracoModule" />
-			<add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" />
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false" />
 
-			<remove name="ScriptModule" />
-			<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+    <modules runAllManagedModulesForAllRequests="true">
+      <remove name="WebDAVModule" />
+      <remove name="UmbracoModule" />
+      <remove name="ScriptModule" />
+      <remove name="ClientDependencyModule" />
+      <remove name="FormsAuthentication" />
+      <remove name="ImageProcessorModule" />
 
-			<remove name="ClientDependencyModule" />
-			<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
+      <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" />
+      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
+      <!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
+      <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
+      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
+    </modules>
 
-			<!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
-			<remove name="FormsAuthentication" />
-			<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
-			<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
-		</modules>
+    <handlers accessPolicy="Read, Write, Script, Execute">
+      <remove name="WebServiceHandlerFactory-Integrated" />
+      <remove name="ScriptHandlerFactory" />
+      <remove name="ScriptHandlerFactoryAppServices" />
+      <remove name="ScriptResource" />
+      <remove name="ClientDependency" />
+      <remove name="MiniProfiler" />
+      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
+      <remove name="OPTIONSVerbHandler" />
+      <remove name="TRACEVerbHandler" />
 
-		<handlers accessPolicy="Read, Write, Script, Execute">
-			<remove name="WebServiceHandlerFactory-Integrated" />
-			<remove name="ScriptHandlerFactory" />
-			<remove name="ScriptHandlerFactoryAppServices" />
-			<remove name="ScriptResource" />
-			<remove name="ClientDependency" />
-			<remove name="MiniProfiler" />
+      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core" />
+      <add name="MiniProfiler" path="mini-profiler-resources/*" verb="*" type="System.Web.Routing.UrlRoutingModule" resourceType="Unspecified" preCondition="integratedMode" />
+      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+    </handlers>
 
-			<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-			<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-			<add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-			<add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core" />
-			<add name="MiniProfiler" path="mini-profiler-resources/*" verb="*" type="System.Web.Routing.UrlRoutingModule" resourceType="Unspecified" preCondition="integratedMode" />
-			<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
-			<remove name="OPTIONSVerbHandler" />
-			<remove name="TRACEVerbHandler" />
-			<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-		</handlers>
+    <staticContent>
+      <remove fileExtension=".air" />
+      <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
+      <remove fileExtension=".svg" />
+      <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
+      <remove fileExtension=".woff"/>
+      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
+      <remove fileExtension=".woff2"/>
+      <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" />
+      <remove fileExtension=".less" />
+      <mimeMap fileExtension=".less" mimeType="text/css" />
+      <remove fileExtension=".mp4" />
+      <mimeMap fileExtension=".mp4" mimeType="video/mp4" />
+      <remove fileExtension=".json" />
+      <mimeMap fileExtension=".json" mimeType="application/json" />
+    </staticContent>
 
-		<!-- Adobe AIR mime type -->
-		<staticContent>
-			<remove fileExtension=".air" />
-			<mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
-			<remove fileExtension=".svg" />
-			<mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
-			<remove fileExtension=".woff"/>
-			<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
-			<remove fileExtension=".woff2"/>
-			<mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" />
-			<remove fileExtension=".less" />
-			<mimeMap fileExtension=".less" mimeType="text/css" />
-			<remove fileExtension=".mp4" />
-			<mimeMap fileExtension=".mp4" mimeType="video/mp4" />
-			<remove fileExtension=".json" />
-			<mimeMap fileExtension=".json" mimeType="application/json" />
-		</staticContent>
+    <!-- Ensure the powered by header is not returned -->
+    <httpProtocol>
+      <customHeaders>
+        <remove name="X-Powered-By" />
+      </customHeaders>
+    </httpProtocol>
 
-		<!-- Ensure the powered by header is not returned -->
-		<httpProtocol>
-			<customHeaders>
-				<remove name="X-Powered-By" />
-			</customHeaders>
-		</httpProtocol>
-
-		<!-- Increase the default upload file size limit -->
-		<security>
-			<requestFiltering>
-				<requestLimits maxAllowedContentLength="52428800" />
-			</requestFiltering>
-		</security>
-
-		<!--
-		  If you wish to use IIS rewrite rules, see the documentation here:
-		  https://our.umbraco.org/documentation/Reference/Routing/IISRewriteRules
-		-->
-		<!--
-		 <rewrite>
-			<rules></rules>
-		 </rewrite>
-		  -->
+    <!-- Increase the default upload file size limit -->
+    <security>
+      <requestFiltering>
+        <requestLimits maxAllowedContentLength="52428800" />
+      </requestFiltering>
+    </security>
 
+    <!--
+      If you wish to use IIS rewrite rules, see the documentation here:
+      https://our.umbraco.org/documentation/Reference/Routing/IISRewriteRules
+    -->
+    <!--
+    <rewrite>
+      <rules></rules>
+    </rewrite>
+    -->
 	</system.webServer>
 
 	<runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-        <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35" />
-      <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="4.0.0.0" />
+        <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.1.0" newVersion="1.5.1.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+        <assemblyIdentity name="Lucene.Net" publicKeyToken="85089178b9ac3181" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.3.0" newVersion="3.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
+        <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+        <assemblyIdentity name="Microsoft.CodeAnalysis.Analyzers" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
+        <assemblyIdentity name="Microsoft.CodeAnalysis.Common" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0"/>
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-      </dependentAssembly>
-
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
@@ -414,71 +407,117 @@
         <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
-
-      <dependentAssembly>
-        <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.5.1.0" newVersion="1.5.1.0" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Lucene.Net" publicKeyToken="85089178b9ac3181" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.3.0" newVersion="3.0.3.0" />
-      </dependentAssembly>
-
-      <dependentAssembly>
-        <assemblyIdentity name="System.Data.SqlServerCe" publicKeyToken="89845DCD8080CC91" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1"/>
-      </dependentAssembly>
-
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.CodeAnalysis.Common" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.CodeAnalysis.Analyzers" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0"/>
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Data.SqlServerCe" publicKeyToken="89845DCD8080CC91" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-1.4.1.0" newVersion="1.4.1.0"/>
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
     </assemblyBinding>
 	</runtime>
 
-	<location path="umbraco">
-		<system.webServer>
-			<urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" />
-		</system.webServer>
-	</location>
-	<location path="App_Plugins">
-		<system.webServer>
-			<urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" />
-		</system.webServer>
-	</location>
+  <location path="umbraco">
+    <system.webServer>
+      <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" />
+    </system.webServer>
+  </location>
+  <location path="App_Plugins">
+    <system.webServer>
+      <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" />
+    </system.webServer>
+  </location>
 
   <imageProcessor>
-    <security configSource="config\imageprocessor\security.config" />
+   <security configSource="config\imageprocessor\security.config" />
     <caching configSource="config\imageprocessor\cache.config" />
-    <processing configSource="config\imageprocessor\processing.config" />
+   <processing configSource="config\imageprocessor\processing.config" />
   </imageProcessor>
 
+  <system.codedom>
+     <compilers>
+       <compiler language="c#;cs;csharp" extension=".cs"
+         type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+         warningLevel="4"
+          compilerOptions="/langversion:7 /nowarn:1659;1699;1701" />
+        <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb"
+         type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+         warningLevel="4"
+         compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
+     </compilers>
+  </system.codedom>
+
 </configuration>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx
index f12ab67b7b..18b582707d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx
@@ -1,10 +1,5 @@
 <%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoDialog.Master" Title="Assembly Browser" Codebehind="assemblyBrowser.aspx.cs" AutoEventWireup="True"
   Inherits="umbraco.developer.assemblyBrowser" %>
-<%@ Register TagPrefix="wc1" Namespace="umbraco.controls" Assembly="umbraco" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-
-
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
 <h4><asp:Label id="AssemblyName" runat="server"></asp:Label></h4>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx
index 3cb7be752c..74c40eca64 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoDialog.Master" AutoEventWireup="true"
     CodeBehind="xsltVisualize.aspx.cs" ValidateRequest="false" Inherits="umbraco.presentation.umbraco.developer.Xslt.xsltVisualize" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register TagPrefix="cc2" Namespace="umbraco.controls" Assembly="umbraco" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
+<%@ Register TagPrefix="cc2" Namespace="umbraco.controls" Assembly="Umbraco.Web" %>
 
 <asp:Content runat="server" ContentPlaceHolderID="head">
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.designer.cs
index 394b3f7a3a..cfc124ef7a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.designer.cs
@@ -1,18 +1,17 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4200
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.presentation.umbraco.developer.Xslt {
-
-
+    
+    
     public partial class xsltVisualize {
-
+        
         /// <summary>
         /// Pane1 control.
         /// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.presentation.umbraco.developer.Xslt {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane1;
-
+        
         /// <summary>
         /// PropertyPanel1 control.
         /// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.presentation.umbraco.developer.Xslt {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel PropertyPanel1;
-
+        
         /// <summary>
         /// xsltSelection control.
         /// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.presentation.umbraco.developer.Xslt {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputHidden xsltSelection;
-
+        
         /// <summary>
         /// contentPicker control.
         /// </summary>
@@ -48,7 +47,7 @@ namespace umbraco.presentation.umbraco.developer.Xslt {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::umbraco.controls.ContentPicker contentPicker;
-
+        
         /// <summary>
         /// visualizeDo control.
         /// </summary>
@@ -57,7 +56,7 @@ namespace umbraco.presentation.umbraco.developer.Xslt {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button visualizeDo;
-
+        
         /// <summary>
         /// visualizeContainer control.
         /// </summary>
@@ -66,7 +65,7 @@ namespace umbraco.presentation.umbraco.developer.Xslt {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane visualizeContainer;
-
+        
         /// <summary>
         /// visualizePanel control.
         /// </summary>
@@ -75,7 +74,7 @@ namespace umbraco.presentation.umbraco.developer.Xslt {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel visualizePanel;
-
+        
         /// <summary>
         /// visualizeArea control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx
index 09af30fd00..c83e3180c2 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx
@@ -1,5 +1,5 @@
-<%@ Register Namespace="umbraco" TagPrefix="umb" Assembly="umbraco" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register Namespace="umbraco" TagPrefix="umb" Assembly="Umbraco.Web" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoPage.Master" ValidateRequest="false"
     CodeBehind="EditDictionaryItem.aspx.cs" AutoEventWireup="True" Inherits="umbraco.settings.EditDictionaryItem" %>