diff --git a/components/standardFormhandlers/AssemblyInfo.cs b/components/standardFormhandlers/AssemblyInfo.cs
deleted file mode 100644
index 177a4f0e70..0000000000
--- a/components/standardFormhandlers/AssemblyInfo.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-//
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]		
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.0.*")]
-
-//
-// In order to sign your assembly you must specify a key to use. Refer to the 
-// Microsoft .NET Framework documentation for more information on assembly signing.
-//
-// Use the attributes below to control which key is used for signing. 
-//
-// Notes: 
-//   (*) If no key is specified, the assembly is not signed.
-//   (*) KeyName refers to a key that has been installed in the Crypto Service
-//       Provider (CSP) on your machine. KeyFile refers to a file which contains
-//       a key.
-//   (*) If the KeyFile and the KeyName values are both specified, the 
-//       following processing occurs:
-//       (1) If the KeyName can be found in the CSP, that key is used.
-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
-//           in the KeyFile is installed into the CSP and used.
-//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
-//       When specifying the KeyFile, the location of the KeyFile should be
-//       relative to the project output directory which is
-//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
-//       located in the project directory, you would specify the AssemblyKeyFile 
-//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
-//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
-//       documentation for more information on this.
-//
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-[assembly: AssemblyKeyName("")]
diff --git a/umbraco/businesslogic/ui.cs b/umbraco/businesslogic/ui.cs
index ff5cf40238..f07b1f553f 100644
--- a/umbraco/businesslogic/ui.cs
+++ b/umbraco/businesslogic/ui.cs
@@ -52,6 +52,7 @@ namespace umbraco
         /// <returns></returns>
         public static string Text(string Key, User u)
         {
+			//TODO: Perhaps we should use the user parameter for something??
             return GetText(Key);
         }
 
@@ -74,6 +75,7 @@ namespace umbraco
         /// <returns></returns>
         public static string Text(string Area, string Key, User u)
         {
+			//TODO: Perhaps we should use the user parameter for something??
             return GetText(Area, Key);
         }
 
@@ -118,7 +120,8 @@ namespace umbraco
         /// <returns></returns>
         public static string Text(string Area, string Key, string Variable, User u)
         {
-            return GetText(Area, Key, Variable);
+			//TODO: Perhaps we should use the user parameter for something??
+			return GetText(Area, Key, Variable);
         }
 
         /// <summary>
diff --git a/umbraco/presentation/Web.config b/umbraco/presentation/Web.config
index 01bb38edac..2c0036099a 100644
--- a/umbraco/presentation/Web.config
+++ b/umbraco/presentation/Web.config
@@ -10,20 +10,21 @@
 					<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>
 					<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
 					<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
-					<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/></sectionGroup>
-			</sectionGroup> 
+					<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+				</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>
-    <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core"/>
+		<section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core"/>
 	</configSections>
-	<urlrewritingnet configSource="config\UrlRewriting.config"/>     
+	<urlrewritingnet configSource="config\UrlRewriting.config"/>
 	<appSettings>
   <add key="umbracoDbDSN" value="datalayer=&quot;VistaDB,VistaDB For Umbraco&quot;" />
   <add key="umbracoConfigurationStatus" value="4.0.2.1" />
-  <add key="umbracoReservedUrls" value=",/config/splashes/booting.aspx,/config/splashes/noNodes.aspx," />
-  <add key="umbracoReservedPaths" value=",/umbraco,/install" />
+  <add key="umbracoReservedUrls" value="/config/splashes/booting.aspx,/install/default.aspx,/config/splashes/noNodes.aspx" />
+  <add key="umbracoReservedPaths" value="/umbraco,/install/" />
   <add key="umbracoContentXML" value="/data/umbraco.config" />
   <add key="umbracoStorageDirectory" value="/data" />
   <add key="umbracoPath" value="/umbraco" />
@@ -33,19 +34,19 @@
   <add key="umbracoUseDirectoryUrls" value="false" />
   <add key="umbracoDebugMode" value="true" />
   <add key="umbracoTimeOutInMinutes" value="20" />
-  <add key="umbracoDisableVersionCheck" value="true" />
+  <add key="umbracoVersionCheckPeriod" value="7" />
   <add key="umbracoDisableXsltExtensions" value="true" />
   <add key="umbracoDefaultUILanguage" value="en" />
   <add key="umbracoProfileUrl" value="profiler" />
   <add key="umbracoUseSSL" value="false" />
   <add key="umbracoUseMediumTrust" value="false" />
  </appSettings>
-  <clientDependency defaultProvider="PageHeaderProvider" compositeFilePath="~/data/ClientDependency" enableCompositeFiles="true" fileDependencyExtensions="js,css">
-    <providers>
-      <add name="PageHeaderProvider" type="ClientDependency.Core.Providers.PageHeaderProvider" />
-      <add name="ClientSideRegistrationProvider" type="ClientDependency.Core.Providers.ClientSideRegistrationProvider" />
-    </providers>   
-  </clientDependency>
+	<clientDependency defaultProvider="PageHeaderProvider" compositeFilePath="~/data/ClientDependency" enableCompositeFiles="true" fileDependencyExtensions="js,css" isDebugMode="false">
+		<providers>
+			<add name="PageHeaderProvider" type="ClientDependency.Core.Providers.PageHeaderProvider" />
+			<add name="ClientSideRegistrationProvider" type="ClientDependency.Core.Providers.ClientSideRegistrationProvider" />
+		</providers>
+	</clientDependency>
 	<system.net>
 		<mailSettings>
 			<smtp>
