diff --git a/src/umbraco.presentation/umbraco.presentation.csproj b/src/umbraco.presentation/umbraco.presentation.csproj
index 51d97d7d21..9c41633de2 100644
--- a/src/umbraco.presentation/umbraco.presentation.csproj
+++ b/src/umbraco.presentation/umbraco.presentation.csproj
@@ -1738,9 +1738,15 @@
     <Content Include="umbraco\Trees\RelationTypes\RelationTypesWebService.asmx" />
     <Content Include="umbraco\Trees\RelationTypes\TreeMenu\ActionDeleteRelationType.js" />
     <Content Include="umbraco\Trees\RelationTypes\TreeMenu\ActionNewRelationType.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\autolink\editor_plugin_src.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\example_dependency\editor_plugin_src.js" />
+    <Content Include="umbraco_client\tinymce3\plugins\lists\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\media\moxieplayer.swf" />
+    <Content Include="umbraco_client\tinymce3\plugins\visualblocks\css\visualblocks.css" />
+    <Content Include="umbraco_client\tinymce3\plugins\visualblocks\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\img\flash.gif" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\img\iframe.gif" />
+    <Content Include="umbraco_client\tinymce3\themes\umbraco\img\pagebreak.gif" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\img\quicktime.gif" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\img\realmedia.gif" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\img\shockwave.gif" />
@@ -1768,7 +1774,6 @@
     <Content Include="umbraco_client\Installer\images\bg-inp-big.png" />
     <Content Include="umbraco_client\modal\jquery.simplemodal.1.4.1.custom.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advhr\css\advhr.css" />
-    <Content Include="umbraco_client\tinymce3\plugins\advhr\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advhr\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advhr\js\rule.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advhr\langs\da_dlg.js" />
@@ -1784,20 +1789,13 @@
     <Content Include="umbraco_client\tinymce3\plugins\advhr\rule.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\advimage\langs\ko_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlink\langs\ko_dlg.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\advlist\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlist\editor_plugin_src.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\autoresize\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\autoresize\editor_plugin_src.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\autosave\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\autosave\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\autosave\langs\en.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\bbcode\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\bbcode\editor_plugin_src.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\contextmenu\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\contextmenu\editor_plugin_src.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\directionality\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\directionality\editor_plugin_src.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\emotions\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\emotions\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\emotions\emotions.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\emotions\img\smiley-cool.gif" />
@@ -1828,14 +1826,12 @@
     <Content Include="umbraco_client\tinymce3\plugins\emotions\langs\no_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\emotions\langs\sv_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\example\dialog.htm" />
-    <Content Include="umbraco_client\tinymce3\plugins\example\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\example\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\example\img\example.gif" />
     <Content Include="umbraco_client\tinymce3\plugins\example\js\dialog.js" />
     <Content Include="umbraco_client\tinymce3\plugins\example\langs\en.js" />
     <Content Include="umbraco_client\tinymce3\plugins\example\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\fullpage\css\fullpage.css" />
-    <Content Include="umbraco_client\tinymce3\plugins\fullpage\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\fullpage\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\fullpage\fullpage.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\fullpage\js\fullpage.js" />
@@ -1849,12 +1845,9 @@
     <Content Include="umbraco_client\tinymce3\plugins\fullpage\langs\nl_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\fullpage\langs\no_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\fullpage\langs\sv_dlg.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\fullscreen\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\fullscreen\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\fullscreen\fullscreen.htm" />
-    <Content Include="umbraco_client\tinymce3\plugins\iespell\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\iespell\editor_plugin_src.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\inlinepopups\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\inlinepopups\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\inlinepopups\skins\clearlooks2\img\alert.gif" />
     <Content Include="umbraco_client\tinymce3\plugins\inlinepopups\skins\clearlooks2\img\button.gif" />
@@ -1874,15 +1867,11 @@
     <Content Include="umbraco_client\tinymce3\plugins\inlinepopups\skins\umbraco\img\vertical.gif" />
     <Content Include="umbraco_client\tinymce3\plugins\inlinepopups\skins\umbraco\window.css" />
     <Content Include="umbraco_client\tinymce3\plugins\inlinepopups\template.htm" />
