diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index f2f058cd14..814d993c43 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -17,26 +17,26 @@ NOTES:
     The LoaderControlProvider is set to default, the javascriptPlaceHolderId, cssPlaceHolderId attributes are optional and default to what is listed below. If using
     this provider, then you must specify both PlaceHolder controls on your page in order to render the JS/CSS.
   -->
-	<fileRegistration defaultProvider="LoaderControlProvider">
-		<providers>
-			<add name="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, ClientDependency.Core" />
-			<add name="LazyLoadProvider" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadProvider, ClientDependency.Core" />
-			<add name="LoaderControlProvider" type="ClientDependency.Core.FileRegistration.Providers.LoaderControlProvider, ClientDependency.Core" />
-			<add name="PlaceHolderProvider" type="ClientDependency.Core.FileRegistration.Providers.PlaceHolderProvider, ClientDependency.Core" enableCompositeFiles="true" javascriptPlaceHolderId="JavaScriptPlaceHolder" cssPlaceHolderId="CssPlaceHolder" />
-			<!-- Used for loading dependencies in Canvas mode -->
-			<add name="CanvasProvider" type="umbraco.presentation.LiveEditing.CanvasClientDependencyProvider, umbraco" />
-		</providers>
-	</fileRegistration>
+  <fileRegistration defaultProvider="LoaderControlProvider">
+    <providers>
+      <add name="PageHeaderProvider" type="ClientDependency.Core.FileRegistration.Providers.PageHeaderProvider, ClientDependency.Core" />
+      <add name="LazyLoadProvider" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadProvider, ClientDependency.Core" />
+      <add name="LoaderControlProvider" type="ClientDependency.Core.FileRegistration.Providers.LoaderControlProvider, ClientDependency.Core" />
+      <add name="PlaceHolderProvider" type="ClientDependency.Core.FileRegistration.Providers.PlaceHolderProvider, ClientDependency.Core" enableCompositeFiles="true" javascriptPlaceHolderId="JavaScriptPlaceHolder" cssPlaceHolderId="CssPlaceHolder" />
+      <!-- Used for loading dependencies in Canvas mode -->
+      <add name="CanvasProvider" type="umbraco.presentation.LiveEditing.CanvasClientDependencyProvider, umbraco" />
+    </providers>
+  </fileRegistration>
 
-	<!-- This section is used for MVC only -->
-	<mvc defaultRenderer="StandardRenderer">
-		<renderers>
-			<add name="StandardRenderer" type="ClientDependency.Core.FileRegistration.Providers.StandardRenderer, ClientDependency.Core" />
-			<add name="LazyLoadRenderer" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadRenderer, ClientDependency.Core" />
-		</renderers>
-	</mvc>
-  
-  <!--
+  <!-- This section is used for MVC only -->
+  <mvc defaultRenderer="StandardRenderer">
+    <renderers>
+      <add name="StandardRenderer" type="ClientDependency.Core.FileRegistration.Providers.StandardRenderer, ClientDependency.Core" />
+      <add name="LazyLoadRenderer" type="ClientDependency.Core.FileRegistration.Providers.LazyLoadRenderer, ClientDependency.Core" />
+    </renderers>
+  </mvc>
+
+  <!-- 
   The composite file section configures the compression/combination/minification of files.
   You can enable/disable minification of either JS/CSS files and you can enable/disable the 
   persistence of composite files. By default, minification and persistence is enabled. Persisting files
@@ -45,14 +45,24 @@ NOTES:
   to be recreated again and will be based on the persisted file on disk. This saves on processing time.
   -->
   <compositeFiles defaultProvider="defaultFileProcessingProvider" compositeFileHandlerPath="~/DependencyHandler.axd">
-		<fileProcessingProviders>
-			<add name="CompositeFileProcessor" type="ClientDependency.Core.CompositeFiles.Providers.CompositeFileProcessingProvider, ClientDependency.Core" enableCssMinify="true" enableJsMinify="true" persistFiles="true" compositeFilePath="~/App_Data/TEMP/ClientDependency" bundleDomains="localhost:123456" urlType="Base64QueryStrings" pathUrlFormat="{dependencyId}/{version}/{type}" />
-		</fileProcessingProviders>
+    <fileProcessingProviders>
+      <add name="CompositeFileProcessor"
+           type="ClientDependency.Core.CompositeFiles.Providers.CompositeFileProcessingProvider, ClientDependency.Core"
+           enableCssMinify="true"
+           enableJsMinify="true"
+           persistFiles="true"
+           compositeFilePath="~/App_Data/TEMP/ClientDependency"
+           bundleDomains="localhost:123456"
+           urlType="Base64QueryStrings"
+           pathUrlFormat="{dependencyId}/{version}/{type}"/>
+    </fileProcessingProviders>
 
-		<!-- A file map provider stores references to dependency files by an id to be used in the handler URL when using the MappedId Url type -->
-		<fileMapProviders>
-			<add name="XmlFileMap" type="ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper, ClientDependency.Core" mapPath="~/App_Data/TEMP/ClientDependency" />
-		</fileMapProviders>
+    <!-- A file map provider stores references to dependency files by an id to be used in the handler URL when using the MappedId Url type -->
+    <fileMapProviders>
+      <add name="XmlFileMap"
+           type="ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper, ClientDependency.Core"
+           mapPath="~/App_Data/TEMP/ClientDependency" />
+    </fileMapProviders>
 
     <!-- 
     Defines the mime types to compress when requested by the client.
@@ -60,10 +70,10 @@ NOTES:
     Generally mime types are only set by client browsers in the request for things
     such as JSON or XML ajax requests.
     -->
-		<mimeTypeCompression>
-			<!-- Compress all json requests for the tree -->
-			<add type="application/json" path="^.*?/webservices/Tree.*" />
-		</mimeTypeCompression>
+    <mimeTypeCompression>
+      <!-- Compress all json requests for the tree -->
+      <add type="application/json" path="^.*?/webservices/Tree.*" />
+    </mimeTypeCompression>
 
     <!-- 
     Defines the paths to match on to enable rogue file compression.
