diff --git a/src/Umbraco.Web.UI/config/trees.Release.config b/src/Umbraco.Web.UI/config/trees.Release.config
index a1712744a0..460d8d47d7 100644
--- a/src/Umbraco.Web.UI/config/trees.Release.config
+++ b/src/Umbraco.Web.UI/config/trees.Release.config
@@ -35,7 +35,7 @@
   <add application="member" alias="memberType" title="Member Types" type="umbraco.loadMemberTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
   <!--Translation-->
   <add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, umbraco" />
-  <add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, umbraco"  />
+  <add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, umbraco" />
   <!-- Custom -->
   <!--<add application="myApplication" alias="myTree" title="Me Tree" type="MyNamespace.myTree, MyAssembly"
        iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="10" />-->
diff --git a/src/Umbraco.Web.UI/web.Template.Debug.config b/src/Umbraco.Web.UI/web.Template.Debug.config
index 13eb6190df..5d78f5db5c 100644
--- a/src/Umbraco.Web.UI/web.Template.Debug.config
+++ b/src/Umbraco.Web.UI/web.Template.Debug.config
@@ -17,8 +17,8 @@
 
 
   <configSections>
-    <section name="Examine" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)"/>
-    <section name="ExamineLuceneIndexSets" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)"/>
+    <section name="Examine" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)" />
+    <section name="ExamineLuceneIndexSets" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)" />
 
     <section name="BaseRestExtensions" xdt:Locator="Match(name)" xdt:Transform="Remove" />
     <section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
@@ -28,25 +28,25 @@
     <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="Remove" />
     <sectionGroup name="umbracoConfiguration" xdt:Transform="Insert">
       <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
-      <section name="BaseRestExtensions" type="Umbraco.Core.Configuration.BaseRest.BaseRestSection, 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="BaseRestExtensions" type="Umbraco.Core.Configuration.BaseRest.BaseRestSection, 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" />
     </sectionGroup>
 
   </configSections>
 
   <BaseRestExtensions xdt:Transform="Remove" />
   <FileSystemProviders xdt:Transform="Remove" />
-  <umbracoConfiguration xdt:Transform="Remove"/>
+  <umbracoConfiguration xdt:Transform="Remove" />
   <umbracoConfiguration xdt:Transform="InsertBefore(/configuration/appSettings)">
     <settings configSource="config\umbracoSettings.config" />
     <BaseRestExtensions configSource="config\BaseRestExtensions.config" />
     <FileSystemProviders configSource="config\FileSystemProviders.config" />
-    <dashBoard configSource="config\Dashboard.config"/>
+    <dashBoard configSource="config\Dashboard.config" />
   </umbracoConfiguration>
 
   <appSettings xdt:Transform="Remove" xdt:Locator="Condition(@configSource != '')" />
-  <appSettings xdt:Transform="InsertIfMissing" >
+  <appSettings xdt:Transform="InsertIfMissing">
     <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/" />
@@ -57,15 +57,15 @@
     <add key="umbracoDefaultUILanguage" value="en" />
     <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="log4net.Config" value="config\log4net.config" />  
+    <add key="webpages:Enabled" value="false" />
+    <add key="enableSimpleMembership" value="false" />
+    <add key="autoFormsAuthentication" value="false" />
+    <add key="log4net.Config" value="config\log4net.config" />
   </appSettings>
 
   <connectionStrings xdt:Transform="Remove" xdt:Locator="Condition(@configSource != '')" />
   <connectionStrings xdt:Transform="InsertIfMissing">
-    <remove name="umbracoDbDSN"/>
+    <remove name="umbracoDbDSN" />
     <add name="umbracoDbDSN" connectionString="" providerName="" />
   </connectionStrings>  
 
@@ -79,25 +79,25 @@
   </system.data>
 
   <system.web>
-    <xhtmlConformance xdt:Transform="Remove"/>
+    <xhtmlConformance xdt:Transform="Remove" />
     <membership defaultProvider="UmbracoMembershipProvider">
       <providers>
         <add name="UmbracoMembershipProvider" defaultMemberTypeAlias="Member"
              xdt:Locator="Condition(@defaultMemberTypeAlias='Another Type' and @name='UmbracoMembershipProvider')"
-             xdt:Transform="SetAttributes(defaultMemberTypeAlias)"/>
+             xdt:Transform="SetAttributes(defaultMemberTypeAlias)" />
       </providers>
     </membership>
 
-    <httpRuntime targetFramework="4.5" xdt:Transform="SetAttributes(targetFramework)"/>
+    <httpRuntime targetFramework="4.5" xdt:Transform="SetAttributes(targetFramework)" />
 
     <compilation debug="true" targetFramework="4.5" xdt:Transform="SetAttributes(debug,targetFramework)">
-      <assemblies xdt:Transform="Remove"/>
+      <assemblies xdt:Transform="Remove" />
     </compilation>
     <!-- We no longer support medium trust so just remove it -->
     <trust xdt:Transform="Remove" />
 
     <httpHandlers>
-      <add path="GoogleSpellChecker.ashx" xdt:Transform="Remove" xdt:Locator="Match(path)"  />
+      <add path="GoogleSpellChecker.ashx" xdt:Transform="Remove" xdt:Locator="Match(path)" />
     </httpHandlers>
   </system.web>
 
@@ -108,7 +108,7 @@
   <system.webServer>
     <handlers>
       <remove name="SpellChecker" xdt:Transform="Remove" xdt:Locator="Match(name)" />