-    <Content Include="umbraco_client\tinymce3\plugins\insertdatetime\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\insertdatetime\editor_plugin_src.js" />
     <Content Include="umbraco_client\Jeditable\jquery.jeditable.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\layer\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\layer\editor_plugin_src.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\legacyoutput\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\legacyoutput\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\media\css\media.css" />
-    <Content Include="umbraco_client\tinymce3\plugins\media\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\media\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\media\js\embed.js" />
     <Content Include="umbraco_client\tinymce3\plugins\media\js\media.js" />
@@ -1897,13 +1886,9 @@
     <Content Include="umbraco_client\tinymce3\plugins\media\langs\no_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\media\langs\sv_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\media\media.htm" />
-    <Content Include="umbraco_client\tinymce3\plugins\nonbreaking\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\nonbreaking\editor_plugin_src.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\noneditable\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\noneditable\editor_plugin_src.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\pagebreak\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\pagebreak\editor_plugin_src.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\paste\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\paste\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\paste\js\pastetext.js" />
     <Content Include="umbraco_client\tinymce3\plugins\paste\js\pasteword.js" />
@@ -1919,17 +1904,13 @@
     <Content Include="umbraco_client\tinymce3\plugins\paste\langs\sv_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\paste\pastetext.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\paste\pasteword.htm" />
-    <Content Include="umbraco_client\tinymce3\plugins\preview\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\preview\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\preview\example.html" />
     <Content Include="umbraco_client\tinymce3\plugins\preview\jscripts\embed.js" />
     <Content Include="umbraco_client\tinymce3\plugins\preview\preview.html" />
-    <Content Include="umbraco_client\tinymce3\plugins\print\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\print\editor_plugin_src.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\save\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\save\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\searchreplace\css\searchreplace.css" />
-    <Content Include="umbraco_client\tinymce3\plugins\searchreplace\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\searchreplace\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\searchreplace\js\searchreplace.js" />
     <Content Include="umbraco_client\tinymce3\plugins\searchreplace\langs\da_dlg.js" />
@@ -1944,7 +1925,6 @@
     <Content Include="umbraco_client\tinymce3\plugins\searchreplace\langs\sv_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\searchreplace\searchreplace.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\style\css\props.css" />
-    <Content Include="umbraco_client\tinymce3\plugins\style\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\style\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\style\js\props.js" />
     <Content Include="umbraco_client\tinymce3\plugins\style\langs\da_dlg.js" />
@@ -1958,13 +1938,11 @@
     <Content Include="umbraco_client\tinymce3\plugins\style\langs\no_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\style\langs\sv_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\style\props.htm" />
-    <Content Include="umbraco_client\tinymce3\plugins\tabfocus\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\tabfocus\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\table\cell.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\table\css\cell.css" />
     <Content Include="umbraco_client\tinymce3\plugins\table\css\row.css" />
     <Content Include="umbraco_client\tinymce3\plugins\table\css\table.css" />
-    <Content Include="umbraco_client\tinymce3\plugins\table\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\table\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\table\js\cell.js" />
     <Content Include="umbraco_client\tinymce3\plugins\table\js\merge_cells.js" />
@@ -1985,7 +1963,6 @@
     <Content Include="umbraco_client\tinymce3\plugins\table\table.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\template\blank.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\template\css\template.css" />
-    <Content Include="umbraco_client\tinymce3\plugins\template\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\template\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\template\js\template.js" />
     <Content Include="umbraco_client\tinymce3\plugins\template\langs\da_dlg.js" />
@@ -2000,9 +1977,7 @@
     <Content Include="umbraco_client\tinymce3\plugins\template\langs\sv_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\template\template.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracoshortcut\editor_plugin_src.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\visualchars\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\visualchars\editor_plugin_src.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\wordcount\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\wordcount\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\abbr.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\acronym.htm" />