@@ -80,5 +90,4 @@ NOTES:
     </rogueFileCompression>
 
   </compositeFiles>
-
 </clientDependency>
diff --git a/src/Umbraco.Web.UI/config/Dashboard.Release.config b/src/Umbraco.Web.UI/config/Dashboard.Release.config
index 63e1816c9d..84fa762483 100644
--- a/src/Umbraco.Web.UI/config/Dashboard.Release.config
+++ b/src/Umbraco.Web.UI/config/Dashboard.Release.config
@@ -69,6 +69,10 @@
       </control>
       <control showOnce="true" addPanel="true" panelCaption="">
         /umbraco/dashboard/startupdashboardkits.ascx
+        <access>
+          <deny>editor</deny>
+          <deny>writer</deny>
+        </access>
       </control>
       <control showOnce="true" addPanel="true" panelCaption="">
         /umbraco/dashboard/startupdashboardvideos.ascx
diff --git a/src/Umbraco.Web.UI/config/ExamineSettings.config b/src/Umbraco.Web.UI/config/ExamineSettings.config
index 6744426c13..d19fce7c95 100644
--- a/src/Umbraco.Web.UI/config/ExamineSettings.config
+++ b/src/Umbraco.Web.UI/config/ExamineSettings.config
@@ -19,9 +19,9 @@ More information and documentation can be found on CodePlex: http://umbracoexami
            supportProtected="true"
            analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net"/>
 
-      <!-- default external indexer, which excludes protected and published pages-->
-      <add name="ExternalIndexer" type="UmbracoExamine.UmbracoContentIndexer, UmbracoExamine"/>
-
+        <!-- default external indexer, which excludes protected and unpublished pages-->
+        <add name="ExternalIndexer" type="UmbracoExamine.UmbracoContentIndexer, UmbracoExamine"/>
+      
     </providers>
   </ExamineIndexProviders>
 
@@ -29,12 +29,12 @@ More information and documentation can be found on CodePlex: http://umbracoexami
     <providers>
       <add name="InternalSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
            analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net"/>
-
+        
+      <add name="ExternalSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine" />
+      
       <add name="InternalMemberSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
            analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net" enableLeadingWildcards="true"/>
 
-      <add name="ExternalSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine" />
-      
     </providers>
   </ExamineSearchProviders>
 
diff --git a/src/Umbraco.Web.UI/config/FileSystemProviders.config b/src/Umbraco.Web.UI/config/FileSystemProviders.config
index 457259fae9..ae2addc39a 100644
--- a/src/Umbraco.Web.UI/config/FileSystemProviders.config
+++ b/src/Umbraco.Web.UI/config/FileSystemProviders.config
@@ -7,5 +7,5 @@
       <add key="virtualRoot" value="~/media/" />
     </Parameters>
   </Provider>
-  
+   
 </FileSystemProviders>
diff --git a/src/Umbraco.Web.UI/config/UrlRewriting.config b/src/Umbraco.Web.UI/config/UrlRewriting.config
index 348a07c972..108f53bf5e 100644
--- a/src/Umbraco.Web.UI/config/UrlRewriting.config
+++ b/src/Umbraco.Web.UI/config/UrlRewriting.config
@@ -29,6 +29,5 @@
 				
 				Any bugs or problems with the rewriter, contact Anders/Duckie
 			-->
-    <add name="rsstagrewrite" virtualUrl="^~/blog/rss/tags/(.*).aspx" rewriteUrlParameter="ExcludeFromClientQueryString" destinationUrl="~/blog/rss.aspx?tag=$1" ignoreCase="true" />
   </rewrites>
 </urlrewritingnet>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/applications.Release.config b/src/Umbraco.Web.UI/config/applications.Release.config
index fd834a87d8..c7a494b36a 100644
--- a/src/Umbraco.Web.UI/config/applications.Release.config
+++ b/src/Umbraco.Web.UI/config/applications.Release.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <applications>
   <add alias="content" name="Content" icon=".traycontent" sortOrder="0" />
   <add alias="media" name="Media" icon=".traymedia" sortOrder="1" />
diff --git a/src/Umbraco.Web.UI/config/feedProxy.config b/src/Umbraco.Web.UI/config/feedProxy.config
index c34fd48031..b55b5324ba 100644
--- a/src/Umbraco.Web.UI/config/feedProxy.config
+++ b/src/Umbraco.Web.UI/config/feedProxy.config
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <feedProxy>
-	<!-- To enable the FeedProxy to access other domains, please add the hostname to an 'allow' element. -->
-	<!-- <allow host="domain.com" /> -->
+  <!-- To enable the FeedProxy to access other domains, please add the hostname to an 'allow' element. -->
+  <!-- <allow host="domain.com" /> -->
 
-	<!-- The following hostnames are used by on the dashboards, please do not delete these. -->
-	<allow host="umbraco.com" />
-	<allow host="umbraco.org" />
+  <!-- The following hostnames are used by on the dashboards, please do not delete these. -->
+  <allow host="umbraco.com" />
+  <allow host="umbraco.org" />
 </feedProxy>
diff --git a/src/Umbraco.Web.UI/config/scripting.config b/src/Umbraco.Web.UI/config/scripting.config
index 505907d38a..ec59c35acb 100644
--- a/src/Umbraco.Web.UI/config/scripting.config
+++ b/src/Umbraco.Web.UI/config/scripting.config
@@ -6,7 +6,6 @@
   </languages>
 
   <options>
-  <![CDATA[]]>
     <set language="Ruby" option="LibraryPaths" value="..\..\Languages\Ruby\libs\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\site_ruby\1.8\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\site_ruby\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\1.8\" />
   </options>
 </microsoft.scripting>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/tinyMceConfig.config b/src/Umbraco.Web.UI/config/tinyMceConfig.config
