diff --git a/aspnet35.build b/aspnet35.build
index 1b02d6a543..e14ea7cfaf 100644
--- a/aspnet35.build
+++ b/aspnet35.build
@@ -24,7 +24,7 @@
     <property name="YUICompressor.dir" value="D:\inetpub\wwwroot\ccnet\buildTools\YUI" />
 
 
-    <!-- Build source -->
+   
     <target name="build" depends="init">
         <attrib normal="true" readonly="false">
             <fileset basedir="${root.dir}">
@@ -41,6 +41,8 @@
 
         <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>
+    
+
 
     <!-- Directories and files -->
     <target name="directories" depends="build">
@@ -53,9 +55,9 @@
             </fileset>
         </copy>
 
-        <!-- asp.net 3.5 DLR dlls -->
+        <!-- asp.net 2.0 SP1 DLR dlls -->
         <copy todir="${build.dir}\bin">
-            <fileset basedir="${dlls.dir}\asp.net 3.5 Assemblies">
+            <fileset basedir="${dlls.dir}\DLR 2.0 SP1">
                 <include name="*.dll" />
             </fileset>
         </copy>
diff --git a/aspnet35.config b/aspnet35.config
index b22aa83ccc..55b9cfe373 100644
--- a/aspnet35.config
+++ b/aspnet35.config
@@ -2,7 +2,7 @@
 <configuration>
   <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" />
+    <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
 
     <!-- ASPNETAJAX  -->
     <sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
diff --git a/default.build b/default.build
index ff6708b7ed..5886ee14dc 100644
--- a/default.build
+++ b/default.build
@@ -70,6 +70,13 @@
             </fileset>
         </copy>
 
+        <!-- asp.net 4.0 DLR dlls -->
+        <copy todir="${build.dir}\bin">
+            <fileset basedir="${dlls.dir}\DLR 4.0">
+                <include name="*.dll" />
+            </fileset>
+        </copy>
+
         <!--standard web.config-->
         <copy file="${root.dir}\config templates\web.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
 
diff --git a/foreign dlls/DLR 4.0/IronPython.Modules.dll b/foreign dlls/DLR 4.0/IronPython.Modules.dll
new file mode 100644
index 0000000000..7d93410e0b
Binary files /dev/null and b/foreign dlls/DLR 4.0/IronPython.Modules.dll differ
diff --git a/foreign dlls/DLR 4.0/IronPython.dll b/foreign dlls/DLR 4.0/IronPython.dll
new file mode 100644
index 0000000000..26fe7e1754
Binary files /dev/null and b/foreign dlls/DLR 4.0/IronPython.dll differ
diff --git a/foreign dlls/DLR 4.0/IronPythonTest.dll b/foreign dlls/DLR 4.0/IronPythonTest.dll
new file mode 100644
index 0000000000..ba60a52d80
Binary files /dev/null and b/foreign dlls/DLR 4.0/IronPythonTest.dll differ
diff --git a/foreign dlls/DLR 4.0/IronRuby.Libraries.Yaml.dll b/foreign dlls/DLR 4.0/IronRuby.Libraries.Yaml.dll
new file mode 100644
index 0000000000..30dea5a77c
Binary files /dev/null and b/foreign dlls/DLR 4.0/IronRuby.Libraries.Yaml.dll differ
diff --git a/foreign dlls/DLR 4.0/IronRuby.Libraries.dll b/foreign dlls/DLR 4.0/IronRuby.Libraries.dll
new file mode 100644
index 0000000000..65159680ca
Binary files /dev/null and b/foreign dlls/DLR 4.0/IronRuby.Libraries.dll differ
diff --git a/foreign dlls/DLR 4.0/IronRuby.dll b/foreign dlls/DLR 4.0/IronRuby.dll
new file mode 100644
index 0000000000..b19a269466
Binary files /dev/null and b/foreign dlls/DLR 4.0/IronRuby.dll differ
diff --git a/foreign dlls/DLR 4.0/Microsoft.Dynamic.dll b/foreign dlls/DLR 4.0/Microsoft.Dynamic.dll
new file mode 100644
index 0000000000..0dc44480aa
Binary files /dev/null and b/foreign dlls/DLR 4.0/Microsoft.Dynamic.dll differ
diff --git a/foreign dlls/DLR 4.0/Microsoft.Scripting.Core.dll b/foreign dlls/DLR 4.0/Microsoft.Scripting.Core.dll
new file mode 100644
index 0000000000..8418067d6a
Binary files /dev/null and b/foreign dlls/DLR 4.0/Microsoft.Scripting.Core.dll differ
diff --git a/foreign dlls/DLR 4.0/Microsoft.Scripting.Debugging.dll b/foreign dlls/DLR 4.0/Microsoft.Scripting.Debugging.dll
new file mode 100644
index 0000000000..a129515cf7
Binary files /dev/null and b/foreign dlls/DLR 4.0/Microsoft.Scripting.Debugging.dll differ
diff --git a/foreign dlls/DLR 4.0/Microsoft.Scripting.ExtensionAttribute.dll b/foreign dlls/DLR 4.0/Microsoft.Scripting.ExtensionAttribute.dll
new file mode 100644
index 0000000000..761780edd8
Binary files /dev/null and b/foreign dlls/DLR 4.0/Microsoft.Scripting.ExtensionAttribute.dll differ
diff --git a/foreign dlls/DLR 4.0/Microsoft.Scripting.dll b/foreign dlls/DLR 4.0/Microsoft.Scripting.dll
new file mode 100644
index 0000000000..65f1697576
Binary files /dev/null and b/foreign dlls/DLR 4.0/Microsoft.Scripting.dll differ
diff --git a/umbraco/presentation/Properties/Settings.Designer.cs b/umbraco/presentation/Properties/Settings.Designer.cs
deleted file mode 100644
index 78879c80f1..0000000000
--- a/umbraco/presentation/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace umbraco.presentation.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("http://regexlib.com/WebServices.asmx")]
-        public string umbraco_com_regexlib_Webservices {
-            get {
-                return ((string)(this["umbraco_com_regexlib_Webservices"]));
-            }
-        }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
-        [global::System.Configuration.DefaultSettingValueAttribute("http://update.umbraco.org/checkforupgrade.asmx")]
-        public string umbraco_org_umbraco_update_CheckForUpgrade {
-            get {
-                return ((string)(this["umbraco_org_umbraco_update_CheckForUpgrade"]));
-            }
-        }
-    }
-}
diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj
index 59edc859d0..01cb4ba189 100644
--- a/umbraco/presentation/umbraco.presentation.csproj
+++ b/umbraco/presentation/umbraco.presentation.csproj
@@ -98,40 +98,11 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\foreign dlls\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="IronPython, Version=1.0.60816.1877, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\foreign dlls\IronPython.dll</HintPath>
+    <Reference Include="Microsoft.Scripting">
+      <HintPath>..\..\foreign dlls\DLR 2.0 SP1\Microsoft.Scripting.dll</HintPath>
     </Reference>