@@ -2011,7 +1986,6 @@
     <Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\css\attributes.css" />
     <Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\css\popup.css" />
     <Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\del.htm" />
-    <Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\ins.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\xhtmlxtras\js\abbr.js" />
@@ -2213,6 +2187,11 @@
     <Content Include="umbraco\LiveEditing\Modules\SkinModule\js\initcolorpicker.js" />
     <Content Include="umbraco_client\MacroContainer\macroContainer.css" />
     <Content Include="umbraco_client\mousewheel\jquery.mousewheel.js" />
+    <Content Include="umbraco_client\tinymce3\themes\umbraco\langs\ko.js" />
+    <Content Include="umbraco_client\tinymce3\themes\umbraco\langs\ko_dlg.js" />
+    <Content Include="umbraco_client\tinymce3\themes\umbraco\shortcuts.htm" />
+    <Content Include="umbraco_client\ui\jquery.alphanumeric.js" />
+    <Content Include="umbraco_client\ui\jquery.tooltip.min.js" />
     <Content Include="umbraco_client\ui\ui-lightness\images\ui-bg_diagonals-thick_18_b81900_40x40.png" />
     <Content Include="umbraco_client\ui\ui-lightness\images\ui-bg_diagonals-thick_20_666666_40x40.png" />
     <Content Include="umbraco_client\ui\ui-lightness\images\ui-bg_flat_10_000000_40x100.png" />
@@ -2227,7 +2206,6 @@
     <Content Include="umbraco_client\ui\ui-lightness\images\ui-icons_ef8c08_256x240.png" />
     <Content Include="umbraco_client\ui\ui-lightness\images\ui-icons_ffd27a_256x240.png" />
     <Content Include="umbraco_client\ui\ui-lightness\images\ui-icons_ffffff_256x240.png" />
-    <Content Include="umbraco_client\ui\ui-lightness\jquery-ui-1.8.4.custom.css" />
     <Content Include="umbraco\endPreview.aspx" />
     <Content Include="umbraco\js\UmbracoCasingRules.aspx" />
     <Content Include="umbraco_client\Application\HistoryManager.js" />
@@ -2430,30 +2408,6 @@
     <Content Include="umbraco_client\tinymce3\plugins\advlink\langs\no_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlink\langs\sv_dlg.js" />
     <Content Include="umbraco_client\tinymce3\umbraco-implementation-notes.txt" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\da.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\da_dlg.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\de.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\de_dlg.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\es.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\es_dlg.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\fr.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\fr_dlg.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\it.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\it_dlg.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\nl.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\nl_dlg.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\no.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\no_dlg.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\sv.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\sv_dlg.js" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\langs\da.js" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\langs\de.js" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\langs\es.js" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\langs\fr.js" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\langs\it.js" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\langs\nl.js" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\langs\no.js" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\langs\sv.js" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\langs\da.js" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\langs\da_dlg.js" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\langs\de.js" />
@@ -2635,6 +2589,7 @@
     <Content Include="config\scripting.config" />
     <Content Include="config\Skinning.config" />
     <Content Include="config\feedProxy.config" />
+    <Content Include="umbraco_client\ui\ui-lightness\jquery-ui.custom.css" />
     <Content Include="web.Template.ShandemVaio.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
       <SubType>Designer</SubType>
@@ -3062,20 +3017,17 @@
     <Content Include="umbraco_client\tinymce3\langs\en.js" />
     <Content Include="umbraco_client\tinymce3\license.txt" />
     <Content Include="umbraco_client\tinymce3\plugins\advimage\css\advimage.css" />
-    <Content Include="umbraco_client\tinymce3\plugins\advimage\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advimage\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advimage\image.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\advimage\img\sample.gif" />
     <Content Include="umbraco_client\tinymce3\plugins\advimage\js\image.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advimage\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlink\css\advlink.css" />
-    <Content Include="umbraco_client\tinymce3\plugins\advlink\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlink\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlink\js\advlink.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlink\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\advlink\link.htm" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracocss\dialog.htm" />
-    <Content Include="umbraco_client\tinymce3\plugins\umbracocss\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracocss\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracocss\img\example.gif" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracocss\js\dialog.js" />
@@ -3085,70 +3037,19 @@
     <Content Include="umbraco_client\tinymce3\plugins\umbracoimg\js\image.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracoimg\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\dialog.htm" />
