diff --git a/src/Umbraco.Web.UI/umbraco/actions/delete.aspx b/src/Umbraco.Web.UI/umbraco/actions/delete.aspx
index 1e56ede2eb..285080f0ce 100644
--- a/src/Umbraco.Web.UI/umbraco/actions/delete.aspx
+++ b/src/Umbraco.Web.UI/umbraco/actions/delete.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoPage.Master" CodeBehind="delete.aspx.cs" Inherits="umbraco.presentation.actions.delete" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
   <style type="text/css">
@@ -9,8 +9,8 @@
 
 <asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
       <cc1:UmbracoPanel ID="Panel2" runat="server" AutoResize="false" Width="500px" Height="200px"  Text="Delete">
-      
-     
+
+
       <asp:Panel ID="confirm" runat="server">
 		    <cc1:Pane ID="pane_delete" runat="server">
 			  <p><asp:Literal ID="warning" runat="server"></asp:Literal></p>
@@ -19,12 +19,12 @@
 			  <asp:Button ID="deleteButton" runat="server" OnClick="deleteButton_Click" />
 			  </p>
 			</asp:Panel>
-			
-			
+
+
 			<cc1:Pane ID="deleteMessage" runat="server" Visible="false">
 			  <p><asp:Literal ID="deleted" runat="server"></asp:Literal></p>
 			</cc1:Pane>
-			
-			
+
+
 			</cc1:UmbracoPanel>
 </asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/actions/publish.aspx b/src/Umbraco.Web.UI/umbraco/actions/publish.aspx
index 100d7fc160..4fd73a96b6 100644
--- a/src/Umbraco.Web.UI/umbraco/actions/publish.aspx
+++ b/src/Umbraco.Web.UI/umbraco/actions/publish.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoPage.Master" CodeBehind="publish.aspx.cs" Inherits="umbraco.presentation.actions.publish" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
   <style type="text/css">
@@ -15,16 +15,16 @@
 			    <p>
 			      <asp:Literal ID="warning" runat="server"></asp:Literal>
 			    </p>
-			    </cc1:Pane>      
-          <br />			    
+			    </cc1:Pane>
+          <br />
 			    <p>
 			      <asp:Button ID="deleteButton" runat="server" OnClick="deleteButton_Click" />
-			    </p>    			
+			    </p>
 			    </asp:Panel>
-			    
+
 			     <cc1:Pane ID="deleteMessage" runat="server" Visible="false">
 			      <p><asp:Literal ID="deleted" runat="server"></asp:Literal></p>
-			     </cc1:Pane>			
+			     </cc1:Pane>
 			</cc1:UmbracoPanel>
-			
+
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/create/language.ascx b/src/Umbraco.Web.UI/umbraco/create/language.ascx
index a5c2f06c4f..ba1373f620 100644
--- a/src/Umbraco.Web.UI/umbraco/create/language.ascx
+++ b/src/Umbraco.Web.UI/umbraco/create/language.ascx
@@ -1,5 +1,5 @@
 <%@ Control Language="c#" AutoEventWireup="True" Inherits="umbraco.cms.presentation.create.controls.language" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <input type="hidden" name="nodeType"/>
 
@@ -15,4 +15,4 @@
     <asp:Button ID="sbmt" CssClass="btn btn-primary" OnClick="sbmt_Click" runat="server" Text='<%#Services.TextService.Localize("create") %>'></asp:Button>
 </cc1:Pane>
 
-    
+
diff --git a/src/Umbraco.Web.UI/umbraco/create/simple.ascx b/src/Umbraco.Web.UI/umbraco/create/simple.ascx
index 4dba61cbe8..c2eb71bd21 100644
--- a/src/Umbraco.Web.UI/umbraco/create/simple.ascx
+++ b/src/Umbraco.Web.UI/umbraco/create/simple.ascx
@@ -1,11 +1,11 @@
 <%@ Control Language="c#" AutoEventWireup="True" Inherits="umbraco.cms.presentation.create.controls.simple" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 
 <cc1:Pane runat="server">
         <cc1:PropertyPanel runat="server" Text="Name">
-             <asp:TextBox id="rename" CssClass="bigInput input-large-type input-block-level" Runat="server"></asp:TextBox><asp:RequiredFieldValidator id="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="rename" runat="server">*</asp:RequiredFieldValidator>   
-        </cc1:PropertyPanel> 
+             <asp:TextBox id="rename" CssClass="bigInput input-large-type input-block-level" Runat="server"></asp:TextBox><asp:RequiredFieldValidator id="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="rename" runat="server">*</asp:RequiredFieldValidator>
+        </cc1:PropertyPanel>
 </cc1:Pane>
 
 <cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
@@ -13,7 +13,7 @@
      <asp:Button id="sbmt" Runat="server" CssClass="btn btn-primary" onclick="sbmt_Click"></asp:Button>
 </cc1:Pane>
 
-    
+
 
 <!-- added to support missing postback on enter in IE -->
 <asp:TextBox runat="server" style="visibility:hidden;display:none;" ID="Textbox1"/>
diff --git a/src/Umbraco.Web.UI/umbraco/create/xslt.ascx b/src/Umbraco.Web.UI/umbraco/create/xslt.ascx
index 38475c2457..ee1d1081ba 100644
--- a/src/Umbraco.Web.UI/umbraco/create/xslt.ascx
+++ b/src/Umbraco.Web.UI/umbraco/create/xslt.ascx
@@ -1,5 +1,5 @@
 <%@ Control Language="c#" AutoEventWireup="True" Codebehind="xslt.ascx.cs" Inherits="Umbraco.Web.UI.Umbraco.Create.Xslt" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <cc1:Pane runat="server">
     <cc1:PropertyPanel runat="server" text="Filename (without .xslt)">
@@ -12,7 +12,7 @@
 	        <asp:ListItem Value="clean.xslt">Clean</asp:ListItem>
         </asp:ListBox>
     </cc1:PropertyPanel>
-    
+
     <cc1:PropertyPanel runat="server" Text="">
         <asp:CheckBox ID="createMacro" Runat="server" Checked="true" Text="Create Macro"></asp:CheckBox>
     </cc1:PropertyPanel>
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Macros/assemblyBrowser.aspx b/src/Umbraco.Web.UI/umbraco/developer/Macros/assemblyBrowser.aspx
index 1e7da97b18..4aaf155fa1 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Macros/assemblyBrowser.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Macros/assemblyBrowser.aspx
@@ -1,16 +1,11 @@
 <%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" Title="Assembly Browser" Codebehind="assemblyBrowser.aspx.cs" AutoEventWireup="True"
   Inherits="umbraco.developer.assemblyBrowser" %>
-<%@ Register TagPrefix="wc1" Namespace="umbraco.controls" Assembly="Umbraco.Web" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="Umbraco.Web" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-
-
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
 <h3 style="MARGIN-LEFT: 0px"><asp:Label id="AssemblyName" runat="server"></asp:Label></h3>
 <asp:Panel id="ChooseProperties" runat="server">
-					<p class="guiDialogTiny">The following list shows the Public Properties from the 
-						Control. By checking the Properties and click the "Save Properties" button at 
+					<p class="guiDialogTiny">The following list shows the Public Properties from the
+						Control. By checking the Properties and click the "Save Properties" button at
 
 						the bottom, umbraco will create the corresponding Macro Elements.</p>
 					<asp:CheckBoxList id="MacroProperties" runat="server"></asp:CheckBoxList>
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx b/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
index baeb717848..d6291f0511 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" Title="Edit macro"
     CodeBehind="EditMacro.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Developer.Macros.EditMacro" %>
 
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 <%@ Register TagPrefix="CD" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/directoryBrowser.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/directoryBrowser.aspx
index bdb30fd628..72eaa4cbc1 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/directoryBrowser.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/directoryBrowser.aspx
@@ -1,6 +1,6 @@
 <%@ Page Language="C#" AutoEventWireup="True" MasterPageFile="../../masterpages/umbracoDialog.Master" CodeBehind="DirectoryBrowser.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Developer.Packages.DirectoryBrowser" %>
 
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 <%@ Register TagPrefix="cdf" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
index 3ada3db523..e8884acfe0 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="C#" ValidateRequest="false" AutoEventWireup="true" MasterPageFile="../../masterpages/umbracoPage.Master"
     Title="Package and export content" CodeBehind="editPackage.aspx.cs" Inherits="umbraco.presentation.developer.packages._Default" %>
 
-<%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc2" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <script type="text/javascript">
         var updateMethod = "";
@@ -36,14 +36,14 @@
                 ControlToValidate="packageVersion">*</asp:RequiredFieldValidator>
         </cc2:PropertyPanel>
         <cc2:PropertyPanel runat="server" ID="pp_icon" Text="Package Icon URL">
-            <asp:TextBox ID="iconUrl" runat="server" Width="230px" CssClass="guiInputText"></asp:TextBox>            
+            <asp:TextBox ID="iconUrl" runat="server" Width="230px" CssClass="guiInputText"></asp:TextBox>
         </cc2:PropertyPanel>
         <cc2:PropertyPanel runat="server" ID="pp_file" Text="Package file (.zip):">
             <asp:Literal ID="packageUmbFile" runat="server" />
         </cc2:PropertyPanel>
-         
+
     </cc2:Pane>
-    
+
     <cc2:Pane ID="Pane5" runat="server">
         <cc2:PropertyPanel runat="server" ID="pp_umbracoVersion" Text="Umbraco Target Version">
             <asp:TextBox ID="umbracoVersion" runat="server" Width="230px" CssClass="guiInputText"></asp:TextBox>
@@ -51,7 +51,7 @@
                 ControlToValidate="umbracoVersion">*</asp:RequiredFieldValidator>
             <asp:RegularExpressionValidator ID="VersionValidator" runat="server" EnableClientScript="false"
                 ControlToValidate="umbracoVersion" ValidationExpression="^\d+\.\d+\.\d+$">Invalid version number (eg. 7.5.0)</asp:RegularExpressionValidator>
-        </cc2:PropertyPanel>        
+        </cc2:PropertyPanel>
     </cc2:Pane>
 
     <cc2:Pane ID="Pane1_1" runat="server">
@@ -189,7 +189,7 @@
                     <asp:TextBox ID="packageControlPath" Width="330px" CssClass="guiInputText" runat="server" />
                     <a href="#" onclick="UmbClientMgr.openModalWindow('developer/packages/directoryBrowser.aspx?target=<%= packageControlPath.ClientID %>','Choose a file or a folder', true, 500, 400); return false;"
                         style="border: none;">
-                         <i class="icon icon-folder"></i>
+                         <i class="icon icon-folder"></i>
                       </a>
                 </td>
             </tr>
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
index f452d7d0e4..1c11c85be5 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
@@ -3,7 +3,7 @@
     Trace="false" ValidateRequest="false" %>
 <%@ Import Namespace="umbraco" %>
 <%@ Import Namespace="Umbraco.Core.Configuration" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
 
diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx
index d8f0954331..80823b8359 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx
@@ -1,16 +1,16 @@
 <%@ Page Language="C#" AutoEventWireup="true" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %>
-<%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="umb" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ID="headContent" ContentPlaceHolderID="head" runat="server">
     <style type="text/css">
         table.relations  { }
         table.relations th { width:auto; }
-                
+
         table.relations th.objectTypeIcon { width:20px; }
         table.relations th.directionIcon { width:16px; height:16px; }
-        
+
         table.relations td { background: transparent none no-repeat scroll center center }
-        
+
         /* objectType icons */
         table.relations td.ContentItemType {}
         table.relations td.ROOT {}
@@ -26,18 +26,18 @@
         table.relations td.Stylesheet {}
         table.relations td.Member {}
         table.relations td.DataType {}
-                
+
         /* direction icons */
         table.relations td.parentToChild { background-image: url('../../developer/RelationTypes/Images/ParentToChild.png'); }
         table.relations td.bidirectional { background-image: url('../../developer/RelationTypes/Images/Bidirectional.png'); }
-    </style>  
+    </style>
 
 </asp:Content>
 
 <asp:Content ID="bodyContent" ContentPlaceHolderID="body" runat="server">
 
     <umb:TabView runat="server" ID="tabControl" Width="200" />
-       
+
     <umb:Pane ID="idPane" runat="server" Text="">
 
         <umb:PropertyPanel runat="server" id="idPropertyPanel" Text="Id">
@@ -45,18 +45,18 @@
         </umb:PropertyPanel>
 
     </umb:Pane>
-       
-       
+
+
     <umb:Pane ID="nameAliasPane" runat="server" Text="">
-	
-		<umb:PropertyPanel runat="server" ID="nameProperyPanel" Text="Name">			
+
+		<umb:PropertyPanel runat="server" ID="nameProperyPanel" Text="Name">
 			<asp:TextBox ID="nameTextBox" runat="server" Columns="40" ></asp:TextBox>
             <asp:RequiredFieldValidator ID="nameRequiredFieldValidator" runat="server" ControlToValidate="nameTextBox" ValidationGroup="RelationType" ErrorMessage="Name Required" Display="Dynamic" />
-			
+
 		</umb:PropertyPanel>
-		
+
 		<umb:PropertyPanel runat="server" id="aliasPropertyPanel" Text="Alias">
-			<asp:TextBox ID="aliasTextBox" runat="server"  Columns="40"></asp:TextBox>				
+			<asp:TextBox ID="aliasTextBox" runat="server"  Columns="40"></asp:TextBox>
             <asp:RequiredFieldValidator ID="aliasRequiredFieldValidator" runat="server" ControlToValidate="aliasTextBox" ValidationGroup="RelationType" ErrorMessage="Alias Required" Display="Dynamic" />
             <asp:CustomValidator ID="aliasCustomValidator" runat="server" ControlToValidate="aliasTextBox" ValidationGroup="RelationType" onservervalidate="AliasCustomValidator_ServerValidate" ErrorMessage="Duplicate Alias" Display="Dynamic" />
 
@@ -64,12 +64,12 @@
 
 	</umb:Pane>
 
-	
+
     <umb:Pane ID="directionPane" runat="server" Text="">
 
         <umb:PropertyPanel runat="server" id="dualPropertyPanel" Text="Direction">
                 <asp:RadioButtonList ID="dualRadioButtonList" runat="server" RepeatDirection="Vertical">