@@ -57,7 +58,7 @@
 	<!-- added by NH to test foreign membership providers-->
 	<connectionStrings>
 		<remove name="LocalSqlServer"/>
-		<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>
+		<!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
 	</connectionStrings>
 	<system.web>
 		<!-- <trust level="Medium" originUrl=".*" />-->
@@ -71,7 +72,8 @@
 			<controls>
 				<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.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=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/></controls>
+				<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 -->
@@ -103,7 +105,8 @@
 				<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"/></assemblies>
+				<add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			</assemblies>
 		</compilation>
 		<authentication mode="Forms">
 			<forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/"/>
@@ -114,17 +117,16 @@
 		<!-- Membership Provider -->
 		<membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
 			<providers>
-				<clear/>
-				<add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="TestType" passwordFormat="Hashed"/>
-				<add name="AspNetSqlMemberShipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="LocalSqlServer"/>
-				<add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed"/>
+				<clear />
+				<add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
+				<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>
-				<clear/>
-				<add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" applicationName="umbraco"/>
+				<clear />
+				<add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
 			</providers>
 		</roleManager>
 		<!-- Sitemap provider-->
@@ -178,15 +180,19 @@
   </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">
-					<providerOption name="CompilerVersion" value="v3.5"/>
-					<providerOption name="WarnAsError" value="false"/></compiler></compilers></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">
+				<providerOption name="CompilerVersion" value="v3.5"/>
+				<providerOption name="WarnAsError" value="false"/>
+			</compiler>
+		</compilers>
+	</system.codedom>
 	<system.webServer>
-			<validation validateIntegratedModeConfiguration="false"/>
+		<validation validateIntegratedModeConfiguration="false"/>
 		<modules>
 			<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>
+			<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+		</modules>
 		<handlers>
 			<remove name="WebServiceHandlerFactory-Integrated"/>
 			<remove name="ScriptHandlerFactory"/>
@@ -194,12 +200,19 @@
 			<remove name="ScriptResource"/>
 			<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"/></handlers></system.webServer>
+			<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"/>
+		</handlers>
+	</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="3.5.0.0"/></dependentAssembly>
+				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
+			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
-				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/></dependentAssembly></assemblyBinding></runtime></configuration>
+				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+</configuration>
diff --git a/umbraco/presentation/config/formHandlers.config b/umbraco/presentation/config/formHandlers.config
index 96072f451e..4fbfcb57de 100644
--- a/umbraco/presentation/config/formHandlers.config
+++ b/umbraco/presentation/config/formHandlers.config
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <formHandlers>
-	<formHandler alias="umbracoMemberLogin" assembly="umbraco.standardFormhandlers" type="validateLogin">
+	<!--
+	<formHandler alias="umbracoMemberLogin" assembly="umbraco.Legacy" type="validateLogin">
 	</formHandler>
-	<formHandler alias="umbracoMemberLogoff" assembly="umbraco.standardFormhandlers" type="memberLogoff">
-	</formHandler>
-	<formHandler alias="mailForm" assembly="umbraco.standardFormhandlers" type="formMail">
-		<parameter alias="sender">youremail@domain.com</parameter>
-		<parameter alias="body">Content</parameter>
-		<parameter alias="subject">Subject</parameter>
-		<parameter alias="debug">true</parameter>
-		<parameter alias="server">127.0.0.1</parameter>
-	</formHandler>
-
+	-->
 </formHandlers>
