diff --git a/aspnet35.build b/aspnet35.build
index 6616361635..392045a409 100644
--- a/aspnet35.build
+++ b/aspnet35.build
@@ -50,7 +50,7 @@
             <arg value="/p:ToolsVersion=3.5" />
         </exec>
 
-        <exec program="${win.dir}\microsoft.net\framework\v4.0.30319\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}&quot;"/>
+        <exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}&quot;"/>
     </target>
 
 
diff --git a/aspnet35.config b/aspnet35.config
index 4467ae5d97..4103d32eff 100644
--- a/aspnet35.config
+++ b/aspnet35.config
@@ -3,8 +3,8 @@
     <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=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
-        <!-- ASPNETAJAX  -->
 
+        <!-- ASPNETAJAX  -->
         <sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
             <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
                 <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
@@ -32,8 +32,7 @@
     <Examine configSource="config\ExamineSettings.config" />
     <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
     <appSettings>
-
-        <add key="umbracoDbDSN" value="server=.\SQLEXPRESS;database=DATABSE;user id=USER;password=PASS" />
+        <add key="umbracoDbDSN" value="server=.\SQLEXPRESS;database=DATABASE;user id=USER;password=PASS" />
         <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/" />
@@ -52,12 +51,7 @@
         <add key="umbracoProfileUrl" value="profiler" />
         <add key="umbracoUseSSL" value="false" />
         <add key="umbracoUseMediumTrust" value="false" />
-
-        <!-- 
-      Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS 
-      Alex Norcliffe 2010 02 for 4.1
-    -->
-        <add key="umbracoContentXMLUseLocalTemp" value="false"/>
+        <add key="umbracoContentXMLUseLocalTemp" value="false" />
     </appSettings>
     <system.net>
         <mailSettings>
@@ -79,6 +73,7 @@
         <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
         <globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
         <xhtmlConformance mode="Strict" />
+
         <pages enableEventValidation="false">
             <!-- ASPNETAJAX -->
             <controls>
@@ -87,28 +82,36 @@
                 <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
             </controls>
         </pages>
+
         <httpModules>
             <!-- URL REWRTIER -->
             <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
             <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
+
             <!-- UMBRACO -->
             <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
             <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
+
             <!-- ASPNETAJAX -->
             <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+
             <!-- CLIENT DEPENDENCY -->
             <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
         </httpModules>
+
         <httpHandlers>
             <remove verb="*" path="*.asmx"/>
             <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
             <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
             <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
+
             <!-- UMBRACO CHANNELS -->
             <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" />
+
             <!-- CLIENT DEPENDENCY -->
             <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
+
             <!-- SPELL CHECKER -->
             <add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
         </httpHandlers>
@@ -129,9 +132,11 @@
         <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>
@@ -140,6 +145,7 @@
                 <add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
             </providers>
         </membership>
+
         <!-- added by NH to support membership providers in access layer -->
         <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
             <providers>
@@ -147,6 +153,7 @@
                 <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
             </providers>
         </roleManager>
+
         <!-- Sitemap provider-->
         <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
             <providers>
@@ -169,14 +176,17 @@
 
             <!-- URL REWRTIER -->
             <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
+
             <!-- UMBRACO -->
             <add name="umbracoRequestModule" type="umbraco.presentation.requestModule, umbraco" />
             <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
             <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
+
             <!-- ASPNETAJAX -->
             <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+
             <!-- CLIENT DEPENDENCY -->
-            <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
+            <add name="ClientDependencyModule" preCondition="managedHandler" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
 
         </modules>
 
@@ -192,11 +202,14 @@
             <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.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=3.5.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=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+
             <!-- UMBRACO CHANNELS -->
             <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" />
+
             <!-- CLIENT DEPENDENCY -->
             <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
+
             <!-- SPELL CHECKER -->
             <add verb="GET,HEAD,POST" name="SpellChecker" preCondition="integratedMode" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco"/>
         </handlers>