index 2c3f2484f6..579dc77ba1 100644
--- a/src/Umbraco.Web.UI/config/tinyMceConfig.config
+++ b/src/Umbraco.Web.UI/config/tinyMceConfig.config
@@ -2,228 +2,222 @@
 <!-- Any changes to this file requires the application (umbraco) to restart -->
 <!-- This can be done by touching the web.config or recycling the application pool -->
 <tinymceConfig>
-    <commands>
-        <command>
-            <umbracoAlias>code</umbracoAlias>
-            <icon>images/editor/code.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="code">code</tinyMceCommand>
-            <priority>1</priority>
-        </command>
-        <command>
-            <umbracoAlias>removeformat</umbracoAlias>
-            <icon>images/editor/removeformat.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="removeformat">removeformat</tinyMceCommand>
-            <priority>2</priority>
-        </command>
+  <commands>
+    <command>
+      <umbracoAlias>code</umbracoAlias>
+      <icon>images/editor/code.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="code">code</tinyMceCommand>
+      <priority>1</priority>
+    </command>
+    <command>
+      <umbracoAlias>removeformat</umbracoAlias>
+      <icon>images/editor/removeformat.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="removeformat">removeformat</tinyMceCommand>
+      <priority>2</priority>
+    </command>
 
-        <command>
-            <umbracoAlias>Undo</umbracoAlias>
-            <icon>images/editor/undo.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="undo">undo</tinyMceCommand>
-            <priority>11</priority>
-        </command>
-        <command>
-            <umbracoAlias>Redo</umbracoAlias>
-            <icon>images/editor/redo.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="redo">redo</tinyMceCommand>
-            <priority>12</priority>
-        </command>
-        <command>
-            <umbracoAlias>Cut</umbracoAlias>
-            <icon>images/editor/cut.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="cut">cut</tinyMceCommand>
-            <priority>13</priority>
-        </command>
-        <command>
-            <umbracoAlias>Copy</umbracoAlias>
-            <icon>images/editor/copy.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="copy">copy</tinyMceCommand>
-            <priority>14</priority>
-        </command>
-        <command>
-            <umbracoAlias>mcePasteWord</umbracoAlias>
-            <icon>images/editor/paste.gif</icon>
-            <tinyMceCommand value="" userInterface="true" frontendCommand="pasteword">pasteword</tinyMceCommand>
-            <priority>15</priority>
-        </command>
+    <command>
+      <umbracoAlias>Undo</umbracoAlias>
+      <icon>images/editor/undo.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="undo">undo</tinyMceCommand>
+      <priority>11</priority>
+    </command>
+    <command>
+      <umbracoAlias>Redo</umbracoAlias>
+      <icon>images/editor/redo.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="redo">redo</tinyMceCommand>
+      <priority>12</priority>
+    </command>
+    <command>
+      <umbracoAlias>Cut</umbracoAlias>
+      <icon>images/editor/cut.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="cut">cut</tinyMceCommand>
+      <priority>13</priority>
+    </command>
+    <command>
+      <umbracoAlias>Copy</umbracoAlias>
+      <icon>images/editor/copy.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="copy">copy</tinyMceCommand>
+      <priority>14</priority>
+    </command>
+    <command>
+      <umbracoAlias>mcePasteWord</umbracoAlias>
+      <icon>images/editor/paste.gif</icon>
+      <tinyMceCommand value="" userInterface="true" frontendCommand="pasteword">pasteword</tinyMceCommand>
+      <priority>15</priority>
+    </command>
 
-        <command isStyle="true">
-            <umbracoAlias>stylePicker</umbracoAlias>
-            <icon>images/editor/showStyles.png</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="umbracocss">umbracocss</tinyMceCommand>
-            <priority>20</priority>
-        </command>
-        <command>
-            <umbracoAlias>bold</umbracoAlias>
-            <icon>images/editor/bold.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="bold">bold</tinyMceCommand>
-            <priority>21</priority>
-        </command>
-        <command>
-            <umbracoAlias>italic</umbracoAlias>
-            <icon>images/editor/italic.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="italic">italic</tinyMceCommand>
-            <priority>22</priority>
-        </command>
-        <command>
-            <umbracoAlias>Underline</umbracoAlias>
-            <icon>images/editor/underline.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="underline">underline</tinyMceCommand>
-            <priority>23</priority>
-        </command>
-        <command>
-            <umbracoAlias>Strikethrough</umbracoAlias>
-            <icon>images/editor/strikethrough.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="strikethrough">strikethrough</tinyMceCommand>
-            <priority>24</priority>
-        </command>
+    <command isStyle="true">
+      <umbracoAlias>stylePicker</umbracoAlias>
+      <icon>images/editor/showStyles.png</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="umbracocss">umbracocss</tinyMceCommand>
+      <priority>20</priority>
+    </command>
+    <command>
+      <umbracoAlias>bold</umbracoAlias>
+      <icon>images/editor/bold.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="bold">bold</tinyMceCommand>
+      <priority>21</priority>
+    </command>
+    <command>
+      <umbracoAlias>italic</umbracoAlias>
+      <icon>images/editor/italic.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="italic">italic</tinyMceCommand>
+      <priority>22</priority>
+    </command>
+    <command>
+      <umbracoAlias>Underline</umbracoAlias>
+      <icon>images/editor/underline.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="underline">underline</tinyMceCommand>
+      <priority>23</priority>
+    </command>
+    <command>
+      <umbracoAlias>Strikethrough</umbracoAlias>
+      <icon>images/editor/strikethrough.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="strikethrough">strikethrough</tinyMceCommand>
+      <priority>24</priority>
+    </command>
 