-    <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\img\insMacro.gif" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\js\dialog.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\langs\en.js" />
     <Content Include="umbraco_client\tinymce3\plugins\umbracomacro\langs\en_dlg.js" />
-    <Content Include="umbraco_client\tinymce3\plugins\safari\blank.htm" />
-    <Content Include="umbraco_client\tinymce3\plugins\safari\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\safari\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\spellchecker\css\content.css" />
-    <Content Include="umbraco_client\tinymce3\plugins\spellchecker\editor_plugin.js" />
     <Content Include="umbraco_client\tinymce3\plugins\spellchecker\editor_plugin_src.js" />
     <Content Include="umbraco_client\tinymce3\plugins\spellchecker\img\wline.gif" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\about.htm" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\anchor.htm" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\charmap.htm" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\color_picker.htm" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\editor_template.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\editor_template_src.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\image.htm" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\img\colorpicker.jpg" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\img\icons.gif" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\js\about.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\js\anchor.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\js\charmap.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\js\color_picker.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\js\image.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\js\link.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\js\source_editor.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\en.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\langs\en_dlg.js" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\link.htm" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\default\content.css" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\default\dialog.css" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\default\img\buttons.png" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\default\img\items.gif" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\default\img\menu_arrow.gif" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\default\img\menu_check.gif" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\default\img\progress.gif" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\default\img\tabs.gif" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\default\ui.css" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\o2k7\content.css" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\o2k7\dialog.css" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\o2k7\img\button_bg.png" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\o2k7\img\button_bg_black.png" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\o2k7\img\button_bg_silver.png" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\o2k7\ui.css" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\o2k7\ui_black.css" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\skins\o2k7\ui_silver.css" />
-    <Content Include="umbraco_client\tinymce3\themes\advanced\source_editor.htm" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\editor_template.js" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\editor_template_src.js" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\img\icons.gif" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\langs\en.js" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\skins\default\content.css" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\skins\default\ui.css" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\skins\o2k7\content.css" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\skins\o2k7\img\button_bg.png" />
-    <Content Include="umbraco_client\tinymce3\themes\simple\skins\o2k7\ui.css" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\about.htm" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\anchor.htm" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\charmap.htm" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\color_picker.htm" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\editor_template.js" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\editor_template_src.js" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\image.htm" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\img\colorpicker.jpg" />
@@ -3163,23 +3064,6 @@
     <Content Include="umbraco_client\tinymce3\themes\umbraco\langs\en.js" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\langs\en_dlg.js" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\link.htm" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\default\content.css" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\default\dialog.css" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\default\img\buttons.png" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\default\img\items.gif" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\default\img\menu_arrow.gif" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\default\img\menu_check.gif" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\default\img\progress.gif" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\default\img\tabs.gif" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\default\ui.css" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\o2k7\content.css" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\o2k7\dialog.css" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\o2k7\img\button_bg.png" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\o2k7\img\button_bg_black.png" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\o2k7\img\button_bg_silver.png" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\o2k7\ui.css" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\o2k7\ui_black.css" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\o2k7\ui_silver.css" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\umbraco\content.css" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\umbraco\dialog.css" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\umbraco\img\buttons.png" />
@@ -3189,9 +3073,7 @@
     <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\umbraco\img\progress.gif" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\umbraco\img\tabs.gif" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\umbraco\ui.css" />
-    <Content Include="umbraco_client\tinymce3\themes\umbraco\skins\umbraco\_ui.css" />
     <Content Include="umbraco_client\tinymce3\themes\umbraco\source_editor.htm" />
-    <Content Include="umbraco_client\tinymce3\tiny_mce.js" />
     <Content Include="umbraco_client\tinymce3\tiny_mce_popup.js" />
     <Content Include="umbraco_client\tinymce3\tiny_mce_src.js" />
     <Content Include="umbraco_client\tinymce3\utils\editable_selects.js" />