diff --git a/umbraco/presentation/data/packages/created/createdPackages.config b/umbraco/presentation/data/packages/created/createdPackages.config
index 04668e4a2b..7be527318c 100644
--- a/umbraco/presentation/data/packages/created/createdPackages.config
+++ b/umbraco/presentation/data/packages/created/createdPackages.config
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="1" version="1.0" url="http://www.aaron-powell.com" name="Macro Importer" folder="f06e14ea-ca1b-447c-b4f0-7a492e1ad1d8" packagepath="/data/packages/Macro_Importer_1.0.zip" repositoryGuid="" packageGuid="88bab311-1dc6-4027-8bd7-e5c44507a7b3" hasUpdate="False">
-    <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license>
-    <author url="http://www.aaron-powell.com">Aaron</author>
-    <readme><![CDATA[]]></readme>
-    <actions>
-    </actions>
-    <datatypes>
-    </datatypes>
-    <content nodeId="" loadChildNodes="False">
-    </content>
-    <templates>
-    </templates>
-    <stylesheets>
-    </stylesheets>
-    <documenttypes>
-    </documenttypes>
-    <macros>21</macros>
-    <files>
-    </files>
-    <languages>
-    </languages>
-    <dictionaryitems>
-    </dictionaryitems>
-    <loadcontrol>
-    </loadcontrol>
-  </package>
-</packages>
\ No newline at end of file
+<packages></packages>
\ No newline at end of file
diff --git a/umbraco/presentation/data/packages/installed/installedPackages.config b/umbraco/presentation/data/packages/installed/installedPackages.config
index 554cddb529..1508affa7e 100644
--- a/umbraco/presentation/data/packages/installed/installedPackages.config
+++ b/umbraco/presentation/data/packages/installed/installedPackages.config
@@ -1,480 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="1" version="1.0" url="" name="Runway" folder="68079d79-a2f2-4178-aecb-0ce92967980d" packagepath="" repositoryGuid="65194810-1f85-11dd-bd0b-0800200c9a66" packageGuid="ae41aad0-1c30-11dd-bd0b-0800200c9a66" hasUpdate="False">
-    <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license>
-    <author url="http://umbraco.org">Umbraco</author>
-    <readme><![CDATA[Runway gives you a bare-bones website that introduces you to a set of well-defined conventions for building an umbraco website.
-
-The Runway website is very simple in form and provided without any design or functionality. By installing Runway, you’ll begin with a minimal site built on best practices. 
-
-You’ll also enjoy the benefits of speaking the same “language” as the rest of the umbraco community by using common properties and naming conventions.]]></readme>
-    <actions>
-      <Action runat="install" alias="publishRootDocument" documentName="Runway Homepage" />
-    </actions>
-    <datatypes>
-    </datatypes>
-    <content nodeId="1048" loadChildNodes="False">
-    </content>
-    <templates>1042,1043,1044</templates>
-    <stylesheets>1047</stylesheets>
-    <documenttypes>1045,1046</documenttypes>
-    <macros>
-    </macros>
-    <files>
-    </files>
-    <languages>
-    </languages>
-    <dictionaryitems>
-    </dictionaryitems>
-    <loadcontrol>
-    </loadcontrol>
-  </package>
-  <package id="2" version="1.0" url="" name="Runway Top navigation" folder="c0b97717-f977-44d7-8376-7c9a48c7577c" packagepath="" repositoryGuid="65194810-1f85-11dd-bd0b-0800200c9a66" packageGuid="dd40e050-1b6b-11dd-bd0b-0800200c9a66" hasUpdate="False">
-    <license url="http://www.opensource.org/licenses/mit-license.php">umbraco gpl</license>
-    <author url="http://umbraco.org">Umbraco</author>
-    <readme><![CDATA[Simple top navigation for Runway]]></readme>
-    <actions>
-      <Action runat="uninstall" alias="removeStringFromHtmlElement" templateAlias="RunwayMaster" htmlElementId="top"><![CDATA[<umbraco:Macro Alias="RunwayTopNavigation" runat="server"></umbraco:Macro>]]></Action>
-      <Action runat="install" alias="addStringToHtmlElement" templateAlias="RunwayMaster" htmlElementId="top" position="end"><![CDATA[<umbraco:Macro Alias="RunwayTopNavigation" runat="server"></umbraco:Macro>]]></Action>
-    </actions>
-    <datatypes>
-    </datatypes>
-    <content nodeId="" loadChildNodes="False">
-    </content>
-    <templates>
-    </templates>
-    <stylesheets>
-    </stylesheets>
-    <documenttypes>
-    </documenttypes>
-    <macros>1</macros>
-    <files>
-      <file>/xslt/RunwayTopNavigation.xslt</file>
-    </files>
-    <languages>
-    </languages>
-    <dictionaryitems>
-    </dictionaryitems>
-    <loadcontrol>
-    </loadcontrol>
-  </package>
-  <package id="3" version="fddfsdsf" url="" name="Test" folder="874dcba1-85ef-415c-9be7-48c0bd4af3dd" packagepath="" repositoryGuid="" packageGuid="" hasUpdate="False">
-    <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license>
-    <author url="sdffdsfs">fds</author>
-    <readme><![CDATA[dfdsfd]]></readme>
-    <actions>
-    </actions>
-    <datatypes>
-    </datatypes>
-    <content nodeId="" loadChildNodes="False">
-    </content>
-    <templates>1056,1057,1058</templates>
-    <stylesheets>
-    </stylesheets>
-    <documenttypes>1059,1060,1061</documenttypes>
-    <macros>
-    </macros>
-    <files>
-    </files>
-    <languages>
-    </languages>
-    <dictionaryitems>
-    </dictionaryitems>
-    <loadcontrol>
-    </loadcontrol>
-  </package>
-  <package id="4" version="2.0.2" url="" name="Creative Website Starter" folder="6ef5bf8a-7c8f-448a-b10b-529b42cb1655" packagepath="" repositoryGuid="65194810-1f85-11dd-bd0b-0800200c9a66" packageGuid="1116a360-0f30-4827-baba-8368937c9151" hasUpdate="False">
-    <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license>
-    <author url="http://www.creativewebspecialist.co.uk">Warren Buckley</author>
-    <readme><![CDATA[This package will install a basic site that will allow you to understand how all the components of an Umbraco site works together.
-
-If you have any Bugs/Problems please report them at Codeplex
-http://umbracocws.codeplex.com
-
-Many Thanks,
-Warren Buckley]]></readme>
-    <actions>
-    </actions>
-    <datatypes>1044,1045,1046,1047</datatypes>
-    <content nodeId="1082" loadChildNodes="False">
-    </content>
-    <templates>1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062</templates>
-    <stylesheets>1074,1076,1077,1078,1079,1080,1081</stylesheets>
-    <documenttypes>1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073</documenttypes>
-    <macros>1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19</macros>
-    <files>
-      <file>/usercontrols/website/ContactForm.ascx</file>
-      <file>/usercontrols/website/EmailAFriendForm.ascx</file>
-      <file>/usercontrols/website/SearchBox.ascx</file>
-      <file>/xslt/DateFormat.xslt</file>
-      <file>/xslt/DisplayArticleImage.xslt</file>
-      <file>/xslt/EmailAFriendLink.xslt</file>
-      <file>/xslt/ListGalleries.xslt</file>
-      <file>/xslt/ListNewsEvents.xslt</file>
-      <file>/xslt/ListPhotos.xslt</file>
-      <file>/xslt/Navi.xslt</file>
-      <file>/xslt/NewsEventsRSS.xslt</file>
-      <file>/xslt/NewsEventsSubNavi.xslt</file>
-      <file>/xslt/PageTitle.xslt</file>
-      <file>/xslt/ParentPageLink.xslt</file>
-      <file>/xslt/PhotoPager.xslt</file>
-      <file>/xslt/PhotoText.xslt</file>
-      <file>/xslt/SubNavi.xslt</file>
-      <file>/xslt/XMLSitemap.xslt</file>
-      <file>/xslt/XSLTsearch.xslt</file>
-      <file>/media/1014/royal-crescent_thumb.jpg</file>
-      <file>/media/1014/royal-crescent_thumb_thumb.jpg</file>
-      <file>/media/1239/bookhouse-boys_gallery.jpg</file>
-      <file>/media/1239/bookhouse-boys_gallery_thumb.jpg</file>
-      <file>/media/1250/bookhouse-boys_1.jpg</file>
-      <file>/media/1250/bookhouse-boys_1_thumb.jpg</file>
-      <file>/media/1277/bookhouse-boys_3.jpg</file>
-      <file>/media/1277/bookhouse-boys_3_thumb.jpg</file>
-      <file>/media/1296/bookhouse-boys_1_thumb.jpg</file>
-      <file>/media/1296/bookhouse-boys_1_thumb_thumb.jpg</file>
-      <file>/media/1314/bookhouse-boys_3_thumb.jpg</file>
-      <file>/media/1314/bookhouse-boys_3_thumb_thumb.jpg</file>
-      <file>/media/1331/bookhouse-boys_2.jpg</file>
-      <file>/media/1331/bookhouse-boys_2_thumb.jpg</file>
-      <file>/media/1350/bookhouse-boys_2_thumb.jpg</file>
-      <file>/media/1350/bookhouse-boys_2_thumb_thumb.jpg</file>
-      <file>/media/171/umbraco_tshirt.jpg</file>
-      <file>/media/171/umbraco_tshirt_thumb.jpg</file>
-      <file>/media/227/warren-buckley.jpg</file>
-      <file>/media/227/warren-buckley_thumb.jpg</file>
-      <file>/media/228/sam-grady.jpg</file>
-      <file>/media/228/sam-grady_thumb.jpg</file>
-      <file>/media/394/codegarden08-t-shirt.jpg</file>
-      <file>/media/394/codegarden08-t-shirt_thumb.jpg</file>
-      <file>/media/445/umbraco_tshirt.jpg</file>
-      <file>/media/445/umbraco_tshirt_thumb.jpg</file>
-      <file>/media/49/home_photo.jpg</file>
-      <file>/media/49/home_photo_thumb.jpg</file>
-      <file>/media/799/codegarden08-t-shirt_thumb.jpg</file>
-      <file>/media/799/codegarden08-t-shirt_thumb_thumb.jpg</file>
-      <file>/media/799/Thumbs.db</file>
-      <file>/media/825/darren-ferguson_david-conlisk.jpg</file>
-      <file>/media/825/darren-ferguson_david-conlisk_thumb.jpg</file>
-      <file>/media/835/darren-ferguson_david-conlisk_thumb.jpg</file>
-      <file>/media/835/darren-ferguson_david-conlisk_thumb_thumb.jpg</file>
-      <file>/media/852/bingo-callers.jpg</file>
-      <file>/media/852/bingo-callers_thumb.jpg</file>
-      <file>/media/871/bingo-callers_thumb.jpg</file>
-      <file>/media/871/bingo-callers_thumb_thumb.jpg</file>
-      <file>/media/879/christian-palm.jpg</file>
-      <file>/media/879/christian-palm_thumb.jpg</file>
-      <file>/media/879/Thumbs.db</file>
-      <file>/media/889/christian-palm_thumb.jpg</file>
-      <file>/media/889/christian-palm_thumb_thumb.jpg</file>
-      <file>/media/935/bath_gallery.jpg</file>
-      <file>/media/935/bath_gallery_thumb.jpg</file>
-      <file>/media/993/codegarden-08_gallery.jpg</file>
-      <file>/media/993/codegarden-08_gallery_thumb.jpg</file>
-      <file>/media/995/royal-crescent.jpg</file>
-      <file>/media/995/royal-crescent_thumb.jpg</file>
-      <file>/media/Assets/arrow_left.gif</file>
-      <file>/media/Assets/arrow_right.gif</file>
-      <file>/media/Assets/cws_logo.gif</file>
-      <file>/media/Assets/dotted_border.gif</file>
-      <file>/media/Assets/footer_border.gif</file>
-      <file>/media/Assets/g72_logo.gif</file>
-      <file>/media/Assets/rss_logo.gif</file>
-      <file>/media/Assets/Thumbs.db</file>
-      <file>/media/Assets/tick_icon.gif</file>
-      <file>/media/Assets/white_30_bg.png</file>
-      <file>/media/Assets/white_60_bg.png</file>
-      <file>/media/Assets/white_90_bg.png</file>
-      <file>/media/Assets/Photos/home_photo.jpg</file>
-      <file>/media/Assets/Photos/placeholder-photo.jpg</file>
-      <file>/media/Assets/Photos/placeholder.jpg</file>
-      <file>/media/Assets/Photos/Sam-Grady.jpg</file>
-      <file>/media/Assets/Photos/Warren-Buckley.jpg</file>
-      <file>/media/Assets/Placeholders/gallery_placeholder.gif</file>
-      <file>/media/Assets/Placeholders/photo_placeholder.gif</file>
-      <file>/media/Assets/sIFR/Amasis_MT.swf</file>
-      <file>/scripts/jquery-1.3.1.min.js</file>
-      <file>/scripts/script.js</file>
-      <file>/scripts/sIFR/sifr-config.js</file>
-      <file>/scripts/sIFR/sifr.js</file>
-      <file>/usercontrols/dashboards/ContactForm_logs.ascx</file>
-      <file>/usercontrols/dashboards/ContactForm_logs.ascx.cs</file>
-      <file>/usercontrols/dashboards/ContactForm_logs.ascx.designer.cs</file>
-      <file>/usercontrols/dashboards/EmailAFriendForm_logs.ascx</file>
-      <file>/usercontrols/dashboards/EmailAFriendForm_logs.ascx.cs</file>
-      <file>/usercontrols/dashboards/EmailAFriendForm_logs.ascx.designer.cs</file>
-      <file>/usercontrols/dashboards/log.css</file>
-      <file>/usercontrols/dashboards/log_script.js</file>
-      <file>/usercontrols/website/ContactForm.ascx.cs</file>
-      <file>/usercontrols/website/ContactForm.ascx.designer.cs</file>
-      <file>/usercontrols/website/EmailAFriendForm.ascx.cs</file>
-      <file>/usercontrols/website/EmailAFriendForm.ascx.designer.cs</file>
-      <file>/usercontrols/website/SearchBox.ascx.cs</file>
-      <file>/usercontrols/website/SearchBox.ascx.designer.cs</file>
-      <file>/data/form_log.xslt</file>
-      <file>/umbraco/images/thumbnails/CWS_date.png</file>
-      <file>/umbraco/images/thumbnails/CWS_email_a_friend.png</file>
-      <file>/umbraco/images/thumbnails/CWS_image2.png</file>
-      <file>/umbraco/images/thumbnails/CWS_kfm_home.png</file>
-      <file>/umbraco/images/thumbnails/CWS_knewsticker.png</file>
-      <file>/umbraco/images/thumbnails/CWS_konqsidebar_news.png</file>
-      <file>/umbraco/images/thumbnails/CWS_kontact_mail.png</file>
-      <file>/umbraco/images/thumbnails/CWS_wordprocessing.png</file>
-      <file>/umbraco/images/umbraco/CWS_calendar.png</file>
-      <file>/umbraco/images/umbraco/CWS_date.png</file>
-      <file>/umbraco/images/umbraco/CWS_email.png</file>
-      <file>/umbraco/images/umbraco/CWS_email_go.png</file>
-      <file>/umbraco/images/umbraco/CWS_feed.png</file>
-      <file>/umbraco/images/umbraco/CWS_house.png</file>
-      <file>/umbraco/images/umbraco/CWS_newspaper.png</file>
-      <file>/umbraco/images/umbraco/CWS_picture.png</file>
-      <file>/umbraco/images/umbraco/CWS_pictures.png</file>
-      <file>/umbraco/images/umbraco/CWS_sitemap_color.png</file>
-      <file>/umbraco/images/umbraco/CWS_vcard.png</file>
-      <file>/bin/PackageActionsContrib.dll</file>
-    </files>
-    <languages>
-    </languages>
-    <dictionaryitems>
-    </dictionaryitems>
-    <loadcontrol>
-    </loadcontrol>
-  </package>
-  <package id="5" version="1.0" url="" name="Macro Importer" folder="8857f03d-03dc-412e-ae3f-caea72add729" packagepath="" repositoryGuid="" packageGuid="" hasUpdate="False">
-    <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license>
-    <author url="http://www.aaron-powell.com">Aaron</author>
-    <readme><![CDATA[]]></readme>
-    <actions>
-    </actions>
-    <datatypes>
-    </datatypes>
-    <content nodeId="" loadChildNodes="False">
-    </content>
-    <templates>
-    </templates>
-    <stylesheets>
-    </stylesheets>
-    <documenttypes>
-    </documenttypes>
-    <macros>22</macros>
-    <files>
-      <file>/usercontrols/DocumentCreator.ascx</file>
-    </files>
-    <languages>
-    </languages>
-    <dictionaryitems>
-    </dictionaryitems>
-    <loadcontrol>
-    </loadcontrol>
-  </package>
-  <package id="6" version="1.0" url="" name="Macro Importer" folder="ced8f1d2-271e-44b6-874c-d1ad6d33bba1" packagepath="" repositoryGuid="" packageGuid="" hasUpdate="False">
-    <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license>
-    <author url="http://www.aaron-powell.com">Aaron</author>
-    <readme><![CDATA[]]></readme>
-    <actions>
-    </actions>
-    <datatypes>
-    </datatypes>
-    <content nodeId="" loadChildNodes="False">
-    </content>
-    <templates>
-    </templates>
-    <stylesheets>
-    </stylesheets>
-    <documenttypes>
-    </documenttypes>
-    <macros>22</macros>
-    <files>
-      <file>/usercontrols/DocumentCreator.ascx</file>
-    </files>
-    <languages>
-    </languages>
-    <dictionaryitems>
-    </dictionaryitems>
-    <loadcontrol>
-    </loadcontrol>
-  </package>
-  <package id="7" version="1.0" url="" name="Macro Importer" folder="57f83138-7239-4ffb-9d52-6eb75fe2ccda" packagepath="" repositoryGuid="" packageGuid="" hasUpdate="False">
-    <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license>
-    <author url="http://www.aaron-powell.com">Aaron</author>
-    <readme><![CDATA[]]></readme>
-    <actions>
-    </actions>
-    <datatypes>
-    </datatypes>
-    <content nodeId="" loadChildNodes="False">
-    </content>
-    <templates>
-    </templates>
-    <stylesheets>
-    </stylesheets>
-    <documenttypes>
-    </documenttypes>
-    <macros>23</macros>
-    <files>
-      <file>/usercontrols/DocumentCreator.ascx</file>
-    </files>
-    <languages>
-    </languages>
-    <dictionaryitems>
-    </dictionaryitems>
-    <loadcontrol>
-    </loadcontrol>
-  </package>
-  <package id="8" version="2.0.2" url="" name="Creative Website Starter" folder="50653cd1-4a99-40d5-a07f-24f204382fa6" packagepath="" repositoryGuid="65194810-1f85-11dd-bd0b-0800200c9a66" packageGuid="1116a360-0f30-4827-baba-8368937c9151" hasUpdate="False">
-    <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license>
-    <author url="http://www.creativewebspecialist.co.uk">Warren Buckley</author>
-    <readme><![CDATA[This package will install a basic site that will allow you to understand how all the components of an Umbraco site works together.
-
-If you have any Bugs/Problems please report them at Codeplex
-http://umbracocws.codeplex.com
-
-Many Thanks,
-Warren Buckley]]></readme>
-    <actions>
-    </actions>
-    <datatypes>1042,1043,1044,1045</datatypes>
-    <content nodeId="" loadChildNodes="False">
-    </content>
-    <templates>1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060</templates>
-    <stylesheets>
-    </stylesheets>
-    <documenttypes>1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071</documenttypes>
-    <macros>1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19</macros>
-    <files>
-      <file>/usercontrols/website/ContactForm.ascx</file>
-      <file>/usercontrols/website/EmailAFriendForm.ascx</file>
-      <file>/usercontrols/website/SearchBox.ascx</file>
-      <file>/xslt/DateFormat.xslt</file>
-      <file>/xslt/DisplayArticleImage.xslt</file>
-      <file>/xslt/EmailAFriendLink.xslt</file>
-      <file>/xslt/ListGalleries.xslt</file>
-      <file>/xslt/ListNewsEvents.xslt</file>
-      <file>/xslt/ListPhotos.xslt</file>
-      <file>/xslt/Navi.xslt</file>
-      <file>/xslt/NewsEventsRSS.xslt</file>
-      <file>/xslt/NewsEventsSubNavi.xslt</file>
-      <file>/xslt/PageTitle.xslt</file>
-      <file>/xslt/ParentPageLink.xslt</file>
-      <file>/xslt/PhotoPager.xslt</file>
-      <file>/xslt/PhotoText.xslt</file>
-      <file>/xslt/SubNavi.xslt</file>
-      <file>/xslt/XMLSitemap.xslt</file>
-      <file>/xslt/XSLTsearch.xslt</file>
-      <file>/media/1014/royal-crescent_thumb.jpg</file>
-      <file>/media/1014/royal-crescent_thumb_thumb.jpg</file>
-      <file>/media/1239/bookhouse-boys_gallery.jpg</file>
-      <file>/media/1239/bookhouse-boys_gallery_thumb.jpg</file>
-      <file>/media/1250/bookhouse-boys_1.jpg</file>
-      <file>/media/1250/bookhouse-boys_1_thumb.jpg</file>
-      <file>/media/1277/bookhouse-boys_3.jpg</file>
-      <file>/media/1277/bookhouse-boys_3_thumb.jpg</file>
-      <file>/media/1296/bookhouse-boys_1_thumb.jpg</file>
-      <file>/media/1296/bookhouse-boys_1_thumb_thumb.jpg</file>
-      <file>/media/1314/bookhouse-boys_3_thumb.jpg</file>
-      <file>/media/1314/bookhouse-boys_3_thumb_thumb.jpg</file>
-      <file>/media/1331/bookhouse-boys_2.jpg</file>
-      <file>/media/1331/bookhouse-boys_2_thumb.jpg</file>
-      <file>/media/1350/bookhouse-boys_2_thumb.jpg</file>
-      <file>/media/1350/bookhouse-boys_2_thumb_thumb.jpg</file>
-      <file>/media/171/umbraco_tshirt.jpg</file>
-      <file>/media/171/umbraco_tshirt_thumb.jpg</file>
-      <file>/media/227/warren-buckley.jpg</file>
-      <file>/media/227/warren-buckley_thumb.jpg</file>
-      <file>/media/228/sam-grady.jpg</file>
-      <file>/media/228/sam-grady_thumb.jpg</file>
-      <file>/media/394/codegarden08-t-shirt.jpg</file>
-      <file>/media/394/codegarden08-t-shirt_thumb.jpg</file>
-      <file>/media/445/umbraco_tshirt.jpg</file>
-      <file>/media/445/umbraco_tshirt_thumb.jpg</file>
-      <file>/media/49/home_photo.jpg</file>
-      <file>/media/49/home_photo_thumb.jpg</file>
-      <file>/media/799/codegarden08-t-shirt_thumb.jpg</file>
-      <file>/media/799/codegarden08-t-shirt_thumb_thumb.jpg</file>
-      <file>/media/799/Thumbs.db</file>
-      <file>/media/825/darren-ferguson_david-conlisk.jpg</file>
-      <file>/media/825/darren-ferguson_david-conlisk_thumb.jpg</file>
-      <file>/media/835/darren-ferguson_david-conlisk_thumb.jpg</file>
-      <file>/media/835/darren-ferguson_david-conlisk_thumb_thumb.jpg</file>
-      <file>/media/852/bingo-callers.jpg</file>
-      <file>/media/852/bingo-callers_thumb.jpg</file>
-      <file>/media/871/bingo-callers_thumb.jpg</file>
-      <file>/media/871/bingo-callers_thumb_thumb.jpg</file>
-      <file>/media/879/christian-palm.jpg</file>
-      <file>/media/879/christian-palm_thumb.jpg</file>
-      <file>/media/879/Thumbs.db</file>
-      <file>/media/889/christian-palm_thumb.jpg</file>
-      <file>/media/889/christian-palm_thumb_thumb.jpg</file>
-      <file>/media/935/bath_gallery.jpg</file>
-      <file>/media/935/bath_gallery_thumb.jpg</file>
-      <file>/media/993/codegarden-08_gallery.jpg</file>
-      <file>/media/993/codegarden-08_gallery_thumb.jpg</file>
-      <file>/media/995/royal-crescent.jpg</file>
-      <file>/media/995/royal-crescent_thumb.jpg</file>
-      <file>/media/Assets/arrow_left.gif</file>
-      <file>/media/Assets/arrow_right.gif</file>
-      <file>/media/Assets/cws_logo.gif</file>
-      <file>/media/Assets/dotted_border.gif</file>
-      <file>/media/Assets/footer_border.gif</file>
-      <file>/media/Assets/g72_logo.gif</file>
-      <file>/media/Assets/rss_logo.gif</file>
-      <file>/media/Assets/Thumbs.db</file>
-      <file>/media/Assets/tick_icon.gif</file>
-      <file>/media/Assets/white_30_bg.png</file>
-      <file>/media/Assets/white_60_bg.png</file>
-      <file>/media/Assets/white_90_bg.png</file>
-      <file>/media/Assets/Photos/home_photo.jpg</file>
-      <file>/media/Assets/Photos/placeholder-photo.jpg</file>
-      <file>/media/Assets/Photos/placeholder.jpg</file>
-      <file>/media/Assets/Photos/Sam-Grady.jpg</file>
-      <file>/media/Assets/Photos/Warren-Buckley.jpg</file>
-      <file>/media/Assets/Placeholders/gallery_placeholder.gif</file>
-      <file>/media/Assets/Placeholders/photo_placeholder.gif</file>
-      <file>/media/Assets/sIFR/Amasis_MT.swf</file>
-      <file>/scripts/jquery-1.3.1.min.js</file>
-      <file>/scripts/script.js</file>
-      <file>/scripts/sIFR/sifr-config.js</file>
-      <file>/scripts/sIFR/sifr.js</file>
-      <file>/usercontrols/dashboards/ContactForm_logs.ascx</file>
-      <file>/usercontrols/dashboards/ContactForm_logs.ascx.cs</file>
-      <file>/usercontrols/dashboards/ContactForm_logs.ascx.designer.cs</file>
-      <file>/usercontrols/dashboards/EmailAFriendForm_logs.ascx</file>
-      <file>/usercontrols/dashboards/EmailAFriendForm_logs.ascx.cs</file>
-      <file>/usercontrols/dashboards/EmailAFriendForm_logs.ascx.designer.cs</file>
-      <file>/usercontrols/dashboards/log.css</file>
-      <file>/usercontrols/dashboards/log_script.js</file>
-      <file>/usercontrols/website/ContactForm.ascx.cs</file>
-      <file>/usercontrols/website/ContactForm.ascx.designer.cs</file>
-      <file>/usercontrols/website/EmailAFriendForm.ascx.cs</file>
-      <file>/usercontrols/website/EmailAFriendForm.ascx.designer.cs</file>
-      <file>/usercontrols/website/SearchBox.ascx.cs</file>
-      <file>/usercontrols/website/SearchBox.ascx.designer.cs</file>
-      <file>/data/form_log.xslt</file>
-      <file>/umbraco/images/thumbnails/CWS_date.png</file>
-      <file>/umbraco/images/thumbnails/CWS_email_a_friend.png</file>
-      <file>/umbraco/images/thumbnails/CWS_image2.png</file>
-      <file>/umbraco/images/thumbnails/CWS_kfm_home.png</file>
-      <file>/umbraco/images/thumbnails/CWS_knewsticker.png</file>
-      <file>/umbraco/images/thumbnails/CWS_konqsidebar_news.png</file>
-      <file>/umbraco/images/thumbnails/CWS_kontact_mail.png</file>
-      <file>/umbraco/images/thumbnails/CWS_wordprocessing.png</file>
-      <file>/umbraco/images/umbraco/CWS_calendar.png</file>
-      <file>/umbraco/images/umbraco/CWS_date.png</file>
-      <file>/umbraco/images/umbraco/CWS_email.png</file>
-      <file>/umbraco/images/umbraco/CWS_email_go.png</file>
-      <file>/umbraco/images/umbraco/CWS_feed.png</file>
-      <file>/umbraco/images/umbraco/CWS_house.png</file>
-      <file>/umbraco/images/umbraco/CWS_newspaper.png</file>
-      <file>/umbraco/images/umbraco/CWS_picture.png</file>
-      <file>/umbraco/images/umbraco/CWS_pictures.png</file>
-      <file>/umbraco/images/umbraco/CWS_sitemap_color.png</file>
-      <file>/umbraco/images/umbraco/CWS_vcard.png</file>
-      <file>/bin/PackageActionsContrib.dll</file>
-    </files>
-    <languages>
-    </languages>
-    <dictionaryitems>
-    </dictionaryitems>
-    <loadcontrol>
-    </loadcontrol>
-  </package>
+  
 </packages>