-        <command>
-            <umbracoAlias>JustifyLeft</umbracoAlias>
-            <icon>images/editor/justifyleft.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="justifyleft">justifyleft</tinyMceCommand>
-            <priority>31</priority>
-        </command>
-        <command>
-            <umbracoAlias>JustifyCenter</umbracoAlias>
-            <icon>images/editor/justifycenter.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="justifycenter">justifycenter</tinyMceCommand>
-            <priority>32</priority>
-        </command>
-        <command>
-            <umbracoAlias>JustifyRight</umbracoAlias>
-            <icon>images/editor/justifyright.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="justifyright">justifyright</tinyMceCommand>
-            <priority>33</priority>
-        </command>
-        <command>
-            <umbracoAlias>JustifyFull</umbracoAlias>
-            <icon>images/editor/justifyfull.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="justifyfull">justifyfull</tinyMceCommand>
-            <priority>34</priority>
-        </command>
+    <command>
+      <umbracoAlias>JustifyLeft</umbracoAlias>
+      <icon>images/editor/justifyleft.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="justifyleft">justifyleft</tinyMceCommand>
+      <priority>31</priority>
+    </command>
+    <command>
+      <umbracoAlias>JustifyCenter</umbracoAlias>
+      <icon>images/editor/justifycenter.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="justifycenter">justifycenter</tinyMceCommand>
+      <priority>32</priority>
+    </command>
+    <command>
+      <umbracoAlias>JustifyRight</umbracoAlias>
+      <icon>images/editor/justifyright.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="justifyright">justifyright</tinyMceCommand>
+      <priority>33</priority>
+    </command>
+    <command>
+      <umbracoAlias>JustifyFull</umbracoAlias>
+      <icon>images/editor/justifyfull.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="justifyfull">justifyfull</tinyMceCommand>
+      <priority>34</priority>
+    </command>
 
-        <command>
-            <umbracoAlias>bullist</umbracoAlias>
-            <icon>images/editor/bullist.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="bullist">bullist</tinyMceCommand>
-            <priority>41</priority>
-        </command>
-        <command>
-            <umbracoAlias>numlist</umbracoAlias>
-            <icon>images/editor/numlist.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="numlist">numlist</tinyMceCommand>
-            <priority>42</priority>
-        </command>
-        <command>
-            <umbracoAlias>Outdent</umbracoAlias>
-            <icon>images/editor/outdent.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="outdent">outdent</tinyMceCommand>
-            <priority>43</priority>
-        </command>
-        <command>
-            <umbracoAlias>Indent</umbracoAlias>
-            <icon>images/editor/indent.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="indent">indent</tinyMceCommand>
-            <priority>44</priority>
-        </command>
+    <command>
+      <umbracoAlias>bullist</umbracoAlias>
+      <icon>images/editor/bullist.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="bullist">bullist</tinyMceCommand>
+      <priority>41</priority>
+    </command>
+    <command>
+      <umbracoAlias>numlist</umbracoAlias>
+      <icon>images/editor/numlist.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="numlist">numlist</tinyMceCommand>
+      <priority>42</priority>
+    </command>
+    <command>
+      <umbracoAlias>Outdent</umbracoAlias>
+      <icon>images/editor/outdent.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="outdent">outdent</tinyMceCommand>
+      <priority>43</priority>
+    </command>
+    <command>
+      <umbracoAlias>Indent</umbracoAlias>
+      <icon>images/editor/indent.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="indent">indent</tinyMceCommand>
+      <priority>44</priority>
+    </command>
 
-        <command>
-            <umbracoAlias>mceLink</umbracoAlias>
-            <icon>images/editor/link.gif</icon>
-            <tinyMceCommand value="" userInterface="true" frontendCommand="link">link</tinyMceCommand>
-            <priority>51</priority>
-        </command>
-        <command>
-            <umbracoAlias>unlink</umbracoAlias>
-            <icon>images/editor/unLink.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="unlink">unlink</tinyMceCommand>
-            <priority>52</priority>
-        </command>
-        <command>
-            <umbracoAlias>mceInsertAnchor</umbracoAlias>
-            <icon>images/editor/anchor.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="anchor">anchor</tinyMceCommand>
-            <priority>53</priority>
-        </command>
+    <command>
+      <umbracoAlias>mceLink</umbracoAlias>
+      <icon>images/editor/link.gif</icon>
+      <tinyMceCommand value="" userInterface="true" frontendCommand="link">link</tinyMceCommand>
+      <priority>51</priority>
+    </command>
+    <command>
+      <umbracoAlias>unlink</umbracoAlias>
+      <icon>images/editor/unLink.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="unlink">unlink</tinyMceCommand>
+      <priority>52</priority>
+    </command>
+    <command>
+      <umbracoAlias>mceInsertAnchor</umbracoAlias>
+      <icon>images/editor/anchor.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="anchor">anchor</tinyMceCommand>
+      <priority>53</priority>
+    </command>
 
-        <command>
-            <umbracoAlias>mceImage</umbracoAlias>
-            <icon>images/editor/image.gif</icon>
-            <tinyMceCommand value="" userInterface="true" frontendCommand="image">image</tinyMceCommand>
-            <priority>61</priority>
-        </command>
+    <command>
+      <umbracoAlias>mceImage</umbracoAlias>
+      <icon>images/editor/image.gif</icon>
+      <tinyMceCommand value="" userInterface="true" frontendCommand="image">image</tinyMceCommand>
+      <priority>61</priority>
+    </command>
+    <command>
+      <umbracoAlias>umbracomacro</umbracoAlias>
+      <icon>images/editor/insMacro.gif</icon>
+      <tinyMceCommand value="" userInterface="true" frontendCommand="mceUmbracomacro">umbracomacro</tinyMceCommand>
+      <priority>62</priority>
+    </command>
+    <command>
+      <umbracoAlias>mceInsertTable</umbracoAlias>
+      <icon>images/editor/table.gif</icon>
+      <tinyMceCommand value="" userInterface="true" frontendCommand="table">table</tinyMceCommand>
+      <priority>63</priority>
+    </command>
+    <command>
+      <umbracoAlias>umbracoembed</umbracoAlias>
+      <icon>images/editor/media.gif</icon>
+      <tinyMceCommand value="" userInterface="true" frontendCommand="mceUmbracoEmbed">umbracoembed</tinyMceCommand>
+      <priority>66</priority>
+    </command>
+    <command>
+      <umbracoAlias>inserthorizontalrule</umbracoAlias>
+      <icon>images/editor/hr.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="hr">hr</tinyMceCommand>
+      <priority>71</priority>
+    </command>
+    <command>
+      <umbracoAlias>subscript</umbracoAlias>
+      <icon>images/editor/sub.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="sub">sub</tinyMceCommand>
+      <priority>72</priority>
+    </command>
+    <command>
+      <umbracoAlias>superscript</umbracoAlias>
+      <icon>images/editor/sup.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="sup">sup</tinyMceCommand>
+      <priority>73</priority>
+    </command>
+    <command>
+      <umbracoAlias>mceCharMap</umbracoAlias>
+      <icon>images/editor/charmap.gif</icon>
+      <tinyMceCommand value="" userInterface="false" frontendCommand="charmap">charmap</tinyMceCommand>
+      <priority>74</priority>
+    </command>
+    <command>
+      <umbracoAlias>mceSpellCheck</umbracoAlias>
+      <icon>images/editor/spellchecker.gif</icon>
+      <tinyMceCommand value="" userInterface="true" frontendCommand="mceSpellCheck">spellchecker</tinyMceCommand>
+      <priority>75</priority>
+    </command>
 