-      <add name="SpellChecker" xdt:Transform="Remove" xdt:Locator="Match(name)"  />
+      <add name="SpellChecker" xdt:Transform="Remove" xdt:Locator="Match(name)" />
     </handlers>
   </system.webServer>
 
@@ -117,28 +117,28 @@
 
       <!-- Ensure correct version of MVC -->
       <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Helpers']])"/>
+												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Helpers']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
       </dependentAssembly>
 
       <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Mvc']])"/>
+												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.Mvc']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="1.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
       </dependentAssembly>
 
       <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.WebPages']])"/>
+												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.WebPages']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
       </dependentAssembly>
 
       <dependentAssembly xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.WebPages.Razor']])"/>
+												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.Web.WebPages.Razor']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
@@ -146,7 +146,7 @@
 
 
       <dependentAssembly  xdt:Transform="Remove"
-												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='HtmlAgilityPack']])"/>
+												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='HtmlAgilityPack']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
         <bindingRedirect oldVersion="1.4.5.0-1.4.6.0" newVersion="1.4.6.0" />
diff --git a/src/Umbraco.Web.UI/web.Template.Release.config b/src/Umbraco.Web.UI/web.Template.Release.config
index b3193ed110..0745ffe7ae 100644
--- a/src/Umbraco.Web.UI/web.Template.Release.config
+++ b/src/Umbraco.Web.UI/web.Template.Release.config
@@ -10,8 +10,8 @@
   -->
 
   <system.web>
-    <trust xdt:Transform="Remove"/>    
-    <globalization xdt:Transform="Remove"/>
+    <trust xdt:Transform="Remove" />
+    <globalization xdt:Transform="Remove" />
     <trace enabled="false" xdt:Transform="SetAttributes(enabled)" />
     <customErrors mode="RemoteOnly" xdt:Transform="SetAttributes(mode)">
     </customErrors>
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 1599ebd7b6..b90b37ce14 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -3,16 +3,16 @@
   <configSections>
     <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
     <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="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="BaseRestExtensions" type="Umbraco.Core.Configuration.BaseRest.BaseRestSection, 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="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" />
+      <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" />
     </sectionGroup>
   </configSections>
 
@@ -20,14 +20,14 @@
     <settings configSource="config\umbracoSettings.config" />
     <BaseRestExtensions configSource="config\BaseRestExtensions.config" />
     <FileSystemProviders configSource="config\FileSystemProviders.config" />
-    <dashBoard configSource="config\Dashboard.config"/>
+    <dashBoard configSource="config\Dashboard.config" />
   </umbracoConfiguration>
 
   <urlrewritingnet configSource="config\UrlRewriting.config" />
   <microsoft.scripting configSource="config\scripting.config" />
   <clientDependency configSource="config\ClientDependency.config" />
   <Examine configSource="config\ExamineSettings.config" />
-  <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />  
+  <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
   <log4net configSource="config\log4net.config" />
 
   <appSettings>
@@ -46,24 +46,24 @@
     <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="webpages:Enabled" value="false" />
+    <add key="enableSimpleMembership" value="false" />
+    <add key="autoFormsAuthentication" value="false" />
 
     <add key="log4net.Config" value="config\log4net.config" />
 
   </appSettings>
   <connectionStrings>
-    <remove name="umbracoDbDSN"/>
+    <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>
   
   <system.data>
     <DbProviderFactories>
-      <remove invariant="System.Data.SqlServerCe.4.0"/>
+      <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"/>
+      <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>
@@ -78,7 +78,7 @@
 
   <system.web>
     <customErrors mode="RemoteOnly" />
-    <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />        
+    <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
     <httpRuntime requestValidationMode="2.0" enableVersionHeader="false" targetFramework="4.5" />
     <!--
       If you are deploying to a cloud environment that has multiple web server instances,
@@ -102,7 +102,7 @@
       <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
       <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" />
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
+      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
     </httpModules>
     <httpHandlers>
       <remove verb="*" path="*.asmx" />
@@ -111,17 +111,17 @@
       <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="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
       <add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
+      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
     </httpHandlers>
 
-    <compilation defaultLanguage="c#" debug="false" batch="false" targetFramework="4.5" >
+    <compilation defaultLanguage="c#" debug="false" batch="false" targetFramework="4.5">
       <assemblies>
-        <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
+        <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       </assemblies>
       <buildProviders>
-        <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
-        <add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
-        <add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
+        <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
+        <add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
+        <add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
       </buildProviders>
     </compilation>
 
@@ -163,11 +163,11 @@
       <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
 
       <remove name="ClientDependencyModule" />
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
+      <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) -->
       <remove name="FormsAuthentication" />
-      <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule"/>
+      <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
     </modules>
 
     <handlers accessPolicy="Read, Write, Script, Execute">
@@ -184,7 +184,7 @@
       <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="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
       <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
+      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core" />
     </handlers>
 
     <!-- Adobe AIR mime type -->
@@ -200,7 +200,7 @@
     <!-- Ensure the powered by header is not returned -->
     <httpProtocol>
       <customHeaders>
-        <remove name="X-Powered-By"/>
+        <remove name="X-Powered-By" />
       </customHeaders>
     </httpProtocol>
     
@@ -233,8 +233,8 @@
         <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
+        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
       </dependentAssembly>
       
       <!-- Ensure correct version of HtmlAgilityPack -->