@@ -3289,55 +3171,55 @@
     <Content Include="web.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="web.Template.User-VAIO.Debug.config" >
+    <Content Include="web.Template.User-VAIO.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.UMBRACOTOSH.Debug.config" >
+    <Content Include="web.Template.UMBRACOTOSH.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.UMBRACOHUMMER.Debug.config" >
+    <Content Include="web.Template.UMBRACOHUMMER.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.UMBRACOELISE.Debug.config" >
+    <Content Include="web.Template.UMBRACOELISE.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.ssaolap01.Debug.config" >
+    <Content Include="web.Template.ssaolap01.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.ssaodsk01.Debug.config" >
+    <Content Include="web.Template.ssaodsk01.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.SONIC.Debug.config" >
+    <Content Include="web.Template.SONIC.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.PETER-PC.Debug.config" >
+    <Content Include="web.Template.PETER-PC.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.PETER-MAC.Debug.config" >
+    <Content Include="web.Template.PETER-MAC.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.slacebox.Debug.config" >
+    <Content Include="web.Template.slacebox.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.NIBBLE-LAPTOP.Debug.config" >
+    <Content Include="web.Template.NIBBLE-LAPTOP.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.INDIGO64SSD.Debug.config" >
+    <Content Include="web.Template.INDIGO64SSD.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.INDIGO64.Debug.config" >
+    <Content Include="web.Template.INDIGO64.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.EQUIUM-SAT1.Debug.config" >
+    <Content Include="web.Template.EQUIUM-SAT1.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.Blueberry.Debug.config" >
+    <Content Include="web.Template.Blueberry.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.APOWELL-BC-WIN7.Debug.config" >
+    <Content Include="web.Template.APOWELL-BC-WIN7.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
-    <Content Include="web.Template.13INCHER.Debug.config" >
+    <Content Include="web.Template.13INCHER.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
     </Content>
   </ItemGroup>
diff --git a/src/umbraco.presentation/umbraco_client/tinymce3/plugins/fullscreen/fullscreen.htm b/src/umbraco.presentation/umbraco_client/tinymce3/plugins/fullscreen/fullscreen.htm
index ffe528e417..73eca25531 100644
--- a/src/umbraco.presentation/umbraco_client/tinymce3/plugins/fullscreen/fullscreen.htm
+++ b/src/umbraco.presentation/umbraco_client/tinymce3/plugins/fullscreen/fullscreen.htm
@@ -3,7 +3,7 @@
 <head>
 	<title></title>
 	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-	<script type="text/javascript" src="../../tiny_mce.js"></script>
+	<script type="text/javascript" src="../../tiny_mce_src.js"></script>
 	<script type="text/javascript">
 		function patchCallback(settings, key) {
 			if (settings[key])
diff --git a/src/umbraco.presentation/web.config b/src/umbraco.presentation/web.config
index 7443750d45..d6b9b88172 100644
--- a/src/umbraco.presentation/web.config
+++ b/src/umbraco.presentation/web.config
@@ -44,12 +44,12 @@
   <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
 
   <appSettings>
-    <add key="umbracoDbDSN" value="server=.\sqlexpress;database=v4;user id=sa;password=test;Application Name=Umbraco41"/>
-    <add key="umbracoConfigurationStatus" value="4.8.0"/>
+    <add key="umbracoDbDSN" value="server=.\SQLEXPRESS;database=umbraco;user id=web;password=farmer" />
+    <add key="umbracoConfigurationStatus" value="4.6.0.Alpha" />
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
     <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
-    <add key="umbracoContentXML" value="~/App_Data/umbraco.config"/>
-    <add key="umbracoStorageDirectory" value="~/App_Data"/>
+    <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
+    <add key="umbracoStorageDirectory" value="~/App_Data" />
     <add key="umbracoPath" value="~/umbraco" />
     <add key="umbracoEnableStat" value="false" />
     <add key="umbracoHideTopLevelNodeFromPath" value="true" />