-        <command>
-            <umbracoAlias>umbracomacro</umbracoAlias>
-            <icon>images/editor/insMacro.gif</icon>
-            <tinyMceCommand value="" userInterface="true" frontendCommand="mceUmbracomacro">umbracomacro</tinyMceCommand>
-            <priority>62</priority>
-        </command>
-        <command>
-            <umbracoAlias>mceInsertTable</umbracoAlias>
-            <icon>images/editor/table.gif</icon>
-            <tinyMceCommand value="" userInterface="true" frontendCommand="table">table</tinyMceCommand>
-            <priority>63</priority>
-        </command>
-        <command>
-          <umbracoAlias>umbracoembed</umbracoAlias>
-          <icon>images/editor/media.gif</icon>
-          <tinyMceCommand value="" userInterface="true" frontendCommand="mceUmbracoEmbed">umbracoembed</tinyMceCommand>
-          <priority>66</priority>
-        </command>
-        <command>
-            <umbracoAlias>inserthorizontalrule</umbracoAlias>
-            <icon>images/editor/hr.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="hr">hr</tinyMceCommand>
-            <priority>71</priority>
-        </command>
-        <command>
-            <umbracoAlias>subscript</umbracoAlias>
-            <icon>images/editor/sub.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="sub">sub</tinyMceCommand>
-            <priority>72</priority>
-        </command>
-
-        <command>
-            <umbracoAlias>superscript</umbracoAlias>
-            <icon>images/editor/sup.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="sup">sup</tinyMceCommand>
-            <priority>73</priority>
-        </command>
-
-        <command>
-            <umbracoAlias>mceCharMap</umbracoAlias>
-            <icon>images/editor/charmap.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="charmap">charmap</tinyMceCommand>
-            <priority>74</priority>
-        </command>
-
-        <command>
-            <umbracoAlias>mceSpellCheck</umbracoAlias>
-            <icon>images/editor/spellchecker.gif</icon>
-            <tinyMceCommand value="" userInterface="true" frontendCommand="mceSpellCheck">spellchecker</tinyMceCommand>
-            <priority>75</priority>
-        </command>
-    </commands>
-    <plugins>
-        <plugin loadOnFrontend="true">paste</plugin>
-        <plugin loadOnFrontend="true">inlinepopups</plugin>
-        <plugin loadOnFrontend="true">noneditable</plugin>
-        <plugin loadOnFrontend="true">table</plugin>
-        <plugin loadOnFrontend="true">lists</plugin>
-        <plugin loadOnFrontend="false">umbracomacro</plugin>
-        <!--<plugin loadOnFrontend="false">advimage</plugin>-->
-        <plugin loadOnFrontend="false">advlink</plugin>
-        <plugin loadOnFrontend="false">umbracocss</plugin>
-        <plugin loadOnFrontend="false">umbracoembed</plugin>  
-        <!--<plugin loadOnFrontend="false">media</plugin>-->
-        <plugin loadOnFrontend="false">umbracoimg</plugin>
-        <plugin loadOnFrontend="false">spellchecker</plugin>
-        <plugin loadOnFrontend="false">umbracoshortcut</plugin>
-    </plugins>
-    <validElements>
-      <![CDATA[+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|
+  </commands>
+  <plugins>
+    <plugin loadOnFrontend="true">paste</plugin>
+    <plugin loadOnFrontend="true">inlinepopups</plugin>
+    <plugin loadOnFrontend="true">noneditable</plugin>
+    <plugin loadOnFrontend="true">table</plugin>
+    <plugin loadOnFrontend="true">lists</plugin>
+    <plugin loadOnFrontend="false">umbracomacro</plugin>
+    <plugin loadOnFrontend="false">umbracoimg</plugin>
+    <plugin loadOnFrontend="false">advlink</plugin>
+    <plugin loadOnFrontend="false">umbracocss</plugin>
+    <plugin loadOnFrontend="false">umbracoembed</plugin>
+    <plugin loadOnFrontend="false">spellchecker</plugin>
+  </plugins>
+  <validElements>
+    <![CDATA[+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|
 ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],
 -strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],
 img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel],
@@ -235,13 +229,13 @@ thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|heig
 -h3[id|dir|class|align],-h4[id|dir|class|align],-h5[id|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],
 dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],
 param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*]]]>
-    </validElements>
-    <invalidElements>font</invalidElements>
+  </validElements>
+  <invalidElements>font</invalidElements>
 
-    <!-- this area is for custom config settings that should be added during TinyMCE initialization -->
-    <customConfig>
-        <!--    <config key="myKey">mySetting</config>-->
-        <config key="entity_encoding">raw</config>
-        <config key="spellchecker_rpc_url">GoogleSpellChecker.ashx</config>
-    </customConfig>
+  <!-- this area is for custom config settings that should be added during TinyMCE initialization -->
+  <customConfig>
+    <!--    <config key="myKey">mySetting</config>-->
+    <config key="entity_encoding">raw</config>
+    <config key="spellchecker_rpc_url">GoogleSpellChecker.ashx</config>
+  </customConfig>
 </tinymceConfig>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/trees.config b/src/Umbraco.Web.UI/config/trees.config
