diff --git a/src/Umbraco.Web.UI/config/tinyMceConfig.Release.config b/src/Umbraco.Web.UI/config/tinyMceConfig.Release.config
index a0135e3d60..7fad4e496c 100644
--- a/src/Umbraco.Web.UI/config/tinyMceConfig.Release.config
+++ b/src/Umbraco.Web.UI/config/tinyMceConfig.Release.config
@@ -2,209 +2,212 @@
 <!-- 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>styleselect</umbracoAlias>
-      <icon>images/editor/showStyles.png</icon>
-      <tinyMceCommand value="" userInterface="false" frontendCommand="styleselect">styleselect</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>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>styleselect</umbracoAlias>
+          <icon>images/editor/showStyles.png</icon>
+          <tinyMceCommand value="" userInterface="false" frontendCommand="styleselect">styleselect</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="alignleft">justifyleft</tinyMceCommand>
+            <priority>31</priority>
+        </command>
+        <command>
+            <umbracoAlias>JustifyCenter</umbracoAlias>
+            <icon>images/editor/justifycenter.gif</icon>
+            <tinyMceCommand value="" userInterface="false" frontendCommand="aligncenter">justifycenter</tinyMceCommand>
+            <priority>32</priority>
+        </command>
+        <command>
+            <umbracoAlias>JustifyRight</umbracoAlias>
+            <icon>images/editor/justifyright.gif</icon>
+            <tinyMceCommand value="" userInterface="false" frontendCommand="alignright">justifyright</tinyMceCommand>
+            <priority>33</priority>
+        </command>
+        <command>
+            <umbracoAlias>JustifyFull</umbracoAlias>
+            <icon>images/editor/justifyfull.gif</icon>
+            <tinyMceCommand value="" userInterface="false" frontendCommand="alignjustify">alignjustify</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>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>
-  </commands>
-  <plugins>
-    <plugin loadOnFrontend="true">code</plugin>
-    <plugin loadOnFrontend="true">paste</plugin>
-    <plugin loadOnFrontend="true">umbracolink</plugin>
-  </plugins>
-  <validElements>
-    <![CDATA[+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|
+        <command>
+            <umbracoAlias>mceImage</umbracoAlias>
+            <icon>images/editor/image.gif</icon>
+            <tinyMceCommand value="" userInterface="true" frontendCommand="umbmediapicker">image</tinyMceCommand>
+            <priority>61</priority>
+        </command>
+
+        <command>
+            <umbracoAlias>umbracomacro</umbracoAlias>
+            <icon>images/editor/insMacro.gif</icon>
+            <tinyMceCommand value="" userInterface="true" frontendCommand="umbmacro">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="umbembeddialog">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="subscript">subscript</tinyMceCommand>
+            <priority>72</priority>
+        </command>
+
+        <command>
+            <umbracoAlias>superscript</umbracoAlias>
+            <icon>images/editor/sup.gif</icon>
+            <tinyMceCommand value="" userInterface="false" frontendCommand="superscript">superscript</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>
+       
+    </commands>
+    <plugins>
+        <plugin loadOnFrontend="true">code</plugin>  
+        <plugin loadOnFrontend="true">paste</plugin>
+        <plugin loadOnFrontend="true">umbracolink</plugin>
+        <plugin loadOnFrontend="true">anchor</plugin>
+        <plugin loadOnFrontend="true">charmap</plugin>
+        <plugin loadOnFrontend="true">table</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],
@@ -216,13 +219,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/tinyMceConfig.config b/src/Umbraco.Web.UI/config/tinyMceConfig.config
index 209d12ce4a..7fad4e496c 100644
--- a/src/Umbraco.Web.UI/config/tinyMceConfig.config
+++ b/src/Umbraco.Web.UI/config/tinyMceConfig.config
@@ -41,14 +41,6 @@
             <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>styleselect</umbracoAlias>
           <icon>images/editor/showStyles.png</icon>
@@ -101,7 +93,7 @@
         <command>
             <umbracoAlias>JustifyFull</umbracoAlias>
             <icon>images/editor/justifyfull.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="alignfull">justifyfull</tinyMceCommand>
+            <tinyMceCommand value="" userInterface="false" frontendCommand="alignjustify">alignjustify</tinyMceCommand>
             <priority>34</priority>
         </command>
 
@@ -149,12 +141,12 @@
             <priority>53</priority>
         </command>
 
-      <command>
-        <umbracoAlias>mceImage</umbracoAlias>
-        <icon>images/editor/image.gif</icon>
-        <tinyMceCommand value="" userInterface="true" frontendCommand="umbmediapicker">image</tinyMceCommand>
-        <priority>61</priority>
-      </command>
+        <command>
+            <umbracoAlias>mceImage</umbracoAlias>
+            <icon>images/editor/image.gif</icon>
+            <tinyMceCommand value="" userInterface="true" frontendCommand="umbmediapicker">image</tinyMceCommand>
+            <priority>61</priority>
+        </command>
 
         <command>
             <umbracoAlias>umbracomacro</umbracoAlias>
@@ -187,14 +179,14 @@
         <command>
             <umbracoAlias>subscript</umbracoAlias>
             <icon>images/editor/sub.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="sub">sub</tinyMceCommand>
+            <tinyMceCommand value="" userInterface="false" frontendCommand="subscript">subscript</tinyMceCommand>
             <priority>72</priority>
         </command>
 
         <command>
             <umbracoAlias>superscript</umbracoAlias>
             <icon>images/editor/sup.gif</icon>
-            <tinyMceCommand value="" userInterface="false" frontendCommand="sup">sup</tinyMceCommand>
+            <tinyMceCommand value="" userInterface="false" frontendCommand="superscript">superscript</tinyMceCommand>
             <priority>73</priority>
         </command>
 
@@ -210,6 +202,9 @@
         <plugin loadOnFrontend="true">code</plugin>  
         <plugin loadOnFrontend="true">paste</plugin>
         <plugin loadOnFrontend="true">umbracolink</plugin>
+        <plugin loadOnFrontend="true">anchor</plugin>
+        <plugin loadOnFrontend="true">charmap</plugin>
+        <plugin loadOnFrontend="true">table</plugin>
     </plugins>
     <validElements>
       <![CDATA[+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|