-                    <asp:ListItem Enabled="true" Selected="False" Text="Parent to Child" Value="0" /> 
+                    <asp:ListItem Enabled="true" Selected="False" Text="Parent to Child" Value="0" />
                     <asp:ListItem Enabled="true" Selected="False" Text="Bidirectional" Value="1"/>
                 </asp:RadioButtonList>
         </umb:PropertyPanel>
@@ -89,7 +89,7 @@
 
     </umb:Pane>
 
-    
+
     <umb:Pane ID="relationsCountPane" runat="server" Text="">
 
         <umb:PropertyPanel runat="server" id="relationsCountPropertyPanel" Text="Count">
@@ -97,12 +97,12 @@
         </umb:PropertyPanel>
 
     </umb:Pane>
-	
+
 
     <umb:Pane ID="relationsPane" runat="server" Text="">
 
         <umb:PropertyPanel runat="server" id="relationsPropertyPanel" Text="Relations">
-            
+
             <asp:Repeater ID="relationsRepeater" runat="server">
                 <HeaderTemplate>
                     <table class="table relations">
@@ -115,7 +115,7 @@
                                 <th>Child</th>
                                 <th>Created</th>
                                 <th>Comment</th>
-                            </tr>                        
+                            </tr>
                         </thead>
                         <tbody>
                 </HeaderTemplate>
@@ -127,15 +127,15 @@
                                 <td class="<%= this.ChildObjectType %>">&nbsp;</td>
                                 <td><%# DataBinder.Eval(Container.DataItem, "ChildText") %></td>
                                 <td><%# DataBinder.Eval(Container.DataItem, "DateTime") %></td>
-                                <td><%# DataBinder.Eval(Container.DataItem, "Comment") %></td>                
+                                <td><%# DataBinder.Eval(Container.DataItem, "Comment") %></td>
                             </tr>
-                </ItemTemplate>            
+                </ItemTemplate>
                 <FooterTemplate>
                         </tbody>
                     </table>
                 </FooterTemplate>
             </asp:Repeater>
-            
+
 
         </umb:PropertyPanel>
 
diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx
index b6aeecca43..eef752c1eb 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx
@@ -1,14 +1,14 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="../../masterpages/umbracoDialog.Master"%>
-<%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="umb" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ID="bodyContent" ContentPlaceHolderID="body" runat="server">
     <umb:Pane ID="nameAliasPane" runat="server" Text="">
-        	
-		<umb:PropertyPanel runat="server" ID="nameProperyPanel" Text="Name">			
+
+		<umb:PropertyPanel runat="server" ID="nameProperyPanel" Text="Name">
                 <asp:TextBox ID="descriptionTextBox" runat="server" Columns="40" AutoCompleteType="Disabled" style="width:200px;" />
                 <asp:RequiredFieldValidator ID="descriptionRequiredFieldValidator" runat="server" ControlToValidate="descriptionTextBox" ValidationGroup="NewRelationType" ErrorMessage="Name Required" Display="Dynamic" />
 		</umb:PropertyPanel>
-        			
+
 		<umb:PropertyPanel runat="server" id="aliasPropertyPanel" Text="Alias">
                 <asp:TextBox ID="aliasTextBox" runat="server" Columns="40" AutoCompleteType="Disabled" style="width:200px;" />
                 <asp:RequiredFieldValidator ID="aliasRequiredFieldValidator" runat="server" ControlToValidate="aliasTextBox" ValidationGroup="NewRelationType" ErrorMessage="Alias Required" Display="Dynamic" />
@@ -21,12 +21,12 @@
 
 		<umb:PropertyPanel runat="server" id="PropertyPanel1" Text="Direction">
                 <asp:RadioButtonList ID="dualRadioButtonList" runat="server" RepeatDirection="Horizontal">
-                    <asp:ListItem Enabled="true" Selected="True" Text="Parent to Child" Value="0"/> 
+                    <asp:ListItem Enabled="true" Selected="True" Text="Parent to Child" Value="0"/>
                     <asp:ListItem Enabled="true" Selected="False" Text="Bidirectional" Value="1"/>
                 </asp:RadioButtonList>
 		</umb:PropertyPanel>
     </umb:Pane>
-    
+
     <umb:Pane ID="objectTypePane" runat="server" Text="">
 
 		<umb:PropertyPanel runat="server" id="PropertyPanel2" Text="Parent">
@@ -38,9 +38,9 @@
         </umb:PropertyPanel>
 
 	</umb:Pane>
-            
-    
-    
+
+
+
 <umb:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
      <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("cancel")%></a>
      <asp:Button ID="addButton" runat="server" Text="Create" cssclass="btn btn-primary" onclick="AddButton_Click" CausesValidation="true" ValidationGroup="NewRelationType" />
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx
index f1ad582627..82708b940e 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx
@@ -1,7 +1,7 @@
 <%@ Page Title="Edit XSLT File" MasterPageFile="../../masterpages/umbracoPage.Master"
     ValidateRequest="false" Language="c#" CodeBehind="editXslt.aspx.cs" AutoEventWireup="True"
     Inherits="umbraco.cms.presentation.developer.editXslt" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 
 <asp:Content ID="DocTypeContent" ContentPlaceHolderID="DocType" runat="server">
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx
index 5fab78f083..dd64a4df9a 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltChooseExtension.aspx
@@ -1,7 +1,8 @@
 <%@ Page Language="c#" Codebehind="xsltChooseExtension.aspx.cs" MasterPageFile="../../masterpages/umbracoDialog.Master"  AutoEventWireup="True"
   Inherits="umbraco.developer.xsltChooseExtension" %>
-<%@ Import Namespace="Umbraco.Web" %>  <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-  
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
+<%@ Import Namespace="Umbraco.Web" %>
+
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <script type="text/javascript">
         function returnResult() {
@@ -13,7 +14,7 @@
             if (result.substring(result.length - 1, result.length) == " ")
                 result = result.substring(0, result.length - 2);
             result = result + ")";
-            
+
             document.location = 'xsltInsertValueOf.aspx?objectId=<%=Request.CleanForXss("objectId")%>&value=' + result;
         }
     </script>
@@ -23,7 +24,7 @@ div.code{padding: 7px 0px 7px 0px;  font-family: Consolas,courier;}
 div.code input{border: none; background:#F6F6F9; color: #000; padding: 5px; font-family: Consolas,courier;}
 </style>
 
-</asp:Content> 
+</asp:Content>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
 <cc1:Pane runat="server" Text="Choose xslt extension">
@@ -38,6 +39,6 @@ div.code input{border: none; background:#F6F6F9; color: #000; padding: 5px; font
 
 <p>
   <asp:Button ID="bt_insert" OnClientClick="returnResult(); return false;" Enabled="false" runat="server" Text="Insert" /> <em><%= Services.TextService.Localize("or") %></em> <a href="xsltInsertValueOf.aspx"><%= Services.TextService.Localize("cancel") %></a>
-</p> 
+</p>
 
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx
index 4a0a92f2a4..809361560b 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Xslt/xsltInsertValueOf.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoDialog.Master" Codebehind="xsltInsertValueOf.aspx.cs" AutoEventWireup="True"  Inherits="umbraco.developer.xsltInsertValueOf" %>
 <%@ Import Namespace="Umbraco.Web" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
 <script type="text/javascript">
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain2.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain2.aspx
index 180c383927..5dbf7b5b27 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain2.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain2.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="AssignDomain2.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.AssignDomain2" %>
 <%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
 <umb:JsInclude runat="server" FilePath="Dialogs/AssignDomain2.js" PathNameAlias="UmbracoClient" />
@@ -25,19 +25,19 @@
 </asp:Content>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
-    
+
     <div class="umb-dialog-body">
 
-    <cc1:Feedback ID="feedback" runat="server" />    
+    <cc1:Feedback ID="feedback" runat="server" />
     <div id="komask"></div>
-    
+
          <cc1:Pane runat="server" ID="pane_language">
             <cc1:PropertyPanel runat="server" ID="prop_language">
                 <select class="umb-editor umb-dropdown" name="language" data-bind="options: languages, optionsText: 'Code', optionsValue: 'Id', value: language, optionsCaption: '<%=Services.TextService.Localize("assignDomain/inherit") %>    '"></select>
              <!--   <small class="help-inline"><%=Services.TextService.Localize("assignDomain/setLanguageHelp") %></small>-->
             </cc1:PropertyPanel>
         </cc1:Pane>
-    
+
 
         <cc1:Pane runat="server" ID="pane_domains">
             <small class="help-inline"><%=Services.TextService.Localize("assignDomain/domainHelp") %></small>
@@ -59,12 +59,12 @@
                     </tbody>
                 </table>
             </cc1:PropertyPanel>
-            
+
             <cc1:PropertyPanel runat="server">
-                <button class="btn" data-bind="click: addDomain"><%=Services.TextService.Localize("assignDomain/addNew") %></button>        
+                <button class="btn" data-bind="click: addDomain"><%=Services.TextService.Localize("assignDomain/addNew") %></button>
             </cc1:PropertyPanel>
 
-               
+
         </cc1:Pane>
 
         </div>
@@ -72,7 +72,7 @@
 
 
         <div runat="server" ID="p_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-             <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>  
+             <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>
              <button class="btn btn-primary" id="btnSave"><%=Services.TextService.Localize("buttons/save") %></button>
         </div>
 
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
index ae21dcc6c0..c13fd708a5 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
@@ -1,20 +1,20 @@
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master"Codebehind="ChangeDocType.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.ChangeDocType" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
 
   <style type="text/css">
     #propertyMapping thead tr th{border-bottom:1px solid #ccc; padding: 4px; padding-right: 25px;
-                                background-image: url(<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.UmbracoClient) %>/tableSorting/img/bg.gif);     
-                                cursor: pointer; 
-                                font-weight: bold; 
-                                background-repeat: no-repeat; 
-                                background-position: center right; 
+                                background-image: url(<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.UmbracoClient) %>/tableSorting/img/bg.gif);
+                                cursor: pointer;
+                                font-weight: bold;
+                                background-repeat: no-repeat;
+                                background-position: center right;
                                }
-    
+
     #propertyMapping tbody tr td{border-bottom:1px solid #efefef}
-    #propertyMapping td{padding: 4px; ;}  
+    #propertyMapping td{padding: 4px; ;}
     body.umbracoDialog { overflow: auto; }
     .umb-dialog .umb-control-group .umb-el-wrap { overflow: hidden; }
     .umb-dialog .umb-control-group .umb-el-wrap label { float: left; width: 140px; font-weight: bold; }
@@ -29,7 +29,7 @@
 
     <cc1:Pane runat="server" ID="ChangeDocTypePane">
         <p class="help">
-            <%= Services.TextService.Localize("changeDocType/changeDocTypeInstruction") %>            
+            <%= Services.TextService.Localize("changeDocType/changeDocTypeInstruction") %>
         </p>
 
         <cc1:PropertyPanel ID="ContentNamePropertyPanel" runat="server">
@@ -42,7 +42,7 @@
 
         <cc1:PropertyPanel ID="NewTypePropertyPanel" runat="server">
             <asp:DropDownList ID="NewDocumentTypeList" runat="server" AutoPostBack="true" OnSelectedIndexChanged="NewDocumentTypeList_SelectedIndexChanged" />
-            <asp:RequiredFieldValidator ControlToValidate="NewDocumentTypeList" ErrorMessage="*" ID="NewDocumentTypeValidator" runat="server" Display="Dynamic" />          
+            <asp:RequiredFieldValidator ControlToValidate="NewDocumentTypeList" ErrorMessage="*" ID="NewDocumentTypeValidator" runat="server" Display="Dynamic" />
             <br /><small><%=Services.TextService.Localize("changeDocType/validDocTypesNote") %></small>
         </cc1:PropertyPanel>
 
@@ -50,8 +50,8 @@
             <asp:DropDownList ID="NewTemplateList" runat="server" />
         </cc1:PropertyPanel>
 
-        <asp:PlaceHolder ID="NotAvailablePlaceholder" runat="server" Visible="false">        
-            <div class="propertyItem notice" style="padding-top: 10px">     
+        <asp:PlaceHolder ID="NotAvailablePlaceholder" runat="server" Visible="false">
+            <div class="propertyItem notice" style="padding-top: 10px">
                 <p><%=Services.TextService.Localize("changeDocType/docTypeCannotBeChanged") %></p>
             </div>
         </asp:PlaceHolder>
@@ -60,7 +60,7 @@
     <cc1:Pane runat="server" ID="ChangeDocTypePropertyMappingPane">
 
         <p class="help">
-            <%= Services.TextService.Localize("changeDocType/changeDocTypeInstruction2") %>            
+            <%= Services.TextService.Localize("changeDocType/changeDocTypeInstruction2") %>
         </p>
 
         <asp:Repeater ID="PropertyMappingRepeater" runat="server">
@@ -92,18 +92,18 @@
 
     <asp:PlaceHolder ID="SuccessPlaceholder" runat="server" Visible="false">
         <p><%=Services.TextService.Localize("changeDocType/docTypeChanged") %></p>
-        <p>        
+        <p>
             <asp:Literal ID="SuccessMessage" runat="server" />
             <asp:Literal ID="PropertiesMappedMessage" runat="server" />
             <asp:Literal ID="ContentPublishedMessage" runat="server" />
             <br /><br />
-            <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("defaultdialogs/closeThisWindow") %></a>  
+            <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("defaultdialogs/closeThisWindow") %></a>
         </p>
     </asp:PlaceHolder>
 
     <asp:PlaceHolder ID="ValidationPlaceholder" runat="server" Visible="false">
         <br />
-        <div class="notice" style="padding: 10px">        
+        <div class="notice" style="padding: 10px">
             <asp:Literal id="ValidationError" runat="server" />
         </div>
     </asp:PlaceHolder>
@@ -111,11 +111,10 @@
     <div class="btn-toolbar umb-btn-toolbar">
         <asp:PlaceHolder ID="SaveAndCancelPlaceholder" runat="server">
             <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>
-            <asp:PlaceHolder ID="SavePlaceholder" runat="server">        
+            <asp:PlaceHolder ID="SavePlaceholder" runat="server">
                 <asp:Button ID="ValidateAndSave" runat="server" CssClass="btn btn-primary" Text="Create" OnClick="ValidateAndSave_Click"></asp:Button>
             </asp:PlaceHolder>
         </asp:Placeholder>
     </div>
-     
+
 </asp:Content>