index 19d72fd252..78e9dfc0db 100644
--- a/src/Umbraco.Web.UI/config/trees.config
+++ b/src/Umbraco.Web.UI/config/trees.config
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <trees>
+
   <!--Content-->
-  <add application="content" alias="content" title="Content" type="umbraco.loadContent,umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" silent="true" sortOrder="0" />
-  <add application="content" alias="contentRecycleBin" title="RecycleBin" type="umbraco.cms.presentation.Trees.ContentRecycleBin,umbraco" iconClosed="folder.gif" iconOpen="folder_o.gif" initialize="false" sortOrder="0" />
+  <add application="content" alias="content" title="Content" type="umbraco.loadContent, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" silent="true" sortOrder="0" />
+  <add application="content" alias="contentRecycleBin" title="RecycleBin" type="umbraco.cms.presentation.Trees.ContentRecycleBin, umbraco" iconClosed="folder.gif" iconOpen="folder_o.gif" initialize="false" sortOrder="0" />
+
   <!--Media-->
-  <add application="media" alias="media" title="Media" type="umbraco.loadMedia,umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="0" />
-  <add application="media" alias="mediaRecycleBin" title="RecycleBin" type="umbraco.cms.presentation.Trees.MediaRecycleBin,umbraco" iconClosed="folder.gif" iconOpen="folder_o.gif" initialize="false" sortOrder="0" />
+  <add application="media" alias="media" title="Media" type="umbraco.loadMedia, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="0" />
+  <add application="media" alias="mediaRecycleBin" title="RecycleBin" type="umbraco.cms.presentation.Trees.MediaRecycleBin, umbraco" iconClosed="folder.gif" iconOpen="folder_o.gif" initialize="false" sortOrder="0" />
+
   <!--Settings-->
-  <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets,umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="0" />
-  <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty,umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" />
+  <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="0" />
+  <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" />
   <add application="settings" alias="templates" title="Templates" type="umbraco.loadTemplates, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="1" />
-  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />
-  <add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="3" />
+	<add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />
+	<add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="3" />
   <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" action="openDictionary()" sortOrder="4" />
   <add application="settings" alias="languages" title="Languages" type="umbraco.loadLanguages, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="5" />
   <add application="settings" alias="mediaTypes" title="Media Types" type="umbraco.loadMediaTypes, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="6" />
   <add application="settings" alias="nodeTypes" title="Document Types" type="umbraco.loadNodeTypes, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="7" />
+
   <!--Developer-->
   <add application="developer" alias="datatype" title="Data Types" type="umbraco.loadDataTypes, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="1" />
   <add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="2" />
@@ -24,19 +28,24 @@
   <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="4" />
   <add application="developer" alias="python" title="Scripting Files" type="umbraco.loadPython, umbraco" iconClosed="folder.gif" iconOpen="folder_o.gif" sortOrder="4" />
   <add application="developer" alias="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="5" />
-  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" />
+	<add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" />
+	
   <!--Users-->
   <add application="users" alias="users" title="Users" type="umbraco.loadUsers, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="0" />
   <add application="users" alias="userTypes" title="User Types" type="umbraco.cms.presentation.Trees.UserTypes, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="1" />
   <add application="users" alias="userPermissions" title="User Permissions" type="umbraco.cms.presentation.Trees.UserPermissions, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="2" />
+
   <!--Members-->
   <add application="member" alias="member" title="Members" type="umbraco.loadMembers, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="0" />
   <add application="member" alias="memberGroup" title="Member Groups" type="umbraco.loadMemberGroups, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="1" />
   <add application="member" alias="memberType" title="Member Types" type="umbraco.loadMemberTypes, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="2" />
+
   <!--Translation-->
   <add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" type="umbraco.loadOpenTasks, umbraco" action="" />
   <add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" type="umbraco.loadYourTasks, umbraco" action="" />
+  
   <!-- Custom -->
   <!--<add application="myApplication" alias="myTree" title="Me Tree" type="MyNamespace.myTree, MyAssembly"
        iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="10" />-->
+
 </trees>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index 1758488f54..f212beac29 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -26,7 +26,7 @@
     </scripteditor>
 
     <!-- should umbraco store the uploaded files like /media/xxx/filename.ext or like /media/xxx-filename.ext
-		should be set to false if the aspnet account hasn't got readrights of the driveroot up to the /media directory -->
+		should be set to false if the application pool's user account hasn't got readrights of the driveroot up to the /media directory -->
     <UploadAllowDirectories>True</UploadAllowDirectories>
     <errors>
       <!-- the id of the page that should be shown if the page is not found -->
@@ -34,7 +34,7 @@
                    <errorPage culture="default">1</errorPage>
                    <errorPage culture="en-US">200</errorPage>
             </error404>-->
-      <error404>1</error404>
+
     </errors>
     <notifications>
       <!-- the email that should be used as from mail when umbraco sends a notification -->
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 6cced72c73..feb1c5e82f 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -34,15 +34,11 @@
                    <errorPage culture="default">1</errorPage>
                    <errorPage culture="en-US">200</errorPage>
             </error404>-->
-      <error404>
-        <errorPage culture="default">1047</errorPage>
-        <errorPage culture="en-US">1047</errorPage>
-        <errorPage culture="en-UK">1047</errorPage>
-      </error404>
+
     </errors>
     <notifications>
       <!-- the email that should be used as from mail when umbraco sends a notification -->
-      <email>robot@umbraco.dk</email>
+      <email>your@email.here</email>
     </notifications>
 
     <!-- if true umbraco will ensure that no page under the same parent has an identical name -->
@@ -51,8 +47,15 @@
     <!-- clean editor content with use of tidy -->
     <TidyEditorContent>False</TidyEditorContent>
 