\ No newline at end of file
diff --git a/umbraco/presentation/install/default.aspx b/umbraco/presentation/install/default.aspx
index 99d2a63885..5d1ef4f301 100644
--- a/umbraco/presentation/install/default.aspx
+++ b/umbraco/presentation/install/default.aspx
@@ -57,7 +57,7 @@
 </head>
 <body>
 	
-	<cc1:UmbracoClientDependencyLoader runat="server" id="ClientLoader" ProviderName="ClientSideRegistrationProvider" />
+	<cc1:UmbracoClientDependencyLoader runat="server" id="ClientLoader" ProviderName="ClientSideRegistrationProvider"  />
 	
 	<umb:CssInclude ID="CssInclude1" runat="server" FilePath="style.css" />
 	<umb:CssInclude ID="CssInclude2" runat="server" FilePath="modal/style.css" PathNameAlias="UmbracoClient" />
diff --git a/umbraco/presentation/install/default.aspx.designer.cs b/umbraco/presentation/install/default.aspx.designer.cs
index 7f3f59f173..47289d6faf 100644
--- a/umbraco/presentation/install/default.aspx.designer.cs
+++ b/umbraco/presentation/install/default.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:2.0.50727.3082
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/umbraco/presentation/umbraco/controls/ProgressBar.ascx b/umbraco/presentation/umbraco/controls/ProgressBar.ascx
index 4e24edea3b..8420720a6f 100644
--- a/umbraco/presentation/umbraco/controls/ProgressBar.ascx
+++ b/umbraco/presentation/umbraco/controls/ProgressBar.ascx
@@ -1,3 +1,3 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProgressBar.ascx.cs" Inherits="umbraco.presentation.umbraco.controls.ProgressBar" %>
 <img src="<%#umbraco.GlobalSettings.ClientPath%>/images/progressBar.gif" runat="server"