-    <Reference Include="IronPython.Modules">
-      <HintPath>..\..\foreign dlls\IronPython.Modules.dll</HintPath>
-    </Reference>
-    <Reference Include="IronRuby, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\foreign dlls\IronRuby.dll</HintPath>
-    </Reference>
-    <Reference Include="IronRuby.Libraries">
-      <HintPath>..\..\foreign dlls\IronRuby.Libraries.dll</HintPath>
-    </Reference>
-    <Reference Include="IronRuby.Libraries.Yaml">
-      <HintPath>..\..\foreign dlls\IronRuby.Libraries.Yaml.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Dynamic">
-      <HintPath>..\..\foreign dlls\Microsoft.Dynamic.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Scripting, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\foreign dlls\Microsoft.Scripting.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Scripting.Core, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\foreign dlls\Microsoft.Scripting.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Scripting.Debugging">
-      <HintPath>..\..\foreign dlls\Microsoft.Scripting.Debugging.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Scripting.ExtensionAttribute, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\foreign dlls\Microsoft.Scripting.ExtensionAttribute.dll</HintPath>
+    <Reference Include="Microsoft.Scripting.Core">
+      <HintPath>..\..\foreign dlls\DLR 2.0 SP1\Microsoft.Scripting.Core.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
diff --git a/umbraco/presentation/web.STANDARD.config b/umbraco/presentation/web.STANDARD.config
index c0769c0917..43e28e0545 100644
--- a/umbraco/presentation/web.STANDARD.config
+++ b/umbraco/presentation/web.STANDARD.config
@@ -3,10 +3,12 @@
   <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" />
+    
     <!--
       ASPNETAJAX ** DISABLED BY ALEX NORCLIFFE 2010 06 03 FOR COMPATIBILITY WITH RUNNING UNDER .NET 4
       USERS CAN ADD THIS THEMSELVES IF THEY WISH TO USE ASP.NET AJAX
       -->
+
     <!--<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" />
@@ -18,6 +20,7 @@
         </sectionGroup>
       </sectionGroup>
     </sectionGroup>-->
+
     <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
       <section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     </sectionGroup>
@@ -32,7 +35,7 @@
   <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
   <appSettings>
     <add key="umbracoDbDSN" value="server=.\SQLEXPRESS;database=umbraco;user id=web;password=farmer" />
-    <add key="umbracoConfigurationStatus" value="4.1.0.betaII" />
+    <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="umbracoContentXML" value="~/App_Data/umbraco.config" />
@@ -112,16 +115,17 @@
     </httpHandlers>
     
     <compilation defaultLanguage="c#" debug="false" batch="false">
-      <assemblies>
-        <!-- ASPNETAJAX -->
-        <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
-        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-      </assemblies>
+        <assemblies>
+            <!-- ASPNETAJAX -->
+            <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+            <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+            <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+            <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+            <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+            <add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+            <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+            <add assembly="Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+        </assemblies>
     </compilation>
     
     <authentication mode="Forms">
@@ -154,14 +158,6 @@
     </siteMap>
   </system.web>
 
-  <applicationSettings>
-    <umbraco.presentation.Properties.Settings>
-      <setting name="umbraco_com_regexlib_Webservices" serializeAs="String">
-        <value>http://regexlib.com/WebServices.asmx</value>
-      </setting>
-    </umbraco.presentation.Properties.Settings>
-  </applicationSettings>
-
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />
     <modules>
@@ -176,7 +172,7 @@
       <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
       <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
       <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <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"/>      
     </modules>
 
@@ -190,9 +186,9 @@
       <remove name="ClientDependency" />
       <remove name="SpellChecker" />
 
-      <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 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" />
       <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 "/>
@@ -200,6 +196,7 @@
     </handlers>
   </system.webServer>
 
+
   <system.codedom>
     <compilers>
       <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
@@ -209,6 +206,7 @@
     </compilers>
   </system.codedom>
 
+
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>