-    <!-- the encoding type for tidy. Default is Raw, options are ASCII, Raw, Latin1, UTF8, ISO2022, MacroMan-->
-    <TidyCharEncoding>Raw</TidyCharEncoding>
+    <!-- the encoding type for tidy. Default is UTF8, options are ASCII, Raw, Latin1, UTF8, ISO2022, MacroMan-->
+    <TidyCharEncoding>UTF8</TidyCharEncoding>
+
+    <!-- to enable new content schema, this needs to be false -->
+    <UseLegacyXmlSchema>false</UseLegacyXmlSchema>
+
+    <!-- Whether to force safe aliases (no spaces, no special characters) at businesslogic level on contenttypes and propertytypes -->
+    <!-- HIGHLY recommend to keep this to true to ensure valid and beautiful XML Schemas -->
+    <ForceSafeAliases>true</ForceSafeAliases>
 
     <!-- Enable / disable xml content cache -->
     <XmlCacheEnabled>True</XmlCacheEnabled>
@@ -61,7 +64,7 @@
     <ContinouslyUpdateXmlDiskCache>True</ContinouslyUpdateXmlDiskCache>
 
     <!-- Update in-memory cache if xml file is changed -->
-    <XmlContentCheckForDiskChanges>True</XmlContentCheckForDiskChanges>
+    <XmlContentCheckForDiskChanges>False</XmlContentCheckForDiskChanges>
 
     <!-- Show the /config/splashes/booting.aspx page while initializing content -->
     <EnableSplashWhileLoading>False</EnableSplashWhileLoading>
@@ -69,24 +72,27 @@
     <!-- Show property descriptions in editing view "icon|text|none" -->
     <PropertyContextHelpOption>text</PropertyContextHelpOption>
 
-    <UseLegacyXmlSchema>false</UseLegacyXmlSchema>
-
-    <cloneXmlContent>true</cloneXmlContent>
-
-    <ForceSafeAliases>true</ForceSafeAliases>
+    <!-- Enables the experimental canvas (live) editing on the frontend of the website -->
+    <EnableCanvasEditing>false</EnableCanvasEditing>
 
+    <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
     <PreviewBadge><![CDATA[<a id="umbracoPreviewBadge" style="position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;" href="{0}/endPreview.aspx?redir={2}"><span style="display:none;">In Preview Mode - click to end</span></a>]]></PreviewBadge>
 
     <!-- Cache cycle of Media and Member data fetched from the umbraco.library methods -->
     <!-- In seconds. 0 will disable cache -->
     <UmbracoLibraryCacheDuration>1800</UmbracoLibraryCacheDuration>
 
+    <!-- Url Resolving ensures that all links works if you run Umbraco in virtual directories -->
+    <!-- Setting this to true can increase render time for pages with a large number of links -->
+    <!-- If running Umbraco in virtual directory this *must* be set to true! -->
+    <ResolveUrlsFromTextString>false</ResolveUrlsFromTextString>
+
     <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
-             - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
-             - silent - Silently suppress the error and do not render the offending macro.
-             - throw  - Throw an exception which can be caught by the global error handler defined in Application_OnError. If no such
-                        error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
-             Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
+         - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
+         - silent - Silently suppress the error and do not render the offending macro.
+         - throw  - Throw an exception which can be caught by the global error handler defined in Application_OnError. If no such
+                    error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page.
+         Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. -->
     <MacroErrors>throw</MacroErrors>
 
     <!-- How Umbraco should show icons in the document type editor. Historically, the list has included all the files in
@@ -101,8 +107,8 @@
              - HideFileDuplicates   - If a file exists on disk with the same name as one in the sprite
                                       then the file in the sprite overrules the one on disk, the file
                                       on disk will be shown (recommended) -->
-    <DocumentTypeIconList>HideFileDuplicates</DocumentTypeIconList>
-    
+    <DocumentTypeIconList>ShowDuplicates</DocumentTypeIconList>
+
     <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
     <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd</disallowedUploadFiles>
 
@@ -122,14 +128,18 @@
     <!-- this will ensure that urls are unique when running with multiple root nodes -->
     <useDomainPrefixes>false</useDomainPrefixes>
     <!-- this will add a trailing slash (/) to urls when in directory url mode -->
-    <addTrailingSlash>false</addTrailingSlash>
+    <addTrailingSlash>true</addTrailingSlash>
     <urlReplacing removeDoubleDashes="true">
       <char org=" ">-</char>
       <char org="&quot;"></char>
+      <char org="'"></char>
+      <char org="%"></char>
       <char org="."></char>
       <char org=";"></char>
       <char org="/"></char>
+      <char org="\"></char>
       <char org=":"></char>
+      <char org="#"></char>
       <char org="+">plus</char>
       <char org="*">star</char>
       <char org="&amp;"></char>
@@ -137,15 +147,29 @@
       <char org="æ">ae</char>
       <char org="ø">oe</char>
       <char org="å">aa</char>
+      <char org="ä">ae</char>
+      <char org="ö">oe</char>
+      <char org="ü">ue</char>
+      <char org="ß">ss</char>
+      <char org="Ä">ae</char>
+      <char org="Ö">oe</char>
+      <char org="|">-</char>
+      <char org="&lt;"></char>
+      <char org="&gt;"></char>
     </urlReplacing>
   </requestHandler>
 
   <templates>
+    <!-- If you want to switch to Mvc then do NOT change useAspNetMasterPages to false -->
+    <!-- This (old!) setting is still used to control how macros are inserted into your pages -->
     <useAspNetMasterPages>true</useAspNetMasterPages>
-    <enableSkinSupport>true</enableSkinSupport>
+
+    <!-- To switch the default rendering engine to MVC, change this value from WebForms to Mvc -->
+    <!-- Do not set useAspNetMasterPages to false, it is not relevant to MVC usage -->
     <defaultRenderingEngine>Mvc</defaultRenderingEngine>
   </templates>
 
+
   <!-- this is used by Umbraco to determine if there's valid classes in the /App_Code folder to be used for Rest/XSLT extensions -->
   <developer>
     <appCodeFileExtensions>