-	id="ImgBar" alt="<%#umbraco.ui.Text("publish", "inProgress")%>" /><br />
\ No newline at end of file
+	id="ImgBar" alt="<%#umbraco.ui.Text("publish", "inProgress", null)%>" /><br />
\ No newline at end of file
diff --git a/components/standardFormhandlers/formMail.cs b/umbraco/umbraco.Legacy/standardFormHandlers/formMail.cs
similarity index 100%
rename from components/standardFormhandlers/formMail.cs
rename to umbraco/umbraco.Legacy/standardFormHandlers/formMail.cs
diff --git a/components/standardFormhandlers/memberLogoff.cs b/umbraco/umbraco.Legacy/standardFormHandlers/memberLogoff.cs
similarity index 100%
rename from components/standardFormhandlers/memberLogoff.cs
rename to umbraco/umbraco.Legacy/standardFormHandlers/memberLogoff.cs
diff --git a/components/standardFormhandlers/validateLogin.cs b/umbraco/umbraco.Legacy/standardFormHandlers/validateLogin.cs
similarity index 100%
rename from components/standardFormhandlers/validateLogin.cs
rename to umbraco/umbraco.Legacy/standardFormHandlers/validateLogin.cs
diff --git a/umbraco/umbraco.Legacy/umbraco.Legacy.csproj b/umbraco/umbraco.Legacy/umbraco.Legacy.csproj
index 3c59b6c003..e5dc554ef9 100644
--- a/umbraco/umbraco.Legacy/umbraco.Legacy.csproj
+++ b/umbraco/umbraco.Legacy/umbraco.Legacy.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{27A2590E-1313-4A33-89FD-92811540B69C}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -70,6 +70,9 @@
     <Compile Include="editorControls\wysiwyg\editor.cs" />
     <Compile Include="editorControls\wysiwyg\WysiwygDataType.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="standardFormHandlers\formMail.cs" />
+    <Compile Include="standardFormHandlers\memberLogoff.cs" />
+    <Compile Include="standardFormHandlers\validateLogin.cs" />
     <Compile Include="umbraco\ContentItem\edit.aspx.cs">
       <DependentUpon>edit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -289,6 +292,9 @@
           <IISUrl>
           </IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>