-  
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.designer.cs b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.designer.cs
index c3b5ca8296..3408bc3f56 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.designer.cs
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.designer.cs
@@ -3,15 +3,15 @@
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace Umbraco.Web.UI.Umbraco.Dialogs {
-
-
+    
+    
     public partial class ChangeDocType {
-
+        
         /// <summary>
         /// ChangeDocTypePane control.
         /// </summary>
@@ -20,7 +20,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane ChangeDocTypePane;
-
+        
         /// <summary>
         /// ContentNamePropertyPanel control.
         /// </summary>
@@ -29,7 +29,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel ContentNamePropertyPanel;
-
+        
         /// <summary>
         /// ContentNameLabel control.
         /// </summary>
@@ -38,7 +38,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label ContentNameLabel;
-
+        
         /// <summary>
         /// CurrentTypePropertyPanel control.
         /// </summary>
@@ -47,7 +47,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel CurrentTypePropertyPanel;
-
+        
         /// <summary>
         /// CurrentTypeLabel control.
         /// </summary>
@@ -56,7 +56,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label CurrentTypeLabel;
-
+        
         /// <summary>
         /// NewTypePropertyPanel control.
         /// </summary>
@@ -65,7 +65,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel NewTypePropertyPanel;
-
+        
         /// <summary>
         /// NewDocumentTypeList control.
         /// </summary>
@@ -74,7 +74,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList NewDocumentTypeList;
-
+        
         /// <summary>
         /// NewDocumentTypeValidator control.
         /// </summary>
@@ -83,7 +83,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator NewDocumentTypeValidator;
-
+        
         /// <summary>
         /// NewTemplatePropertyPanel control.
         /// </summary>
@@ -92,7 +92,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel NewTemplatePropertyPanel;
-
+        
         /// <summary>
         /// NewTemplateList control.
         /// </summary>
@@ -101,7 +101,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList NewTemplateList;
-
+        
         /// <summary>
         /// NotAvailablePlaceholder control.
         /// </summary>
@@ -110,7 +110,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder NotAvailablePlaceholder;
-
+        
         /// <summary>
         /// ChangeDocTypePropertyMappingPane control.
         /// </summary>
@@ -119,7 +119,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane ChangeDocTypePropertyMappingPane;
-
+        
         /// <summary>
         /// PropertyMappingRepeater control.
         /// </summary>
@@ -128,7 +128,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater PropertyMappingRepeater;
-
+        
         /// <summary>
         /// SuccessPlaceholder control.
         /// </summary>
@@ -137,7 +137,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder SuccessPlaceholder;
-
+        
         /// <summary>
         /// SuccessMessage control.
         /// </summary>
@@ -146,7 +146,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal SuccessMessage;
-
+        
         /// <summary>
         /// PropertiesMappedMessage control.
         /// </summary>
@@ -155,7 +155,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal PropertiesMappedMessage;
-
+        
         /// <summary>
         /// ContentPublishedMessage control.
         /// </summary>
@@ -164,7 +164,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal ContentPublishedMessage;
-
+        
         /// <summary>
         /// ValidationPlaceholder control.
         /// </summary>
@@ -173,7 +173,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder ValidationPlaceholder;
-
+        
         /// <summary>
         /// ValidationError control.
         /// </summary>
@@ -182,7 +182,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal ValidationError;
-
+        
         /// <summary>
         /// SaveAndCancelPlaceholder control.
         /// </summary>
@@ -191,7 +191,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder SaveAndCancelPlaceholder;
-
+        
         /// <summary>
         /// SavePlaceholder control.
         /// </summary>
@@ -200,7 +200,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder SavePlaceholder;
-
+        
         /// <summary>
         /// ValidateAndSave control.
         /// </summary>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/Preview.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/Preview.aspx
index 8ea3e989fc..504edac152 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/Preview.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/Preview.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoDialog.Master" Inherits="umbraco.presentation.dialogs.Preview" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="body" runat="server">
 
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/Publish.aspx.designer.cs b/src/Umbraco.Web.UI/umbraco/dialogs/Publish.aspx.designer.cs
index 26eb7ede75..8d393f6f1d 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/Publish.aspx.designer.cs
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/Publish.aspx.designer.cs
@@ -3,15 +3,15 @@
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace Umbraco.Web.UI.Umbraco.Dialogs {
-
-
+    
+    
     public partial class Publish {
-
+        
         /// <summary>
         /// JsInclude1 control.
         /// </summary>
@@ -20,7 +20,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-
+        
         /// <summary>
         /// JsInclude2 control.
         /// </summary>
@@ -29,7 +29,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::ClientDependency.Core.Controls.JsInclude JsInclude2;
-
+        
         /// <summary>
         /// CssInclude1 control.
         /// </summary>
@@ -38,7 +38,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::ClientDependency.Core.Controls.CssInclude CssInclude1;
-
+        
         /// <summary>
         /// ProgBar1 control.
         /// </summary>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
index 7d5067f8a1..a75010eeaa 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
@@ -1,21 +1,21 @@
-<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" 
+<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master"
     AutoEventWireup="True" Inherits="umbraco.dialogs.create" %>
 
 <%@ Import Namespace="Umbraco.Web" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register Src="../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 <asp:Content ContentPlaceHolderID="head" runat="server">
 
     <script language="javascript" type="text/javascript">
-        
+
         var pageNameHolder = null;
         var pageName = null;
-        
+
         jQuery(document).ready(function() {
             pageNameHolder = jQuery("#<%=PageNameHolder.ClientID%>");
-		    pageName = pageNameHolder.find("p");    
+		    pageName = pageNameHolder.find("p");
         });
-        
+
 		function dialogHandler(id) {
 			document.getElementById("nodeId").value = id;
 			document.getElementById("ok").disabled = false;
@@ -23,20 +23,20 @@
 			if (id > 0) {
 			    umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbracoUserContextID%>', id, updateName);
 				}
-			else			
+			else
 				pageName.html("<p><strong><%=Services.TextService.Localize(App)%></strong> <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %></p>");
 				pageNameHolder.attr("class","success");
 		}
-		
-		function updateName(result) {			  
+
+		function updateName(result) {
 		    pageName.html("<p><strong>" + result + "</strong> <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %></p>");
 			pageNameHolder.attr("class","success");
 		}
-		
+
 		function onNodeSelectionConfirmed() {
 		    document.location.href = 'create.aspx?nodeType=<%=Request.CleanForXss("nodeType")%>&app=<%=App%>&nodeId=' + document.getElementById('nodeId').value
 		}
-	
+
     </script>
 
 </asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/notifications.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/notifications.aspx
index ecb6b2ed62..2df6d6ffb2 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/notifications.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/notifications.aspx
@@ -1,18 +1,18 @@
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="notifications.aspx.cs" AutoEventWireup="True"
   Inherits="umbraco.dialogs.notifications" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
 
 <div class="umb-dialog-body form-horizontal">
-    
+
     <cc1:Pane ID="pane_form" runat="server">
 
 
     </cc1:Pane>
 </div>
 <div runat="server" ID="pl_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>  
+        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>
        <asp:Button ID="Button1" runat="server" CssClass="btn btn-primary" OnClick="Button1_Click"></asp:Button>
 </div>
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
index 1a2325b894..4115ea5a2b 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
@@ -1,7 +1,5 @@
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.presentation.umbraco.dialogs.protectPage" %>
 
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <script type="text/javascript">
         function updateLoginId() {
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx
index 740f065eb5..1882570d00 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx
@@ -3,8 +3,8 @@
 <%@ Import Namespace="Umbraco.Core" %>
 <%@ Import Namespace="Umbraco.Web" %>
 <%@ Import Namespace="Umbraco.Web.Mvc" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
@@ -55,8 +55,8 @@
                     <%=Services.TextService.Localize("publish/includeUnpublished") %>
                 </label>
             </div>
-            
-            
+
+
 
         </div>
 
@@ -90,8 +90,8 @@
              <p>
                  <a href='#' class="btn" data-bind="click: closeDialog"><%=Services.TextService.Localize("closeThisWindow") %></a>
              </p>
-        </div> 
-       
+        </div>
+
 
     </div>
 
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx
index 2b3acfa093..0dc2dce659 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="c#" Codebehind="republish.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.cms.presentation.republish" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
    <script type="text/javascript">
@@ -14,27 +14,27 @@
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
 <asp:Panel ID="p_republish" runat="server">
-    <div class="propertyDiv">      
+    <div class="propertyDiv">
           <p><%= Services.TextService.Localize("defaultdialogs/siterepublishHelp")%> </p>
     </div>
-      
+
     <div id="buttons" class="btn-toolbar umb-btn-toolbar">
         <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow();"><%=Services.TextService.Localize("cancel")%></a>
         <asp:Button ID="bt_go" cssclass="btn btn-primary" OnClick="go" OnClientClick="showProgress(document.getElementById('buttons'),'progress'); return true;" runat="server" Text="Republish" />
-    </div>     
-      
+    </div>
+
     <div id="progress" style="visibility: hidden;">
       <div class="umb-loader-wrapper">
 		    <cc1:ProgressBar ID="progbar" runat="server" Title="Please wait..." />
       </div>
     </div>
-      
+
     </asp:Panel>
-    
+
     <asp:Panel ID="p_done" Visible="false" runat="server">
      <div class="success">
       <p><%= Services.TextService.Localize("defaultdialogs/siterepublished")%></p>
-      
+
      </div>
       <input type="button" class="btn btn-primary" onclick="UmbClientMgr.closeModalWindow();" value="Ok" />
     </asp:Panel>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
index a4c5df4961..29dbae2bef 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master"AutoEventWireup="True" Inherits="umbraco.presentation.dialogs.rollBack" %>
 
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <script type="text/javascript">
@@ -94,5 +94,5 @@
     <div runat="server" id="pl_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
         <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>
         <asp:Button ID="Button1" runat="server" visible="false" CssClass="btn btn-primary" OnClick="doRollback_Click"></asp:Button>
-    </div>  
+    </div>
 </asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/search.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/search.aspx
index 7eb174063c..bb1b7a6f3c 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/search.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/search.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true"
     CodeBehind="search.aspx.cs" Inherits="umbraco.presentation.dialogs.search" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <asp:Content ID="header1" ContentPlaceHolderID="head" runat="server">
 <script type="text/javascript">
     function openItem(id) {
@@ -33,7 +33,7 @@
     <cc1:Pane ID="Wizard" runat="server">
         <h3>Search</h3>
         <p>
-        <asp:TextBox ID="keyword" runat="server" Width="500" CssClass="bigInput"></asp:TextBox> 
+        <asp:TextBox ID="keyword" runat="server" Width="500" CssClass="bigInput"></asp:TextBox>
             <asp:Button ID="searchButton" runat="server" Text="Search" onclick="search_Click" /><br />
         </p>
         <asp:Panel ID="nothingFound" runat="server" Visible="false">
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/sendToTranslation.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/sendToTranslation.aspx
index 5e27895926..96a5d88323 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/sendToTranslation.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/sendToTranslation.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" Codebehind="sendToTranslation.aspx.cs" Inherits="umbraco.presentation.dialogs.sendToTranslation" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
 <style type="text/css">
@@ -34,4 +34,3 @@
 </p>
 </asp:Panel>
 </asp:Content>
-      
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
index 1d40b6e934..2df3cc606e 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
@@ -3,8 +3,8 @@
 <%@ Import Namespace="System.Globalization" %>
 <%@ Import Namespace="Umbraco.Core.IO" %>
 <%@ Import Namespace="Umbraco.Web" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <umb:CssInclude ID="CssInclude1" runat="server" FilePath="Dialogs/SortDialog.css" PathNameAlias="UmbracoClient"></umb:CssInclude>
@@ -23,7 +23,7 @@
                 <div class="notice">
                     <p><%= Services.TextService.Localize("sort/sortPleaseWait") %></p>
                 </div>
-                
+
                 <div class="umb-loader-wrapper">
                     <cc1:ProgressBar ID="prog1" runat="server" Title="sorting.." />
                 </div>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/treePicker.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/treePicker.aspx
index 0fb6db8b5f..294a4f8229 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/treePicker.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/treePicker.aspx
@@ -2,22 +2,21 @@
     AutoEventWireup="True" Inherits="umbraco.dialogs.treePicker" %>
 
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb2" TagName="Tree" Src="../controls/Tree/TreeControl.ascx" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
-    
+
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
 
     <script type="text/javascript" language="javascript">
-    
+
 			function dialogHandler(id) {
 			    UmbClientMgr.closeModalWindow(id);
-			}			
-			
+			}
+
     </script>
 
     <umb2:Tree runat="server" ID="DialogTree" App='<%#TreeParams.App %>' TreeType='<%#TreeParams.TreeType %>'
         IsDialog="true" ShowContextMenu="false" DialogMode="id" FunctionToCall="dialogHandler" NodeKey='<%#TreeParams.NodeKey %>' />
-        
+
 </asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
index 212d2968b7..2880b1e683 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
@@ -2,8 +2,8 @@
     AutoEventWireup="True" Inherits="umbraco.dialogs.umbracoField" %>
 
 <%@ Import Namespace="Umbraco.Web" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <script type="text/javascript">
@@ -17,9 +17,9 @@
                     objectId: '<%=Request.CleanForXss("objectId")%>'
                 });
                 umbracoField.init();
-            });            
+            });
         })(jQuery);
-        
+
         var functionsFrame = this;
         var tabFrame = this;
         var isDialog = true;
@@ -34,10 +34,10 @@
     <div class="umb-panel umb-modal">
     <div class="umb-panel-body no-header with-footer">
     <input type="hidden" name="tagName" runat="server" id="tagName" value="?UMBRACO_GETITEM" />
-    
+
     <cc1:Pane ID="pane_form" runat="server" Title="Choose value">
         <cc1:PropertyPanel ID="pp_insertField" runat="server">
-            <cc1:FieldDropDownList ID="fieldPicker" Width="170px" Rows="1" runat="server"></cc1:FieldDropDownList>            
+            <cc1:FieldDropDownList ID="fieldPicker" Width="170px" Rows="1" runat="server"></cc1:FieldDropDownList>
             <input type="text" size="25" name="field" class="guiInputTextTiny"/>
         </cc1:PropertyPanel>
 
@@ -47,19 +47,19 @@
             <span class="guiDialogTiny">
                 <%=Services.TextService.Localize("templateEditor/usedIfEmpty")%></span>
         </cc1:PropertyPanel>