@@ -154,6 +178,29 @@
     </appCodeFileExtensions>
   </developer>
 
+  <scripting>
+    <razor>
+      <!-- razor DynamicNode typecasting detects XML and returns DynamicXml - Root elements that won't convert to DynamicXml -->
+      <notDynamicXmlDocumentElements>
+        <element>p</element>
+        <element>div</element>
+        <element>ul</element>
+        <element>span</element>
+      </notDynamicXmlDocumentElements>
+      <dataTypeModelStaticMappings>
+        <!--
+            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping documentTypeAlias="textPage" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" documentTypeAlias="textPage" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" documentTypeAlias="textPage">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping dataTypeGuid="00000000-0000-0000-0000-000000000000" nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            <mapping nodeTypeAlias="propertyAlias">Fully.Qualified.Type.Name.For.ModelBinder,Assembly.Name.Excluding.Dot.Dll</mapping>
+            -->
+      </dataTypeModelStaticMappings>
+    </razor>
+  </scripting>
+
+  <!-- This moves the asp.net viewstate data to the end of the html document instead of having it in the beginning-->
   <viewstateMoverModule enable="false" />
 
   <!-- 
@@ -166,9 +213,9 @@
     <disabledLogTypes>
       <!-- <logTypeAlias>[alias-of-log-type-in-lowercase]</logTypeAlias> -->
     </disabledLogTypes>
-    <autoCleanLogs>falses</autoCleanLogs>
-    <cleaningMiliseconds>86400</cleaningMiliseconds>
-    <maxLogAge>1440</maxLogAge>
+    <!-- You can add your own logging tool by implementing the umbraco.BusinessLogic.Interfaces.ILog interface and add the reference here -->
+    <!-- The external logger can also act as the audit trail storage by setting the logAuditTrail attribute to true -->
+    <!--<externalLogger assembly="~/bin/assemblyFileName.dll" type="fully.qualified.namespace.and.type" logAuditTrail="false" /> -->
   </logging>
 
   <scheduledTasks>
@@ -183,22 +230,25 @@
     <user>0</user>
     <servers>
       <!-- add ip number or hostname, make sure that it can be reached from all servers -->
-        <!-- you can also add optional attributes to force a protocol or port number (see #2) -->
+      <!-- you can also add optional attributes to force a protocol or port number (see #2) -->
+      <!-- <server>127.0.0.1</server>-->
+      <!-- <server forceProtocol="http|https" forcePortnumber="80|443">127.0.0.1</server>-->
         <server>umb1.dev</server>
-        <server forcePortnumber="6200">localhost</server>
+        <server forcePortnumber="6200">localhost</server>      
     </servers>
   </distributedCall>
 
   <!-- configuration for webservices -->
   <!-- webservices are disabled by default. Set enable="True" to enable them -->
-  <webservices enabled="True">
+  <webservices enabled="False">
     <!-- You must set user-rights for each service. Enter the usernames seperated with comma (,) -->
-    <documentServiceUsers>umbraco</documentServiceUsers>
-    <fileServiceUsers>umbraco</fileServiceUsers>
+    <documentServiceUsers>your-username</documentServiceUsers>
+    <fileServiceUsers>your-username</fileServiceUsers>
+    <stylesheetServiceUsers>your-username</stylesheetServiceUsers>
+    <memberServiceUsers>your-username</memberServiceUsers>
+    <templateServiceUsers>your-username</templateServiceUsers>
+    <!-- type of files (extensions) that are allowed for the file service -->
     <fileServiceFolders>css,xslt</fileServiceFolders>
-    <stylesheetServiceUsers>umbraco</stylesheetServiceUsers>
-    <memberServiceUsers>umbraco</memberServiceUsers>
-    <templateServiceUsers>umbraco</templateServiceUsers>
   </webservices>
 
   <!-- Configuration for repositories -->
diff --git a/src/Umbraco.Web.UI/config/xsltExtensions.config b/src/Umbraco.Web.UI/config/xsltExtensions.config
index 91012fe61f..dfd43863e0 100644
--- a/src/Umbraco.Web.UI/config/xsltExtensions.config
+++ b/src/Umbraco.Web.UI/config/xsltExtensions.config
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <XsltExtensions>
-  <!-- This file is used to register 3rd party XSLT extensions (methods you can execute from XSLT, like umbraco.library:NiceUrl) -->
-  <!-- <ext assembly="assemblyName" type="assemblyName.namespace.type" alias="custom" /> -->
-  <ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltCommon" alias="Exslt.ExsltCommon" />
-  <ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltDatesAndTimes" alias="Exslt.ExsltDatesAndTimes" />
-  <ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltMath" alias="Exslt.ExsltMath" />
-  <ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltRegularExpressions" alias="Exslt.ExsltRegularExpressions" />
-  <ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltStrings" alias="Exslt.ExsltStrings" />
-  <ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltSets" alias="Exslt.ExsltSets" />
-  <ext assembly="UmbracoExamine" type="UmbracoExamine.XsltExtensions" alias="Examine" />
-</XsltExtensions>
\ No newline at end of file
+	<!-- This file is used to register 3rd party XSLT extensions (methods you can execute from XSLT, like umbraco.library:NiceUrl) -->
+	<!-- <ext assembly="assemblyName" type="assemblyName.namespace.type" alias="custom" /> -->
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltCommon" alias="Exslt.ExsltCommon" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltDatesAndTimes" alias="Exslt.ExsltDatesAndTimes" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltMath" alias="Exslt.ExsltMath" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltRegularExpressions" alias="Exslt.ExsltRegularExpressions" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltStrings" alias="Exslt.ExsltStrings" />
+	<ext assembly="umbraco" type="umbraco.presentation.xslt.Exslt.ExsltSets" alias="Exslt.ExsltSets" />
+	<ext assembly="UmbracoExamine" type="UmbracoExamine.XsltExtensions" alias="Examine" />
+</XsltExtensions>