diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 427b0d4ba4..793cd6a11c 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -266,6 +266,12 @@
     <Compile Include="umbraco\masterpages\UmbracoDialog.master.designer.cs">
       <DependentUpon>umbracoDialog.Master</DependentUpon>
     </Compile>
+    <Compile Include="umbraco\settings\EditTemplate.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="umbraco\settings\EditTemplate.aspx.designer.cs">
+      <DependentUpon>editTemplate.aspx</DependentUpon>
+    </Compile>
     <Compile Include="umbraco\settings\views\EditView.aspx.cs">
       <DependentUpon>EditView.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/src/Umbraco.Web.UI/umbraco/settings/EditTemplate.aspx.cs b/src/Umbraco.Web.UI/umbraco/settings/EditTemplate.aspx.cs
new file mode 100644
index 0000000000..c219f71a29
--- /dev/null
+++ b/src/Umbraco.Web.UI/umbraco/settings/EditTemplate.aspx.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace Umbraco.Web.UI.Umbraco.Settings
+{
+	public partial class EditTemplate : global::umbraco.cms.presentation.settings.editTemplate
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/settings/EditTemplate.aspx.designer.cs b/src/Umbraco.Web.UI/umbraco/settings/EditTemplate.aspx.designer.cs
new file mode 100644
index 0000000000..d77c3b0cfa
--- /dev/null
+++ b/src/Umbraco.Web.UI/umbraco/settings/EditTemplate.aspx.designer.cs
@@ -0,0 +1,15 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Umbraco.Web.UI.Umbraco.Settings {
+    
+    
+    public partial class EditTemplate {
+    }
+}
diff --git a/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx b/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
index 398132b7c1..50ad9b4e46 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
+++ b/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
@@ -1,5 +1,5 @@
-<%@ Page MasterPageFile="../masterpages/umbracoPage.Master" Language="c#" CodeBehind="editTemplate.aspx.cs"
-    ValidateRequest="false" AutoEventWireup="True" Inherits="umbraco.cms.presentation.settings.editTemplate" %>
+<%@ Page MasterPageFile="../masterpages/umbracoPage.Master" Language="c#" CodeBehind="EditTemplate.aspx.cs"
+    ValidateRequest="false" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Settings.EditTemplate" %>
 
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 3115a3b89f..c2b1e1965c 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -325,8 +325,13 @@
     <Compile Include="umbraco.presentation\umbraco\dialogs\treePicker.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoDialog.master.cs" />
+    <Compile Include="umbraco.presentation\umbraco\masterpages\umbracoDialog.master.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="umbraco.presentation\umbraco\nodeFactory\UmbracoSiteMapProviderAccessUpdate.cs" />
+    <Compile Include="umbraco.presentation\umbraco\settings\editTemplate.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="umbraco.presentation\umbraco\uQuery\IGetProperty.cs" />
     <Compile Include="UmbracoHelper.cs" />
     <Compile Include="Mvc\ViewContextExtensions.cs" />
@@ -1520,13 +1525,6 @@
     <Compile Include="umbraco.presentation\umbraco\settings\EditNodeTypeNew.aspx.designer.cs">
       <DependentUpon>EditNodeTypeNew.aspx</DependentUpon>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\editTemplate.aspx.cs">
-      <DependentUpon>editTemplate.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="umbraco.presentation\umbraco\settings\editTemplate.aspx.designer.cs">
-      <DependentUpon>editTemplate.aspx</DependentUpon>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\settings\modals\ShowUmbracoTags.aspx.cs">
       <DependentUpon>ShowUmbracoTags.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -2063,9 +2061,6 @@
     <Content Include="umbraco.presentation\umbraco\settings\EditNodeTypeNew.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
-    <Content Include="umbraco.presentation\umbraco\settings\editTemplate.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
     <Content Include="umbraco.presentation\umbraco\settings\modals\ShowUmbracoTags.aspx" />
     <Content Include="umbraco.presentation\umbraco\settings\stylesheet\editstylesheet.aspx">
       <SubType>ASPXCodeBehind</SubType>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx
deleted file mode 100644
index 98050220f9..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx
+++ /dev/null
@@ -1,224 +0,0 @@
-<%@ Page MasterPageFile="../masterpages/umbracoPage.Master" Language="c#" CodeBehind="editTemplate.aspx.cs"
-    ValidateRequest="false" AutoEventWireup="True" Inherits="umbraco.cms.presentation.settings.editTemplate" %>
-
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<asp:Content ContentPlaceHolderID="head" runat="server">
-    <umb:CssInclude ID="CssInclude1" runat="server" FilePath="splitbutton/splitbutton.css"
-        PathNameAlias="UmbracoClient" />
-    <umb:JsInclude ID="JsInclude" runat="server" FilePath="splitbutton/jquery.splitbutton.js"
-        PathNameAlias="UmbracoClient" Priority="1" />
-    <script language="javascript" type="text/javascript">
-        jQuery(document).ready(function() {
-            //macro split button
-            jQuery('#sbMacro').splitbutton({menu:'#macroMenu'});
-            jQuery("#splitButtonMacro").appendTo("#splitButtonMacroPlaceHolder");
-            jQuery(".macro").click(function(){
-                var alias = jQuery(this).attr("rel");
-               if(jQuery(this).attr("params") == "1")
-                {
-                    openMacroModal(alias);
-                }
-                else
-                {
-                    insertMacro(alias);
-                }
-            });
-            applySplitButtonOverflow('mcontainer','innerc','macroMenu','.macro', 'showMoreMacros');
-            
-            //razor macro split button
-            jQuery('#sb').splitbutton({menu:'#codeTemplateMenu'});
-            jQuery("#splitButton").appendTo("#splitButtonPlaceHolder");
-
-            jQuery(".codeTemplate").click(function(){              
-                insertCodeBlockFromTemplate(jQuery(this).attr("rel"));
-            });
-
-        });
-        
-        function doSubmit() {
-            var codeVal = UmbEditor.GetCode();
-            umbraco.presentation.webservices.codeEditorSave.SaveTemplate(jQuery('#<%= NameTxt.ClientID %>').val(), jQuery('#<%= AliasTxt.ClientID %>').val(), codeVal, '<%= Request.QueryString["templateID"] %>', jQuery('#<%= MasterTemplate.ClientID %>').val(), submitSucces, submitFailure);
-        }
-        
-        function submitSucces(t)
-        {
-            if(t != 'true')
-            {
-                top.UmbSpeechBubble.ShowMessage('error', '<%= umbraco.ui.Text("speechBubbles", "templateErrorHeader") %>', '<%= umbraco.ui.Text("speechBubbles", "templateErrorText") %>');
-            }
-            else
-            {
-                top.UmbSpeechBubble.ShowMessage('save', '<%= umbraco.ui.Text("speechBubbles", "templateSavedHeader") %>', '<%= umbraco.ui.Text("speechBubbles", "templateSavedText") %>')
-            }
-        }
-        function submitFailure(t)
-        {
-            top.UmbSpeechBubble.ShowMessage('error', '<%= umbraco.ui.Text("speechBubbles", "templateErrorHeader") %>', '<%= umbraco.ui.Text("speechBubbles", "templateErrorText") %>')
-        }
-
-        function umbracoTemplateInsertMasterPageContentContainer() {
-          var master = document.getElementById('<%= MasterTemplate.ClientID %>')[document.getElementById('<%= MasterTemplate.ClientID %>').selectedIndex].value;
-          if (master == "") master = 0;
-          umbraco.presentation.webservices.legacyAjaxCalls.TemplateMasterPageContentContainer(<%=Request["templateID"] %>, master, umbracoTemplateInsertMasterPageContentContainerDo);
-        }
-        
-        function umbracoTemplateInsertMasterPageContentContainerDo(result) {
-          UmbEditor.Insert(result + '\n', '\n</asp\:Content>\n', '<%= editorSource.ClientID%>');
-        }
-        
-        function changeMasterPageFile(){
-          var editor = document.getElementById("<%= editorSource.ClientID %>");
-          var templateDropDown = document.getElementById("<%= MasterTemplate.ClientID %>");
-          
-          var templateCode = UmbEditor.GetCode();
-          var selectedTemplate = templateDropDown.options[templateDropDown.selectedIndex].id;
-          var masterTemplate = "<%= umbraco.IO.SystemDirectories.Masterpages%>/" + selectedTemplate + ".master";
-          
-          if(selectedTemplate == "")
-            masterTemplate = "<%= umbraco.IO.SystemDirectories.Umbraco%>/masterpages/default.master";
-                    
-          var regex = /MasterPageFile=[~a-z0-9/._"-]+/im;
-          
-           if (templateCode.match(regex)) {
-             templateCode = templateCode.replace(regex, 'MasterPageFile="' + masterTemplate + '"');
-             
-             UmbEditor.SetCode(templateCode);
-           
-           } else {
-             //todo, spot if a directive is there, and if not suggest that the user inserts it.. 
-             alert("Master directive not found...");
-             return false;
-           } 
-        }
-        
-       function insertContentElement(id){
-       
-       //nasty hack to avoid asp.net freaking out because of the markup...
-        var cp = 'asp:Content ContentPlaceHolderId="' + id + '"';
-        cp += ' runat="server"';
-        cp += '>\n\t<!-- Insert "' + id + '" markup here -->';
-
-        UmbEditor.Insert('\n<' + cp, '\n</asp:Content' + '>\n', '<%= editorSource.ClientID %>');
-       }
-       
-       function insertPlaceHolderElement(id){       
-        
-        var cp = 'asp:ContentPlaceHolder Id="' + id + '"';
-        cp += ' runat="server"';
-        cp += '>\n\t<!-- Insert default "' + id + '" markup here -->';
-
-        UmbEditor.Insert('\n<' + cp, '\n</asp:ContentPlaceHolder' + '>\n', '<%= editorSource.ClientID %>');
-       }
-        
-       function insertCodeBlock()
-       {
-            var snip = umbracoInsertSnippet();
-            UmbEditor.Insert(snip.BeginTag, snip.EndTag, '<%= editorSource.ClientID %>');
-       }
-
-       function umbracoInsertSnippet() {
-            var snip = new UmbracoCodeSnippet();
-            var cp = 'umbraco:Macro runat="server" language="cshtml"';
-            snip.BeginTag = '\n<' + cp + '>\n';
-            snip.EndTag = '\n<' + '/umbraco:Macro' + '>\n';
-            snip.TargetId = "<%= editorSource.ClientID %>";
-            return snip;
-       }
-
-       function insertCodeBlockFromTemplate(templateId)
-       {
-            
-        jQuery.ajax({
-            type: "POST",
-            url: "../webservices/templates.asmx/GetCodeSnippet",
-            data: "{templateId: '" + templateId + "'}",
-            contentType: "application/json; charset=utf-8",
-            dataType: "json",
-            success: function(msg) {
-
-            var cp = 'umbraco:Macro  runat="server" language="cshtml"';
-            UmbEditor.Insert('\n<' + cp +'>\n'  + msg.d,'\n</umbraco:Macro' + '>\n', '<%= editorSource.ClientID %>');
-
-                    }
-           });
-
-       }
-
-       function insertMacro(alias)
-       {
-            <%if (umbraco.UmbracoSettings.UseAspNetMasterPages) { %>
-			var macroElement = "umbraco:Macro";
-			<%}else{ %>
-			var macroElement = "?UMBRACO_MACRO";
-			<%}%>
-
-             var cp = macroElement + ' Alias="'+ alias +'" runat="server"';
-             UmbEditor.Insert('<' + cp +' />','', '<%= editorSource.ClientID %>');
-       }
-       function openMacroModal(alias)
-       {
-            var t = "";
-            if(alias != null && alias != ""){
-                t = "&alias="+alias;
-            }
-            UmbClientMgr.openModalWindow('<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>/dialogs/editMacro.aspx?objectId=<%= editorSource.ClientID %>' + t, 'Insert Macro', true, 470, 530, 0, 0, '', '');
-       }
-
-    </script>
-</asp:Content>
-<asp:Content ContentPlaceHolderID="body" runat="server">
-    <cc1:UmbracoPanel ID="Panel1" runat="server" Width="608px" Height="336px" hasMenu="true">
-        <cc1:Pane ID="Pane7" runat="server" Height="44px" Width="528px">
-            <cc1:PropertyPanel ID="pp_name" runat="server">
-                <asp:TextBox ID="NameTxt" Width="350px" runat="server"></asp:TextBox>
-            </cc1:PropertyPanel>
-            <cc1:PropertyPanel ID="pp_alias" runat="server">
-                <asp:TextBox ID="AliasTxt" Width="350px" runat="server"></asp:TextBox>
-            </cc1:PropertyPanel>
-            <cc1:PropertyPanel ID="pp_masterTemplate" runat="server">
-                <asp:DropDownList ID="MasterTemplate" Width="350px" runat="server" />
-            </cc1:PropertyPanel>
-            <cc1:PropertyPanel ID="pp_source" runat="server">
-                <cc1:CodeArea ID="editorSource" runat="server" CodeBase="HtmlMixed" EditorMimeType="text/html" ClientSaveMethod="doSubmit"
-                    AutoResize="true" OffSetX="37" OffSetY="54"/>
-            </cc1:PropertyPanel>
-        </cc1:Pane>
-    </cc1:UmbracoPanel>
-    <div id="splitButton" style="display: inline; height: 23px; vertical-align: top;">
-        <a href="javascript:insertCodeBlock();" id="sb" class="sbLink">
-            <img alt="Insert Inline Razor Macro" src="../images/editor/insRazorMacro.png" title="Insert Inline Razor Macro"
-                style="vertical-align: top;">
-        </a>
-    </div>
-    <div id="codeTemplateMenu" style="width: 285px;">
-        <asp:Repeater ID="rpt_codeTemplates" runat="server">
-            <ItemTemplate>
-                <div class="codeTemplate" rel="<%# DataBinder.Eval(Container, "DataItem.Key") %>">
-                    <%# DataBinder.Eval(Container, "DataItem.Value") %>
-                </div>
-            </ItemTemplate>
-        </asp:Repeater>
-    </div>
-    <div id="splitButtonMacro" style="display: inline; height: 23px; vertical-align: top;">
-        <a href="javascript:openMacroModal();" id="sbMacro" class="sbLink">
-            <img alt="Insert Macro" src="../images/editor/insMacroSB.png" title="Insert Macro"
-                style="vertical-align: top;">
-        </a>
-    </div>
-    <div id="macroMenu" style="width: 285px">
-        <asp:Repeater ID="rpt_macros" runat="server">
-            <ItemTemplate>
-                <div class="macro" rel="<%# DataBinder.Eval(Container, "DataItem.macroAlias")%>"
-                    params="<%#  DoesMacroHaveSettings(DataBinder.Eval(Container, "DataItem.id").ToString()) %>">
-                    <%# DataBinder.Eval(Container, "DataItem.macroName")%>
-                </div>
-            </ItemTemplate>
-        </asp:Repeater>
-    </div>
-    <script type="text/javascript">
-        jQuery(document).ready(function () {
-            UmbClientMgr.appActions().bindSaveShortCut();
-        });
-    </script>
-</asp:Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
index 026cb7d137..8e24df4b19 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Web.UI;
@@ -15,221 +15,347 @@ using System.Linq;
 
 namespace umbraco.cms.presentation.settings
 {
-    /// <summary>
-    /// Summary description for editTemplate.
-    /// </summary>
-    public partial class editTemplate : UmbracoEnsuredPage
-    {
-        private Template _template;
+	/// <summary>
+	/// Summary description for editTemplate.
+	/// </summary>
+	public partial class editTemplate : UmbracoEnsuredPage
+	{
+		private Template _template;
 
-        public editTemplate()
-        {
-            CurrentApp = DefaultApps.settings.ToString();
-        }
+		public editTemplate()
+		{
+			CurrentApp = DefaultApps.settings.ToString();
+		}
 
-        protected override void OnPreRender(EventArgs e)
-        {
-            base.OnPreRender(e);
+		protected override void OnPreRender(EventArgs e)
+		{
+			base.OnPreRender(e);
 
-            ScriptManager.GetCurrent(Page).Services.Add(
-                new ServiceReference(IOHelper.ResolveUrl(SystemDirectories.Webservices + "/codeEditorSave.asmx")));
-            ScriptManager.GetCurrent(Page).Services.Add(
-                new ServiceReference(IOHelper.ResolveUrl(SystemDirectories.Webservices + "/legacyAjaxCalls.asmx")));
-        }
+			ScriptManager.GetCurrent(Page).Services.Add(
+				new ServiceReference(IOHelper.ResolveUrl(SystemDirectories.Webservices + "/codeEditorSave.asmx")));
+			ScriptManager.GetCurrent(Page).Services.Add(
+				new ServiceReference(IOHelper.ResolveUrl(SystemDirectories.Webservices + "/legacyAjaxCalls.asmx")));
+		}
 
 
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            MasterTemplate.Attributes.Add("onchange", "changeMasterPageFile()");
+		protected void Page_Load(object sender, EventArgs e)
+		{
+			MasterTemplate.Attributes.Add("onchange", "changeMasterPageFile()");
 
-            if (!IsPostBack)
-            {
-                MasterTemplate.Items.Add(new ListItem(ui.Text("none"), "0"));
-                foreach (Template t in Template.GetAllAsList())
-                {
-                    if (t.Id != _template.Id)
-                    {
-                        var li = new ListItem(t.Text, t.Id.ToString());
-                        li.Attributes.Add("id", t.Alias.Replace(" ", ""));
-                        MasterTemplate.Items.Add(li);
-                    }
-                }
+			if (!IsPostBack)
+			{
+				MasterTemplate.Items.Add(new ListItem(ui.Text("none"), "0"));
+				foreach (Template t in Template.GetAllAsList())
+				{
+					if (t.Id != _template.Id)
+					{
+						var li = new ListItem(t.Text, t.Id.ToString());
+						li.Attributes.Add("id", t.Alias.Replace(" ", ""));
+						MasterTemplate.Items.Add(li);
+					}
+				}
 
-                NameTxt.Text = _template.GetRawText();
-                AliasTxt.Text = _template.Alias;
-                editorSource.Text = _template.Design;
+				NameTxt.Text = _template.GetRawText();
+				AliasTxt.Text = _template.Alias;
+				editorSource.Text = _template.Design;
 
-                try
-                {
-                    if (_template.MasterTemplate > 0)
-                        MasterTemplate.SelectedValue = _template.MasterTemplate.ToString();
-                }
-                catch (Exception ex)
-                {
-                }
+				try
+				{
+					if (_template.MasterTemplate > 0)
+						MasterTemplate.SelectedValue = _template.MasterTemplate.ToString();
+				}
+				catch (Exception ex)
+				{
+				}
 
-                ClientTools
-                    .SetActiveTreeType(TreeDefinitionCollection.Instance.FindTree<loadTemplates>().Tree.Alias)
-                    .SyncTree("-1,init," + _template.Path.Replace("-1,", ""), false);
+				ClientTools
+					.SetActiveTreeType(TreeDefinitionCollection.Instance.FindTree<loadTemplates>().Tree.Alias)
+					.SyncTree("-1,init," + _template.Path.Replace("-1,", ""), false);
 
-                LoadScriptingTemplates();
-                LoadMacros();
-            }
-        }
+				LoadScriptingTemplates();
+				LoadMacros();
+			}
+		}
 
-        protected override void OnInit(EventArgs e)
-        {
-            _template = new Template(int.Parse(Request.QueryString["templateID"]));
-            //
-            // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-            //
-            InitializeComponent();
-            base.OnInit(e);
-            Panel1.hasMenu = true;
+		protected override void OnInit(EventArgs e)
+		{
+			_template = new Template(int.Parse(Request.QueryString["templateID"]));
+			//
+			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
+			//
+			InitializeComponent();
+			base.OnInit(e);
+			Panel1.hasMenu = true;
 
-            MenuIconI save = Panel1.Menu.NewIcon();
-            save.ImageURL = SystemDirectories.Umbraco + "/images/editor/save.gif";
-            save.OnClickCommand = "doSubmit()";
-            save.AltText = ui.Text("save");
-            save.ID = "save";
+			MenuIconI save = Panel1.Menu.NewIcon();
+			save.ImageURL = SystemDirectories.Umbraco + "/images/editor/save.gif";
+			save.OnClickCommand = "doSubmit()";
+			save.AltText = ui.Text("save");
+			save.ID = "save";
 
-            Panel1.Text = ui.Text("edittemplate");
-            pp_name.Text = ui.Text("name", base.getUser());
-            pp_alias.Text = ui.Text("alias", base.getUser());
-            pp_masterTemplate.Text = ui.Text("mastertemplate", base.getUser());
+			Panel1.Text = ui.Text("edittemplate");
+			pp_name.Text = ui.Text("name", base.getUser());
+			pp_alias.Text = ui.Text("alias", base.getUser());
+			pp_masterTemplate.Text = ui.Text("mastertemplate", base.getUser());
 
-            // Editing buttons
-            Panel1.Menu.InsertSplitter();
-            MenuIconI umbField = Panel1.Menu.NewIcon();
-            umbField.ImageURL = UmbracoPath + "/images/editor/insField.gif";
-            umbField.OnClickCommand =
-                ClientTools.Scripts.OpenModalWindow(
-                    IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" +
-                    editorSource.ClientID + "&tagName=UMBRACOGETDATA", ui.Text("template", "insertPageField"), 640, 550);
-            umbField.AltText = ui.Text("template", "insertPageField");
+			// Editing buttons
+			Panel1.Menu.InsertSplitter();
+			MenuIconI umbField = Panel1.Menu.NewIcon();
+			umbField.ImageURL = UmbracoPath + "/images/editor/insField.gif";
+			umbField.OnClickCommand =
+				ClientTools.Scripts.OpenModalWindow(
+					IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" +
+					editorSource.ClientID + "&tagName=UMBRACOGETDATA", ui.Text("template", "insertPageField"), 640, 550);
+			umbField.AltText = ui.Text("template", "insertPageField");
 
-            // TODO: Update icon
-            MenuIconI umbDictionary = Panel1.Menu.NewIcon();
-            umbDictionary.ImageURL = GlobalSettings.Path + "/images/editor/dictionaryItem.gif";
-            umbDictionary.OnClickCommand =
-                ClientTools.Scripts.OpenModalWindow(
-                    IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" +
-                    editorSource.ClientID + "&tagName=UMBRACOGETDICTIONARY", ui.Text("template", "insertDictionaryItem"),
-                    640, 550);
-            umbDictionary.AltText = "Insert umbraco dictionary item";
+			// TODO: Update icon
+			MenuIconI umbDictionary = Panel1.Menu.NewIcon();
+			umbDictionary.ImageURL = GlobalSettings.Path + "/images/editor/dictionaryItem.gif";
+			umbDictionary.OnClickCommand =
+				ClientTools.Scripts.OpenModalWindow(
+					IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" +
+					editorSource.ClientID + "&tagName=UMBRACOGETDICTIONARY", ui.Text("template", "insertDictionaryItem"),
+					640, 550);
+			umbDictionary.AltText = "Insert umbraco dictionary item";
 
-            //uicontrols.MenuIconI umbMacro = Panel1.Menu.NewIcon();
-            //umbMacro.ImageURL = UmbracoPath + "/images/editor/insMacro.gif";
-            //umbMacro.AltText = ui.Text("template", "insertMacro");
-            //umbMacro.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/editMacro.aspx?objectId=" + editorSource.ClientID, ui.Text("template", "insertMacro"), 470, 530);
+			//uicontrols.MenuIconI umbMacro = Panel1.Menu.NewIcon();
+			//umbMacro.ImageURL = UmbracoPath + "/images/editor/insMacro.gif";
+			//umbMacro.AltText = ui.Text("template", "insertMacro");
+			//umbMacro.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/editMacro.aspx?objectId=" + editorSource.ClientID, ui.Text("template", "insertMacro"), 470, 530);
 
-            Panel1.Menu.NewElement("div", "splitButtonMacroPlaceHolder", "sbPlaceHolder", 40);
+			Panel1.Menu.NewElement("div", "splitButtonMacroPlaceHolder", "sbPlaceHolder", 40);
 
-            if (UmbracoSettings.UseAspNetMasterPages)
-            {
-                Panel1.Menu.InsertSplitter();
+			if (UmbracoSettings.UseAspNetMasterPages)
+			{
+				Panel1.Menu.InsertSplitter();
 
-                MenuIconI umbContainer = Panel1.Menu.NewIcon();
-                umbContainer.ImageURL = UmbracoPath + "/images/editor/masterpagePlaceHolder.gif";
-                umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
-                umbContainer.OnClickCommand =
-                    ClientTools.Scripts.OpenModalWindow(
-                        IOHelper.ResolveUrl(SystemDirectories.Umbraco) +
-                        "/dialogs/insertMasterpagePlaceholder.aspx?&id=" + _template.Id,
-                        ui.Text("template", "insertContentAreaPlaceHolder"), 470, 320);
+				MenuIconI umbContainer = Panel1.Menu.NewIcon();
+				umbContainer.ImageURL = UmbracoPath + "/images/editor/masterpagePlaceHolder.gif";
+				umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
+				umbContainer.OnClickCommand =
+					ClientTools.Scripts.OpenModalWindow(
+						IOHelper.ResolveUrl(SystemDirectories.Umbraco) +
+						"/dialogs/insertMasterpagePlaceholder.aspx?&id=" + _template.Id,
+						ui.Text("template", "insertContentAreaPlaceHolder"), 470, 320);
 
-                MenuIconI umbContent = Panel1.Menu.NewIcon();
-                umbContent.ImageURL = UmbracoPath + "/images/editor/masterpageContent.gif";
-                umbContent.AltText = ui.Text("template", "insertContentArea");
-                umbContent.OnClickCommand =
-                    ClientTools.Scripts.OpenModalWindow(
-                        IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/insertMasterpageContent.aspx?id=" +
-                        _template.Id, ui.Text("template", "insertContentArea"), 470, 300);
-            }
+				MenuIconI umbContent = Panel1.Menu.NewIcon();
+				umbContent.ImageURL = UmbracoPath + "/images/editor/masterpageContent.gif";
+				umbContent.AltText = ui.Text("template", "insertContentArea");
+				umbContent.OnClickCommand =
+					ClientTools.Scripts.OpenModalWindow(
+						IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/insertMasterpageContent.aspx?id=" +
+						_template.Id, ui.Text("template", "insertContentArea"), 470, 300);
+			}
 
 
-            //Spit button
-            Panel1.Menu.InsertSplitter();
-            Panel1.Menu.NewElement("div", "splitButtonPlaceHolder", "sbPlaceHolder", 40);
+			//Spit button
+			Panel1.Menu.InsertSplitter();
+			Panel1.Menu.NewElement("div", "splitButtonPlaceHolder", "sbPlaceHolder", 40);
 
-            if (Skinning.StarterKitGuid(_template.Id).HasValue)
-            {
-                Panel1.Menu.InsertSplitter();
-                MenuIconI umbContainer = Panel1.Menu.NewIcon();
-                umbContainer.ImageURL = UmbracoPath + "/images/editor/skin.gif";
-                umbContainer.AltText = ui.Text("template", "modifyTemplateSkin");
-                //umbContainer.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/TemplateSkinning.aspx?&id=" + _template.Id.ToString(), ui.Text("template", "modifyTemplateSkin"), 570, 420);
-                umbContainer.OnClickCommand = "window.open('" + GlobalSettings.Path + "/canvas.aspx?redir=" +
-                                              ResolveUrl("~/") + "&umbSkinning=true&umbSkinningConfigurator=true" +
-                                              "','canvas')";
-            }
+			if (Skinning.StarterKitGuid(_template.Id).HasValue)
+			{
+				Panel1.Menu.InsertSplitter();
+				MenuIconI umbContainer = Panel1.Menu.NewIcon();
+				umbContainer.ImageURL = UmbracoPath + "/images/editor/skin.gif";
+				umbContainer.AltText = ui.Text("template", "modifyTemplateSkin");
+				//umbContainer.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/TemplateSkinning.aspx?&id=" + _template.Id.ToString(), ui.Text("template", "modifyTemplateSkin"), 570, 420);
+				umbContainer.OnClickCommand = "window.open('" + GlobalSettings.Path + "/canvas.aspx?redir=" +
+											  ResolveUrl("~/") + "&umbSkinning=true&umbSkinningConfigurator=true" +
+											  "','canvas')";
+			}
 
-            // Help
-            Panel1.Menu.InsertSplitter();
+			// Help
+			Panel1.Menu.InsertSplitter();
 
-            MenuIconI helpIcon = Panel1.Menu.NewIcon();
-            helpIcon.OnClickCommand =
-                ClientTools.Scripts.OpenModalWindow(
-                    IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/settings/modals/showumbracotags.aspx?alias=" +
-                    _template.Alias, ui.Text("template", "quickGuide"), 600, 580);
-            helpIcon.ImageURL = UmbracoPath + "/images/editor/help.png";
-            helpIcon.AltText = ui.Text("template", "quickGuide");
-        }
+			MenuIconI helpIcon = Panel1.Menu.NewIcon();
+			helpIcon.OnClickCommand =
+				ClientTools.Scripts.OpenModalWindow(
+					IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/settings/modals/showumbracotags.aspx?alias=" +
+					_template.Alias, ui.Text("template", "quickGuide"), 600, 580);
+			helpIcon.ImageURL = UmbracoPath + "/images/editor/help.png";
+			helpIcon.AltText = ui.Text("template", "quickGuide");
+		}
 
 
-        private void LoadScriptingTemplates()
-        {
-            string path = SystemDirectories.Umbraco + "/scripting/templates/cshtml/";
-            string abPath = IOHelper.MapPath(path);
+		private void LoadScriptingTemplates()
+		{
+			string path = SystemDirectories.Umbraco + "/scripting/templates/cshtml/";
+			string abPath = IOHelper.MapPath(path);
 
-            var files = new List<KeyValuePair<string, string>>();
+			var files = new List<KeyValuePair<string, string>>();
 
-            if (Directory.Exists(abPath))
-            {
-                string extension = ".cshtml";
+			if (Directory.Exists(abPath))
+			{
+				string extension = ".cshtml";
 
-                foreach (FileInfo fi in new DirectoryInfo(abPath).GetFiles("*" + extension))
-                {
-                    string filename = Path.GetFileName(fi.FullName);
+				foreach (FileInfo fi in new DirectoryInfo(abPath).GetFiles("*" + extension))
+				{
+					string filename = Path.GetFileName(fi.FullName);
 
-                    files.Add(new KeyValuePair<string, string>(
-                                  filename,
-                                  helper.SpaceCamelCasing(filename.Replace(extension, ""))
-                                  ));
-                }
-            }
+					files.Add(new KeyValuePair<string, string>(
+								  filename,
+								  helper.SpaceCamelCasing(filename.Replace(extension, ""))
+								  ));
+				}
+			}
 
-            rpt_codeTemplates.DataSource = files;
-            rpt_codeTemplates.DataBind();
-        }
+			rpt_codeTemplates.DataSource = files;
+			rpt_codeTemplates.DataBind();
+		}
 
-        private void LoadMacros()
-        {
-            IRecordsReader macroRenderings =
-                SqlHelper.ExecuteReader("select id, macroAlias, macroName from cmsMacro order by macroName");
+		private void LoadMacros()
+		{
+			IRecordsReader macroRenderings =
+				SqlHelper.ExecuteReader("select id, macroAlias, macroName from cmsMacro order by macroName");
 
-            rpt_macros.DataSource = macroRenderings;
-            rpt_macros.DataBind();
+			rpt_macros.DataSource = macroRenderings;
+			rpt_macros.DataBind();
 
-            macroRenderings.Close();
-        }
+			macroRenderings.Close();
+		}
 
-        public string DoesMacroHaveSettings(string macroId)
-        {
-            if (
-                SqlHelper.ExecuteScalar<int>(string.Format("select 1 from cmsMacroProperty where macro = {0}", macroId)) ==
-                1)
-                return "1";
-            else
-                return "0";
-        }
+		public string DoesMacroHaveSettings(string macroId)
+		{
+			if (
+				SqlHelper.ExecuteScalar<int>(string.Format("select 1 from cmsMacroProperty where macro = {0}", macroId)) ==
+				1)
+				return "1";
+			else
+				return "0";
+		}
 
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-        }
-    }
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+		}
+
+		/// <summary>
+		/// CssInclude1 control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::ClientDependency.Core.Controls.CssInclude CssInclude1;
+
+		/// <summary>
+		/// JsInclude control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::ClientDependency.Core.Controls.JsInclude JsInclude;
+
+		/// <summary>
+		/// Panel1 control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::umbraco.uicontrols.UmbracoPanel Panel1;
+
+		/// <summary>
+		/// Pane7 control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::umbraco.uicontrols.Pane Pane7;
+
+		/// <summary>
+		/// pp_name control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::umbraco.uicontrols.PropertyPanel pp_name;
+
+		/// <summary>
+		/// NameTxt 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 NameTxt;
+
+		/// <summary>
+		/// pp_alias control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::umbraco.uicontrols.PropertyPanel pp_alias;
+
+		/// <summary>
+		/// AliasTxt 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 AliasTxt;
+
+		/// <summary>
+		/// pp_masterTemplate control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::umbraco.uicontrols.PropertyPanel pp_masterTemplate;
+
+		/// <summary>
+		/// MasterTemplate 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.DropDownList MasterTemplate;
+
+		/// <summary>
+		/// pp_source control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::umbraco.uicontrols.PropertyPanel pp_source;
+
+		/// <summary>
+		/// editorSource control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::umbraco.uicontrols.CodeArea editorSource;
+
+		/// <summary>
+		/// rpt_codeTemplates 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.Repeater rpt_codeTemplates;
+
+		/// <summary>
+		/// rpt_macros 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.Repeater rpt_macros;
+	}
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.designer.cs
deleted file mode 100644
index b760bc093f..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.designer.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace umbraco.cms.presentation.settings {
-    
-    
-    public partial class editTemplate {
-        
-        /// <summary>
-        /// CssInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.CssInclude CssInclude1;
-        
-        /// <summary>
-        /// JsInclude control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude;
-        
-        /// <summary>
-        /// Panel1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.UmbracoPanel Panel1;
-        
-        /// <summary>
-        /// Pane7 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane Pane7;
-        
-        /// <summary>
-        /// pp_name control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_name;
-        
-        /// <summary>
-        /// NameTxt 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 NameTxt;
-        
-        /// <summary>
-        /// pp_alias control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_alias;
-        
-        /// <summary>
-        /// AliasTxt 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 AliasTxt;
-        
-        /// <summary>
-        /// pp_masterTemplate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_masterTemplate;
-        
-        /// <summary>
-        /// MasterTemplate 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.DropDownList MasterTemplate;
-        
-        /// <summary>
-        /// pp_source control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_source;
-        
-        /// <summary>
-        /// editorSource control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.CodeArea editorSource;
-        
-        /// <summary>
-        /// rpt_codeTemplates 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.Repeater rpt_codeTemplates;
-        
-        /// <summary>
-        /// rpt_macros 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.Repeater rpt_macros;
-    }
-}