-        
+
         <cc1:PropertyPanel ID="pp_insertAltText" runat="server">
             <textarea rows="1" style="width: 310px;" name="alternativeText" class="guiInputTextTiny"></textarea><br />
             <span class="guiDialogTiny">
                 <%=Services.TextService.Localize("templateEditor/usedIfAllEmpty")%></span>
         </cc1:PropertyPanel>
-        
+
         <cc1:PropertyPanel ID="pp_recursive" runat="server">
             <input type="checkbox" name="recursive" value="true"/> <%=Services.TextService.Localize("templateEditor/recursive")%>
         </cc1:PropertyPanel>
 
     </cc1:Pane>
-    
+
     <cc1:Pane runat="server" Title="Format and encoding">
         <cc1:PropertyPanel ID="pp_FormatAsDate" runat="server">
             <input type="radio" name="formatAsDate" value="formatAsDate"/>
@@ -111,7 +111,7 @@
 
         <cc1:PropertyPanel ID="pp_convertLineBreaks" runat="server">
             <input type="checkbox" name="convertLineBreaks" value="true"/>  <%=Services.TextService.Localize("templateEditor/convertLineBreaks")%>
-            
+
             <br />
             <span class="guiDialogTiny">
                 <%=Services.TextService.Localize("templateEditor/convertLineBreaksHelp")%>
@@ -126,16 +126,16 @@
         </cc1:PropertyPanel>
     </cc1:Pane>
     </div>
-    
+
     <div class="umb-panel-footer">
         <div class="btn-toolbar umb-btn-toolbar">
             <a id="cancelButton" href="#" class="btn btn-link">
-                <%=Services.TextService.Localize("general/cancel")%></a> 
-    
+                <%=Services.TextService.Localize("general/cancel")%></a>
+
             <input id="submitButton" type="button" name="gem" class="btn btn-primary" value="<%=Services.TextService.Localize("insert")%>" />
         </div>
     </div>
 
     </div>
-    
+
 </asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx
index 16de3da702..4fa9fcb2e2 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoPage.Master"Codebehind="viewAuditTrail.aspx.cs" AutoEventWireup="True"
   Inherits="umbraco.presentation.umbraco.dialogs.viewAuditTrail" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
 <style type="text/css">
@@ -67,6 +67,6 @@
 </asp:Content>
 
 
-           
-            
-            
+
+
+
diff --git a/src/Umbraco.Web.UI/umbraco/settings/DictionaryItemList.aspx b/src/Umbraco.Web.UI/umbraco/settings/DictionaryItemList.aspx
index 4f68903ef4..f97020249e 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/DictionaryItemList.aspx
+++ b/src/Umbraco.Web.UI/umbraco/settings/DictionaryItemList.aspx
@@ -1,6 +1,6 @@
 <%@ Page Language="C#" AutoEventWireup="true" Codebehind="DictionaryItemList.aspx.cs"
   Inherits="umbraco.presentation.settings.DictionaryItemList" MasterPageFile="../masterpages/umbracoPage.Master" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
diff --git a/src/Umbraco.Web.UI/umbraco/settings/editLanguage.aspx b/src/Umbraco.Web.UI/umbraco/settings/editLanguage.aspx
index 797ca0d9bc..68088ae594 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/editLanguage.aspx
+++ b/src/Umbraco.Web.UI/umbraco/settings/editLanguage.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" CodeBehind="editLanguage.aspx.cs" AutoEventWireup="True" MasterPageFile="../masterpages/umbracoPage.Master"
     Inherits="umbraco.settings.editLanguage" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <asp:Content ContentPlaceHolderID="body" runat="server">
     <cc1:UmbracoPanel ID="Panel1" runat="server" Width="608px" Height="336px" hasMenu="true">
         <cc1:Pane ID="Pane7" runat="server">
diff --git a/src/Umbraco.Web.UI/umbraco/settings/modals/ShowUmbracoTags.aspx b/src/Umbraco.Web.UI/umbraco/settings/modals/ShowUmbracoTags.aspx
index 9663dc6e15..b36acbfca7 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/modals/ShowUmbracoTags.aspx
+++ b/src/Umbraco.Web.UI/umbraco/settings/modals/ShowUmbracoTags.aspx
@@ -1,8 +1,8 @@
 <%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" Title="ShowUmbracoTags"
     Codebehind="ShowUmbracoTags.aspx.cs" AutoEventWireup="True"
   Inherits="umbraco.cms.presentation.settings.modal.ShowUmbracoTags" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 <%@ Import Namespace="Umbraco.Core.IO" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
     <style type="text/css">
diff --git a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx
index f31cc9c430..81eb204650 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx
+++ b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx
@@ -3,31 +3,31 @@
 <%@ Import Namespace="Umbraco.Core" %>
 <%@ Import Namespace="Umbraco.Web.Mvc" %>
 
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="cdf" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <cdf:JsInclude runat="server" FilePath="Editors/EditStyleSheet.js" PathNameAlias="UmbracoClient"></cdf:JsInclude>
 
     <script type="text/javascript">
-        
+
         (function ($) {
             $(document).ready(function () {
                 var editor = new Umbraco.Editors.EditStyleSheet({
                     nameTxtBox: $('#<%= NameTxt.ClientID %>'),
                     originalFileName: '<%= NameTxt.Text %>',
                     saveButton: $("#<%= ((Control)SaveButton).ClientID %>"),
-                    editorSourceElement: $('#<%= editorSource.ClientID %>'), 
+                    editorSourceElement: $('#<%= editorSource.ClientID %>'),
                     restServiceLocation: "<%= Url.GetSaveFileServicePath() %>",
                     treeSyncPath: "<%= TreeSyncPath %>",
                     lttPathElement: $('#<%= lttPath.ClientID %>')
                 });
                 editor.init();
-                
+
                 //bind save shortcut
                 UmbClientMgr.appActions().bindSaveShortCut();
             });
-                
+
             })(jQuery);
 
     </script>
diff --git a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx
index 33be29065a..dc61833366 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx
+++ b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" MasterPageFile="../../../masterpages/umbracoPage.Master" CodeBehind="EditStyleSheetProperty.aspx.cs"
   AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Settings.Stylesheet.Property.EditStyleSheetProperty"
   ValidateRequest="False" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
   <cc1:UmbracoPanel ID="Panel1" runat="server" Text="Edit stylesheet property" Width="432px" Height="176px" hasMenu="true">
diff --git a/src/Umbraco.Web.UI/umbraco/translation/default.aspx b/src/Umbraco.Web.UI/umbraco/translation/default.aspx
index 872e0481fa..1c921bd07b 100644
--- a/src/Umbraco.Web.UI/umbraco/translation/default.aspx
+++ b/src/Umbraco.Web.UI/umbraco/translation/default.aspx
@@ -1,40 +1,40 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoPage.Master" CodeBehind="default.aspx.cs" Inherits="umbraco.presentation.translation._default" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
   <style type="text/css">
   .fieldsTable tr{
     border-color: #D9D7D7 !Important;
-  }  
+  }
 </style>
 </asp:Content>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
   <cc1:UmbracoPanel ID="Panel2" runat="server">
-    
+
     <cc1:Feedback ID="feedback" runat="server" />
-    
+
     <cc1:Pane ID="pane_uploadFile" runat="server" Text="Upload translation file">
       <p>
         When you have completed the translation. Upload the edited XML file here. The related translation tasks will automatically be closed when a file is uploaded.
       </p>
-      
+
       <cc1:PropertyPanel runat="server">
                 <input type="file" runat="server" id="translationFile" size="30" /> &nbsp; <asp:Button ID="uploadFile" runat="server" Text="Upload file" OnClick="uploadFile_Click" />
       </cc1:PropertyPanel>
     </cc1:Pane>
-    
-   
+
+
    <cc1:Pane ID="pane_tasks" runat="server" Text="Your tasks">
        <p>
         <asp:Literal ID="lt_tasksHelp" runat="server"></asp:Literal>
        </p>
-        
+
         <p>
             <a href="xml.aspx?task=all" target="_blank"><%= Services.TextService.Localize("translation/downloadAllAsXml") %></a>
              &nbsp; &nbsp;
-            <a href="translationTasks.dtd" target="_blank"><%= Services.TextService.Localize("translation/DownloadXmlDTD")%></a>        
-        </p>              
+            <a href="translationTasks.dtd" target="_blank"><%= Services.TextService.Localize("translation/DownloadXmlDTD")%></a>
+        </p>
       <asp:GridView GridLines="Horizontal" ID="taskList" runat="server" CssClass="fieldsTable" BorderStyle="None" Width="100%"
             CellPadding="5" AutoGenerateColumns="false">
             <Columns>
@@ -50,6 +50,6 @@
             </Columns>
           </asp:GridView>
    </cc1:Pane>
-    
+
   </cc1:UmbracoPanel>
 </asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/translation/details.aspx b/src/Umbraco.Web.UI/umbraco/translation/details.aspx
index 05367e755f..ea3e3cd59b 100644
--- a/src/Umbraco.Web.UI/umbraco/translation/details.aspx
+++ b/src/Umbraco.Web.UI/umbraco/translation/details.aspx
@@ -1,5 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="details.aspx.cs" Inherits="umbraco.presentation.umbraco.translation.details" %>
-<%@ Register TagPrefix="ui" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="ui" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
@@ -7,7 +7,7 @@
 <style type="text/css">
   .fieldsTable tr{
     border-color: #D9D7D7 !Important;
-  }  
+  }
 </style>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
diff --git a/src/Umbraco.Web.UI/umbraco/translation/preview.aspx b/src/Umbraco.Web.UI/umbraco/translation/preview.aspx
index 2e3c382980..10302d6a24 100644
--- a/src/Umbraco.Web.UI/umbraco/translation/preview.aspx
+++ b/src/Umbraco.Web.UI/umbraco/translation/preview.aspx
@@ -1,5 +1,4 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoPage.Master" CodeBehind="preview.aspx.cs" Inherits="umbraco.presentation.translation.preview" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
 
@@ -12,18 +11,18 @@
   <td colspan="2">
       <div class="notice">
         <p>
-            <strong>Please notice</strong> that due to templating and unpublished content, the 2 pages can have differences in layout. 
+            <strong>Please notice</strong> that due to templating and unpublished content, the 2 pages can have differences in layout.
         </p>
       </div>
   </td>
 </tr>
 <tr>
   <td style="border-right: 1px solid #ccc; padding-right: 15px;">
- 
+
   <iframe src="<%= translatedUrl %>" frameborder="0" style="border: none"></iframe>
   </td>
   <td style="padding-left: 15px;">
- 
+
   <iframe src="<%= originalUrl %>" frameborder="0" style="border: none"></iframe>
   </td>
 </tr>
@@ -35,7 +34,7 @@
     var docWidth = jQuery(document).width();
 
     jQuery("iframe").height(docHeight - 140).width((docWidth / 2) - 31);
-  });     
+  });
 </script>
 
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx
index 1e56ede2eb..4ea4a2f81b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoPage.Master" CodeBehind="delete.aspx.cs" Inherits="umbraco.presentation.actions.delete" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
   <style type="text/css">
@@ -9,8 +9,8 @@
 
 <asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
       <cc1:UmbracoPanel ID="Panel2" runat="server" AutoResize="false" Width="500px" Height="200px"  Text="Delete">
-      
-     
+
+
       <asp:Panel ID="confirm" runat="server">
 		    <cc1:Pane ID="pane_delete" runat="server">
 			  <p><asp:Literal ID="warning" runat="server"></asp:Literal></p>
@@ -19,12 +19,12 @@
 			  <asp:Button ID="deleteButton" runat="server" OnClick="deleteButton_Click" />
 			  </p>
 			</asp:Panel>
-			
-			
+
+
 			<cc1:Pane ID="deleteMessage" runat="server" Visible="false">
 			  <p><asp:Literal ID="deleted" runat="server"></asp:Literal></p>
 			</cc1:Pane>
-			
-			
+
+
 			</cc1:UmbracoPanel>
 </asp:Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx.designer.cs
index 9eaec05d7e..dc80441bb7 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/delete.aspx.designer.cs
@@ -1,18 +1,17 @@
 //------------------------------------------------------------------------------
 // <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.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.presentation.actions {
-
-
+    
+    
     public partial class delete {
-
+        
         /// <summary>
         /// Panel2 control.
         /// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.presentation.actions {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.UmbracoPanel Panel2;
-
+        
         /// <summary>
         /// confirm control.
         /// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.presentation.actions {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel confirm;
-
+        
         /// <summary>
         /// pane_delete control.
         /// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.presentation.actions {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane pane_delete;
-
+        
         /// <summary>
         /// warning control.
         /// </summary>
@@ -48,7 +47,7 @@ namespace umbraco.presentation.actions {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal warning;
-
+        
         /// <summary>
         /// deleteButton control.
         /// </summary>
@@ -57,7 +56,7 @@ namespace umbraco.presentation.actions {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button deleteButton;
-
+        
         /// <summary>
         /// deleteMessage control.
         /// </summary>
@@ -66,7 +65,7 @@ namespace umbraco.presentation.actions {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane deleteMessage;
-
+        
         /// <summary>
         /// deleted control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx
index 100d7fc160..b4d8a81c32 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoPage.Master" CodeBehind="publish.aspx.cs" Inherits="umbraco.presentation.actions.publish" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
   <style type="text/css">
@@ -15,16 +15,16 @@
 			    <p>
 			      <asp:Literal ID="warning" runat="server"></asp:Literal>
 			    </p>
-			    </cc1:Pane>      
-          <br />			    
+			    </cc1:Pane>
+          <br />
 			    <p>
 			      <asp:Button ID="deleteButton" runat="server" OnClick="deleteButton_Click" />
-			    </p>    			
+			    </p>
 			    </asp:Panel>
-			    
+
 			     <cc1:Pane ID="deleteMessage" runat="server" Visible="false">
 			      <p><asp:Literal ID="deleted" runat="server"></asp:Literal></p>
-			     </cc1:Pane>			
+			     </cc1:Pane>
 			</cc1:UmbracoPanel>
-			
+
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.designer.cs
index 70914fb668..d8b50f4c96 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.designer.cs
@@ -1,18 +1,17 @@
 //------------------------------------------------------------------------------
 // <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.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.presentation.actions {
-
-
+    
+    
     public partial class publish {
-
+        
         /// <summary>
         /// Panel2 control.
         /// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.presentation.actions {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.UmbracoPanel Panel2;
-
+        
         /// <summary>
         /// confirm control.
         /// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.presentation.actions {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel confirm;
-
+        
         /// <summary>
         /// pane_publish control.
         /// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.presentation.actions {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane pane_publish;
-
+        
         /// <summary>
         /// warning control.
         /// </summary>
@@ -48,7 +47,7 @@ namespace umbraco.presentation.actions {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal warning;
-
+        
         /// <summary>
         /// deleteButton control.
         /// </summary>
@@ -57,7 +56,7 @@ namespace umbraco.presentation.actions {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button deleteButton;
-
+        
         /// <summary>
         /// deleteMessage control.
         /// </summary>
@@ -66,7 +65,7 @@ namespace umbraco.presentation.actions {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane deleteMessage;
-
+        
         /// <summary>
         /// deleted control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx
index b66388d3a0..e8884acfe0 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="C#" ValidateRequest="false" AutoEventWireup="true" MasterPageFile="../../masterpages/umbracoPage.Master"
     Title="Package and export content" CodeBehind="editPackage.aspx.cs" Inherits="umbraco.presentation.developer.packages._Default" %>
 
-<%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc2" Namespace="Umbraco.Web._Legacy.Controls" Assembly="Umbraco.Web" %>
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <script type="text/javascript">
         var updateMethod = "";
@@ -35,12 +35,27 @@
             <asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" EnableClientScript="false"
                 ControlToValidate="packageVersion">*</asp:RequiredFieldValidator>
         </cc2:PropertyPanel>
+        <cc2:PropertyPanel runat="server" ID="pp_icon" Text="Package Icon URL">
+            <asp:TextBox ID="iconUrl" runat="server" Width="230px" CssClass="guiInputText"></asp:TextBox>
+        </cc2:PropertyPanel>
         <cc2:PropertyPanel runat="server" ID="pp_file" Text="Package file (.zip):">
             <asp:Literal ID="packageUmbFile" runat="server" />
         </cc2:PropertyPanel>
+
     </cc2:Pane>
+
+    <cc2:Pane ID="Pane5" runat="server">
+        <cc2:PropertyPanel runat="server" ID="pp_umbracoVersion" Text="Umbraco Target Version">
+            <asp:TextBox ID="umbracoVersion" runat="server" Width="230px" CssClass="guiInputText"></asp:TextBox>
+            <asp:RequiredFieldValidator ID="RequiredFieldValidator7" runat="server" EnableClientScript="false"
+                ControlToValidate="umbracoVersion">*</asp:RequiredFieldValidator>
+            <asp:RegularExpressionValidator ID="VersionValidator" runat="server" EnableClientScript="false"
+                ControlToValidate="umbracoVersion" ValidationExpression="^\d+\.\d+\.\d+$">Invalid version number (eg. 7.5.0)</asp:RegularExpressionValidator>
+        </cc2:PropertyPanel>
+    </cc2:Pane>
+
     <cc2:Pane ID="Pane1_1" runat="server">
-        <cc2:PropertyPanel runat="server" ID="pp_author" Text="Author Name">
+        <cc2:PropertyPanel runat="server" ID="pp_author" Text="Author Name" >
             <asp:TextBox ID="packageAuthorName" runat="server" Width="230px" CssClass="guiInputText"></asp:TextBox>
             <asp:RequiredFieldValidator ID="RequiredFieldValidator3" runat="server" EnableClientScript="false"
                 ControlToValidate="packageAuthorName">*</asp:RequiredFieldValidator>
@@ -51,6 +66,7 @@
                 ControlToValidate="packageAuthorUrl">*</asp:RequiredFieldValidator>
         </cc2:PropertyPanel>
     </cc2:Pane>
+
     <cc2:Pane ID="Pane1_2" runat="server">
         <cc2:PropertyPanel runat="server" ID="pp_licens" Text="License Name:">
             <asp:TextBox ID="packageLicenseName" runat="server" Width="230px" CssClass="guiInputText"></asp:TextBox>
@@ -74,7 +90,7 @@
             <asp:PlaceHolder ID="content" runat="server"></asp:PlaceHolder>
             <br />
             <asp:CheckBox ID="packageContentSubdirs" runat="server" />
-            Include all child nodes
+            <asp:Label ID="packageContentSubdirsLabel" Text="Include all child nodes" AssociatedControlID="packageContentSubdirs" runat="server" />
         </cc2:PropertyPanel>
     </cc2:Pane>
     <cc2:Pane ID="Pane2_1" runat="server">
@@ -117,7 +133,7 @@
             <tr>
                 <td>
                     <strong style="color: Red;">Remember:</strong> .xslt and .ascx files for your macros
-                    will be added automatically, but you will still need to add <strong>assemblies</strong>,
+                    will be added automaticly, but you will still need to add <strong>assemblies</strong>,
                     <strong>images</strong> and <strong>script files</strong> manually to the list below.
                 </td>
             </tr>
@@ -152,6 +168,7 @@
                     <a href="#" onclick="UmbClientMgr.openModalWindow('developer/packages/directoryBrowser.aspx?target=<%= packageFilePathNew.ClientID %>','Choose a file or a folder', true, 400, 500); return false;"
                         style="border: none;">
                         <i class="icon icon-folder"></i>
+                        </a>
                 </td>
                 <td class="propertyContent">
                     <asp:Button ID="createNewFilePath" OnClientClick="addfileJs()" Text="Add" OnClick="addFileToPackage"
@@ -172,7 +189,8 @@
                     <asp:TextBox ID="packageControlPath" Width="330px" CssClass="guiInputText" runat="server" />
                     <a href="#" onclick="UmbClientMgr.openModalWindow('developer/packages/directoryBrowser.aspx?target=<%= packageControlPath.ClientID %>','Choose a file or a folder', true, 500, 400); return false;"
                         style="border: none;">
-                        <img style="border: none;" src="../../images/foldericon.png" /></a>
+                         <i class="icon icon-folder"></i>
+                      </a>
                 </td>
             </tr>
         </table>
@@ -186,7 +204,7 @@
                         during installation and uninstallation.
                         <br />
                         All actions are formed as a xml node, containing data for the action to be performed.
-                        <a href="http://our.umbraco.org/wiki/reference/packaging/package-actions
+                        <a href="https://our.umbraco.org/documentation/Reference/Packaging/
 " target="_blank">Package actions documentation</a>
                     </p>
                     <asp:CustomValidator ID="actionsVal" runat="server" OnServerValidate="validateActions"
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.designer.cs
index 1afba5aaa7..c7a873659e 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.designer.cs
@@ -3,15 +3,15 @@
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.presentation.developer.packages {
-
-
+    
+    
     public partial class _Default {
-
+        
         /// <summary>
         /// TabView1 control.
         /// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.TabView TabView1;
-
+        
         /// <summary>
         /// Pane1 control.
         /// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane1;
-
+        
         /// <summary>
         /// pp_name control.
         /// </summary>
@@ -38,16 +38,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_name;
-
-        protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_icon;
-        protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_umbracoVersion;
-        protected global::System.Web.UI.WebControls.TextBox iconUrl;
-        protected global::System.Web.UI.WebControls.TextBox umbracoVersion;
-        protected global::Umbraco.Web._Legacy.Controls.Pane Pane5;
-        protected global::System.Web.UI.WebControls.RegularExpressionValidator VersionValidator;
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator7;
-
-
+        
         /// <summary>
         /// packageName control.
         /// </summary>
@@ -56,7 +47,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox packageName;
-
+        
         /// <summary>
         /// RequiredFieldValidator0 control.
         /// </summary>
@@ -65,7 +56,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator0;
-
+        
         /// <summary>
         /// pp_url control.
         /// </summary>
@@ -74,7 +65,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_url;
-
+        
         /// <summary>
         /// packageUrl control.
         /// </summary>
@@ -83,7 +74,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox packageUrl;
-
+        
         /// <summary>
         /// RequiredFieldValidator1 control.
         /// </summary>
@@ -92,7 +83,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
-
+        
         /// <summary>
         /// pp_version control.
         /// </summary>
@@ -101,7 +92,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_version;
-
+        
         /// <summary>
         /// packageVersion control.
         /// </summary>
@@ -110,7 +101,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox packageVersion;
-
+        
         /// <summary>
         /// RequiredFieldValidator2 control.
         /// </summary>
@@ -119,7 +110,25 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator2;
-
+        
+        /// <summary>
+        /// pp_icon control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_icon;
+        
+        /// <summary>
+        /// iconUrl control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox iconUrl;
+        
         /// <summary>
         /// pp_file control.
         /// </summary>
@@ -128,7 +137,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_file;
-
+        
         /// <summary>
         /// packageUmbFile control.
         /// </summary>
@@ -137,7 +146,52 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal packageUmbFile;
-
+        
+        /// <summary>
+        /// Pane5 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::Umbraco.Web._Legacy.Controls.Pane Pane5;
+        
+        /// <summary>
+        /// pp_umbracoVersion control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_umbracoVersion;
+        
+        /// <summary>
+        /// umbracoVersion control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox umbracoVersion;
+        
+        /// <summary>
+        /// RequiredFieldValidator7 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator7;
+        
+        /// <summary>
+        /// VersionValidator control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RegularExpressionValidator VersionValidator;
+        
         /// <summary>
         /// Pane1_1 control.
         /// </summary>
@@ -146,7 +200,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane1_1;
-
+        
         /// <summary>
         /// pp_author control.
         /// </summary>
@@ -155,7 +209,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_author;
-
+        
         /// <summary>
         /// packageAuthorName control.
         /// </summary>
@@ -164,7 +218,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox packageAuthorName;
-
+        
         /// <summary>
         /// RequiredFieldValidator3 control.
         /// </summary>
@@ -173,7 +227,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator3;
-
+        
         /// <summary>
         /// pp_author_url control.
         /// </summary>
@@ -182,7 +236,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_author_url;
-
+        
         /// <summary>
         /// packageAuthorUrl control.
         /// </summary>
@@ -191,7 +245,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox packageAuthorUrl;
-
+        
         /// <summary>
         /// RequiredFieldValidator4 control.
         /// </summary>
@@ -200,7 +254,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator4;
-
+        
         /// <summary>
         /// Pane1_2 control.
         /// </summary>
@@ -209,7 +263,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane1_2;
-
+        
         /// <summary>
         /// pp_licens control.
         /// </summary>
@@ -218,7 +272,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_licens;
-
+        
         /// <summary>
         /// packageLicenseName control.
         /// </summary>
@@ -227,7 +281,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox packageLicenseName;
-
+        
         /// <summary>
         /// RequiredFieldValidator5 control.
         /// </summary>
@@ -236,7 +290,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator5;
-
+        
         /// <summary>
         /// pp_license_url control.
         /// </summary>
@@ -245,7 +299,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_license_url;
-
+        
         /// <summary>
         /// packageLicenseUrl control.
         /// </summary>
@@ -254,7 +308,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox packageLicenseUrl;
-
+        
         /// <summary>
         /// RequiredFieldValidator6 control.
         /// </summary>
@@ -263,7 +317,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator6;
-
+        
         /// <summary>
         /// Pane1_3 control.
         /// </summary>
@@ -272,7 +326,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane1_3;
-
+        
         /// <summary>
         /// pp_readme control.
         /// </summary>
@@ -281,7 +335,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_readme;
-
+        
         /// <summary>
         /// packageReadme control.
         /// </summary>
@@ -290,7 +344,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox packageReadme;
-
+        
         /// <summary>
         /// Pane2 control.
         /// </summary>
@@ -299,7 +353,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane2;
-
+        
         /// <summary>
         /// pp_content control.
         /// </summary>
@@ -308,7 +362,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_content;
-
+        
         /// <summary>
         /// content control.
         /// </summary>
@@ -317,7 +371,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder content;
-
+        
         /// <summary>
         /// packageContentSubdirs control.
         /// </summary>
@@ -326,7 +380,16 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBox packageContentSubdirs;
-
+        
+        /// <summary>
+        /// packageContentSubdirsLabel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label packageContentSubdirsLabel;
+        
         /// <summary>
         /// Pane2_1 control.
         /// </summary>
@@ -335,7 +398,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane2_1;
-
+        
         /// <summary>
         /// documentTypes control.
         /// </summary>
@@ -344,7 +407,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBoxList documentTypes;
-
+        
         /// <summary>
         /// Pane2_2 control.
         /// </summary>
@@ -353,7 +416,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane2_2;
-
+        
         /// <summary>
         /// templates control.
         /// </summary>
@@ -362,7 +425,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBoxList templates;
-
+        
         /// <summary>
         /// Pane2_3 control.
         /// </summary>
@@ -371,7 +434,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane2_3;
-
+        
         /// <summary>
         /// stylesheets control.
         /// </summary>
@@ -380,7 +443,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBoxList stylesheets;
-
+        
         /// <summary>
         /// Pane2_4 control.
         /// </summary>
@@ -389,7 +452,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane2_4;
-
+        
         /// <summary>
         /// macros control.
         /// </summary>
@@ -398,7 +461,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBoxList macros;
-
+        
         /// <summary>
         /// Pane2_5 control.
         /// </summary>
@@ -407,7 +470,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane2_5;
-
+        
         /// <summary>
         /// languages control.
         /// </summary>
@@ -416,7 +479,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBoxList languages;
-
+        
         /// <summary>
         /// Pane2_6 control.
         /// </summary>
@@ -425,7 +488,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane2_6;
-
+        
         /// <summary>
         /// dictionary control.
         /// </summary>
@@ -434,7 +497,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBoxList dictionary;
-
+        
         /// <summary>
         /// Pane2_7 control.
         /// </summary>
@@ -443,7 +506,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane2_7;
-
+        
         /// <summary>
         /// cbl_datatypes control.
         /// </summary>
@@ -452,7 +515,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBoxList cbl_datatypes;
-
+        
         /// <summary>
         /// Pane3 control.
         /// </summary>
@@ -461,7 +524,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane3;
-
+        
         /// <summary>
         /// Pane3_1 control.
         /// </summary>
@@ -470,7 +533,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane3_1;
-
+        
         /// <summary>
         /// packageFilesRepeater control.
         /// </summary>
@@ -479,7 +542,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater packageFilesRepeater;
-
+        
         /// <summary>
         /// packageFilePathNew control.
         /// </summary>
@@ -488,7 +551,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox packageFilePathNew;
-
+        
         /// <summary>
         /// createNewFilePath control.
         /// </summary>
@@ -497,7 +560,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button createNewFilePath;
-
+        
         /// <summary>
         /// Pane3_2 control.
         /// </summary>
@@ -506,7 +569,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane3_2;
-
+        
         /// <summary>
         /// packageControlPath control.
         /// </summary>
@@ -515,7 +578,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox packageControlPath;
-
+        
         /// <summary>
         /// Pane4 control.
         /// </summary>
@@ -524,7 +587,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane4;
-
+        
         /// <summary>
         /// actionsVal control.
         /// </summary>
@@ -533,7 +596,7 @@ namespace umbraco.presentation.developer.packages {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CustomValidator actionsVal;
-
+        
         /// <summary>
         /// tb_actions control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx
index 8ea8e8b932..e492d72d6f 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx
@@ -1,16 +1,16 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %>
-<%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="umb" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 <asp:Content ID="headContent" ContentPlaceHolderID="head" runat="server">
     <style type="text/css">
         table.relations  { }
         table.relations th { width:auto; }
-                
+
         table.relations th.objectTypeIcon { width:20px; }
         table.relations th.directionIcon { width:16px; height:16px; }
-        
+
         table.relations td { background: transparent none no-repeat scroll center center }
-        
+
         /* objectType icons */
         table.relations td.ContentItemType {}
         table.relations td.ROOT {}
@@ -26,19 +26,19 @@
         table.relations td.Stylesheet {}
         table.relations td.Member {}
         table.relations td.DataType {}
-                
+
         /* direction icons */
         table.relations td.parentToChild { background-image: url('/umbraco/developer/RelationTypes/Images/ParentToChild.png'); }
         table.relations td.bidirectional { background-image: url('/umbraco/developer/RelationTypes/Images/Bidirectional.png'); }
-    </style>  
-  
+    </style>
+
 
 </asp:Content>
 
 <asp:Content ID="bodyContent" ContentPlaceHolderID="body" runat="server">
 
     <umb:TabView runat="server" ID="tabControl" Width="200" />
-       
+
     <umb:Pane ID="idPane" runat="server" Text="">
 
         <umb:PropertyPanel runat="server" id="idPropertyPanel" Text="Id">
@@ -46,18 +46,18 @@
         </umb:PropertyPanel>
 
     </umb:Pane>
-       
-       
+
+
     <umb:Pane ID="nameAliasPane" runat="server" Text="">
-	
-		<umb:PropertyPanel runat="server" ID="nameProperyPanel" Text="Name">			
+
+		<umb:PropertyPanel runat="server" ID="nameProperyPanel" Text="Name">
 			<asp:TextBox ID="nameTextBox" runat="server" Columns="40" ></asp:TextBox>
             <asp:RequiredFieldValidator ID="nameRequiredFieldValidator" runat="server" ControlToValidate="nameTextBox" ValidationGroup="RelationType" ErrorMessage="Name Required" Display="Dynamic" />
-			
+
 		</umb:PropertyPanel>
-		
+
 		<umb:PropertyPanel runat="server" id="aliasPropertyPanel" Text="Alias">
-			<asp:TextBox ID="aliasTextBox" runat="server"  Columns="40"></asp:TextBox>				
+			<asp:TextBox ID="aliasTextBox" runat="server"  Columns="40"></asp:TextBox>
             <asp:RequiredFieldValidator ID="aliasRequiredFieldValidator" runat="server" ControlToValidate="aliasTextBox" ValidationGroup="RelationType" ErrorMessage="Alias Required" Display="Dynamic" />
             <asp:CustomValidator ID="aliasCustomValidator" runat="server" ControlToValidate="aliasTextBox" ValidationGroup="RelationType" onservervalidate="AliasCustomValidator_ServerValidate" ErrorMessage="Duplicate Alias" Display="Dynamic" />
 
@@ -65,12 +65,12 @@
 
 	</umb:Pane>
 
-	
+
     <umb:Pane ID="directionPane" runat="server" Text="">
 
         <umb:PropertyPanel runat="server" id="dualPropertyPanel" Text="Direction">
                 <asp:RadioButtonList ID="dualRadioButtonList" runat="server" RepeatDirection="Horizontal">
-                    <asp:ListItem Enabled="true" Selected="False" Text="Parent to Child" Value="0" /> 
+                    <asp:ListItem Enabled="true" Selected="False" Text="Parent to Child" Value="0" />
                     <asp:ListItem Enabled="true" Selected="False" Text="Bidirectional" Value="1"/>
                 </asp:RadioButtonList>
         </umb:PropertyPanel>
@@ -90,7 +90,7 @@
 
     </umb:Pane>
 
-    
+
     <umb:Pane ID="relationsCountPane" runat="server" Text="">
 
         <umb:PropertyPanel runat="server" id="relationsCountPropertyPanel" Text="Count">
@@ -98,12 +98,12 @@
         </umb:PropertyPanel>
 
     </umb:Pane>
-	
+
 
     <umb:Pane ID="relationsPane" runat="server" Text="">
 
         <umb:PropertyPanel runat="server" id="relationsPropertyPanel" Text="Relations">
-            
+
             <asp:Repeater ID="relationsRepeater" runat="server">
                 <HeaderTemplate>
                     <table class="relations">
@@ -116,7 +116,7 @@
                                 <th>Child</th>
                                 <th>Created</th>
                                 <th>Comment</th>
-                            </tr>                        
+                            </tr>
                         </thead>
                         <tbody>
                 </HeaderTemplate>
@@ -128,15 +128,15 @@
                                 <td class="<%= this.ChildObjectType %>">&nbsp;</td>
                                 <td><%# DataBinder.Eval(Container.DataItem, "ChildText") %></td>
                                 <td><%# DataBinder.Eval(Container.DataItem, "DateTime") %></td>
-                                <td><%# DataBinder.Eval(Container.DataItem, "Comment") %></td>                
+                                <td><%# DataBinder.Eval(Container.DataItem, "Comment") %></td>
                             </tr>
-                </ItemTemplate>            
+                </ItemTemplate>
                 <FooterTemplate>
                         </tbody>
                     </table>
                 </FooterTemplate>
             </asp:Repeater>
-            
+
 
         </umb:PropertyPanel>
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.designer.cs
index 3d1b215134..8c535466ab 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.designer.cs
@@ -3,15 +3,15 @@
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace umbraco.cms.presentation.developer.RelationTypes
-{
-    public partial class EditRelationType
-    {
-
+namespace umbraco.cms.presentation.developer.RelationTypes {
+    
+    
+    public partial class EditRelationType {
+        
         /// <summary>
         /// tabControl control.
         /// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.TabView tabControl;
-
+        
         /// <summary>
         /// idPane control.
         /// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane idPane;
-
+        
         /// <summary>
         /// idPropertyPanel control.
         /// </summary>
@@ -38,7 +38,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel idPropertyPanel;
-
+        
         /// <summary>
         /// idLiteral control.
         /// </summary>
@@ -47,7 +47,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal idLiteral;
-
+        
         /// <summary>
         /// nameAliasPane control.
         /// </summary>
@@ -56,7 +56,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane nameAliasPane;
-
+        
         /// <summary>
         /// nameProperyPanel control.
         /// </summary>
@@ -65,7 +65,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel nameProperyPanel;
-
+        
         /// <summary>
         /// nameTextBox control.
         /// </summary>
@@ -74,7 +74,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox nameTextBox;
-
+        
         /// <summary>
         /// nameRequiredFieldValidator control.
         /// </summary>
@@ -83,7 +83,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator nameRequiredFieldValidator;
-
+        
         /// <summary>
         /// aliasPropertyPanel control.
         /// </summary>
@@ -92,7 +92,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel aliasPropertyPanel;
-
+        
         /// <summary>
         /// aliasTextBox control.
         /// </summary>
@@ -101,7 +101,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox aliasTextBox;
-
+        
         /// <summary>
         /// aliasRequiredFieldValidator control.
         /// </summary>
@@ -110,7 +110,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator aliasRequiredFieldValidator;
-
+        
         /// <summary>
         /// aliasCustomValidator control.
         /// </summary>
@@ -119,7 +119,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CustomValidator aliasCustomValidator;
-
+        
         /// <summary>
         /// directionPane control.
         /// </summary>
@@ -128,7 +128,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane directionPane;
-
+        
         /// <summary>
         /// dualPropertyPanel control.
         /// </summary>
@@ -137,7 +137,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel dualPropertyPanel;
-
+        
         /// <summary>
         /// dualRadioButtonList control.
         /// </summary>
@@ -146,7 +146,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RadioButtonList dualRadioButtonList;
-
+        
         /// <summary>
         /// objectTypePane control.
         /// </summary>
@@ -155,7 +155,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane objectTypePane;
-
+        
         /// <summary>
         /// parentPropertyPanel control.
         /// </summary>
@@ -164,7 +164,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel parentPropertyPanel;
-
+        
         /// <summary>
         /// parentLiteral control.
         /// </summary>
@@ -173,7 +173,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal parentLiteral;
-
+        
         /// <summary>
         /// childPropertyPanel control.
         /// </summary>
@@ -182,7 +182,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel childPropertyPanel;
-
+        
         /// <summary>
         /// childLiteral control.
         /// </summary>
@@ -191,7 +191,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal childLiteral;
-
+        
         /// <summary>
         /// relationsCountPane control.
         /// </summary>
@@ -200,7 +200,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane relationsCountPane;
-
+        
         /// <summary>
         /// relationsCountPropertyPanel control.
         /// </summary>
@@ -209,7 +209,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel relationsCountPropertyPanel;
-
+        
         /// <summary>
         /// relationsCountLiteral control.
         /// </summary>
@@ -218,7 +218,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal relationsCountLiteral;
-
+        
         /// <summary>
         /// relationsPane control.
         /// </summary>
@@ -227,7 +227,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane relationsPane;
-
+        
         /// <summary>
         /// relationsPropertyPanel control.
         /// </summary>
@@ -236,7 +236,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel relationsPropertyPanel;
-
+        
         /// <summary>
         /// relationsRepeater control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx
index e323d60ab7..4a1779697e 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx
@@ -1,17 +1,17 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="../../masterpages/umbracoPage.Master"%>
-<%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="umb" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 
 <asp:Content ID="bodyContent" ContentPlaceHolderID="body" runat="server">
 
 
     <umb:Pane ID="nameAliasPane" runat="server" Text="">
-        	
-		<umb:PropertyPanel runat="server" ID="nameProperyPanel" Text="Name">			
+
+		<umb:PropertyPanel runat="server" ID="nameProperyPanel" Text="Name">
                 <asp:TextBox ID="descriptionTextBox" runat="server" Columns="40" AutoCompleteType="Disabled" style="width:200px;" />
                 <asp:RequiredFieldValidator ID="descriptionRequiredFieldValidator" runat="server" ControlToValidate="descriptionTextBox" ValidationGroup="NewRelationType" ErrorMessage="Name Required" Display="Dynamic" />
 		</umb:PropertyPanel>
-        			
+
 		<umb:PropertyPanel runat="server" id="aliasPropertyPanel" Text="Alias">
                 <asp:TextBox ID="aliasTextBox" runat="server" Columns="40" AutoCompleteType="Disabled" style="width:200px;" />
                 <asp:RequiredFieldValidator ID="aliasRequiredFieldValidator" runat="server" ControlToValidate="aliasTextBox" ValidationGroup="NewRelationType" ErrorMessage="Alias Required" Display="Dynamic" />
@@ -23,7 +23,7 @@
 
 		<umb:PropertyPanel runat="server" id="PropertyPanel1" Text="Direction">
                 <asp:RadioButtonList ID="dualRadioButtonList" runat="server" RepeatDirection="Horizontal">
-                    <asp:ListItem Enabled="true" Selected="True" Text="Parent to Child" Value="0"/> 
+                    <asp:ListItem Enabled="true" Selected="True" Text="Parent to Child" Value="0"/>
                     <asp:ListItem Enabled="true" Selected="False" Text="Bidirectional" Value="1"/>
                 </asp:RadioButtonList>
 		</umb:PropertyPanel>
@@ -42,7 +42,7 @@
         </umb:PropertyPanel>
 
 	</umb:Pane>
-            
+
     <div style="margin-top:15px">
         <asp:Button ID="addButton" runat="server" Text="Create" onclick="AddButton_Click" CausesValidation="true" ValidationGroup="NewRelationType" />
         <em>or</em>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx.designer.cs
index a1810b986f..2ea126c644 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx.designer.cs
@@ -3,15 +3,15 @@
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace umbraco.cms.presentation.developer.RelationTypes
-{
-    public partial class NewRelationType
-    {
-
+namespace umbraco.cms.presentation.developer.RelationTypes {
+    
+    
+    public partial class NewRelationType {
+        
         /// <summary>
         /// nameAliasPane control.
         /// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane nameAliasPane;
-
+        
         /// <summary>
         /// nameProperyPanel control.
         /// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel nameProperyPanel;
-
+        
         /// <summary>
         /// descriptionTextBox control.
         /// </summary>
@@ -38,7 +38,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox descriptionTextBox;
-
+        
         /// <summary>
         /// descriptionRequiredFieldValidator control.
         /// </summary>
@@ -47,7 +47,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator descriptionRequiredFieldValidator;
-
+        
         /// <summary>
         /// aliasPropertyPanel control.
         /// </summary>
@@ -56,7 +56,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel aliasPropertyPanel;
-
+        
         /// <summary>
         /// aliasTextBox control.
         /// </summary>
@@ -65,7 +65,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox aliasTextBox;
-
+        
         /// <summary>
         /// aliasRequiredFieldValidator control.
         /// </summary>
@@ -74,7 +74,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator aliasRequiredFieldValidator;
-
+        
         /// <summary>
         /// aliasCustomValidator control.
         /// </summary>
@@ -83,7 +83,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CustomValidator aliasCustomValidator;
-
+        
         /// <summary>
         /// directionPane control.
         /// </summary>
@@ -92,7 +92,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane directionPane;
-
+        
         /// <summary>
         /// PropertyPanel1 control.
         /// </summary>
@@ -101,7 +101,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel PropertyPanel1;
-
+        
         /// <summary>
         /// dualRadioButtonList control.
         /// </summary>
@@ -110,7 +110,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RadioButtonList dualRadioButtonList;
-
+        
         /// <summary>
         /// objectTypePane control.
         /// </summary>
@@ -119,7 +119,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane objectTypePane;
-
+        
         /// <summary>
         /// PropertyPanel2 control.
         /// </summary>
@@ -128,7 +128,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel PropertyPanel2;
-
+        
         /// <summary>
         /// parentDropDownList control.
         /// </summary>
@@ -137,7 +137,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList parentDropDownList;
-
+        
         /// <summary>
         /// PropertyPanel3 control.
         /// </summary>
@@ -146,7 +146,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel PropertyPanel3;
-
+        
         /// <summary>
         /// childDropDownList control.
         /// </summary>
@@ -155,7 +155,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList childDropDownList;
-
+        
         /// <summary>
         /// addButton control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx
index 5ae03829cc..b719951aed 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" Codebehind="xsltChooseExtension.aspx.cs" MasterPageFile="../../masterpages/umbracoDialog.Master"  AutoEventWireup="True"
   Inherits="umbraco.developer.xsltChooseExtension" %>
-  <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-  
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
+
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <script type="text/javascript">
       function returnResult() {
@@ -24,7 +24,7 @@ div.code{padding: 7px 0px 7px 0px;  font-family: Consolas,courier;}
 div.code input{border: none; background:#F6F6F9; color: #000; padding: 5px; font-family: Consolas,courier;}
 </style>
 
-</asp:Content> 
+</asp:Content>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
 <cc1:Pane runat="server" Text="Choose xslt extension">
@@ -39,6 +39,6 @@ div.code input{border: none; background:#F6F6F9; color: #000; padding: 5px; font
 
 <p>
   <asp:Button ID="bt_insert" OnClientClick="returnResult(); return false;" Enabled="false" runat="server" Text="Insert" /> <em><%= Services.TextService.Localize("or") %></em> <a href="xsltInsertValueOf.aspx"><%= Services.TextService.Localize("cancel") %></a>
-</p> 
+</p>
 
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx.designer.cs
index 236667c51a..2b5efd94bf 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltChooseExtension.aspx.designer.cs
@@ -1,18 +1,17 @@
 //------------------------------------------------------------------------------
 // <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.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.developer {
-
-
+    
+    
     public partial class xsltChooseExtension {
-
+        
         /// <summary>
         /// assemblies control.
         /// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.developer {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList assemblies;
-
+        
         /// <summary>
         /// methods control.
         /// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.developer {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList methods;
-
+        
         /// <summary>
         /// PlaceHolderParamters control.
         /// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.developer {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolderParamters;
-
+        
         /// <summary>
         /// bt_insert control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx
index 2a550dec6d..34142b2805 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx
@@ -1,6 +1,6 @@
 <%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoDialog.Master" Codebehind="xsltInsertValueOf.aspx.cs" AutoEventWireup="True"  Inherits="umbraco.developer.xsltInsertValueOf" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
 <script type="text/javascript">
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.designer.cs
index 10c24c58ed..d02006dd22 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.designer.cs
@@ -1,18 +1,17 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4200
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.developer {
-
-
+    
+    
     public partial class xsltInsertValueOf {
-
+        
         /// <summary>
         /// JsInclude1 control.
         /// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.developer {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-
+        
         /// <summary>
         /// valueOf control.
         /// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.developer {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox valueOf;
-
+        
         /// <summary>
         /// preValues control.
         /// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.developer {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList preValues;
-
+        
         /// <summary>
         /// disableOutputEscaping control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx
index 3b0f3e0cf0..7ed41ac40d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx
@@ -2,7 +2,7 @@
 
 <%@ Import Namespace="Umbraco.Web" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <umb:JsInclude runat="server" FilePath="Dialogs/AssignDomain2.js" PathNameAlias="UmbracoClient" />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.designer.cs
index 8975879c97..ad1d2db1d9 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx.designer.cs
@@ -3,15 +3,15 @@
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.dialogs {
-
-
+    
+    
     public partial class AssignDomain2 {
-
+        
         /// <summary>
         /// data control.
         /// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal data;
-
+        
         /// <summary>
         /// feedback control.
         /// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Feedback feedback;
-
+        
         /// <summary>
         /// pane_language control.
         /// </summary>
@@ -38,7 +38,7 @@ namespace umbraco.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane pane_language;
-
+        
         /// <summary>
         /// prop_language control.
         /// </summary>
@@ -47,7 +47,7 @@ namespace umbraco.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel prop_language;
-
+        
         /// <summary>
         /// pane_domains control.
         /// </summary>
@@ -56,7 +56,7 @@ namespace umbraco.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane pane_domains;
-
+        
         /// <summary>
         /// p_buttons control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx
index c93b21f8c8..0f61355ed5 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="Preview.aspx.cs" Inherits="umbraco.presentation.dialogs.Preview" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="body" runat="server">
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx.designer.cs
index f07d34b908..c6b6ae72a4 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/Preview.aspx.designer.cs
@@ -1,18 +1,17 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.presentation.dialogs {
-
-
+    
+    
     public partial class Preview {
-
+        
         /// <summary>
         /// feedback1 control.
         /// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Feedback feedback1;
-
+        
         /// <summary>
         /// pane_form control.
         /// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane pane_form;
-
+        
         /// <summary>
         /// PropertyPanel1 control.
         /// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel PropertyPanel1;
-
+        
         /// <summary>
         /// docLit control.
         /// </summary>
@@ -48,7 +47,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal docLit;
-
+        
         /// <summary>
         /// PropertyPanel2 control.
         /// </summary>
@@ -57,7 +56,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel PropertyPanel2;
-
+        
         /// <summary>
         /// changeSetUrl control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx
index 9fa666c7d0..21e7670461 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx
@@ -1,5 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" CodeBehind="insertMasterpageContent.aspx.cs" Inherits="umbraco.presentation.umbraco.dialogs.insertMasterpageContent" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
 <script type="text/javascript">
@@ -13,7 +13,7 @@
 </asp:Content>
 
 <asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
-  
+
   <cc1:Pane ID="pane_insert" runat="server">
     <cc1:PropertyPanel runat="server">
             <p>
@@ -24,7 +24,7 @@
              <asp:DropDownList ID="dd_detectedAlias" Width="350px" CssClass="bigInput input-block-level" runat="server" />
     </cc1:PropertyPanel>
   </cc1:Pane>
-   
+
   <cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
             <a class="btn btn-link" onclick="UmbClientMgr.closeModalWindow(); return false;"><%=Services.TextService.Localize("general/cancel")%></a>
             <input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= Services.TextService.Localize("insert") %>" />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.designer.cs
index bb533f26a7..fbda589028 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx.designer.cs
@@ -3,15 +3,15 @@
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.presentation.umbraco.dialogs {
-
-
+    
+    
     public partial class insertMasterpageContent {
-
+        
         /// <summary>
         /// pane_insert control.
         /// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.presentation.umbraco.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane pane_insert;
-
+        
         /// <summary>
         /// pp_placeholder control.
         /// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.presentation.umbraco.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_placeholder;
-
+        
         /// <summary>
         /// dd_detectedAlias control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx
index ecb6b2ed62..6165a9ac21 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx
@@ -1,18 +1,18 @@
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="notifications.aspx.cs" AutoEventWireup="True"
   Inherits="umbraco.dialogs.notifications" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
 
 <div class="umb-dialog-body form-horizontal">
-    
+
     <cc1:Pane ID="pane_form" runat="server">
 
 
     </cc1:Pane>
 </div>
 <div runat="server" ID="pl_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>  
+        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>
        <asp:Button ID="Button1" runat="server" CssClass="btn btn-primary" OnClick="Button1_Click"></asp:Button>
 </div>
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs
index 2122134e97..e8adf435e2 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs
@@ -3,15 +3,15 @@
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.dialogs {
-
-
+    
+    
     public partial class notifications {
-
+        
         /// <summary>
         /// pane_form control.
         /// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane pane_form;
-
+        
         /// <summary>
         /// pl_buttons control.
         /// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl pl_buttons;
-
+        
         /// <summary>
         /// Button1 control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx
index 8d27af83b8..1368fb61fc 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="c#" Codebehind="republish.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.cms.presentation.republish" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
    <script type="text/javascript">
@@ -14,26 +14,26 @@
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
 <asp:Panel ID="p_republish" runat="server">
-      <div class="propertyDiv">      
+      <div class="propertyDiv">
           <p><%= Services.TextService.Localize("defaultdialogs/siterepublishHelp")%> </p>
       </div>
-      
+
           <div id="buttons">
             <asp:Button ID="bt_go" OnClick="go" OnClientClick="showProgress(document.getElementById('buttons'),'progress'); return true;" runat="server" Text="Republish" />
-            <em><%= Services.TextService.Localize("or") %></em>  
+            <em><%= Services.TextService.Localize("or") %></em>
             <a href="#" onclick="UmbClientMgr.closeModalWindow();"><%=Services.TextService.Localize("cancel")%></a>
-          </div>     
-      
+          </div>
+
       <div id="progress" style="visibility: hidden;">
 		<cc1:ProgressBar ID="progbar" runat="server" Title="Please wait..." />
       </div>
-      
+
     </asp:Panel>
-    
+
     <asp:Panel ID="p_done" Visible="false" runat="server">
      <div class="success">
       <p><%= Services.TextService.Localize("defaultdialogs/siterepublished")%></p>
-      
+
      </div>
       <input type="button" class="guiInputButton" onclick="UmbClientMgr.closeModalWindow();" value="Ok" />
     </asp:Panel>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx.designer.cs
index dbb419478c..3b2e34836a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx.designer.cs
@@ -1,18 +1,17 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4200
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.cms.presentation {
-
-
+    
+    
     public partial class republish {
-
+        
         /// <summary>
         /// p_republish control.
         /// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.cms.presentation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel p_republish;
-
+        
         /// <summary>
         /// bt_go control.
         /// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.cms.presentation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button bt_go;
-
+        
         /// <summary>
         /// progbar control.
         /// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.cms.presentation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.ProgressBar progbar;
-
+        
         /// <summary>
         /// p_done control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
index d9c68ba21e..bdbe582b34 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" CodeBehind="rollBack.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.presentation.dialogs.rollBack" %>
 
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <script type="text/javascript">
@@ -95,5 +95,5 @@
     <div runat="server" id="pl_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
         <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>
         <asp:Button ID="Button1" runat="server" Visible="false" CssClass="btn btn-primary" OnClick="doRollback_Click"></asp:Button>
-    </div>  
+    </div>
 </asp:Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.designer.cs
index 8e412d1a5c..b09cd862ba 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.designer.cs
@@ -3,15 +3,15 @@
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.presentation.dialogs {
-
-
+    
+    
     public partial class rollBack {
-
+        
         /// <summary>
         /// JsInclude1 control.
         /// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-
+        
         /// <summary>
         /// feedBackMsg control.
         /// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Feedback feedBackMsg;
-
+        
         /// <summary>
         /// pp_selectVersion control.
         /// </summary>
@@ -38,7 +38,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane pp_selectVersion;
-
+        
         /// <summary>
         /// pp_currentVersion control.
         /// </summary>
@@ -47,7 +47,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_currentVersion;
-
+        
         /// <summary>
         /// currentVersionTitle control.
         /// </summary>
@@ -56,7 +56,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal currentVersionTitle;
-
+        
         /// <summary>
         /// currentVersionMeta control.
         /// </summary>
@@ -65,7 +65,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal currentVersionMeta;
-
+        
         /// <summary>
         /// pp_rollBackTo control.
         /// </summary>
@@ -74,7 +74,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_rollBackTo;
-
+        
         /// <summary>
         /// allVersions control.
         /// </summary>
@@ -83,7 +83,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList allVersions;
-
+        
         /// <summary>
         /// pp_view control.
         /// </summary>
@@ -92,7 +92,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_view;
-
+        
         /// <summary>
         /// rbl_mode control.
         /// </summary>
@@ -101,7 +101,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RadioButtonList rbl_mode;
-
+        
         /// <summary>
         /// diffPanel control.
         /// </summary>
@@ -110,7 +110,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel diffPanel;
-
+        
         /// <summary>
         /// lt_notice control.
         /// </summary>
@@ -119,7 +119,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal lt_notice;
-
+        
         /// <summary>
         /// propertiesCompare control.
         /// </summary>
@@ -128,7 +128,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal propertiesCompare;
-
+        
         /// <summary>
         /// pl_buttons control.
         /// </summary>
@@ -137,7 +137,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl pl_buttons;
-
+        
         /// <summary>
         /// Button1 control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx
index 7eb174063c..7feb7a60d2 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true"
     CodeBehind="search.aspx.cs" Inherits="umbraco.presentation.dialogs.search" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <asp:Content ID="header1" ContentPlaceHolderID="head" runat="server">
 <script type="text/javascript">
     function openItem(id) {
@@ -33,7 +33,7 @@
     <cc1:Pane ID="Wizard" runat="server">
         <h3>Search</h3>
         <p>
-        <asp:TextBox ID="keyword" runat="server" Width="500" CssClass="bigInput"></asp:TextBox> 
+        <asp:TextBox ID="keyword" runat="server" Width="500" CssClass="bigInput"></asp:TextBox>
             <asp:Button ID="searchButton" runat="server" Text="Search" onclick="search_Click" /><br />
         </p>
         <asp:Panel ID="nothingFound" runat="server" Visible="false">
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.designer.cs
index 4d3d61fd05..efc60d5bed 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.designer.cs
@@ -3,15 +3,15 @@
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.presentation.dialogs {
-
-
+    
+    
     public partial class search {
-
+        
         /// <summary>
         /// Wizard control.
         /// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Wizard;
-
+        
         /// <summary>
         /// keyword control.
         /// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox keyword;
-
+        
         /// <summary>
         /// searchButton control.
         /// </summary>
@@ -38,7 +38,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button searchButton;
-
+        
         /// <summary>
         /// nothingFound control.
         /// </summary>
@@ -47,7 +47,7 @@ namespace umbraco.presentation.dialogs {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel nothingFound;
-
+        
         /// <summary>
         /// searchResult control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx
index 5e27895926..ec356ea2c2 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" Codebehind="sendToTranslation.aspx.cs" Inherits="umbraco.presentation.dialogs.sendToTranslation" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
 <style type="text/css">
@@ -34,4 +34,3 @@
 </p>
 </asp:Panel>
 </asp:Content>
-      
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.designer.cs
index a067bf09ed..f9615c6f9b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.designer.cs
@@ -3,19 +3,15 @@
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-using System.Web.UI.WebControls;
-
-
-namespace umbraco.presentation.dialogs
-{
-
-
+namespace umbraco.presentation.dialogs {
+    
+    
     public partial class sendToTranslation {
-
+        
         /// <summary>
         /// feedback control.
         /// </summary>
@@ -23,8 +19,8 @@ namespace umbraco.presentation.dialogs
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected Umbraco.Web._Legacy.Controls.Feedback feedback;
-
+        protected global::Umbraco.Web._Legacy.Controls.Feedback feedback;
+        
         /// <summary>
         /// pane_form control.
         /// </summary>
@@ -32,8 +28,8 @@ namespace umbraco.presentation.dialogs
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected Umbraco.Web._Legacy.Controls.Pane pane_form;
-
+        protected global::Umbraco.Web._Legacy.Controls.Pane pane_form;
+        
         /// <summary>
         /// pp_translator control.
         /// </summary>
@@ -41,8 +37,8 @@ namespace umbraco.presentation.dialogs
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected Umbraco.Web._Legacy.Controls.PropertyPanel pp_translator;
-
+        protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_translator;
+        
         /// <summary>
         /// translator control.
         /// </summary>
@@ -50,8 +46,8 @@ namespace umbraco.presentation.dialogs
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected DropDownList translator;
-
+        protected global::System.Web.UI.WebControls.DropDownList translator;
+        
         /// <summary>
         /// pp_language control.
         /// </summary>
@@ -59,8 +55,8 @@ namespace umbraco.presentation.dialogs
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected Umbraco.Web._Legacy.Controls.PropertyPanel pp_language;
-
+        protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_language;
+        
         /// <summary>
         /// language control.
         /// </summary>
@@ -68,8 +64,8 @@ namespace umbraco.presentation.dialogs
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected DropDownList language;
-
+        protected global::System.Web.UI.WebControls.DropDownList language;
+        
         /// <summary>
         /// defaultLanguage control.
         /// </summary>
@@ -77,8 +73,8 @@ namespace umbraco.presentation.dialogs
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected Literal defaultLanguage;
-
+        protected global::System.Web.UI.WebControls.Literal defaultLanguage;
+        
         /// <summary>
         /// pp_includeSubs control.
         /// </summary>
@@ -86,8 +82,8 @@ namespace umbraco.presentation.dialogs
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected Umbraco.Web._Legacy.Controls.PropertyPanel pp_includeSubs;
-
+        protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_includeSubs;
+        
         /// <summary>
         /// includeSubpages control.
         /// </summary>
@@ -95,8 +91,8 @@ namespace umbraco.presentation.dialogs
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected CheckBox includeSubpages;
-
+        protected global::System.Web.UI.WebControls.CheckBox includeSubpages;
+        
         /// <summary>
         /// pp_comment control.
         /// </summary>
@@ -104,8 +100,8 @@ namespace umbraco.presentation.dialogs
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected Umbraco.Web._Legacy.Controls.PropertyPanel pp_comment;
-
+        protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_comment;
+        
         /// <summary>
         /// comment control.
         /// </summary>
@@ -113,8 +109,8 @@ namespace umbraco.presentation.dialogs
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected TextBox comment;
-
+        protected global::System.Web.UI.WebControls.TextBox comment;
+        
         /// <summary>
         /// pl_buttons control.
         /// </summary>
@@ -122,8 +118,8 @@ namespace umbraco.presentation.dialogs
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected Panel pl_buttons;
-
+        protected global::System.Web.UI.WebControls.Panel pl_buttons;
+        
         /// <summary>
         /// doTranslation control.
         /// </summary>
@@ -131,6 +127,6 @@ namespace umbraco.presentation.dialogs
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected Button doTranslation;
+        protected global::System.Web.UI.WebControls.Button doTranslation;
     }
 }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx
index 0eecffa2ff..1c703d25a0 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoPage.Master"Codebehind="viewAuditTrail.aspx.cs" AutoEventWireup="True"
   Inherits="umbraco.presentation.umbraco.dialogs.viewAuditTrail" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
 <style type="text/css">
@@ -66,6 +66,6 @@
 </asp:Content>
 
 
-           
-            
-            
+
+
+
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx
index ae6de88ffb..a941427f1f 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx
@@ -1,6 +1,6 @@
 <%@ Page Language="C#" AutoEventWireup="true" Codebehind="DictionaryItemList.aspx.cs"
   Inherits="umbraco.presentation.settings.DictionaryItemList" MasterPageFile="../masterpages/umbracoPage.Master" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx.designer.cs
index cdb58334cf..23895e6f8a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/DictionaryItemList.aspx.designer.cs
@@ -3,15 +3,15 @@
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.presentation.settings {
-
-
+    
+    
     public partial class DictionaryItemList {
-
+        
         /// <summary>
         /// Panel1 control.
         /// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.presentation.settings {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.UmbracoPanel Panel1;
-
+        
         /// <summary>
         /// pane1 control.
         /// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.presentation.settings {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane pane1;
-
+        
         /// <summary>
         /// lt_table control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx
index 797ca0d9bc..a985543c6d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" CodeBehind="editLanguage.aspx.cs" AutoEventWireup="True" MasterPageFile="../masterpages/umbracoPage.Master"
     Inherits="umbraco.settings.editLanguage" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <asp:Content ContentPlaceHolderID="body" runat="server">
     <cc1:UmbracoPanel ID="Panel1" runat="server" Width="608px" Height="336px" hasMenu="true">
         <cc1:Pane ID="Pane7" runat="server">
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.designer.cs
index 02aa907395..1fdc6da7f5 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.designer.cs
@@ -3,15 +3,15 @@
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.settings {
-
-
+    
+    
     public partial class editLanguage {
-
+        
         /// <summary>
         /// Panel1 control.
         /// </summary>
@@ -20,7 +20,7 @@ namespace umbraco.settings {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.UmbracoPanel Panel1;
-
+        
         /// <summary>
         /// Pane7 control.
         /// </summary>
@@ -29,7 +29,7 @@ namespace umbraco.settings {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane Pane7;
-
+        
         /// <summary>
         /// pp_language control.
         /// </summary>
@@ -38,7 +38,7 @@ namespace umbraco.settings {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_language;
-
+        
         /// <summary>
         /// Cultures control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx
index 872e0481fa..9fd6d7e472 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx
@@ -1,40 +1,40 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoPage.Master" CodeBehind="default.aspx.cs" Inherits="umbraco.presentation.translation._default" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="cc1" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
   <style type="text/css">
   .fieldsTable tr{
     border-color: #D9D7D7 !Important;
-  }  
+  }
 </style>
 </asp:Content>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
   <cc1:UmbracoPanel ID="Panel2" runat="server">
-    
+
     <cc1:Feedback ID="feedback" runat="server" />
-    
+
     <cc1:Pane ID="pane_uploadFile" runat="server" Text="Upload translation file">
       <p>
         When you have completed the translation. Upload the edited XML file here. The related translation tasks will automatically be closed when a file is uploaded.
       </p>
-      
+
       <cc1:PropertyPanel runat="server">
                 <input type="file" runat="server" id="translationFile" size="30" /> &nbsp; <asp:Button ID="uploadFile" runat="server" Text="Upload file" OnClick="uploadFile_Click" />
       </cc1:PropertyPanel>
     </cc1:Pane>
-    
-   
+
+
    <cc1:Pane ID="pane_tasks" runat="server" Text="Your tasks">
        <p>
         <asp:Literal ID="lt_tasksHelp" runat="server"></asp:Literal>
        </p>
-        
+
         <p>
             <a href="xml.aspx?task=all" target="_blank"><%= Services.TextService.Localize("translation/downloadAllAsXml") %></a>
              &nbsp; &nbsp;
-            <a href="translationTasks.dtd" target="_blank"><%= Services.TextService.Localize("translation/DownloadXmlDTD")%></a>        
-        </p>              
+            <a href="translationTasks.dtd" target="_blank"><%= Services.TextService.Localize("translation/DownloadXmlDTD")%></a>
+        </p>
       <asp:GridView GridLines="Horizontal" ID="taskList" runat="server" CssClass="fieldsTable" BorderStyle="None" Width="100%"
             CellPadding="5" AutoGenerateColumns="false">
             <Columns>
@@ -50,6 +50,6 @@
             </Columns>
           </asp:GridView>
    </cc1:Pane>
-    
+
   </cc1:UmbracoPanel>
 </asp:Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.designer.cs
index 3bc3fbef53..6e9cbb54e2 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.designer.cs
@@ -1,18 +1,17 @@
 //------------------------------------------------------------------------------
 // <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.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.presentation.translation {
-
-
+    
+    
     public partial class _default {
-
+        
         /// <summary>
         /// Panel2 control.
         /// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.presentation.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.UmbracoPanel Panel2;
-
+        
         /// <summary>
         /// feedback control.
         /// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.presentation.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Feedback feedback;
-
+        
         /// <summary>
         /// pane_uploadFile control.
         /// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.presentation.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane pane_uploadFile;
-
+        
         /// <summary>
         /// translationFile control.
         /// </summary>
@@ -48,7 +47,7 @@ namespace umbraco.presentation.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputFile translationFile;
-
+        
         /// <summary>
         /// uploadFile control.
         /// </summary>
@@ -57,7 +56,7 @@ namespace umbraco.presentation.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button uploadFile;
-
+        
         /// <summary>
         /// pane_tasks control.
         /// </summary>
@@ -66,7 +65,7 @@ namespace umbraco.presentation.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane pane_tasks;
-
+        
         /// <summary>
         /// lt_tasksHelp control.
         /// </summary>
@@ -75,7 +74,7 @@ namespace umbraco.presentation.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal lt_tasksHelp;
-
+        
         /// <summary>
         /// taskList control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx
index 05367e755f..e3b2745eec 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx
@@ -1,5 +1,5 @@
 <%@ Page Title="" Language="C#" MasterPageFile="../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="details.aspx.cs" Inherits="umbraco.presentation.umbraco.translation.details" %>
-<%@ Register TagPrefix="ui" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="ui" Namespace="Umbraco.Web._Legacy.Controls" %>
 
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
@@ -7,7 +7,7 @@
 <style type="text/css">
   .fieldsTable tr{
     border-color: #D9D7D7 !Important;
-  }  
+  }
 </style>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.designer.cs
index 4a046832d4..9b637eea17 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.designer.cs
@@ -1,18 +1,17 @@
 //------------------------------------------------------------------------------
 // <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.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.presentation.umbraco.translation {
-
-
+    
+    
     public partial class details {
-
+        
         /// <summary>
         /// panel1 control.
         /// </summary>
@@ -21,7 +20,7 @@ namespace umbraco.presentation.umbraco.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.UmbracoPanel panel1;
-
+        
         /// <summary>
         /// pane_details control.
         /// </summary>
@@ -30,7 +29,7 @@ namespace umbraco.presentation.umbraco.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane pane_details;
-
+        
         /// <summary>
         /// pp_date control.
         /// </summary>
@@ -39,7 +38,7 @@ namespace umbraco.presentation.umbraco.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_date;
-
+        
         /// <summary>
         /// pp_owner control.
         /// </summary>
@@ -48,7 +47,7 @@ namespace umbraco.presentation.umbraco.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_owner;
-
+        
         /// <summary>
         /// pp_totalWords control.
         /// </summary>
@@ -57,7 +56,7 @@ namespace umbraco.presentation.umbraco.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_totalWords;
-
+        
         /// <summary>
         /// pp_comment control.
         /// </summary>
@@ -66,7 +65,7 @@ namespace umbraco.presentation.umbraco.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_comment;
-
+        
         /// <summary>
         /// pane_tasks control.
         /// </summary>
@@ -75,7 +74,7 @@ namespace umbraco.presentation.umbraco.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane pane_tasks;
-
+        
         /// <summary>
         /// pp_xml control.
         /// </summary>
@@ -84,7 +83,7 @@ namespace umbraco.presentation.umbraco.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_xml;
-
+        
         /// <summary>
         /// pp_upload control.
         /// </summary>
@@ -93,7 +92,7 @@ namespace umbraco.presentation.umbraco.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_upload;
-
+        
         /// <summary>
         /// pp_closeTask control.
         /// </summary>
@@ -102,7 +101,7 @@ namespace umbraco.presentation.umbraco.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.PropertyPanel pp_closeTask;
-
+        
         /// <summary>
         /// bt_close control.
         /// </summary>
@@ -111,7 +110,7 @@ namespace umbraco.presentation.umbraco.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button bt_close;
-
+        
         /// <summary>
         /// pane_fields control.
         /// </summary>
@@ -120,7 +119,7 @@ namespace umbraco.presentation.umbraco.translation {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::Umbraco.Web._Legacy.Controls.Pane pane_fields;
-
+        
         /// <summary>
         /// dg_fields control.
         /// </summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx
index 2e3c382980..10302d6a24 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx
@@ -1,5 +1,4 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoPage.Master" CodeBehind="preview.aspx.cs" Inherits="umbraco.presentation.translation.preview" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
 
@@ -12,18 +11,18 @@
   <td colspan="2">
       <div class="notice">
         <p>
-            <strong>Please notice</strong> that due to templating and unpublished content, the 2 pages can have differences in layout. 
+            <strong>Please notice</strong> that due to templating and unpublished content, the 2 pages can have differences in layout.
         </p>
       </div>
   </td>
 </tr>
 <tr>
   <td style="border-right: 1px solid #ccc; padding-right: 15px;">
- 
+
   <iframe src="<%= translatedUrl %>" frameborder="0" style="border: none"></iframe>
   </td>
   <td style="padding-left: 15px;">
- 
+
   <iframe src="<%= originalUrl %>" frameborder="0" style="border: none"></iframe>
   </td>
 </tr>
@@ -35,7 +34,7 @@
     var docWidth = jQuery(document).width();
 
     jQuery("iframe").height(docHeight - 140).width((docWidth / 2) - 31);
-  });     
+  });
 </script>
 
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx.designer.cs
index 3bdf1f5600..55005e228c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/preview.aspx.designer.cs
@@ -1,16 +1,15 @@
 //------------------------------------------------------------------------------
 // <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.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace umbraco.presentation.translation {
-
-
+    
+    
     public partial class preview {
     }
 }