From fc2eaecb33a7dcbaf734671b1c14f3fd5d32f2eb Mon Sep 17 00:00:00 2001
From: starfighter83 <unknown@kiln.example.com>
Date: Mon, 14 Mar 2011 09:46:21 -0100
Subject: [PATCH] adding files related to tinymce upgrade

---
 .../tinymce3/plugins/advhr/css/advhr.css      |    5 +
 .../tinymce3/plugins/advhr/editor_plugin.js   |    1 +
 .../plugins/advhr/editor_plugin_src.js        |   57 +
 .../tinymce3/plugins/advhr/js/rule.js         |   43 +
 .../tinymce3/plugins/advhr/langs/da_dlg.js    |    5 +
 .../tinymce3/plugins/advhr/langs/de_dlg.js    |    5 +
 .../tinymce3/plugins/advhr/langs/en_dlg.js    |    7 +
 .../tinymce3/plugins/advhr/langs/es_dlg.js    |    5 +
 .../tinymce3/plugins/advhr/langs/fr_dlg.js    |    5 +
 .../tinymce3/plugins/advhr/langs/it_dlg.js    |    5 +
 .../tinymce3/plugins/advhr/langs/nl_dlg.js    |    5 +
 .../tinymce3/plugins/advhr/langs/no_dlg.js    |    5 +
 .../tinymce3/plugins/advhr/langs/sv_dlg.js    |    5 +
 .../tinymce3/plugins/advhr/rule.htm           |   58 +
 .../tinymce3/plugins/advlist/editor_plugin.js |    1 +
 .../plugins/advlist/editor_plugin_src.js      |  154 +++
 .../plugins/autoresize/editor_plugin.js       |    1 +
 .../plugins/autoresize/editor_plugin_src.js   |  119 ++
 .../plugins/autosave/editor_plugin.js         |    1 +
 .../plugins/autosave/editor_plugin_src.js     |  431 ++++++
 .../tinymce3/plugins/autosave/langs/en.js     |    4 +
 .../tinymce3/plugins/bbcode/editor_plugin.js  |    1 +
 .../plugins/bbcode/editor_plugin_src.js       |  120 ++
 .../plugins/contextmenu/editor_plugin.js      |    1 +
 .../plugins/contextmenu/editor_plugin_src.js  |  156 +++
 .../plugins/directionality/editor_plugin.js   |    1 +
 .../directionality/editor_plugin_src.js       |   82 ++
 .../plugins/emotions/editor_plugin.js         |    1 +
 .../plugins/emotions/editor_plugin_src.js     |   43 +
 .../tinymce3/plugins/emotions/emotions.htm    |   41 +
 .../plugins/emotions/img/smiley-cool.gif      |  Bin 0 -> 354 bytes
 .../plugins/emotions/img/smiley-cry.gif       |  Bin 0 -> 329 bytes
 .../emotions/img/smiley-embarassed.gif        |  Bin 0 -> 331 bytes
 .../emotions/img/smiley-foot-in-mouth.gif     |  Bin 0 -> 344 bytes
 .../plugins/emotions/img/smiley-frown.gif     |  Bin 0 -> 340 bytes
 .../plugins/emotions/img/smiley-innocent.gif  |  Bin 0 -> 336 bytes
 .../plugins/emotions/img/smiley-kiss.gif      |  Bin 0 -> 338 bytes
 .../plugins/emotions/img/smiley-laughing.gif  |  Bin 0 -> 344 bytes
 .../emotions/img/smiley-money-mouth.gif       |  Bin 0 -> 321 bytes
 .../plugins/emotions/img/smiley-sealed.gif    |  Bin 0 -> 325 bytes
 .../plugins/emotions/img/smiley-smile.gif     |  Bin 0 -> 345 bytes
 .../plugins/emotions/img/smiley-surprised.gif |  Bin 0 -> 342 bytes
 .../emotions/img/smiley-tongue-out.gif        |  Bin 0 -> 328 bytes
 .../plugins/emotions/img/smiley-undecided.gif |  Bin 0 -> 337 bytes
 .../plugins/emotions/img/smiley-wink.gif      |  Bin 0 -> 351 bytes
 .../plugins/emotions/img/smiley-yell.gif      |  Bin 0 -> 336 bytes
 .../tinymce3/plugins/emotions/js/emotions.js  |   22 +
 .../tinymce3/plugins/emotions/langs/da_dlg.js |   20 +
 .../tinymce3/plugins/emotions/langs/de_dlg.js |   20 +
 .../tinymce3/plugins/emotions/langs/en_dlg.js |   20 +
 .../tinymce3/plugins/emotions/langs/es_dlg.js |   20 +
 .../tinymce3/plugins/emotions/langs/fr_dlg.js |   20 +
 .../tinymce3/plugins/emotions/langs/it_dlg.js |   20 +
 .../tinymce3/plugins/emotions/langs/nl_dlg.js |   20 +
 .../tinymce3/plugins/emotions/langs/no_dlg.js |   20 +
 .../tinymce3/plugins/emotions/langs/sv_dlg.js |   20 +
 .../tinymce3/plugins/example/dialog.htm       |   22 +
 .../tinymce3/plugins/example/editor_plugin.js |    1 +
 .../plugins/example/editor_plugin_src.js      |   84 ++
 .../tinymce3/plugins/example/img/example.gif  |  Bin 0 -> 87 bytes
 .../tinymce3/plugins/example/js/dialog.js     |   19 +
 .../tinymce3/plugins/example/langs/en.js      |    3 +
 .../tinymce3/plugins/example/langs/en_dlg.js  |    3 +
 .../plugins/fullpage/css/fullpage.css         |  182 +++
 .../plugins/fullpage/editor_plugin.js         |    1 +
 .../plugins/fullpage/editor_plugin_src.js     |  166 +++
 .../tinymce3/plugins/fullpage/fullpage.htm    |  571 ++++++++
 .../tinymce3/plugins/fullpage/js/fullpage.js  |  492 +++++++
 .../tinymce3/plugins/fullpage/langs/da_dlg.js |   85 ++
 .../tinymce3/plugins/fullpage/langs/de_dlg.js |   85 ++
 .../tinymce3/plugins/fullpage/langs/en_dlg.js |   85 ++
 .../tinymce3/plugins/fullpage/langs/es_dlg.js |   85 ++
 .../tinymce3/plugins/fullpage/langs/fr_dlg.js |   85 ++
 .../tinymce3/plugins/fullpage/langs/it_dlg.js |   85 ++
 .../tinymce3/plugins/fullpage/langs/nl_dlg.js |   85 ++
 .../tinymce3/plugins/fullpage/langs/no_dlg.js |   85 ++
 .../tinymce3/plugins/fullpage/langs/sv_dlg.js |   85 ++
 .../plugins/fullscreen/editor_plugin.js       |    1 +
 .../plugins/fullscreen/editor_plugin_src.js   |  159 +++
 .../plugins/fullscreen/fullscreen.htm         |  109 ++
 .../tinymce3/plugins/iespell/editor_plugin.js |    1 +
 .../plugins/iespell/editor_plugin_src.js      |   54 +
 .../plugins/inlinepopups/editor_plugin.js     |    1 +
 .../plugins/inlinepopups/editor_plugin_src.js |  696 ++++++++++
 .../skins/clearlooks2/img/alert.gif           |  Bin 0 -> 818 bytes
 .../skins/clearlooks2/img/button.gif          |  Bin 0 -> 280 bytes
 .../skins/clearlooks2/img/buttons.gif         |  Bin 0 -> 1195 bytes
 .../skins/clearlooks2/img/confirm.gif         |  Bin 0 -> 915 bytes
 .../skins/clearlooks2/img/corners.gif         |  Bin 0 -> 911 bytes
 .../skins/clearlooks2/img/horizontal.gif      |  Bin 0 -> 769 bytes
 .../skins/clearlooks2/img/vertical.gif        |  Bin 0 -> 92 bytes
 .../inlinepopups/skins/clearlooks2/window.css |   90 ++
 .../inlinepopups/skins/umbraco/img/alert.gif  |  Bin 0 -> 818 bytes
 .../inlinepopups/skins/umbraco/img/button.gif |  Bin 0 -> 280 bytes
 .../skins/umbraco/img/buttons.gif             |  Bin 0 -> 1195 bytes
 .../inlinepopups/skins/umbraco/img/close.png  |  Bin 0 -> 3728 bytes
 .../skins/umbraco/img/confirm.gif             |  Bin 0 -> 915 bytes
 .../skins/umbraco/img/corners.gif             |  Bin 0 -> 569 bytes
 .../skins/umbraco/img/horizontal.gif          |  Bin 0 -> 436 bytes
 .../skins/umbraco/img/vertical.gif            |  Bin 0 -> 140 bytes
 .../inlinepopups/skins/umbraco/window.css     |   77 ++
 .../plugins/inlinepopups/template.htm         |  387 ++++++
 .../plugins/insertdatetime/editor_plugin.js   |    1 +
 .../insertdatetime/editor_plugin_src.js       |   83 ++
 .../tinymce3/plugins/layer/editor_plugin.js   |    1 +
 .../plugins/layer/editor_plugin_src.js        |  214 +++
 .../plugins/legacyoutput/editor_plugin.js     |    1 +
 .../plugins/legacyoutput/editor_plugin_src.js |  139 ++
 .../tinymce3/plugins/media/css/media.css      |   17 +
 .../tinymce3/plugins/media/editor_plugin.js   |    1 +
 .../plugins/media/editor_plugin_src.js        |  770 +++++++++++
 .../tinymce3/plugins/media/js/embed.js        |   73 +
 .../tinymce3/plugins/media/js/media.js        |  340 +++++
 .../tinymce3/plugins/media/langs/da_dlg.js    |  103 ++
 .../tinymce3/plugins/media/langs/de_dlg.js    |  103 ++
 .../tinymce3/plugins/media/langs/en_dlg.js    |  109 ++
 .../tinymce3/plugins/media/langs/es_dlg.js    |  103 ++
 .../tinymce3/plugins/media/langs/fr_dlg.js    |  103 ++
 .../tinymce3/plugins/media/langs/it_dlg.js    |  103 ++
 .../tinymce3/plugins/media/langs/nl_dlg.js    |  103 ++
 .../tinymce3/plugins/media/langs/no_dlg.js    |  103 ++
 .../tinymce3/plugins/media/langs/sv_dlg.js    |  103 ++
 .../tinymce3/plugins/media/media.htm          |  812 +++++++++++
 .../plugins/nonbreaking/editor_plugin.js      |    1 +
 .../plugins/nonbreaking/editor_plugin_src.js  |   53 +
 .../plugins/noneditable/editor_plugin.js      |    1 +
 .../plugins/noneditable/editor_plugin_src.js  |   90 ++
 .../plugins/pagebreak/editor_plugin.js        |    1 +
 .../plugins/pagebreak/editor_plugin_src.js    |   74 ++
 .../tinymce3/plugins/paste/editor_plugin.js   |    1 +
 .../plugins/paste/editor_plugin_src.js        |  910 +++++++++++++
 .../tinymce3/plugins/paste/js/pastetext.js    |   36 +
 .../tinymce3/plugins/paste/js/pasteword.js    |   51 +
 .../tinymce3/plugins/paste/langs/da_dlg.js    |    5 +
 .../tinymce3/plugins/paste/langs/de_dlg.js    |    5 +
 .../tinymce3/plugins/paste/langs/en_dlg.js    |    5 +
 .../tinymce3/plugins/paste/langs/es_dlg.js    |    5 +
 .../tinymce3/plugins/paste/langs/fr_dlg.js    |    5 +
 .../tinymce3/plugins/paste/langs/it_dlg.js    |    5 +
 .../tinymce3/plugins/paste/langs/nl_dlg.js    |    5 +
 .../tinymce3/plugins/paste/langs/no_dlg.js    |    5 +
 .../tinymce3/plugins/paste/langs/sv_dlg.js    |    5 +
 .../tinymce3/plugins/paste/pastetext.htm      |   27 +
 .../tinymce3/plugins/paste/pasteword.htm      |   21 +
 .../tinymce3/plugins/preview/editor_plugin.js |    1 +
 .../plugins/preview/editor_plugin_src.js      |   53 +
 .../tinymce3/plugins/preview/example.html     |   28 +
 .../plugins/preview/jscripts/embed.js         |   73 +
 .../tinymce3/plugins/preview/preview.html     |   17 +
 .../tinymce3/plugins/print/editor_plugin.js   |    1 +
 .../plugins/print/editor_plugin_src.js        |   34 +
 .../tinymce3/plugins/save/editor_plugin.js    |    1 +
 .../plugins/save/editor_plugin_src.js         |  101 ++
 .../searchreplace/css/searchreplace.css       |    6 +
 .../plugins/searchreplace/editor_plugin.js    |    1 +
 .../searchreplace/editor_plugin_src.js        |   61 +
 .../plugins/searchreplace/js/searchreplace.js |  140 ++
 .../plugins/searchreplace/langs/da_dlg.js     |   16 +
 .../plugins/searchreplace/langs/de_dlg.js     |   16 +
 .../plugins/searchreplace/langs/en_dlg.js     |   16 +
 .../plugins/searchreplace/langs/es_dlg.js     |   16 +
 .../plugins/searchreplace/langs/fr_dlg.js     |   16 +
 .../plugins/searchreplace/langs/it_dlg.js     |   16 +
 .../plugins/searchreplace/langs/nl_dlg.js     |   16 +
 .../plugins/searchreplace/langs/no_dlg.js     |   16 +
 .../plugins/searchreplace/langs/sv_dlg.js     |   16 +
 .../plugins/searchreplace/searchreplace.htm   |  100 ++
 .../tinymce3/plugins/style/css/props.css      |   13 +
 .../tinymce3/plugins/style/editor_plugin.js   |    1 +
 .../plugins/style/editor_plugin_src.js        |   55 +
 .../tinymce3/plugins/style/js/props.js        |  635 +++++++++
 .../tinymce3/plugins/style/langs/da_dlg.js    |   63 +
 .../tinymce3/plugins/style/langs/de_dlg.js    |   63 +
 .../tinymce3/plugins/style/langs/en_dlg.js    |   70 +
 .../tinymce3/plugins/style/langs/es_dlg.js    |   63 +
 .../tinymce3/plugins/style/langs/fr_dlg.js    |   63 +
 .../tinymce3/plugins/style/langs/it_dlg.js    |   63 +
 .../tinymce3/plugins/style/langs/nl_dlg.js    |   63 +
 .../tinymce3/plugins/style/langs/no_dlg.js    |   63 +
 .../tinymce3/plugins/style/langs/sv_dlg.js    |   63 +
 .../tinymce3/plugins/style/props.htm          |  838 ++++++++++++
 .../plugins/tabfocus/editor_plugin.js         |    1 +
 .../plugins/tabfocus/editor_plugin_src.js     |  114 ++
 .../tinymce3/plugins/table/cell.htm           |  178 +++
 .../tinymce3/plugins/table/css/cell.css       |   17 +
 .../tinymce3/plugins/table/css/row.css        |   25 +
 .../tinymce3/plugins/table/css/table.css      |   13 +
 .../tinymce3/plugins/table/editor_plugin.js   |    1 +
 .../plugins/table/editor_plugin_src.js        | 1183 +++++++++++++++++
 .../tinymce3/plugins/table/js/cell.js         |  284 ++++
 .../tinymce3/plugins/table/js/merge_cells.js  |   27 +
 .../tinymce3/plugins/table/js/row.js          |  232 ++++
 .../tinymce3/plugins/table/js/table.js        |  450 +++++++
 .../tinymce3/plugins/table/langs/da_dlg.js    |   74 ++
 .../tinymce3/plugins/table/langs/de_dlg.js    |   74 ++
 .../tinymce3/plugins/table/langs/en_dlg.js    |   74 ++
 .../tinymce3/plugins/table/langs/es_dlg.js    |   74 ++
 .../tinymce3/plugins/table/langs/fr_dlg.js    |   74 ++
 .../tinymce3/plugins/table/langs/it_dlg.js    |   74 ++
 .../tinymce3/plugins/table/langs/nl_dlg.js    |   74 ++
 .../tinymce3/plugins/table/langs/no_dlg.js    |   74 ++
 .../tinymce3/plugins/table/langs/sv_dlg.js    |   73 +
 .../tinymce3/plugins/table/merge_cells.htm    |   32 +
 .../tinymce3/plugins/table/row.htm            |  157 +++
 .../tinymce3/plugins/table/table.htm          |  188 +++
 .../tinymce3/plugins/template/blank.htm       |   12 +
 .../plugins/template/css/template.css         |   23 +
 .../plugins/template/editor_plugin.js         |    1 +
 .../plugins/template/editor_plugin_src.js     |  159 +++
 .../tinymce3/plugins/template/js/template.js  |  106 ++
 .../tinymce3/plugins/template/langs/da_dlg.js |   15 +
 .../tinymce3/plugins/template/langs/de_dlg.js |   15 +
 .../tinymce3/plugins/template/langs/en_dlg.js |   15 +
 .../tinymce3/plugins/template/langs/es_dlg.js |   15 +
 .../tinymce3/plugins/template/langs/fr_dlg.js |   15 +
 .../tinymce3/plugins/template/langs/it_dlg.js |   15 +
 .../tinymce3/plugins/template/langs/nl_dlg.js |   15 +
 .../tinymce3/plugins/template/langs/no_dlg.js |   15 +
 .../tinymce3/plugins/template/langs/sv_dlg.js |   15 +
 .../tinymce3/plugins/template/template.htm    |   31 +
 .../plugins/visualchars/editor_plugin.js      |    1 +
 .../plugins/visualchars/editor_plugin_src.js  |   83 ++
 .../plugins/wordcount/editor_plugin.js        |    1 +
 .../plugins/wordcount/editor_plugin_src.js    |  114 ++
 .../tinymce3/plugins/xhtmlxtras/abbr.htm      |  142 ++
 .../tinymce3/plugins/xhtmlxtras/acronym.htm   |  142 ++
 .../plugins/xhtmlxtras/attributes.htm         |  149 +++
 .../tinymce3/plugins/xhtmlxtras/cite.htm      |  142 ++
 .../plugins/xhtmlxtras/css/attributes.css     |   11 +
 .../tinymce3/plugins/xhtmlxtras/css/popup.css |    9 +
 .../tinymce3/plugins/xhtmlxtras/del.htm       |  162 +++
 .../plugins/xhtmlxtras/editor_plugin.js       |    1 +
 .../plugins/xhtmlxtras/editor_plugin_src.js   |  132 ++
 .../tinymce3/plugins/xhtmlxtras/ins.htm       |  162 +++
 .../tinymce3/plugins/xhtmlxtras/js/abbr.js    |   28 +
 .../tinymce3/plugins/xhtmlxtras/js/acronym.js |   28 +
 .../plugins/xhtmlxtras/js/attributes.js       |  125 ++
 .../tinymce3/plugins/xhtmlxtras/js/cite.js    |   28 +
 .../tinymce3/plugins/xhtmlxtras/js/del.js     |   53 +
 .../plugins/xhtmlxtras/js/element_common.js   |  229 ++++
 .../tinymce3/plugins/xhtmlxtras/js/ins.js     |   53 +
 .../plugins/xhtmlxtras/langs/da_dlg.js        |   32 +
 .../plugins/xhtmlxtras/langs/de_dlg.js        |   32 +
 .../plugins/xhtmlxtras/langs/en_dlg.js        |   32 +
 .../plugins/xhtmlxtras/langs/es_dlg.js        |   32 +
 .../plugins/xhtmlxtras/langs/fr_dlg.js        |   32 +
 .../plugins/xhtmlxtras/langs/it_dlg.js        |   32 +
 .../plugins/xhtmlxtras/langs/nl_dlg.js        |   32 +
 .../plugins/xhtmlxtras/langs/no_dlg.js        |   32 +
 .../plugins/xhtmlxtras/langs/sv_dlg.js        |   32 +
 250 files changed, 19144 insertions(+)
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/css/advhr.css
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/js/rule.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/da_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/de_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/en_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/es_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/fr_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/it_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/nl_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/no_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/sv_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/rule.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advlist/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/advlist/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/autoresize/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/autoresize/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/autosave/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/autosave/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/autosave/langs/en.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/bbcode/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/bbcode/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/contextmenu/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/contextmenu/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/directionality/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/directionality/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/emotions.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-cool.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-cry.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-embarassed.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-foot-in-mouth.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-frown.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-innocent.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-kiss.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-laughing.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-money-mouth.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-sealed.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-smile.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-surprised.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-tongue-out.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-undecided.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-wink.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-yell.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/js/emotions.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/da_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/de_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/en_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/es_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/fr_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/it_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/nl_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/no_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/sv_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/example/dialog.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/example/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/example/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/example/img/example.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/example/js/dialog.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/example/langs/en.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/example/langs/en_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/css/fullpage.css
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/fullpage.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/js/fullpage.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/da_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/de_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/en_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/es_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/fr_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/it_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/nl_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/no_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/sv_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullscreen/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullscreen/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/fullscreen/fullscreen.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/iespell/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/iespell/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/button.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/window.css
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/alert.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/button.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/buttons.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/close.png
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/confirm.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/corners.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/horizontal.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/vertical.gif
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/window.css
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/template.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/insertdatetime/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/insertdatetime/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/layer/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/layer/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/legacyoutput/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/legacyoutput/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/css/media.css
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/js/embed.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/js/media.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/da_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/de_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/en_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/es_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/fr_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/it_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/nl_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/no_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/sv_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/media/media.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/nonbreaking/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/nonbreaking/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/noneditable/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/noneditable/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/pagebreak/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/pagebreak/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/js/pastetext.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/js/pasteword.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/da_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/de_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/en_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/es_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/fr_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/it_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/nl_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/no_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/sv_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/pastetext.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/paste/pasteword.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/preview/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/preview/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/preview/example.html
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/preview/jscripts/embed.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/preview/preview.html
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/print/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/print/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/save/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/save/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/css/searchreplace.css
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/js/searchreplace.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/da_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/de_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/en_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/es_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/fr_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/it_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/nl_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/no_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/sv_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/searchreplace.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/style/css/props.css
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/style/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/style/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/style/js/props.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/da_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/de_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/en_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/es_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/fr_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/it_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/nl_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/no_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/sv_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/style/props.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/tabfocus/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/tabfocus/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/cell.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/css/cell.css
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/css/row.css
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/css/table.css
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/cell.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/merge_cells.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/row.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/table.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/da_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/de_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/en_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/es_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/fr_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/it_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/nl_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/no_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/sv_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/merge_cells.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/row.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/table/table.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/blank.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/css/template.css
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/js/template.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/da_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/de_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/en_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/es_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/fr_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/it_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/nl_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/no_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/sv_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/template/template.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/visualchars/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/visualchars/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/wordcount/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/wordcount/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/abbr.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/acronym.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/attributes.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/cite.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/css/attributes.css
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/css/popup.css
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/del.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/editor_plugin.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/editor_plugin_src.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/ins.htm
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/abbr.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/acronym.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/attributes.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/cite.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/del.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/element_common.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/ins.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/da_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/de_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/en_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/es_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/fr_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/it_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/nl_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/no_dlg.js
 create mode 100644 umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/sv_dlg.js

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/css/advhr.css b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/css/advhr.css
new file mode 100644
index 0000000000..0e22834985
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/css/advhr.css
@@ -0,0 +1,5 @@
+input.radio {border:1px none #000; background:transparent; vertical-align:middle;}
+.panel_wrapper div.current {height:80px;}
+#width {width:50px; vertical-align:middle;}
+#width2 {width:50px; vertical-align:middle;}
+#size {width:100px;}
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/editor_plugin.js
new file mode 100644
index 0000000000..4d3b062dee
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.AdvancedHRPlugin",{init:function(a,b){a.addCommand("mceAdvancedHr",function(){a.windowManager.open({file:b+"/rule.htm",width:250+parseInt(a.getLang("advhr.delta_width",0)),height:160+parseInt(a.getLang("advhr.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("advhr",{title:"advhr.advhr_desc",cmd:"mceAdvancedHr"});a.onNodeChange.add(function(d,c,e){c.setActive("advhr",e.nodeName=="HR")});a.onClick.add(function(c,d){d=d.target;if(d.nodeName==="HR"){c.selection.select(d)}})},getInfo:function(){return{longname:"Advanced HR",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advhr",tinymce.plugins.AdvancedHRPlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/editor_plugin_src.js
new file mode 100644
index 0000000000..0c652d3303
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/editor_plugin_src.js
@@ -0,0 +1,57 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.AdvancedHRPlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceAdvancedHr', function() {
+				ed.windowManager.open({
+					file : url + '/rule.htm',
+					width : 250 + parseInt(ed.getLang('advhr.delta_width', 0)),
+					height : 160 + parseInt(ed.getLang('advhr.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.addButton('advhr', {
+				title : 'advhr.advhr_desc',
+				cmd : 'mceAdvancedHr'
+			});
+
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setActive('advhr', n.nodeName == 'HR');
+			});
+
+			ed.onClick.add(function(ed, e) {
+				e = e.target;
+
+				if (e.nodeName === 'HR')
+					ed.selection.select(e);
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Advanced HR',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('advhr', tinymce.plugins.AdvancedHRPlugin);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/js/rule.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/js/rule.js
new file mode 100644
index 0000000000..b6cbd66c75
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/js/rule.js
@@ -0,0 +1,43 @@
+var AdvHRDialog = {
+	init : function(ed) {
+		var dom = ed.dom, f = document.forms[0], n = ed.selection.getNode(), w;
+
+		w = dom.getAttrib(n, 'width');
+		f.width.value = w ? parseInt(w) : (dom.getStyle('width') || '');
+		f.size.value = dom.getAttrib(n, 'size') || parseInt(dom.getStyle('height')) || '';
+		f.noshade.checked = !!dom.getAttrib(n, 'noshade') || !!dom.getStyle('border-width');
+		selectByValue(f, 'width2', w.indexOf('%') != -1 ? '%' : 'px');
+	},
+
+	update : function() {
+		var ed = tinyMCEPopup.editor, h, f = document.forms[0], st = '';
+
+		h = '<hr';
+
+		if (f.size.value) {
+			h += ' size="' + f.size.value + '"';
+			st += ' height:' + f.size.value + 'px;';
+		}
+
+		if (f.width.value) {
+			h += ' width="' + f.width.value + (f.width2.value == '%' ? '%' : '') + '"';
+			st += ' width:' + f.width.value + (f.width2.value == '%' ? '%' : 'px') + ';';
+		}
+
+		if (f.noshade.checked) {
+			h += ' noshade="noshade"';
+			st += ' border-width: 1px; border-style: solid; border-color: #CCCCCC; color: #ffffff;';
+		}
+
+		if (ed.settings.inline_styles)
+			h += ' style="' + tinymce.trim(st) + '"';
+
+		h += ' />';
+
+		ed.execCommand("mceInsertContent", false, h);
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.requireLangPack();
+tinyMCEPopup.onInit.add(AdvHRDialog.init, AdvHRDialog);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/da_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/da_dlg.js
new file mode 100644
index 0000000000..0aea2e13fe
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/da_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('da.advhr_dlg',{
+width:"Bredde",
+size:"H\u00F8jde",
+noshade:"Ingen skygge"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/de_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/de_dlg.js
new file mode 100644
index 0000000000..22344d4f8c
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/de_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('de.advhr_dlg',{
+width:"Breite",
+size:"H\u00F6he",
+noshade:"Kein Schatten"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/en_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/en_dlg.js
new file mode 100644
index 0000000000..ad6a7b6988
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/en_dlg.js
@@ -0,0 +1,7 @@
+tinyMCE.addI18n('en.advhr_dlg',{
+normal:"Normal",
+width:"Width",
+widthunits:"Units",
+size:"Height",
+noshade:"No shadow"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/es_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/es_dlg.js
new file mode 100644
index 0000000000..50849732b4
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/es_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('es.advhr_dlg',{
+width:"Ancho",
+size:"Alto",
+noshade:"Sin sombra"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/fr_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/fr_dlg.js
new file mode 100644
index 0000000000..0b954bfb58
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/fr_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('fr.advhr_dlg',{
+width:"Largeur",
+size:"Hauteur",
+noshade:"Pas d'ombre"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/it_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/it_dlg.js
new file mode 100644
index 0000000000..fc7ef18fd7
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/it_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('it.advhr_dlg',{
+width:"Width",
+size:"Height",
+noshade:"Senza ombreggiatura"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/nl_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/nl_dlg.js
new file mode 100644
index 0000000000..10bec4e9e9
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/nl_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('nl.advhr_dlg',{
+width:"Breedte",
+size:"Hoogte",
+noshade:"Geen schaduw"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/no_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/no_dlg.js
new file mode 100644
index 0000000000..5efc17411a
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/no_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('no.advhr_dlg',{
+width:"Bredde",
+size:"St\u00F8rrelse",
+noshade:"Ingen skygge"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/sv_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/sv_dlg.js
new file mode 100644
index 0000000000..f23d9f1982
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/langs/sv_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('sv.advhr_dlg',{
+width:"Bredd",
+size:"H\u00F6jd",
+noshade:"Ingen skugga"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/rule.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/rule.htm
new file mode 100644
index 0000000000..843e1f8f0b
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advhr/rule.htm
@@ -0,0 +1,58 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#advhr.advhr_desc}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/rule.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<link href="css/advhr.css" rel="stylesheet" type="text/css" />
+</head>
+<body role="application">
+<form onsubmit="AdvHRDialog.update();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advhr.advhr_desc}</a></span></li>
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<table role="presentation" border="0" cellpadding="4" cellspacing="0">
+					<tr role="group" aria-labelledby="width_label">
+						<td><label id="width_label" for="width">{#advhr_dlg.width}</label></td>
+						<td class="nowrap">
+							<input id="width" name="width" type="text" value="" class="mceFocus" />
+							<span style="display:none;" id="width_unit_label">{#advhr_dlg.widthunits}</span>
+							<select name="width2" id="width2" aria-labelledby="width_unit_label">
+								<option value="">px</option>
+								<option value="%">%</option>
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<td><label for="size">{#advhr_dlg.size}</label></td>
+						<td><select id="size" name="size">
+							<option value="">{#advhr_dlg.normal}</option>
+							<option value="1">1</option>
+							<option value="2">2</option>
+							<option value="3">3</option>
+							<option value="4">4</option>
+							<option value="5">5</option>
+						</select></td>
+					</tr>
+					<tr>
+						<td><label for="noshade">{#advhr_dlg.noshade}</label></td>
+						<td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>
+					</tr>
+			</table>
+		</div>
+	</div>
+
+	<div class="mceActionPanel">
+		<input type="submit" id="insert" name="insert" value="{#insert}" />
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+	</div>
+</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advlist/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/advlist/editor_plugin.js
new file mode 100644
index 0000000000..e884b76ec9
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advlist/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.AdvListPlugin",{init:function(b,c){var d=this;d.editor=b;function e(g){var f=[];a(g.split(/,/),function(h){f.push({title:"advlist."+(h=="default"?"def":h.replace(/-/g,"_")),styles:{listStyleType:h=="default"?"":h}})});return f}d.numlist=b.getParam("advlist_number_styles")||e("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");d.bullist=b.getParam("advlist_bullet_styles")||e("default,circle,disc,square")},createControl:function(d,b){var f=this,e,h;if(d=="numlist"||d=="bullist"){if(f[d][0].title=="advlist.def"){h=f[d][0]}function c(i,k){var j=true;a(k.styles,function(m,l){if(f.editor.dom.getStyle(i,l)!=m){j=false;return false}});return j}function g(){var k,i=f.editor,l=i.dom,j=i.selection;k=l.getParent(j.getNode(),"ol,ul");if(!k||k.nodeName==(d=="bullist"?"OL":"UL")||c(k,h)){i.execCommand(d=="bullist"?"InsertUnorderedList":"InsertOrderedList")}if(h){k=l.getParent(j.getNode(),"ol,ul");if(k){l.setStyles(k,h.styles);k.removeAttribute("data-mce-style")}}i.focus()}e=b.createSplitButton(d,{title:"advanced."+d+"_desc","class":"mce_"+d,onclick:function(){g()}});e.onRenderMenu.add(function(i,j){j.onShowMenu.add(function(){var m=f.editor.dom,l=m.getParent(f.editor.selection.getNode(),"ol,ul"),k;if(l||h){k=f[d];a(j.items,function(n){var o=true;n.setSelected(0);if(l&&!n.isDisabled()){a(k,function(p){if(p.id==n.id){if(!c(l,p)){o=false;return false}}});if(o){n.setSelected(1)}}});if(!l){j.items[h.id].setSelected(1)}}});j.add({id:f.editor.dom.uniqueId(),title:"advlist.types","class":"mceMenuItemTitle",titleItem:true}).setDisabled(1);a(f[d],function(k){k.id=f.editor.dom.uniqueId();j.add({id:k.id,title:k.title,onclick:function(){h=k;g()}})})});return e}},getInfo:function(){return{longname:"Advanced lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlist",tinymce.plugins.AdvListPlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/advlist/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/advlist/editor_plugin_src.js
new file mode 100644
index 0000000000..e8ff208102
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/advlist/editor_plugin_src.js
@@ -0,0 +1,154 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.plugins.AdvListPlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			function buildFormats(str) {
+				var formats = [];
+
+				each(str.split(/,/), function(type) {
+					formats.push({
+						title : 'advlist.' + (type == 'default' ? 'def' : type.replace(/-/g, '_')),
+						styles : {
+							listStyleType : type == 'default' ? '' : type
+						}
+					});
+				});
+
+				return formats;
+			};
+
+			// Setup number formats from config or default
+			t.numlist = ed.getParam("advlist_number_styles") || buildFormats("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");
+			t.bullist = ed.getParam("advlist_bullet_styles") || buildFormats("default,circle,disc,square");
+		},
+
+		createControl: function(name, cm) {
+			var t = this, btn, format;
+
+			if (name == 'numlist' || name == 'bullist') {
+				// Default to first item if it's a default item
+				if (t[name][0].title == 'advlist.def')
+					format = t[name][0];
+
+				function hasFormat(node, format) {
+					var state = true;
+
+					each(format.styles, function(value, name) {
+						// Format doesn't match
+						if (t.editor.dom.getStyle(node, name) != value) {
+							state = false;
+							return false;
+						}
+					});
+
+					return state;
+				};
+
+				function applyListFormat() {
+					var list, ed = t.editor, dom = ed.dom, sel = ed.selection;
+
+					// Check for existing list element
+					list = dom.getParent(sel.getNode(), 'ol,ul');
+
+					// Switch/add list type if needed
+					if (!list || list.nodeName == (name == 'bullist' ? 'OL' : 'UL') || hasFormat(list, format))
+						ed.execCommand(name == 'bullist' ? 'InsertUnorderedList' : 'InsertOrderedList');
+
+					// Append styles to new list element
+					if (format) {
+						list = dom.getParent(sel.getNode(), 'ol,ul');
+						if (list) {
+							dom.setStyles(list, format.styles);
+							list.removeAttribute('data-mce-style');
+						}
+					}
+					ed.focus();
+				};
+
+				btn = cm.createSplitButton(name, {
+					title : 'advanced.' + name + '_desc',
+					'class' : 'mce_' + name,
+					onclick : function() {
+						applyListFormat();
+					}
+				});
+
+				btn.onRenderMenu.add(function(btn, menu) {
+					menu.onShowMenu.add(function() {
+						var dom = t.editor.dom, list = dom.getParent(t.editor.selection.getNode(), 'ol,ul'), fmtList;
+
+						if (list || format) {
+							fmtList = t[name];
+
+							// Unselect existing items
+							each(menu.items, function(item) {
+								var state = true;
+
+								item.setSelected(0);
+
+								if (list && !item.isDisabled()) {
+									each(fmtList, function(fmt) {
+										if (fmt.id == item.id) {
+											if (!hasFormat(list, fmt)) {
+												state = false;
+												return false;
+											}
+										}
+									});
+
+									if (state)
+										item.setSelected(1);
+								}
+							});
+
+							// Select the current format
+							if (!list)
+								menu.items[format.id].setSelected(1);
+						}
+					});
+
+					menu.add({id : t.editor.dom.uniqueId(), title : 'advlist.types', 'class' : 'mceMenuItemTitle', titleItem: true}).setDisabled(1);
+
+					each(t[name], function(item) {
+						item.id = t.editor.dom.uniqueId();
+
+						menu.add({id : item.id, title : item.title, onclick : function() {
+							format = item;
+							applyListFormat();
+						}});
+					});
+				});
+
+				return btn;
+			}
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Advanced lists',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('advlist', tinymce.plugins.AdvListPlugin);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/autoresize/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/autoresize/editor_plugin.js
new file mode 100644
index 0000000000..1676b154a8
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/autoresize/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this;if(a.getParam("fullscreen_is_enabled")){return}function b(){var h=a.getDoc(),e=h.body,j=h.documentElement,g=tinymce.DOM,i=d.autoresize_min_height,f;f=tinymce.isIE?e.scrollHeight:j.offsetHeight;if(f>d.autoresize_min_height){i=f}g.setStyle(g.get(a.id+"_ifr"),"height",i+"px");if(d.throbbing){a.setProgressState(false);a.setProgressState(true)}}d.editor=a;d.autoresize_min_height=a.getElement().offsetHeight;a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);if(a.getParam("autoresize_on_init",true)){a.onInit.add(function(f,e){f.setProgressState(true);d.throbbing=true;f.getBody().style.overflowY="hidden"});a.onLoadContent.add(function(f,e){b();setTimeout(function(){b();f.setProgressState(false);d.throbbing=false},1250)})}a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/autoresize/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/autoresize/editor_plugin_src.js
new file mode 100644
index 0000000000..c260b7a24f
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/autoresize/editor_plugin_src.js
@@ -0,0 +1,119 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	/**
+	 * Auto Resize
+	 * 
+	 * This plugin automatically resizes the content area to fit its content height.
+	 * It will retain a minimum height, which is the height of the content area when
+	 * it's initialized.
+	 */
+	tinymce.create('tinymce.plugins.AutoResizePlugin', {
+		/**
+		 * Initializes the plugin, this will be executed after the plugin has been created.
+		 * This call is done before the editor instance has finished it's initialization so use the onInit event
+		 * of the editor instance to intercept that event.
+		 *
+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+		 * @param {string} url Absolute URL to where the plugin is located.
+		 */
+		init : function(ed, url) {
+			var t = this;
+
+			if (ed.getParam('fullscreen_is_enabled'))
+				return;
+
+			/**
+			 * This method gets executed each time the editor needs to resize.
+			 */
+			function resize() {
+				var d = ed.getDoc(), b = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight = t.autoresize_min_height, myHeight;
+
+				// Get height differently depending on the browser used
+				myHeight = tinymce.isIE ? b.scrollHeight : de.offsetHeight;
+
+				// Don't make it smaller than the minimum height
+				if (myHeight > t.autoresize_min_height)
+					resizeHeight = myHeight;
+
+				// Resize content element
+				DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
+
+				// if we're throbbing, we'll re-throb to match the new size
+				if (t.throbbing) {
+					ed.setProgressState(false);
+					ed.setProgressState(true);
+				}
+			};
+
+			t.editor = ed;
+
+			// Define minimum height
+			t.autoresize_min_height = ed.getElement().offsetHeight;
+
+			// Add appropriate listeners for resizing content area
+			ed.onChange.add(resize);
+			ed.onSetContent.add(resize);
+			ed.onPaste.add(resize);
+			ed.onKeyUp.add(resize);
+			ed.onPostRender.add(resize);
+
+			if (ed.getParam('autoresize_on_init', true)) {
+				// Things to do when the editor is ready
+				ed.onInit.add(function(ed, l) {
+					// Show throbber until content area is resized properly
+					ed.setProgressState(true);
+					t.throbbing = true;
+
+					// Hide scrollbars
+					ed.getBody().style.overflowY = "hidden";
+				});
+
+				ed.onLoadContent.add(function(ed, l) {
+					resize();
+
+					// Because the content area resizes when its content CSS loads,
+					// and we can't easily add a listener to its onload event,
+					// we'll just trigger a resize after a short loading period
+					setTimeout(function() {
+						resize();
+
+						// Disable throbber
+						ed.setProgressState(false);
+						t.throbbing = false;
+					}, 1250);
+				});
+			}
+
+			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
+			ed.addCommand('mceAutoResize', resize);
+		},
+
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @return {Object} Name/value array containing information about the plugin.
+		 */
+		getInfo : function() {
+			return {
+				longname : 'Auto Resize',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('autoresize', tinymce.plugins.AutoResizePlugin);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/autosave/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/autosave/editor_plugin.js
new file mode 100644
index 0000000000..7f49107e65
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/autosave/editor_plugin.js
@@ -0,0 +1 @@
+(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent({draft:true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){h.storeDraft();i.nodeChanged()},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},getInfo:function(){return{longname:"Auto save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave",version:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();try{m.save("TinyMCE")}catch(o){}},getItem:function(l){var m=i.getElement();try{m.load("TinyMCE");return m.getAttribute(l)}catch(n){return null}},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent({draft:true});if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,i=h.storage;if(i){content=i.getItem(h.key);if(content){h.editor.setContent(content);h.onRestoreDraft.dispatch(h,{content:content})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()<i.getTime()){return b}h.removeDraft()}else{return b}}}return false},removeDraft:function(){var h=this,k=h.storage,i=h.key,j;if(k){j=k.getItem(i);k.removeItem(i);k.removeItem(i+"_expires");if(j){h.onRemoveDraft.dispatch(h,{content:j})}}},"static":{_beforeUnloadHandler:function(h){var i;e.each(tinyMCE.editors,function(j){if(j.plugins.autosave){j.plugins.autosave.storeDraft()}if(j.getParam("fullscreen_is_enabled")){return}if(!i&&j.isDirty()&&j.getParam("autosave_ask_before_unload")){i=j.getLang("autosave.unload_msg")}});return i}}});e.PluginManager.add("autosave",e.plugins.AutoSave)})(tinymce);
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/autosave/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/autosave/editor_plugin_src.js
new file mode 100644
index 0000000000..061cf13519
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/autosave/editor_plugin_src.js
@@ -0,0 +1,431 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ *
+ * Adds auto-save capability to the TinyMCE text editor to rescue content
+ * inadvertently lost. This plugin was originally developed by Speednet
+ * and that project can be found here: http://code.google.com/p/tinyautosave/
+ *
+ * TECHNOLOGY DISCUSSION:
+ * 
+ * The plugin attempts to use the most advanced features available in the current browser to save
+ * as much content as possible.  There are a total of four different methods used to autosave the
+ * content.  In order of preference, they are:
+ * 
+ * 1. localStorage - A new feature of HTML 5, localStorage can store megabytes of data per domain
+ * on the client computer. Data stored in the localStorage area has no expiration date, so we must
+ * manage expiring the data ourselves.  localStorage is fully supported by IE8, and it is supposed
+ * to be working in Firefox 3 and Safari 3.2, but in reality is is flaky in those browsers.  As
+ * HTML 5 gets wider support, the AutoSave plugin will use it automatically. In Windows Vista/7,
+ * localStorage is stored in the following folder:
+ * C:\Users\[username]\AppData\Local\Microsoft\Internet Explorer\DOMStore\[tempFolder]
+ * 
+ * 2. sessionStorage - A new feature of HTML 5, sessionStorage works similarly to localStorage,
+ * except it is designed to expire after a certain amount of time.  Because the specification
+ * around expiration date/time is very loosely-described, it is preferrable to use locaStorage and
+ * manage the expiration ourselves.  sessionStorage has similar storage characteristics to
+ * localStorage, although it seems to have better support by Firefox 3 at the moment.  (That will
+ * certainly change as Firefox continues getting better at HTML 5 adoption.)
+ * 
+ * 3. UserData - A very under-exploited feature of Microsoft Internet Explorer, UserData is a
+ * way to store up to 128K of data per "document", or up to 1MB of data per domain, on the client
+ * computer.  The feature is available for IE 5+, which makes it available for every version of IE
+ * supported by TinyMCE.  The content is persistent across browser restarts and expires on the
+ * date/time specified, just like a cookie.  However, the data is not cleared when the user clears
+ * cookies on the browser, which makes it well-suited for rescuing autosaved content.  UserData,
+ * like other Microsoft IE browser technologies, is implemented as a behavior attached to a
+ * specific DOM object, so in this case we attach the behavior to the same DOM element that the
+ * TinyMCE editor instance is attached to.
+ */
+
+(function(tinymce) {
+	// Setup constants to help the compressor to reduce script size
+	var PLUGIN_NAME = 'autosave',
+		RESTORE_DRAFT = 'restoredraft',
+		TRUE = true,
+		undefined,
+		unloadHandlerAdded,
+		Dispatcher = tinymce.util.Dispatcher;
+
+	/**
+	 * This plugin adds auto-save capability to the TinyMCE text editor to rescue content
+	 * inadvertently lost. By using localStorage.
+	 *
+	 * @class tinymce.plugins.AutoSave
+	 */
+	tinymce.create('tinymce.plugins.AutoSave', {
+		/**
+		 * Initializes the plugin, this will be executed after the plugin has been created.
+		 * This call is done before the editor instance has finished it's initialization so use the onInit event
+		 * of the editor instance to intercept that event.
+		 *
+		 * @method init
+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+		 * @param {string} url Absolute URL to where the plugin is located.
+		 */
+		init : function(ed, url) {
+			var self = this, settings = ed.settings;
+
+			self.editor = ed;
+
+			// Parses the specified time string into a milisecond number 10m, 10s etc.
+			function parseTime(time) {
+				var multipels = {
+					s : 1000,
+					m : 60000
+				};
+
+				time = /^(\d+)([ms]?)$/.exec('' + time);
+
+				return (time[2] ? multipels[time[2]] : 1) * parseInt(time);
+			};
+
+			// Default config
+			tinymce.each({
+				ask_before_unload : TRUE,
+				interval : '30s',
+				retention : '20m',
+				minlength : 50
+			}, function(value, key) {
+				key = PLUGIN_NAME + '_' + key;
+
+				if (settings[key] === undefined)
+					settings[key] = value;
+			});
+
+			// Parse times
+			settings.autosave_interval = parseTime(settings.autosave_interval);
+			settings.autosave_retention = parseTime(settings.autosave_retention);
+
+			// Register restore button
+			ed.addButton(RESTORE_DRAFT, {
+				title : PLUGIN_NAME + ".restore_content",
+				onclick : function() {
+					if (ed.getContent({draft: true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi, "").length > 0) {
+						// Show confirm dialog if the editor isn't empty
+						ed.windowManager.confirm(
+							PLUGIN_NAME + ".warning_message",
+							function(ok) {
+								if (ok)
+									self.restoreDraft();
+							}
+						);
+					} else
+						self.restoreDraft();
+				}
+			});
+
+			// Enable/disable restoredraft button depending on if there is a draft stored or not
+			ed.onNodeChange.add(function() {
+				var controlManager = ed.controlManager;
+
+				if (controlManager.get(RESTORE_DRAFT))
+					controlManager.setDisabled(RESTORE_DRAFT, !self.hasDraft());
+			});
+
+			ed.onInit.add(function() {
+				// Check if the user added the restore button, then setup auto storage logic
+				if (ed.controlManager.get(RESTORE_DRAFT)) {
+					// Setup storage engine
+					self.setupStorage(ed);
+
+					// Auto save contents each interval time
+					setInterval(function() {
+						self.storeDraft();
+						ed.nodeChanged();
+					}, settings.autosave_interval);
+				}
+			});
+
+			/**
+			 * This event gets fired when a draft is stored to local storage.
+			 *
+			 * @event onStoreDraft
+			 * @param {tinymce.plugins.AutoSave} sender Plugin instance sending the event.
+			 * @param {Object} draft Draft object containing the HTML contents of the editor.
+			 */
+			self.onStoreDraft = new Dispatcher(self);
+
+			/**
+			 * This event gets fired when a draft is restored from local storage.
+			 *
+			 * @event onStoreDraft
+			 * @param {tinymce.plugins.AutoSave} sender Plugin instance sending the event.
+			 * @param {Object} draft Draft object containing the HTML contents of the editor.
+			 */
+			self.onRestoreDraft = new Dispatcher(self);
+
+			/**
+			 * This event gets fired when a draft removed/expired.
+			 *
+			 * @event onRemoveDraft
+			 * @param {tinymce.plugins.AutoSave} sender Plugin instance sending the event.
+			 * @param {Object} draft Draft object containing the HTML contents of the editor.
+			 */
+			self.onRemoveDraft = new Dispatcher(self);
+
+			// Add ask before unload dialog only add one unload handler
+			if (!unloadHandlerAdded) {
+				window.onbeforeunload = tinymce.plugins.AutoSave._beforeUnloadHandler;
+				unloadHandlerAdded = TRUE;
+			}
+		},
+
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @method getInfo
+		 * @return {Object} Name/value array containing information about the plugin.
+		 */
+		getInfo : function() {
+			return {
+				longname : 'Auto save',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		/**
+		 * Returns an expiration date UTC string.
+		 *
+		 * @method getExpDate
+		 * @return {String} Expiration date UTC string.
+		 */
+		getExpDate : function() {
+			return new Date(
+				new Date().getTime() + this.editor.settings.autosave_retention
+			).toUTCString();
+		},
+
+		/**
+		 * This method will setup the storage engine. If the browser has support for it.
+		 *
+		 * @method setupStorage
+		 */
+		setupStorage : function(ed) {
+			var self = this, testKey = PLUGIN_NAME + '_test', testVal = "OK";
+
+			self.key = PLUGIN_NAME + ed.id;
+
+			// Loop though each storage engine type until we find one that works
+			tinymce.each([
+				function() {
+					// Try HTML5 Local Storage
+					if (localStorage) {
+						localStorage.setItem(testKey, testVal);
+
+						if (localStorage.getItem(testKey) === testVal) {
+							localStorage.removeItem(testKey);
+
+							return localStorage;
+						}
+					}
+				},
+
+				function() {
+					// Try HTML5 Session Storage
+					if (sessionStorage) {
+						sessionStorage.setItem(testKey, testVal);
+
+						if (sessionStorage.getItem(testKey) === testVal) {
+							sessionStorage.removeItem(testKey);
+
+							return sessionStorage;
+						}
+					}
+				},
+
+				function() {
+					// Try IE userData
+					if (tinymce.isIE) {
+						ed.getElement().style.behavior = "url('#default#userData')";
+
+						// Fake localStorage on old IE
+						return {
+							autoExpires : TRUE,
+
+							setItem : function(key, value) {
+								var userDataElement = ed.getElement();
+
+								userDataElement.setAttribute(key, value);
+								userDataElement.expires = self.getExpDate();
+
+								try {
+									userDataElement.save("TinyMCE");
+								} catch (e) {
+									// Ignore, saving might fail if "Userdata Persistence" is disabled in IE
+								}
+							},
+
+							getItem : function(key) {
+								var userDataElement = ed.getElement();
+
+								try {
+									userDataElement.load("TinyMCE");
+									return userDataElement.getAttribute(key);
+								} catch (e) {
+									// Ignore, loading might fail if "Userdata Persistence" is disabled in IE
+									return null;
+								}
+							},
+
+							removeItem : function(key) {
+								ed.getElement().removeAttribute(key);
+							}
+						};
+					}
+				},
+			], function(setup) {
+				// Try executing each function to find a suitable storage engine
+				try {
+					self.storage = setup();
+
+					if (self.storage)
+						return false;
+				} catch (e) {
+					// Ignore
+				}
+			});
+		},
+
+		/**
+		 * This method will store the current contents in the the storage engine.
+		 *
+		 * @method storeDraft
+		 */
+		storeDraft : function() {
+			var self = this, storage = self.storage, editor = self.editor, expires, content;
+
+			// Is the contents dirty
+			if (storage) {
+				// If there is no existing key and the contents hasn't been changed since
+				// it's original value then there is no point in saving a draft
+				if (!storage.getItem(self.key) && !editor.isDirty())
+					return;
+
+				// Store contents if the contents if longer than the minlength of characters
+				content = editor.getContent({draft: true});
+				if (content.length > editor.settings.autosave_minlength) {
+					expires = self.getExpDate();
+
+					// Store expiration date if needed IE userData has auto expire built in
+					if (!self.storage.autoExpires)
+						self.storage.setItem(self.key + "_expires", expires);
+
+					self.storage.setItem(self.key, content);
+					self.onStoreDraft.dispatch(self, {
+						expires : expires,
+						content : content
+					});
+				}
+			}
+		},
+
+		/**
+		 * This method will restore the contents from the storage engine back to the editor.
+		 *
+		 * @method restoreDraft
+		 */
+		restoreDraft : function() {
+			var self = this, storage = self.storage;
+
+			if (storage) {
+				content = storage.getItem(self.key);
+
+				if (content) {
+					self.editor.setContent(content);
+					self.onRestoreDraft.dispatch(self, {
+						content : content
+					});
+				}
+			}
+		},
+
+		/**
+		 * This method will return true/false if there is a local storage draft available.
+		 *
+		 * @method hasDraft
+		 * @return {boolean} true/false state if there is a local draft.
+		 */
+		hasDraft : function() {
+			var self = this, storage = self.storage, expDate, exists;
+
+			if (storage) {
+				// Does the item exist at all
+				exists = !!storage.getItem(self.key);
+				if (exists) {
+					// Storage needs autoexpire
+					if (!self.storage.autoExpires) {
+						expDate = new Date(storage.getItem(self.key + "_expires"));
+
+						// Contents hasn't expired
+						if (new Date().getTime() < expDate.getTime())
+							return TRUE;
+
+						// Remove it if it has
+						self.removeDraft();
+					} else
+						return TRUE;
+				}
+			}
+
+			return false;
+		},
+
+		/**
+		 * Removes the currently stored draft.
+		 *
+		 * @method removeDraft
+		 */
+		removeDraft : function() {
+			var self = this, storage = self.storage, key = self.key, content;
+
+			if (storage) {
+				// Get current contents and remove the existing draft
+				content = storage.getItem(key);
+				storage.removeItem(key);
+				storage.removeItem(key + "_expires");
+
+				// Dispatch remove event if we had any contents
+				if (content) {
+					self.onRemoveDraft.dispatch(self, {
+						content : content
+					});
+				}
+			}
+		},
+
+		"static" : {
+			// Internal unload handler will be called before the page is unloaded
+			_beforeUnloadHandler : function(e) {
+				var msg;
+
+				tinymce.each(tinyMCE.editors, function(ed) {
+					// Store a draft for each editor instance
+					if (ed.plugins.autosave)
+						ed.plugins.autosave.storeDraft();
+
+					// Never ask in fullscreen mode
+					if (ed.getParam("fullscreen_is_enabled"))
+						return;
+
+					// Setup a return message if the editor is dirty
+					if (!msg && ed.isDirty() && ed.getParam("autosave_ask_before_unload"))
+						msg = ed.getLang("autosave.unload_msg");
+				});
+
+				return msg;
+			}
+		}
+	});
+
+	tinymce.PluginManager.add('autosave', tinymce.plugins.AutoSave);
+})(tinymce);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/autosave/langs/en.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/autosave/langs/en.js
new file mode 100644
index 0000000000..fce6bd3e1f
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/autosave/langs/en.js
@@ -0,0 +1,4 @@
+tinyMCE.addI18n('en.autosave',{
+restore_content: "Restore auto-saved content",
+warning_message: "If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/bbcode/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/bbcode/editor_plugin.js
new file mode 100644
index 0000000000..8f8821fd64
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/bbcode/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/&nbsp;|\u00a0/gi," ");b(/&quot;/gi,'"');b(/&lt;/gi,"<");b(/&gt;/gi,">");b(/&amp;/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/bbcode/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/bbcode/editor_plugin_src.js
new file mode 100644
index 0000000000..4e7eb3377f
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/bbcode/editor_plugin_src.js
@@ -0,0 +1,120 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.BBCodePlugin', {
+		init : function(ed, url) {
+			var t = this, dialect = ed.getParam('bbcode_dialect', 'punbb').toLowerCase();
+
+			ed.onBeforeSetContent.add(function(ed, o) {
+				o.content = t['_' + dialect + '_bbcode2html'](o.content);
+			});
+
+			ed.onPostProcess.add(function(ed, o) {
+				if (o.set)
+					o.content = t['_' + dialect + '_bbcode2html'](o.content);
+
+				if (o.get)
+					o.content = t['_' + dialect + '_html2bbcode'](o.content);
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'BBCode Plugin',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		// HTML -> BBCode in PunBB dialect
+		_punbb_html2bbcode : function(s) {
+			s = tinymce.trim(s);
+
+			function rep(re, str) {
+				s = s.replace(re, str);
+			};
+
+			// example: <strong> to [b]
+			rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");
+			rep(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");
+			rep(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");
+			rep(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");
+			rep(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");
+			rep(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");
+			rep(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");
+			rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");
+			rep(/<font>(.*?)<\/font>/gi,"$1");
+			rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");
+			rep(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");
+			rep(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");
+			rep(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");
+			rep(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");
+			rep(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");
+			rep(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");
+			rep(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");
+			rep(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");
+			rep(/<\/(strong|b)>/gi,"[/b]");
+			rep(/<(strong|b)>/gi,"[b]");
+			rep(/<\/(em|i)>/gi,"[/i]");
+			rep(/<(em|i)>/gi,"[i]");
+			rep(/<\/u>/gi,"[/u]");
+			rep(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");
+			rep(/<u>/gi,"[u]");
+			rep(/<blockquote[^>]*>/gi,"[quote]");
+			rep(/<\/blockquote>/gi,"[/quote]");
+			rep(/<br \/>/gi,"\n");
+			rep(/<br\/>/gi,"\n");
+			rep(/<br>/gi,"\n");
+			rep(/<p>/gi,"");
+			rep(/<\/p>/gi,"\n");
+			rep(/&nbsp;|\u00a0/gi," ");
+			rep(/&quot;/gi,"\"");
+			rep(/&lt;/gi,"<");
+			rep(/&gt;/gi,">");
+			rep(/&amp;/gi,"&");
+
+			return s; 
+		},
+
+		// BBCode -> HTML from PunBB dialect
+		_punbb_bbcode2html : function(s) {
+			s = tinymce.trim(s);
+
+			function rep(re, str) {
+				s = s.replace(re, str);
+			};
+
+			// example: [b] to <strong>
+			rep(/\n/gi,"<br />");
+			rep(/\[b\]/gi,"<strong>");
+			rep(/\[\/b\]/gi,"</strong>");
+			rep(/\[i\]/gi,"<em>");
+			rep(/\[\/i\]/gi,"</em>");
+			rep(/\[u\]/gi,"<u>");
+			rep(/\[\/u\]/gi,"</u>");
+			rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");
+			rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");
+			rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");
+			rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<font color=\"$1\">$2</font>");
+			rep(/\[code\](.*?)\[\/code\]/gi,"<span class=\"codeStyle\">$1</span>&nbsp;");
+			rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<span class=\"quoteStyle\">$1</span>&nbsp;");
+
+			return s; 
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('bbcode', tinymce.plugins.BBCodePlugin);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/contextmenu/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/contextmenu/editor_plugin.js
new file mode 100644
index 0000000000..221306f34f
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/contextmenu/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(d){var g=this,h,e;g.editor=d;g.onContextMenu=new tinymce.util.Dispatcher(this);e=d.onContextMenu.add(function(i,j){if(!j.ctrlKey){if(h){i.selection.setRng(h)}g._getMenu(i).showMenu(j.clientX||j.pageX,j.clientY||j.pageX);a.add(i.getDoc(),"click",function(k){f(i,k)});a.cancel(j)}});d.onRemove.add(function(){if(g._menu){g._menu.removeAll()}});function f(i,j){h=null;if(j&&j.button==2){h=i.selection.getRng();return}if(g._menu){g._menu.removeAll();g._menu.destroy();a.remove(i.getDoc(),"click",f)}}d.onMouseDown.add(f);d.onKeyDown.add(f);d.onKeyDown.add(function(i,j){if(j.shiftKey&&!j.ctrlKey&&!j.altKey&&j.keyCode===121){a.cancel(j);e(i,j)}})},getInfo:function(){return{longname:"Contextmenu",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getMenu:function(h){var l=this,f=l._menu,i=h.selection,e=i.isCollapsed(),d=i.getNode()||h.getBody(),g,k,j;if(f){f.removeAll();f.destroy()}k=b.getPos(h.getContentAreaContainer());j=b.getPos(h.getContainer());f=h.controlManager.createDropMenu("contextmenu",{offset_x:k.x+h.getParam("contextmenu_offset_x",0),offset_y:k.y+h.getParam("contextmenu_offset_y",0),constrain:1,keyboard_focus:true});l._menu=f;f.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(e);f.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(e);f.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((d.nodeName=="A"&&!h.dom.getAttrib(d,"name"))||!e){f.addSeparator();f.add({title:"advanced.link_desc",icon:"link",cmd:h.plugins.advlink?"mceAdvLink":"mceLink",ui:true});f.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}f.addSeparator();f.add({title:"advanced.image_desc",icon:"image",cmd:h.plugins.advimage?"mceAdvImage":"mceImage",ui:true});f.addSeparator();g=f.addMenu({title:"contextmenu.align"});g.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});g.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});g.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});g.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});l.onContextMenu.dispatch(l,f,d,e);return f}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/contextmenu/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/contextmenu/editor_plugin_src.js
new file mode 100644
index 0000000000..4455910282
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/contextmenu/editor_plugin_src.js
@@ -0,0 +1,156 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var Event = tinymce.dom.Event, each = tinymce.each, DOM = tinymce.DOM;
+
+	/**
+	 * This plugin a context menu to TinyMCE editor instances.
+	 *
+	 * @class tinymce.plugins.ContextMenu
+	 */
+	tinymce.create('tinymce.plugins.ContextMenu', {
+		/**
+		 * Initializes the plugin, this will be executed after the plugin has been created.
+		 * This call is done before the editor instance has finished it's initialization so use the onInit event
+		 * of the editor instance to intercept that event.
+		 *
+		 * @method init
+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+		 * @param {string} url Absolute URL to where the plugin is located.
+		 */
+		init : function(ed) {
+			var t = this, lastRng, showMenu;
+
+			t.editor = ed;
+
+			/**
+			 * This event gets fired when the context menu is shown.
+			 *
+			 * @event onContextMenu
+			 * @param {tinymce.plugins.ContextMenu} sender Plugin instance sending the event.
+			 * @param {tinymce.ui.DropMenu} menu Drop down menu to fill with more items if needed.
+			 */
+			t.onContextMenu = new tinymce.util.Dispatcher(this);
+
+			showMenu = ed.onContextMenu.add(function(ed, e) {
+				if (!e.ctrlKey) {
+					// Restore the last selection since it was removed
+					if (lastRng)
+						ed.selection.setRng(lastRng);
+
+					t._getMenu(ed).showMenu(e.clientX || e.pageX, e.clientY || e.pageX);
+					Event.add(ed.getDoc(), 'click', function(e) {
+						hide(ed, e);
+					});
+					Event.cancel(e);
+				}
+			});
+
+			ed.onRemove.add(function() {
+				if (t._menu)
+					t._menu.removeAll();
+			});
+
+			function hide(ed, e) {
+				lastRng = null;
+
+				// Since the contextmenu event moves
+				// the selection we need to store it away
+				if (e && e.button == 2) {
+					lastRng = ed.selection.getRng();
+					return;
+				}
+
+				if (t._menu) {
+					t._menu.removeAll();
+					t._menu.destroy();
+					Event.remove(ed.getDoc(), 'click', hide);
+				}
+			};
+
+			ed.onMouseDown.add(hide);
+			ed.onKeyDown.add(hide);
+			ed.onKeyDown.add(function(ed, e) {
+				if (e.shiftKey && !e.ctrlKey && !e.altKey && e.keyCode === 121) {
+					Event.cancel(e);
+					showMenu(ed, e);
+				}
+			});
+		},
+
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @method getInfo
+		 * @return {Object} Name/value array containing information about the plugin.
+		 */
+		getInfo : function() {
+			return {
+				longname : 'Contextmenu',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		_getMenu : function(ed) {
+			var t = this, m = t._menu, se = ed.selection, col = se.isCollapsed(), el = se.getNode() || ed.getBody(), am, p1, p2;
+
+			if (m) {
+				m.removeAll();
+				m.destroy();
+			}
+
+			p1 = DOM.getPos(ed.getContentAreaContainer());
+			p2 = DOM.getPos(ed.getContainer());
+
+			m = ed.controlManager.createDropMenu('contextmenu', {
+				offset_x : p1.x + ed.getParam('contextmenu_offset_x', 0),
+				offset_y : p1.y + ed.getParam('contextmenu_offset_y', 0),
+				constrain : 1,
+				keyboard_focus: true
+			});
+
+            t._menu = m;
+
+            var keys = UmbClientMgr.uiKeys();
+
+            m.add({ title: keys['defaultdialogs_cut'], icon: 'cut', cmd: 'Cut' }).setDisabled(col);
+            m.add({ title: keys['general_copy'], icon: 'copy', cmd: 'Copy' }).setDisabled(col);
+            m.add({ title: keys['defaultdialogs_paste'], icon: 'paste', cmd: 'Paste' });
+
+			if ((el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) || !col) {
+				m.addSeparator();
+				m.add({ title: keys['defaultdialogs_insertlink'], icon: 'link', cmd: ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui: true });
+				m.add({ title: keys['relatedlinks_removeLink'], icon: 'unlink', cmd: 'UnLink' });
+			}
+
+			m.addSeparator();
+			m.add({ title: keys['defaultdialogs_insertimage'], icon: 'image', cmd: ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui: true });
+
+			m.addSeparator();
+			am = m.addMenu({title : 'contextmenu.align'});
+			am.add({title : 'contextmenu.left', icon : 'justifyleft', cmd : 'JustifyLeft'});
+			am.add({title : 'contextmenu.center', icon : 'justifycenter', cmd : 'JustifyCenter'});
+			am.add({title : 'contextmenu.right', icon : 'justifyright', cmd : 'JustifyRight'});
+			am.add({title : 'contextmenu.full', icon : 'justifyfull', cmd : 'JustifyFull'});
+
+			t.onContextMenu.dispatch(t, m, el, col);
+
+			return m;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('contextmenu', tinymce.plugins.ContextMenu);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/directionality/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/directionality/editor_plugin.js
new file mode 100644
index 0000000000..bce8e73995
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/directionality/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.Directionality",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceDirectionLTR",function(){var d=a.dom.getParent(a.selection.getNode(),a.dom.isBlock);if(d){if(a.dom.getAttrib(d,"dir")!="ltr"){a.dom.setAttrib(d,"dir","ltr")}else{a.dom.setAttrib(d,"dir","")}}a.nodeChanged()});a.addCommand("mceDirectionRTL",function(){var d=a.dom.getParent(a.selection.getNode(),a.dom.isBlock);if(d){if(a.dom.getAttrib(d,"dir")!="rtl"){a.dom.setAttrib(d,"dir","rtl")}else{a.dom.setAttrib(d,"dir","")}}a.nodeChanged()});a.addButton("ltr",{title:"directionality.ltr_desc",cmd:"mceDirectionLTR"});a.addButton("rtl",{title:"directionality.rtl_desc",cmd:"mceDirectionRTL"});a.onNodeChange.add(c._nodeChange,c)},getInfo:function(){return{longname:"Directionality",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var d=b.dom,c;e=d.getParent(e,d.isBlock);if(!e){a.setDisabled("ltr",1);a.setDisabled("rtl",1);return}c=d.getAttrib(e,"dir");a.setActive("ltr",c=="ltr");a.setDisabled("ltr",0);a.setActive("rtl",c=="rtl");a.setDisabled("rtl",0)}});tinymce.PluginManager.add("directionality",tinymce.plugins.Directionality)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/directionality/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/directionality/editor_plugin_src.js
new file mode 100644
index 0000000000..4444959bf3
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/directionality/editor_plugin_src.js
@@ -0,0 +1,82 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Directionality', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			ed.addCommand('mceDirectionLTR', function() {
+				var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock);
+
+				if (e) {
+					if (ed.dom.getAttrib(e, "dir") != "ltr")
+						ed.dom.setAttrib(e, "dir", "ltr");
+					else
+						ed.dom.setAttrib(e, "dir", "");
+				}
+
+				ed.nodeChanged();
+			});
+
+			ed.addCommand('mceDirectionRTL', function() {
+				var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock);
+
+				if (e) {
+					if (ed.dom.getAttrib(e, "dir") != "rtl")
+						ed.dom.setAttrib(e, "dir", "rtl");
+					else
+						ed.dom.setAttrib(e, "dir", "");
+				}
+
+				ed.nodeChanged();
+			});
+
+			ed.addButton('ltr', {title : 'directionality.ltr_desc', cmd : 'mceDirectionLTR'});
+			ed.addButton('rtl', {title : 'directionality.rtl_desc', cmd : 'mceDirectionRTL'});
+
+			ed.onNodeChange.add(t._nodeChange, t);
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Directionality',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_nodeChange : function(ed, cm, n) {
+			var dom = ed.dom, dir;
+
+			n = dom.getParent(n, dom.isBlock);
+			if (!n) {
+				cm.setDisabled('ltr', 1);
+				cm.setDisabled('rtl', 1);
+				return;
+			}
+
+			dir = dom.getAttrib(n, 'dir');
+			cm.setActive('ltr', dir == "ltr");
+			cm.setDisabled('ltr', 0);
+			cm.setActive('rtl', dir == "rtl");
+			cm.setDisabled('rtl', 0);
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('directionality', tinymce.plugins.Directionality);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/editor_plugin.js
new file mode 100644
index 0000000000..dbdd8ffb58
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/editor_plugin.js
@@ -0,0 +1 @@
+(function(a){a.create("tinymce.plugins.EmotionsPlugin",{init:function(b,c){b.addCommand("mceEmotion",function(){b.windowManager.open({file:c+"/emotions.htm",width:250+parseInt(b.getLang("emotions.delta_width",0)),height:160+parseInt(b.getLang("emotions.delta_height",0)),inline:1},{plugin_url:c})});b.addButton("emotions",{title:"emotions.emotions_desc",cmd:"mceEmotion"})},getInfo:function(){return{longname:"Emotions",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("emotions",a.plugins.EmotionsPlugin)})(tinymce);
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/editor_plugin_src.js
new file mode 100644
index 0000000000..71d5416972
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/editor_plugin_src.js
@@ -0,0 +1,43 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function(tinymce) {
+	tinymce.create('tinymce.plugins.EmotionsPlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceEmotion', function() {
+				ed.windowManager.open({
+					file : url + '/emotions.htm',
+					width : 250 + parseInt(ed.getLang('emotions.delta_width', 0)),
+					height : 160 + parseInt(ed.getLang('emotions.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.addButton('emotions', {title : 'emotions.emotions_desc', cmd : 'mceEmotion'});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Emotions',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('emotions', tinymce.plugins.EmotionsPlugin);
+})(tinymce);
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/emotions.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/emotions.htm
new file mode 100644
index 0000000000..2c91002e4e
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/emotions.htm
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#emotions_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/emotions.js"></script>
+</head>
+<body style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#emotions_dlg.title}</span>
+<div align="center">
+	<div class="title">{#emotions_dlg.title}:<br /><br /></div>
+
+	<table role="presentation" border="0" cellspacing="0" cellpadding="4">
+		<tr>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-cool.gif','emotions_dlg.cool');"><img src="img/smiley-cool.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cool}" title="{#emotions_dlg.cool}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-cry.gif','emotions_dlg.cry');"><img src="img/smiley-cry.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cry}" title="{#emotions_dlg.cry}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-embarassed.gif','emotions_dlg.embarassed');"><img src="img/smiley-embarassed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.embarassed}" title="{#emotions_dlg.embarassed}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-foot-in-mouth.gif','emotions_dlg.foot_in_mouth');"><img src="img/smiley-foot-in-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.foot_in_mouth}" title="{#emotions_dlg.foot_in_mouth}" /></a></td>
+		</tr>
+		<tr>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-frown.gif','emotions_dlg.frown');"><img src="img/smiley-frown.gif" width="18" height="18" border="0" alt="{#emotions_dlg.frown}" title="{#emotions_dlg.frown}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-innocent.gif','emotions_dlg.innocent');"><img src="img/smiley-innocent.gif" width="18" height="18" border="0" alt="{#emotions_dlg.innocent}" title="{#emotions_dlg.innocent}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-kiss.gif','emotions_dlg.kiss');"><img src="img/smiley-kiss.gif" width="18" height="18" border="0" alt="{#emotions_dlg.kiss}" title="{#emotions_dlg.kiss}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-laughing.gif','emotions_dlg.laughing');"><img src="img/smiley-laughing.gif" width="18" height="18" border="0" alt="{#emotions_dlg.laughing}" title="{#emotions_dlg.laughing}" /></a></td>
+		</tr>
+		<tr>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-money-mouth.gif','emotions_dlg.money_mouth');"><img src="img/smiley-money-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.money_mouth}" title="{#emotions_dlg.money_mouth}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-sealed.gif','emotions_dlg.sealed');"><img src="img/smiley-sealed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.sealed}" title="{#emotions_dlg.sealed}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-smile.gif','emotions_dlg.smile');"><img src="img/smiley-smile.gif" width="18" height="18" border="0" alt="{#emotions_dlg.smile}" title="{#emotions_dlg.smile}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-surprised.gif','emotions_dlg.surprised');"><img src="img/smiley-surprised.gif" width="18" height="18" border="0" alt="{#emotions_dlg.surprised}" title="{#emotions_dlg.surprised}" /></a></td>
+		</tr>
+		<tr>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-tongue-out.gif','emotions_dlg.tongue_out');"><img src="img/smiley-tongue-out.gif" width="18" height="18" border="0" alt="{#emotions_dlg.tongue-out}" title="{#emotions_dlg.tongue_out}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-undecided.gif','emotions_dlg.undecided');"><img src="img/smiley-undecided.gif" width="18" height="18" border="0" alt="{#emotions_dlg.undecided}" title="{#emotions_dlg.undecided}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-wink.gif','emotions_dlg.wink');"><img src="img/smiley-wink.gif" width="18" height="18" border="0" alt="{#emotions_dlg.wink}" title="{#emotions_dlg.wink}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-yell.gif','emotions_dlg.yell');"><img src="img/smiley-yell.gif" width="18" height="18" border="0" alt="{#emotions_dlg.yell}" title="{#emotions_dlg.yell}" /></a></td>
+		</tr>
+	</table>
+</div>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-cool.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-cool.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ba90cc36fb0415d0273d1cd206bff63fd9c91fde
GIT binary patch
literal 354
zcmV-o0iFIwNk%w1VG;lm0Mr!#3ke00dJfFY%i+lrhK7V(RutUQJhPY;?(XfrsZKgL
z7WLQ^zPO&zzav{)SL^9nBOw~z(=orMEH5uC-P_gr`uhCnASMa|$-iRw?m_(dUwU8)
zq>Kx}s1_F$4FCWDA^8LW0018VEC2ui01^Na000Hw;3tYzX_jM3Qpv$_M?zI9i5=0S
zX-{-uv=l<p*=3HIT}Of#RazKBq;Z@YZV4Iz0#Fnb06?MO>3%&P0s%m9Ox_a(m_c|u
z01g3U0`Wll5)poVdma=N8y<3f0Sf~hXmTC}2oxMW4FdxUj+z4<0}lrX2nP=qkDRIt
z9Ge*(qzMrj3jrIOjvI{`5eWzt3`G_T8yChG8w(a19SkK12@M(+799Zr9n=~PzBCmA
z5)BU-)YKUd4H5!D9|!^o9kWIe9SH(WDHRk92}DZ?3})2$P@$55g90f0N)ZA8JID5J
Aw*UYD

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-cry.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-cry.gif
new file mode 100644
index 0000000000000000000000000000000000000000..74d897a4f6d22e814e2b054e98b8a75fb464b4be
GIT binary patch
literal 329
zcmV-P0k-}}Nk%w1VG;lm0Mr-&E)xPSit@9T3%;vR+|V+?t0A(pllJjXrMl7n=_A_a
za^B+Su$LjvyC3@TIQZNZa##w=!k(SO^P#bO*w(eU#;{U83XFCU_V)J5wrb+;g2vkN
z#>U24qVoOvY5)KLA^8LW0018VEC2ui01^Na000HX;3tY$X_jM3QUfCh%s^o(nF++<
zc?Th6v=oL>*by8K!mhvwelUXuuW&&U9iGO3hM@>Njw{l^#0q9mWpcefdI;O$;efnY
zkd~@r-o$*74FCWI1%d((4+jDz0va0>69^fI6%`W{8w!gU1pyL>prH>E0R<%k6Aq%H
z4ij+^9TEwM5P}eh2@)L<B?|!!2MHGf4Gk9;2?q@U3tR{Vzzzx13409%2tlM00|hxd
bJp}{XBh3p2-Gt%><~6+>@EpxfA0YrcPNsSu

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-embarassed.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-embarassed.gif
new file mode 100644
index 0000000000000000000000000000000000000000..963a96b8a7593b1d8bcbab073abe5ee4e539dbf6
GIT binary patch
literal 331
zcmV-R0kr-{Nk%w1VG;lm0MrryDh>j~yq&6%75dW~z^P39(NxsGDE{UkxtkIEq(S-a
zRKlwv+S=Lr?>hbYY~sQ?c3T&ZcN_Nh_E<O%#>U3s(>Io6B&>WW`@bsw**)Ocy1bht
z{*G6|uwwqUQ2+n{A^8LW0018VEC2ui01^Na000HZ;3tYwX_jM3YQ!c88=*-m*&&bO
zILd=`w3KAC;8hxpif*w9ek6oqV-Z0L77fROK$B<?js^^gTnMs=8C02!K#=aEqQaFR
z6pBm+GC@uzdU#EC4h0?_7ZwKt5f%vv7zzj_2!<RSkOKo436}{4lS7u67@C}(1%m_+
z1&^hgn~wz#bpZ=`7y=Uj023D&843#lB@6@x3J1!|$_fSq3|$Nh$PLU5&I{2a5)2&+
dN;`849os?-0Z|L<1OetM#T4=s(M}&B06V4ic~SrX

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-foot-in-mouth.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-foot-in-mouth.gif
new file mode 100644
index 0000000000000000000000000000000000000000..16f68cc1e91a9b8ec6cfa0ba4e0c86f94b177f1a
GIT binary patch
literal 344
zcmV-e0jK^)Nk%w1VG;lm0MrlwCJF+^#>SR@5BAv-%C>6y>>#+D4e#&nz^qMDItlpp
zTG728+|V&?R13PIEBW(C`uh6d*t-1sZ^XQv;oDD}iYLOV7uVO;{`xl4#4tJ{0;h@!
z>)kfFn;iS@Hvj+tA^8LW0018VEC2ui01^Na000Hm;3tYuX_jM3Mo7199TGt*Nf;R=
zNmOPKwA8_2Q6MTDP6eT`I1VESVj-zGIG(JdB3U44kcdI@;AAq{Gv^^O%%ltj2GdB)
z>vIL;d*~=0a|w1Bf^!cF9R~+vb94;_0}TxWlnMrlj2MuVoSYAreF`3(0|pHS8VLgr
zi3bP_qZ<Mn4FCY94IX<35EDfUw!s<#2@6dVC9cMT8yWxt76K1mydMx34#t`b3jz%k
q3l0}S9|so*77T}f85Rf^P$}0F2t-Z@6XP}3<^lcz@W_1#0RTHjS$aSK

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-frown.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-frown.gif
new file mode 100644
index 0000000000000000000000000000000000000000..716f55e161bfebb1c3d34f0b0f40c177fc82c30b
GIT binary patch
literal 340
zcmV-a0jvH;Nk%w1VG;lm0MroxK_>;q#>Sw62=mns-On=0wransPVevT^YK{Dy(0YY
zH)vE6x0?;Wqb>gZas1^OT0si>`ugD5y87}*#H$s=yq(wA*8cf7{`y+(+9J7|9QfT7
z`ROHiU=Y&6FaQ7mA^8LW0018VEC2ui01^Na000Hi;3tYvX_jM3N`@u~nju9hSuh^r
zIEcp-wA7(NL0~2d#RP+(G!CPPA>o*KJjv_CkucCA5=K?AfF#RG2V*8BU@jL304|4P
z2;PGRF@bj$et;Jf2pR_mVsIA<85|n}kQ*Bq42Ovqj*yy>6P0=h3X&9Z01y<C4-<w5
z1_YrDr5zn|3>yk~2N4w%7#RW^55W%`0vQ+-6(y_*2pqz~90*;x9}yM}%$UI(7t#$D
mK_3Se1{4HKM+6iG7EmeH6$V631{L5n)#CyC0qx-*Apkoyg?w!Q

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-innocent.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-innocent.gif
new file mode 100644
index 0000000000000000000000000000000000000000..334d49e0e60f2997c9ba24071764f95d9e08a5cc
GIT binary patch
literal 336
zcmV-W0k8f?Nk%w1VG;lm0MrryI4TI-%dP0m5~*<p%dw5l&RW5fRqyTWvyTq>+Y`T~
z7Rth){q{I_X%*S48uRZ|(b3V&wIKTX`u+WJzo<^$#wuY;3W|Cf{O29IkTAcaE&lpe
z+P*^H)-tknA^-pYA^8LW0018VEC2ui01^Na000He;3tYwX_n)75QgVvNQ`6#5gcMm
zEEG~blgXokptKAJgCU?%JT?yo<M~i%4gt?6Fz6~Am9UtD7-RyH0HP3SJKk^yXMmPa
zIvd6X(CBm;d>s!R6cPtcQWh2siHlNI2L}ifQhgX02^InZ2?-ktkqVRyZJY^Trk|lv
zovp437?1~d46O)?2(1i+2NDYk8<+_Kil!K!3njA^!I#dL8x<729}*B65mC=m5gHH@
iDi9P3f*VjB3KS4HDb_qqRul{0DI<mu`1#Z$Apkp|ihYg%

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-kiss.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-kiss.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4efd549ed31c44b1faac17ed34bb67abeb42baf8
GIT binary patch
literal 338
zcmV-Y0j>T=Nk%w1VG;lm0Mrx!QauaC#>Vb6G=_5=^YB^9wrc376Sb5I-qJGf@9vZ#
z5WlKU(!eVB+7tfnDXp0zyB`?BZ5IChalob*`uh6d*t+@dKGHcU+L|83yq*5~IoH?L
zy`?Gp<{bX|SpWb4A^8LW0018VEC2ui01^Na000Hg;3tYyX_jM3R?Bl7&r(q;SsVx<
zNd$5fv{ZsKA$SlL3&KN~a1tZRf*~1Ltk<iAv7k{Z2Z`pvc_hgXjpQ(sE;$1LK%<cl
zILB_HNUzT|aeYk*31NL24jm1Pj2;JshKLOYi<FIzdjt-Z3NH$l9TpRW3rGzS3J|Ig
z3K0!T3keh%6CNEM5fB0b7ZJA}6B#85Qy!Zb7Z(@}4jx>x9~2uL3<QX`4jKdu92-F&
k2^$L&NFE+a6AK$qDbg7WL{1AC-ZjzT0r>&z-yb0WJDRY082|tP

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-laughing.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-laughing.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1606c119e75678c4031f384e0d50849906e8f533
GIT binary patch
literal 344
zcmV-e0jK^)Nk%w1VG;lm0MruzQauf>s;1-69HWK?p_PpF=Pd8<?!T%|a$ZRD@LAHn
zAH%B}$j8NMQxe3yo%Yxe`tnEM*t)ly6Z-o4{{3<N_BV)iTG-Xox}Pq}wrbweGI?VY
z)x$BurZWEfS^xk5A^8LW0018VEC2ui01^Na000Hm;3tYxX_jM3Mu#*E(h*H6nMqti
zQ3)qyw3Gp}NO&Mfh$peY7)FzWf&$@iDite)qBzhd5ec=@0AS0Ntz;I}c(4F-C64uI
zyaq`Eg55Owe`yI426+@%6$Oe90s;?@9)yMk9FC8d4+{bil6ngW7NMe{2pF7&2O4Aq
z3;`Dx0Sp9xcLoy<3myUu7Yro~7Yzy?3l1d)Qo0)iud@OkUA7++7aa--6$={!3l#|p
q9T!0#1{Vhl8cIhR3kMfZDbx-J9SaK`2M*#j)8!2Rz@&``0RTG|A$nB+

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-money-mouth.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-money-mouth.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ca2451e102722e12e131ae53ea76989acbf191e2
GIT binary patch
literal 321
zcmV-H0lxl6Nk%w1VG;lm0Mrx!DHsO6wwjoX9Kxs~!mLsE+7oVAHu>~Ygtcnp*fHAL
z**;z>w3iC}`fmL6IkKB1N;3zEa}&zKpsu1;_V)HocR5-{J~BcYvE`YXhBnc@CfU=!
za(E<?eig#P!T<mOA^8LW0018VEC2ui01^Na000HP;3tYyX_jM3Zp6bd53x}yNif>c
zG>66zv=rqr;2j)}gKqE$ekcSD?}0=<bQ<7u!)Q1n00<H+ZZKxh#32EQBphsaG65Va
zkpjTmkyjs@6kSLVZ3P8{5rzj0C4zW{h8>WLB?AWp85)qAL<a*U1aAfwq@|<=aCH)v
z4*(Si6|WTl0-h2j3Q-&j3$U*X6&G0wG!zO07rYn<2p9_&0t3V&#uK|3*v<n4(?SXX
Tyx|K0-72^q=pMvQA0YrcF~)Li

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-sealed.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-sealed.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b33d3cca1e7b8e62dc689880074d5c61f619520d
GIT binary patch
literal 325
zcmV-L0lNN2Nk%w1VG;lm0MruzQaua4xS#gj6sL~~h=_>d+P=4)6X4oXy{bw2>K^d$
z@6ERvva+(4ib~41YUkTEn1&#?rzrOHT>1I=Y*h`+%*@WtPUPg|!@EEI_d5LgZ>^Og
z-qyCjsu$J9F8}}lA^8LW0018VEC2ui01^Na000HT;3tYxX_jM37RWXX8&XUv=@{Oj
zX@_Sxw3H&!kzgQ?2LvPOL=>Y5VxieY9+_+eqFEql6OKWXd3Ze8Ggf2Zln@U|mI9d9
zGm^(wVUTA5cYs-V1`2#+a})^z6chrF5`~8k5e6@pmkW`GeGw<069yTQaGnH)s0suV
zR|pCd0ZtRCsjM9VB^L+~7X%f*zyuc%2p3=#ycf#L%McYo9|{Z&5D^#_78qL%3{WW(
X7Xb)FP6z?UH6ODVz!ev-DIowmgll^P

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-smile.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-smile.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e6a9e60d5ddd1243fbbf2197b4dc6cd9c1b58b93
GIT binary patch
literal 345
zcmV-f0jB;(Nk%w1VG;lm0MrlwCJF+^#>SR<4C>Dj%C>6W(lWoQPVevT^YB^Fy&h6M
z4YZgH{O~qtR1(Ci8T;lQ`uh6d*t-7xar*K{#Jrulo-Wtd*44u?{`oh#n;gQXGXDEo
z_}UVAU=FH^0ssI2A^8LW0018VEC2ui01^Na000Hn;3tYuX_jM3Mn>j&nGr!MNh}v4
zNyxPjwA7*EKx`%q#$<zVR1PDEAt9MuF3Iaek}%L9kwul!P$bJr$zmogY%myw0xpMd
z3f@BoF@bj)et;Mg2pI<lVsID?4-Xsz100eY3x|n}l9`f`6P0=h3<DmTk{$yO6NU!{
z1q>Vl9SM>N9ReH-cn1&^4jYXf0KotqjT;UWC94U(4-NtX4#i!%9}pHA2?&dg3>XLr
r8Wuqx2Nnhn1xrT-4h9xbDb^GQ8V(K`1{C5o)#U;I0p5-K5CQ-@9%y<Y

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-surprised.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-surprised.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cb99cdd9136fa30462a9f57aa6a0adeb7e4124e7
GIT binary patch
literal 342
zcmV-c0jd5+Nk%w1VG;lm0MrlwC=3F|#>SnDDC*4*{OcpiwransPVevTQacIr@mkQp
zCf(06s)_=>r7UYx48o@u`uh6d*t-7rH~ji<`P&oj;5Wp)o!8ga`SV6TA_BIW5#ZWV
z{`*+_<Ql}dL;wH)A^8LW0018VEC2ui01^Na000Hk;3tYuX_jM3Mux^Pnh`-NS!l~P
zP1~XswA7*TNO%O5iolb2G!7$(K`{|DDiTShA($u(G)P1<!BiHCEV_c3XlBv{C+k4a
z?Gnxce9$B?SqON7Sr`c#2YnM+5)KXo9gY-}9Egfp1Ou9zlN1=1MG~D4000`D9T*RZ
z1`DE-2&D*}5_<;_77rYd9T}wn9UTN54;Cc{Q@fF}!W>_>9}pJ}3JDSl85wB_3Jn)Q
o9|so(4+|I^92g4^1{Y8%(iR3pP6ig=HPPY$`~mLZA3^{CJDB=?L;wH)

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-tongue-out.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-tongue-out.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2075dc16058f1f17912167675ce5cfb9986fc71d
GIT binary patch
literal 328
zcmV-O0k{4~Nk%w1VG;lm0Mrx!CJF+^#>SU@3-{U*rx+Q^wrc$ABfqLn@9*x?z8(4X
zSW-O=@){bmmI~g|GQXoP);c<FSP}d3M*jVA`uh6d*t))=8CnMdwl62dyq*2^H`mwJ
z)x$CM;3E1`Q~&?~A^8LW0018VEC2ui01^Na000HW;3tYyX_jM3R)^Iz)=^O^Su~t7
zO$yf(v=riDQ79xxiP7>vj3|f1M8e@{G*!tYaiCEujj1NGxRN#6#tiCETo+{x{Hkzt
z5k-kPvcD=V2nb<UR~-feh=~dffrA={iID>mjCgL6k{uF&2nP-t0s;w<385Nx2oxDb
z9T5Pp7qJl?3Kkh9oe2sCr5F$p7zPSlsUH*@54w*83=9Or4;w)r2pcU95(FL|1Th;<
aDaRQH4;Tal7#Y$v#?=Au0pHUfApkpvZg^t=

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-undecided.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-undecided.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bef7e257303f8243c89787e7a7f9955dd1f112e2
GIT binary patch
literal 337
zcmV-X0j~Z>Nk%w1VG;lm0MroxDi#99#>R?y8~4}{%C>6#>?OadPVevTr-=vi@LATn
z4rERY-qJF+n+?CCE&B3D{{3<K`ugD5x<W4p!>Shh?>WT0o%`b%*Voqm`dL;(4F35y
zc485^n;g!+Bme*aA^8LW0018VEC2ui01^Na000Hf;3tYvX_jM3N=AnuogqakNi<9X
zK?&0kwA8^tNn{?C$|IAYI1ZzT!2>}iuMddFK#NEkRl!7%6brJAnUs;)XcnA}TNBSP
zxQ9;SvEfwYeSaGd2^|LqU~(QF1qBxr3Ii7x84ZVt8wCTKoSYAqc?p`G2onnpk`IOl
z1`HLGj}riN2p1K12N4z&8IBDc6tEWs859;JtRB6>lf+xO9}yT19toMv8wnl`7(pKg
j7zPv!OGgY81{hE&(iR3pP6ig;HPPS!_yOwPA0Yrc)=Yf3

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-wink.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-wink.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9faf1aff8f4b28e02f4f414975fe1859c43b6b54
GIT binary patch
literal 351
zcmV-l0igazNk%w1VG;lm0MrryC=CL}#>Sn03F^-g-qAA3wransPV?|t@9*x%vmQ`7
z4E*pcw3rOOq%3t@4*K#({N^40{c-yG`rz2Q!KfI-yq*61HrBop*VoqW<}&{JS@_x#
zwwfH#!YTdnIsgCwA^8LW0018VEC2ui01^Na000Ht;3tYwX_jM3P6j6koH0o%Sun&A
zMF+tYv=pL2IcOdp&qH&dG!P?+ArV0)J)O=Yk}%LD6Go&#@MJn3he8=)%%lWOM*#pN
zEDD9iq9J$@90v~;83`GC4i0+{2OJ0pVtacF5E}yn8<`pmkCBv_pqZEtoPY-l0}P>=
z3<D4kjtB;28v+g&nHLTM8y<cL5)~905D*S^bq>WE6cr`19U7DgF9{F}at6R35*Q5~
x2OgBy9tRx_7(pKh7zPvsOGgA01{hE&-4zBzP6id}HMp@0Krnzkbss_i06S`>cdh^c

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-yell.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/img/smiley-yell.gif
new file mode 100644
index 0000000000000000000000000000000000000000..648e6e879123fe49beebbc1f3635141864a79a9c
GIT binary patch
literal 336
zcmV-W0k8f?Nk%w1VG;lm0MrryG8O{K#>IbS7WCB_mWF$+hzY-{PWkp(?(Xf;zbH~P
z3jOdj?W+^YwrakfE8fyG&5jTBz!3WS`fgM_;MltQ+c}4GO8)(E`S3`@yq&d~5!ct&
z)v79NObo)O7XSbNA^8LW0018VEC2ui01^Na000He;3tYwX_jM3QifI(nn6h_*=Wyk
zUB{y}v=qYOIUF#R3dZPhAVv~H;(|<CF_(maCZTAu39B_R)y$%~g`mSpayo)VZ;Q|z
z7ZnA-;Q%Nq3riXZbr%Z>a2yN_5FH&J0|$eJ3kw4gj1Y?v5d#>LMV12^6BYy$1)ZKA
zga!|m2?POz0R)f>4+aPl8KD{gz`+G_9vLMFQU?RU!8uyH9}*i52|cC+7S0YEK_3Vk
i1|APfM-Ltb8&4_H83sg61{vHn(cc000qNZzApkp<uzFPh

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/js/emotions.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/js/emotions.js
new file mode 100644
index 0000000000..c549367096
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/js/emotions.js
@@ -0,0 +1,22 @@
+tinyMCEPopup.requireLangPack();
+
+var EmotionsDialog = {
+	init : function(ed) {
+		tinyMCEPopup.resizeToInnerSize();
+	},
+
+	insert : function(file, title) {
+		var ed = tinyMCEPopup.editor, dom = ed.dom;
+
+		tinyMCEPopup.execCommand('mceInsertContent', false, dom.createHTML('img', {
+			src : tinyMCEPopup.getWindowArg('plugin_url') + '/img/' + file,
+			alt : ed.getLang(title),
+			title : ed.getLang(title),
+			border : 0
+		}));
+
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.onInit.add(EmotionsDialog.init, EmotionsDialog);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/da_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/da_dlg.js
new file mode 100644
index 0000000000..0e37b795e2
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/da_dlg.js
@@ -0,0 +1,20 @@
+tinyMCE.addI18n('da.emotions_dlg',{
+title:"Inds\u00E6t hum\u00F8rikon",
+desc:"Hum\u00F8rikoner",
+cool:"Cool",
+cry:"Gr\u00E6de",
+embarassed:"Flov",
+foot_in_mouth:"Fod i munden",
+frown:"Forskr\u00E6kket",
+innocent:"Uskyldig",
+kiss:"Kys",
+laughing:"Grine",
+money_mouth:"Pengemund",
+sealed:"Lukket",
+smile:"Smil",
+surprised:"Overrasket",
+tongue_out:"Tunge ud",
+undecided:"Ubeslutsom",
+wink:"Vink",
+yell:"R\u00E5be"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/de_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/de_dlg.js
new file mode 100644
index 0000000000..3940a2a54b
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/de_dlg.js
@@ -0,0 +1,20 @@
+tinyMCE.addI18n('de.emotions_dlg',{
+title:"Smiley einf\u00FCgen",
+desc:"Smilies",
+cool:"Cool",
+cry:"Weinend",
+embarassed:"Verlegen",
+foot_in_mouth:"Reingefallen",
+frown:"Stirnrunzelnd",
+innocent:"Unschuldig",
+kiss:"K\u00FCssend",
+laughing:"Lachend",
+money_mouth:"Geld",
+sealed:"Verschlossen",
+smile:"L\u00E4chelnd",
+surprised:"\u00DCberrascht",
+tongue_out:"Zunge raus",
+undecided:"Unentschlossen",
+wink:"Zwinkernd",
+yell:"Br\u00FCllend"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/en_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/en_dlg.js
new file mode 100644
index 0000000000..3b57ad9e3c
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/en_dlg.js
@@ -0,0 +1,20 @@
+tinyMCE.addI18n('en.emotions_dlg',{
+title:"Insert emotion",
+desc:"Emotions",
+cool:"Cool",
+cry:"Cry",
+embarassed:"Embarassed",
+foot_in_mouth:"Foot in mouth",
+frown:"Frown",
+innocent:"Innocent",
+kiss:"Kiss",
+laughing:"Laughing",
+money_mouth:"Money mouth",
+sealed:"Sealed",
+smile:"Smile",
+surprised:"Surprised",
+tongue_out:"Tongue out",
+undecided:"Undecided",
+wink:"Wink",
+yell:"Yell"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/es_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/es_dlg.js
new file mode 100644
index 0000000000..0d95db55d0
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/es_dlg.js
@@ -0,0 +1,20 @@
+tinyMCE.addI18n('es.emotions_dlg',{
+title:"Insertar emoticon",
+desc:"Emoticones",
+cool:"Todo bien",
+cry:"Llora",
+embarassed:"Verg\u00FCenza",
+foot_in_mouth:"Pie en la boca",
+frown:"Triste",
+innocent:"Inocente",
+kiss:"Beso",
+laughing:"Risa",
+money_mouth:"Dinero boca",
+sealed:"Sellado",
+smile:"Sonrisa",
+surprised:"Sorprendido",
+tongue_out:"Lengua fuera",
+undecided:"Indeciso",
+wink:"Gui\u00F1o",
+yell:"Enfadado"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/fr_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/fr_dlg.js
new file mode 100644
index 0000000000..b47571864d
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/fr_dlg.js
@@ -0,0 +1,20 @@
+tinyMCE.addI18n('fr.emotions_dlg',{
+title:"Ins\u00E9rer \u00E9motion",
+desc:"\u00C9motions",
+cool:"Cool",
+cry:"En pleurs",
+embarassed:"Embarass\u00E9",
+foot_in_mouth:"Pied de nez",
+frown:"D\u00E9\u00E7u",
+innocent:"Innocent",
+kiss:"Bisou",
+laughing:"Rigolant",
+money_mouth:"Avare",
+sealed:"Bouche cousue",
+smile:"Sourire",
+surprised:"Surpris",
+tongue_out:"Langue tir\u00E9e",
+undecided:"Non d\u00E9cid\u00E9",
+wink:"Clin d'oeil",
+yell:"Criant"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/it_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/it_dlg.js
new file mode 100644
index 0000000000..8b9efb7849
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/it_dlg.js
@@ -0,0 +1,20 @@
+tinyMCE.addI18n('it.emotions_dlg',{
+title:"Inserisci faccina",
+desc:"Faccina",
+cool:"Fico",
+cry:"Piango",
+embarassed:"Imbarazzato",
+foot_in_mouth:"Piede in bocca",
+frown:"Triste",
+innocent:"Santarellino",
+kiss:"Bacio",
+laughing:"Risatona",
+money_mouth:"Bocca danarosa",
+sealed:"Bocca sigillata",
+smile:"Sorridente",
+surprised:"Sorpreso",
+tongue_out:"Linguaccia",
+undecided:"Indeciso",
+wink:"Occhiolino",
+yell:"Arrabbiato"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/nl_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/nl_dlg.js
new file mode 100644
index 0000000000..f98e1da701
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/nl_dlg.js
@@ -0,0 +1,20 @@
+tinyMCE.addI18n('nl.emotions_dlg',{
+title:"Emotie invoegen",
+desc:"Emoties",
+cool:"Stoer",
+cry:"Huilen",
+embarassed:"Schamen",
+foot_in_mouth:"Verstomd",
+frown:"Wenkbrouw ophalen",
+innocent:"Onschuldig",
+kiss:"Zoenen",
+laughing:"Lachen",
+money_mouth:"Hebberig",
+sealed:"Afgesloten",
+smile:"Lachen",
+surprised:"Verrast",
+tongue_out:"Tong uitsteken",
+undecided:"Onbeslist",
+wink:"Knipogen",
+yell:"Roepen"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/no_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/no_dlg.js
new file mode 100644
index 0000000000..698a8d8946
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/no_dlg.js
@@ -0,0 +1,20 @@
+tinyMCE.addI18n('no.emotions_dlg',{
+title:"Sett inn hum\u00F8rfjes",
+desc:"Hum\u00F8rfjes",
+cool:"Cool",
+cry:"Gret",
+embarassed:"Flau",
+foot_in_mouth:"Fot i munnen",
+frown:"Skuffa",
+innocent:"Uskyldig",
+kiss:"Kyss",
+laughing:"Ler",
+money_mouth:"Pengar i munnen",
+sealed:"Hemmelig",
+smile:"Glad",
+surprised:"Overraska",
+tongue_out:"Rekke tunge",
+undecided:"Skeptisk",
+wink:"Blunke",
+yell:"Skrik"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/sv_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/sv_dlg.js
new file mode 100644
index 0000000000..cc6c35687b
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/emotions/langs/sv_dlg.js
@@ -0,0 +1,20 @@
+tinyMCE.addI18n('sv.emotions_dlg',{
+title:"Infoga smiley",
+desc:"Smileys",
+cool:"Cool",
+cry:"Gr\u00E5ter",
+embarassed:"Sk\u00E4ms",
+foot_in_mouth:"Foten i munnen",
+frown:"Rynkar p\u00E5 n\u00E4san",
+innocent:"Oskyldig",
+kiss:"Kyss",
+laughing:"Skrattande",
+money_mouth:"Guld i mun",
+sealed:"Tyst",
+smile:"Glad",
+surprised:"F\u00F6rv\u00E5nad",
+tongue_out:"Tungan ute",
+undecided:"Obest\u00E4md",
+wink:"Fl\u00F6rt",
+yell:"Skrikandes"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/example/dialog.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/example/dialog.htm
new file mode 100644
index 0000000000..50b2b34451
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/example/dialog.htm
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#example_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/dialog.js"></script>
+</head>
+<body>
+
+<form onsubmit="ExampleDialog.insert();return false;" action="#">
+	<p>Here is a example dialog.</p>
+	<p>Selected text: <input id="someval" name="someval" type="text" class="text" /></p>
+	<p>Custom arg: <input id="somearg" name="somearg" type="text" class="text" /></p>
+
+	<div class="mceActionPanel">
+		<input type="button" id="insert" name="insert" value="{#insert}" onclick="ExampleDialog.insert();" />
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+	</div>
+</form>
+
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/example/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/example/editor_plugin.js
new file mode 100644
index 0000000000..ec1f81ea40
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/example/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.PluginManager.requireLangPack("example");tinymce.create("tinymce.plugins.ExamplePlugin",{init:function(a,b){a.addCommand("mceExample",function(){a.windowManager.open({file:b+"/dialog.htm",width:320+parseInt(a.getLang("example.delta_width",0)),height:120+parseInt(a.getLang("example.delta_height",0)),inline:1},{plugin_url:b,some_custom_arg:"custom arg"})});a.addButton("example",{title:"example.desc",cmd:"mceExample",image:b+"/img/example.gif"});a.onNodeChange.add(function(d,c,e){c.setActive("example",e.nodeName=="IMG")})},createControl:function(b,a){return null},getInfo:function(){return{longname:"Example plugin",author:"Some author",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example",version:"1.0"}}});tinymce.PluginManager.add("example",tinymce.plugins.ExamplePlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/example/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/example/editor_plugin_src.js
new file mode 100644
index 0000000000..9a0e7da15d
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/example/editor_plugin_src.js
@@ -0,0 +1,84 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	// Load plugin specific language pack
+	tinymce.PluginManager.requireLangPack('example');
+
+	tinymce.create('tinymce.plugins.ExamplePlugin', {
+		/**
+		 * Initializes the plugin, this will be executed after the plugin has been created.
+		 * This call is done before the editor instance has finished it's initialization so use the onInit event
+		 * of the editor instance to intercept that event.
+		 *
+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+		 * @param {string} url Absolute URL to where the plugin is located.
+		 */
+		init : function(ed, url) {
+			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
+			ed.addCommand('mceExample', function() {
+				ed.windowManager.open({
+					file : url + '/dialog.htm',
+					width : 320 + parseInt(ed.getLang('example.delta_width', 0)),
+					height : 120 + parseInt(ed.getLang('example.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url, // Plugin absolute URL
+					some_custom_arg : 'custom arg' // Custom argument
+				});
+			});
+
+			// Register example button
+			ed.addButton('example', {
+				title : 'example.desc',
+				cmd : 'mceExample',
+				image : url + '/img/example.gif'
+			});
+
+			// Add a node change handler, selects the button in the UI when a image is selected
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setActive('example', n.nodeName == 'IMG');
+			});
+		},
+
+		/**
+		 * Creates control instances based in the incomming name. This method is normally not
+		 * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons
+		 * but you sometimes need to create more complex controls like listboxes, split buttons etc then this
+		 * method can be used to create those.
+		 *
+		 * @param {String} n Name of the control to create.
+		 * @param {tinymce.ControlManager} cm Control manager to use inorder to create new control.
+		 * @return {tinymce.ui.Control} New control instance or null if no control was created.
+		 */
+		createControl : function(n, cm) {
+			return null;
+		},
+
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @return {Object} Name/value array containing information about the plugin.
+		 */
+		getInfo : function() {
+			return {
+				longname : 'Example plugin',
+				author : 'Some author',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example',
+				version : "1.0"
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('example', tinymce.plugins.ExamplePlugin);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/example/img/example.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/example/img/example.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1ab5da4461113d2af579898528246fdbe52ecd00
GIT binary patch
literal 87
zcmZ?wbhEHb6k!lyn83&Y1dNP~ia%L^OhyJB5FaGNz@*pGzw+SQ`#f{}FJ-?!v#V)e
mtsGNfpJeCKSAiOz**>0`XR2{OVa>-G_df0vaY<rium%9X5FI1{

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/example/js/dialog.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/example/js/dialog.js
new file mode 100644
index 0000000000..fa8341132f
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/example/js/dialog.js
@@ -0,0 +1,19 @@
+tinyMCEPopup.requireLangPack();
+
+var ExampleDialog = {
+	init : function() {
+		var f = document.forms[0];
+
+		// Get the selected contents as text and place it in the input
+		f.someval.value = tinyMCEPopup.editor.selection.getContent({format : 'text'});
+		f.somearg.value = tinyMCEPopup.getWindowArg('some_custom_arg');
+	},
+
+	insert : function() {
+		// Insert the contents from the input into the document
+		tinyMCEPopup.editor.execCommand('mceInsertContent', false, document.forms[0].someval.value);
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.onInit.add(ExampleDialog.init, ExampleDialog);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/example/langs/en.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/example/langs/en.js
new file mode 100644
index 0000000000..e0784f80f4
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/example/langs/en.js
@@ -0,0 +1,3 @@
+tinyMCE.addI18n('en.example',{
+	desc : 'This is just a template button'
+});
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/example/langs/en_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/example/langs/en_dlg.js
new file mode 100644
index 0000000000..ebcf948dac
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/example/langs/en_dlg.js
@@ -0,0 +1,3 @@
+tinyMCE.addI18n('en.example_dlg',{
+	title : 'This is just a example title'
+});
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/css/fullpage.css b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/css/fullpage.css
new file mode 100644
index 0000000000..7a3334f08d
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/css/fullpage.css
@@ -0,0 +1,182 @@
+/* Hide the advanced tab */
+#advanced_tab {
+	display: none;
+}
+
+#metatitle, #metakeywords, #metadescription, #metaauthor, #metacopyright {
+	width: 280px;
+}
+
+#doctype, #docencoding {
+	width: 200px;
+}
+
+#langcode {
+	width: 30px;
+}
+
+#bgimage {
+	width: 220px;	
+}
+
+#fontface {
+	width: 240px;
+}
+
+#leftmargin, #rightmargin, #topmargin, #bottommargin {
+	width: 50px;
+}
+
+.panel_wrapper div.current {
+	height: 400px;
+}
+
+#stylesheet, #style {
+	width: 240px;
+}
+
+/* Head list classes */
+
+.headlistwrapper {
+	width: 100%;
+}
+
+.addbutton, .removebutton, .moveupbutton, .movedownbutton {
+	border-top: 1px solid;
+	border-left: 1px solid;
+	border-bottom: 1px solid;
+	border-right: 1px solid;
+	border-color: #F0F0EE;
+	cursor: default;
+	display: block;
+	width: 20px;
+	height: 20px;
+}
+
+#doctypes {
+	width: 200px;
+}
+
+.addbutton:hover, .removebutton:hover, .moveupbutton:hover, .movedownbutton:hover {
+	border: 1px solid #0A246A;
+	background-color: #B6BDD2;
+}
+
+.addbutton {
+	background-image: url('../images/add.gif');
+	float: left;
+	margin-right: 3px;
+}
+
+.removebutton {
+	background-image: url('../images/remove.gif');
+	float: left;
+}
+
+.moveupbutton {
+	background-image: url('../images/move_up.gif');
+	float: left;
+	margin-right: 3px;
+}
+
+.movedownbutton {
+	background-image: url('../images/move_down.gif');
+	float: left;
+}
+
+.selected {
+	border: 1px solid #0A246A;
+	background-color: #B6BDD2;
+}
+
+.toolbar {
+	width: 100%;
+}
+
+#headlist {
+	width: 100%;
+	margin-top: 3px;
+	font-size: 11px;
+}
+
+#info, #title_element, #meta_element, #script_element, #style_element, #base_element, #link_element, #comment_element, #unknown_element {
+	display: none;
+}
+
+#addmenu {
+	position: absolute;
+	border: 1px solid gray;
+	display: none;
+	z-index: 100;
+	background-color: white;
+}
+
+#addmenu a {
+	display: block;
+	width: 100%;
+	line-height: 20px;
+	text-decoration: none;
+	background-color: white;
+}
+
+#addmenu a:hover {
+	background-color: #B6BDD2;
+	color: black;
+}
+
+#addmenu span {
+	padding-left: 10px;
+	padding-right: 10px;
+}
+
+#updateElementPanel {
+	display: none;
+}
+
+#script_element .panel_wrapper div.current {
+	height: 108px;
+}
+
+#style_element .panel_wrapper div.current {
+	height: 108px;
+}
+
+#link_element  .panel_wrapper div.current {
+	height: 140px;
+}
+
+#element_script_value {
+	width: 100%;
+	height: 100px;
+}
+
+#element_comment_value {
+	width: 100%;
+	height: 120px;
+}
+
+#element_style_value {
+	width: 100%;
+	height: 100px;
+}
+
+#element_title, #element_script_src, #element_meta_name, #element_meta_content, #element_base_href, #element_link_href, #element_link_title {
+	width: 250px;
+}
+
+.updateElementButton {
+	margin-top: 3px;
+}
+
+/* MSIE specific styles */
+
+* html .addbutton, * html .removebutton, * html .moveupbutton, * html .movedownbutton {
+	width: 22px;
+	height: 22px;
+}
+
+textarea {
+	height: 55px;
+}
+
+.panel_wrapper div.current {height:420px;}
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/editor_plugin.js
new file mode 100644
index 0000000000..20fb9b9624
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.FullPagePlugin",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceFullPageProperties",function(){a.windowManager.open({file:b+"/fullpage.htm",width:430+parseInt(a.getLang("fullpage.delta_width",0)),height:495+parseInt(a.getLang("fullpage.delta_height",0)),inline:1},{plugin_url:b,head_html:c.head})});a.addButton("fullpage",{title:"fullpage.desc",cmd:"mceFullPageProperties"});a.onBeforeSetContent.add(c._setContent,c);a.onSetContent.add(c._setBodyAttribs,c);a.onGetContent.add(c._getContent,c)},getInfo:function(){return{longname:"Fullpage",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_setBodyAttribs:function(e,a){var p,d,g,l,b,m,n,h=this.head.match(/body(.*?)>/i),j="",c,f=this.head.match(/<html([^>]*?)>/i);if(h&&h[1]){p=h[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);if(p){for(d=0,g=p.length;d<g;d++){l=p[d].split("=");b=l[0].replace(/\s/,"");m=l[1];if(m){m=m.replace(/^\s+/,"").replace(/\s+$/,"");n=m.match(/^["'](.*)["']$/);if(n){m=n[1]}if(b=="dir"){j=m}}else{m=b}e.dom.setAttrib(e.getBody(),"style",m)}}}if(j==""&&f&&f[1]){c=f[1].match(/dir\s*=\s*["']([^"']*)["']/i);if(c&&c[1]){j=c[1]}}bd=e.getBody();bd.setAttribute("dir",j)},_createSerializer:function(){return new tinymce.dom.Serializer({dom:this.editor.dom,indent:true,apply_source_formatting:true,indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,title,meta,head",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,title,meta,head"})},_setContent:function(d,b){var h=this,a,j,f=b.content,g,i="";if(b.format=="raw"&&h.head){return}if(b.source_view&&d.getParam("fullpage_hide_in_source_view")){return}f=f.replace(/<(\/?)BODY/gi,"<$1body");a=f.indexOf("<body");if(a!=-1){a=f.indexOf(">",a);h.head=f.substring(0,a+1);j=f.indexOf("</body",a);if(j==-1){j=f.length}b.content=f.substring(a+1,j);h.foot=f.substring(j);function e(c){return c.replace(/<\/?[A-Z]+/g,function(k){return k.toLowerCase()})}h.head=e(h.head);h.foot=e(h.foot)}else{h.head="";if(d.getParam("fullpage_default_xml_pi")){h.head+='<?xml version="1.0" encoding="'+d.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'}h.head+=d.getParam("fullpage_default_doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');h.head+="\n<html>\n<head>\n<title>"+d.getParam("fullpage_default_title","Untitled document")+"</title>\n";if(g=d.getParam("fullpage_default_encoding")){h.head+='<meta http-equiv="Content-Type" content="'+g+'" />\n'}if(g=d.getParam("fullpage_default_font_family")){i+="font-family: "+g+";"}if(g=d.getParam("fullpage_default_font_size")){i+="font-size: "+g+";"}if(g=d.getParam("fullpage_default_text_color")){i+="color: "+g+";"}h.head+="</head>\n<body"+(i?' style="'+i+'"':"")+">\n";h.foot="\n</body>\n</html>"}},_getContent:function(a,c){var b=this;if(!c.source_view||!a.getParam("fullpage_hide_in_source_view")){c.content=tinymce.trim(b.head)+"\n"+tinymce.trim(c.content)+"\n"+tinymce.trim(b.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/editor_plugin_src.js
new file mode 100644
index 0000000000..256d241db0
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/editor_plugin_src.js
@@ -0,0 +1,166 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.FullPagePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceFullPageProperties', function() {
+				ed.windowManager.open({
+					file : url + '/fullpage.htm',
+					width : 430 + parseInt(ed.getLang('fullpage.delta_width', 0)),
+					height : 495 + parseInt(ed.getLang('fullpage.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url,
+					head_html : t.head
+				});
+			});
+
+			// Register buttons
+			ed.addButton('fullpage', {title : 'fullpage.desc', cmd : 'mceFullPageProperties'});
+
+			ed.onBeforeSetContent.add(t._setContent, t);
+			ed.onSetContent.add(t._setBodyAttribs, t);
+			ed.onGetContent.add(t._getContent, t);
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Fullpage',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private plugin internal methods
+
+		_setBodyAttribs : function(ed, o) {
+			var bdattr, i, len, kv, k, v, t, attr = this.head.match(/body(.*?)>/i), bddir = '',htattr, hattr = this.head.match(/<html([^>]*?)>/i);
+
+			if (attr && attr[1]) {
+				bdattr = attr[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);
+
+				if (bdattr) {
+					for(i = 0, len = bdattr.length; i < len; i++) {
+						kv = bdattr[i].split('=');
+						k = kv[0].replace(/\s/,'');
+						v = kv[1];
+
+						if (v) {
+							v = v.replace(/^\s+/,'').replace(/\s+$/,'');
+							t = v.match(/^["'](.*)["']$/);
+
+							if (t)
+								v = t[1];
+							if(k == 'dir')
+								bddir = v;
+						} else
+							v = k;
+
+						ed.dom.setAttrib(ed.getBody(), 'style', v);
+					}
+				}
+			}
+			//if found fetch the dir-attribute from the html-tag and apply it to the editor-body
+			if(bddir == '' && hattr && hattr[1]){
+				htattr = hattr[1].match(/dir\s*=\s*["']([^"']*)["']/i);
+				if (htattr && htattr[1])
+					bddir = htattr[1];
+			}
+			bd = ed.getBody();
+			bd.setAttribute('dir', bddir);
+		},
+
+		_createSerializer : function() {
+			return new tinymce.dom.Serializer({
+				dom : this.editor.dom,
+				indent : true,
+				apply_source_formatting : true,
+				indent_before : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,title,meta,head',
+				indent_after : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,title,meta,head'
+			});
+		},
+
+		_setContent : function(ed, o) {
+			var t = this, sp, ep, c = o.content, v, st = '';
+
+			// Ignore raw updated if we already have a head, this will fix issues with undo/redo keeping the head/foot separate
+			if (o.format == 'raw' && t.head)
+				return;
+
+			if (o.source_view && ed.getParam('fullpage_hide_in_source_view'))
+				return;
+
+			// Parse out head, body and footer
+			c = c.replace(/<(\/?)BODY/gi, '<$1body');
+			sp = c.indexOf('<body');
+
+			if (sp != -1) {
+				sp = c.indexOf('>', sp);
+				t.head = c.substring(0, sp + 1);
+
+				ep = c.indexOf('</body', sp);
+				if (ep == -1)
+					ep = c.length;
+
+				o.content = c.substring(sp + 1, ep);
+				t.foot = c.substring(ep);
+
+				function low(s) {
+					return s.replace(/<\/?[A-Z]+/g, function(a) {
+						return a.toLowerCase();
+					})
+				};
+
+				t.head = low(t.head);
+				t.foot = low(t.foot);
+			} else {
+				t.head = '';
+				if (ed.getParam('fullpage_default_xml_pi'))
+					t.head += '<?xml version="1.0" encoding="' + ed.getParam('fullpage_default_encoding', 'ISO-8859-1') + '" ?>\n';
+
+				t.head += ed.getParam('fullpage_default_doctype', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');
+				t.head += '\n<html>\n<head>\n<title>' + ed.getParam('fullpage_default_title', 'Untitled document') + '</title>\n';
+
+				if (v = ed.getParam('fullpage_default_encoding'))
+					t.head += '<meta http-equiv="Content-Type" content="' + v + '" />\n';
+
+				if (v = ed.getParam('fullpage_default_font_family'))
+					st += 'font-family: ' + v + ';';
+
+				if (v = ed.getParam('fullpage_default_font_size'))
+					st += 'font-size: ' + v + ';';
+
+				if (v = ed.getParam('fullpage_default_text_color'))
+					st += 'color: ' + v + ';';
+
+				t.head += '</head>\n<body' + (st ? ' style="' + st + '"' : '') + '>\n';
+				t.foot = '\n</body>\n</html>';
+			}
+		},
+
+		_getContent : function(ed, o) {
+			var t = this;
+
+			if (!o.source_view || !ed.getParam('fullpage_hide_in_source_view'))
+				o.content = tinymce.trim(t.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(t.foot);
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('fullpage', tinymce.plugins.FullPagePlugin);
+})();
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/fullpage.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/fullpage.htm
new file mode 100644
index 0000000000..80ff016928
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/fullpage.htm
@@ -0,0 +1,571 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#fullpage_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="js/fullpage.js"></script>
+	<link href="css/fullpage.css" rel="stylesheet" type="text/css" />
+</head>
+<body id="advlink" style="display: none">
+<form onsubmit="updateAction();return false;" name="fullpage" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="meta_tab" class="current"><span><a href="javascript:mcTabs.displayTab('meta_tab','meta_panel');" onmousedown="return false;">{#fullpage_dlg.meta_tab}</a></span></li>
+				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#fullpage_dlg.appearance_tab}</a></span></li>
+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#fullpage_dlg.advanced_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="meta_panel" class="panel current">
+				<fieldset>
+					<legend>{#fullpage_dlg.meta_props}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="nowrap"><label for="metatitle">{#fullpage_dlg.meta_title}</label>&nbsp;</td>
+							<td><input type="text" id="metatitle" name="metatitle" value="" class="mceFocus" /></td>
+						</tr>
+						<tr>
+							<td class="nowrap"><label for="metakeywords">{#fullpage_dlg.meta_keywords}</label>&nbsp;</td>
+							<td><textarea id="metakeywords" name="metakeywords" rows="4"></textarea></td>
+						</tr>
+						<tr>
+							<td class="nowrap"><label for="metadescription">{#fullpage_dlg.meta_description}</label>&nbsp;</td>
+							<td><textarea id="metadescription" name="metadescription" rows="4"></textarea></td>
+						</tr>
+						<tr>
+							<td class="nowrap"><label for="metaauthor">{#fullpage_dlg.author}</label>&nbsp;</td>
+							<td><input type="text" id="metaauthor" name="metaauthor" value="" /></td>
+						</tr>
+						<tr>
+							<td class="nowrap"><label for="metacopyright">{#fullpage_dlg.copyright}</label>&nbsp;</td>
+							<td><input type="text" id="metacopyright" name="metacopyright" value="" /></td>
+						</tr>
+						<tr>
+							<td class="nowrap"><label for="metarobots">{#fullpage_dlg.meta_robots}</label>&nbsp;</td>
+							<td>
+								<select id="metarobots" name="metarobots">
+											<option value="">{#not_set}</option> 
+											<option value="index,follow">{#fullpage_dlg.meta_index_follow}</option>
+											<option value="index,nofollow">{#fullpage_dlg.meta_index_nofollow}</option>
+											<option value="noindex,follow">{#fullpage_dlg.meta_noindex_follow}</option>
+											<option value="noindex,nofollow">{#fullpage_dlg.meta_noindex_nofollow}</option>
+								</select>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{#fullpage_dlg.langprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="docencoding">{#fullpage_dlg.encoding}</label></td> 
+							<td>
+								<select id="docencoding" name="docencoding"> 
+										<option value="">{#not_set}</option>
+								</select>
+							</td> 
+						</tr>
+						<tr>
+							<td class="nowrap"><label for="doctypes">{#fullpage_dlg.doctypes}</label>&nbsp;</td>
+							<td>
+								<select id="doctypes" name="doctypes">
+										<option value="">{#not_set}</option>
+								</select>
+							</td>
+						</tr>
+						<tr>
+							<td class="nowrap"><label for="langcode">{#fullpage_dlg.langcode}</label>&nbsp;</td>
+							<td><input type="text" id="langcode" name="langcode" value="" /></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="langdir">{#fullpage_dlg.langdir}</label></td> 
+							<td>
+								<select id="langdir" name="langdir"> 
+										<option value="">{#not_set}</option> 
+										<option value="ltr">{#fullpage_dlg.ltr}</option> 
+										<option value="rtl">{#fullpage_dlg.rtl}</option> 
+								</select>
+							</td> 
+						</tr>
+						<tr>
+							<td class="nowrap"><label for="xml_pi">{#fullpage_dlg.xml_pi}</label>&nbsp;</td>
+							<td><input type="checkbox" id="xml_pi" name="xml_pi" class="checkbox" /></td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="appearance_panel" class="panel">
+				<fieldset>
+					<legend>{#fullpage_dlg.appearance_textprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="fontface">{#fullpage_dlg.fontface}</label></td> 
+							<td>
+								<select id="fontface" name="fontface" onchange="changedStyleField(this);">
+										<option value="">{#not_set}</option>
+								</select>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="fontsize">{#fullpage_dlg.fontsize}</label></td> 
+							<td>
+								<select id="fontsize" name="fontsize" onchange="changedStyleField(this);">
+										<option value="">{#not_set}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="textcolor">{#fullpage_dlg.textcolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="textcolor" name="textcolor" type="text" value="" size="9" onchange="updateColor('textcolor_pick','textcolor');changedStyleField(this);" /></td>
+										<td id="textcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{#fullpage_dlg.appearance_bgprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="bgimage">{#fullpage_dlg.bgimage}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgimage" name="bgimage" type="text" value="" onchange="changedStyleField(this);" /></td>
+										<td id="bgimage_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="bgcolor">{#fullpage_dlg.bgcolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedStyleField(this);" /></td>
+										<td id="bgcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{#fullpage_dlg.appearance_marginprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="leftmargin">{#fullpage_dlg.left_margin}</label></td> 
+							<td><input id="leftmargin" name="leftmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+							<td class="column1"><label for="rightmargin">{#fullpage_dlg.right_margin}</label></td> 
+							<td><input id="rightmargin" name="rightmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="topmargin">{#fullpage_dlg.top_margin}</label></td> 
+							<td><input id="topmargin" name="topmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+							<td class="column1"><label for="bottommargin">{#fullpage_dlg.bottom_margin}</label></td> 
+							<td><input id="bottommargin" name="bottommargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{#fullpage_dlg.appearance_linkprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="link_color">{#fullpage_dlg.link_color}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="link_color" name="link_color" type="text" value="" size="9" onchange="updateColor('link_color_pick','link_color');changedStyleField(this);" /></td>
+										<td id="link_color_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+
+							<td class="column1"><label for="visited_color">{#fullpage_dlg.visited_color}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="visited_color" name="visited_color" type="text" value="" size="9" onchange="updateColor('visited_color_pick','visited_color');changedStyleField(this);" /></td>
+										<td id="visited_color_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="active_color">{#fullpage_dlg.active_color}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="active_color" name="active_color" type="text" value="" size="9" onchange="updateColor('active_color_pick','active_color');changedStyleField(this);" /></td>
+										<td id="active_color_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+
+							<td>&nbsp;</td>
+							<td>&nbsp;</td>
+
+<!--							<td class="column1"><label for="hover_color">{#fullpage_dlg.hover_color}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="hover_color" name="hover_color" type="text" value="" size="9" onchange="changedStyleField(this);" /></td>
+										<td id="hover_color_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> -->
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{#fullpage_dlg.appearance_style}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="stylesheet">{#fullpage_dlg.stylesheet}</label></td> 
+							<td><table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="stylesheet" name="stylesheet" type="text" value="" /></td>
+										<td id="stylesheet_browsercontainer">&nbsp;</td>
+									</tr>
+								</table></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="style">{#fullpage_dlg.style}</label></td> 
+							<td><input id="style" name="style" type="text" value="" onchange="changedStyleField(this);" /></td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<div id="addmenu">
+					<table border="0" cellpadding="0" cellspacing="0">
+						<tr><td><a href="javascript:addHeadElm('title');" onmousedown="return false;"><span>{#fullpage_dlg.add_title}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('meta');" onmousedown="return false;"><span>{#fullpage_dlg.add_meta}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('script');" onmousedown="return false;"><span>{#fullpage_dlg.add_script}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('style');" onmousedown="return false;"><span>{#fullpage_dlg.add_style}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('link');" onmousedown="return false;"><span>{#fullpage_dlg.add_link}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('base');" onmousedown="return false;"><span>{#fullpage_dlg.add_base}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('comment');" onmousedown="return false;"><span>{#fullpage_dlg.add_comment}</span></a></td></tr>
+					</table>
+				</div>
+
+				<fieldset>
+					<legend>{#fullpage_dlg.head_elements}</legend>
+
+					<div class="headlistwrapper">
+						<div class="toolbar">
+							<div style="float: left">
+								<a id="addbutton" href="javascript:showAddMenu();" onmousedown="return false;" class="addbutton" title="{#fullpage_dlg.add}"></a>
+								<a href="#" onmousedown="return false;" class="removebutton" title="{#fullpage_dlg.remove}"></a>
+							</div>
+							<div style="float: right">
+								<a href="#" onmousedown="return false;" class="moveupbutton" title="{#fullpage_dlg.moveup}"></a>
+								<a href="#" onmousedown="return false;" class="movedownbutton" title="{#fullpage_dlg.movedown}"></a>
+							</div>
+							<br style="clear: both" />
+						</div>
+						<select id="headlist" size="26" onchange="updateHeadElm(this.options[this.selectedIndex].value);">
+							<option value="title_0">&lt;title&gt;Some title bla bla bla&lt;/title&gt;</option>
+							<option value="meta_1">&lt;meta name="keywords"&gt;Some bla bla bla&lt;/meta&gt;</option>
+							<option value="meta_2">&lt;meta name="description"&gt;Some bla bla bla bla bla bla bla bla bla&lt;/meta&gt;</option>
+							<option value="script_3">&lt;script language=&quot;javascript&quot;&gt;...&lt;/script&gt;</option>
+							<option value="style_4">&lt;style&gt;...&lt;/style&gt;</option>
+							<option value="base_5">&lt;base href="." /&gt;</option>
+							<option value="comment_6">&lt;!-- ... --&gt;</option>
+							<option value="link_7">&lt;link href="." /&gt;</option>
+						</select>
+					</div>
+				</fieldset>
+
+				<fieldset id="meta_element">
+					<legend>{#fullpage_dlg.meta_element}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="element_meta_type">{#fullpage_dlg.type}</label></td> 
+							<td><select id="element_meta_type">
+										<option value="name">name</option>
+										<option value="http-equiv">http-equiv</option>
+								</select></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="element_meta_name">{#fullpage_dlg.name}</label></td> 
+							<td><input id="element_meta_name" name="element_meta_name" type="text" value="" /></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="element_meta_content">{#fullpage_dlg.content}</label></td> 
+							<td><input id="element_meta_content" name="element_meta_content" type="text" value="" /></td>
+						</tr>
+					</table>
+
+					<input type="button" id="meta_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="title_element">
+					<legend>{#fullpage_dlg.title_element}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="element_title">{#fullpage_dlg.meta_title}</label></td> 
+							<td><input id="element_title" name="element_title" type="text" value="" /></td>
+						</tr>
+					</table>
+
+					<input type="button" id="title_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="script_element">
+					<legend>{#fullpage_dlg.script_element}</legend>
+
+					<div class="tabs">
+						<ul>
+							<li id="script_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('script_props_tab','script_props_panel');" onmousedown="return false;">{#fullpage_dlg.properties}</a></span></li>
+							<li id="script_value_tab"><span><a href="javascript:mcTabs.displayTab('script_value_tab','script_value_panel');" onmousedown="return false;">{#fullpage_dlg.value}</a></span></li>
+						</ul>
+					</div>
+
+					<br style="clear: both" />
+
+					<div class="panel_wrapper">
+						<div id="script_props_panel" class="panel current">
+							<table border="0" cellpadding="4" cellspacing="0">
+								<tr>
+									<td class="column1"><label for="element_script_type">{#fullpage_dlg.type}</label></td> 
+									<td><select id="element_script_type">
+										<option value="text/javascript">text/javascript</option>
+										<option value="text/jscript">text/jscript</option>
+										<option value="text/vbscript">text/vbscript</option>
+										<option value="text/vbs">text/vbs</option>
+										<option value="text/ecmascript">text/ecmascript</option>
+										<option value="text/xml">text/xml</option>
+									</select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_script_src">{#fullpage_dlg.src}</label></td> 
+									<td><table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="element_script_src" name="element_script_src" type="text" value="" /></td>
+										<td id="script_src_pickcontainer">&nbsp;</td>
+									</tr>
+								</table></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_script_charset">{#fullpage_dlg.charset}</label></td> 
+									<td><select id="element_script_charset"><option value="">{#not_set}</option></select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_script_defer">{#fullpage_dlg.defer}</label></td> 
+									<td><input type="checkbox" id="element_script_defer" name="element_script_defer" class="checkbox" /></td>
+								</tr>
+							</table>
+						</div>
+
+						<div id="script_value_panel" class="panel">
+							<textarea id="element_script_value"></textarea>
+						</div>
+					</div>
+
+					<input type="button" id="script_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="style_element">
+					<legend>{#fullpage_dlg.style_element}</legend>
+
+					<div class="tabs">
+						<ul>
+							<li id="style_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('style_props_tab','style_props_panel');" onmousedown="return false;">{#fullpage_dlg.properties}</a></span></li>
+							<li id="style_value_tab"><span><a href="javascript:mcTabs.displayTab('style_value_tab','style_value_panel');" onmousedown="return false;">{#fullpage_dlg.value}</a></span></li>
+						</ul>
+					</div>
+
+					<br style="clear: both" />
+
+					<div class="panel_wrapper">
+						<div id="style_props_panel" class="panel current">
+							<table border="0" cellpadding="4" cellspacing="0">
+								<tr>
+									<td class="column1"><label for="element_style_type">{#fullpage_dlg.type}</label></td> 
+									<td><select id="element_style_type">
+										<option value="text/css">text/css</option>
+									</select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_style_media">{#fullpage_dlg.media}</label></td> 
+									<td><select id="element_style_media"></select></td>
+								</tr>
+							</table>
+						</div>
+
+						<div id="style_value_panel" class="panel">
+							<textarea id="element_style_value"></textarea>
+						</div>
+					</div>
+
+					<input type="button" id="style_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="base_element">
+					<legend>{#fullpage_dlg.base_element}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="element_base_href">{#fullpage_dlg.href}</label></td> 
+							<td><input id="element_base_href" name="element_base_href" type="text" value="" /></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="element_base_target">{#fullpage_dlg.target}</label></td> 
+							<td><input id="element_base_target" name="element_base_target" type="text" value="" /></td>
+						</tr>
+					</table>
+
+					<input type="button" id="base_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="link_element">
+					<legend>{#fullpage_dlg.link_element}</legend>
+
+					<div class="tabs">
+						<ul>
+							<li id="link_general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('link_general_tab','link_general_panel');" onmousedown="return false;">{#fullpage_dlg.general_props}</a></span></li>
+							<li id="link_advanced_tab"><span><a href="javascript:mcTabs.displayTab('link_advanced_tab','link_advanced_panel');" onmousedown="return false;">{#fullpage_dlg.advanced_props}</a></span></li>
+						</ul>
+					</div>
+
+					<br style="clear: both" />
+
+					<div class="panel_wrapper">
+						<div id="link_general_panel" class="panel current">
+							<table border="0" cellpadding="4" cellspacing="0">
+								<tr>
+									<td class="column1"><label for="element_link_href">{#fullpage_dlg.href}</label></td> 
+									<td><table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="element_link_href" name="element_link_href" type="text" value="" /></td>
+										<td id="link_href_pickcontainer">&nbsp;</td>
+									</tr>
+								</table></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_title">{#fullpage_dlg.meta_title}</label></td> 
+									<td><input id="element_link_title" name="element_link_title" type="text" value="" /></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_type">{#fullpage_dlg.type}</label></td> 
+									<td><select id="element_link_type" name="element_link_type">
+										<option value="text/css">text/css</option>
+										<option value="text/javascript">text/javascript</option>
+									</select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_media">{#fullpage_dlg.media}</label></td> 
+									<td><select id="element_link_media" name="element_link_media"></select></td>
+								</tr>
+								<tr>
+									<td><label for="element_style_rel">{#fullpage_dlg.rel}</label></td>
+									<td><select id="element_style_rel" name="element_style_rel"> 
+											<option value="">{#not_set}</option> 
+											<option value="stylesheet">Stylesheet</option>
+											<option value="alternate">Alternate</option>
+											<option value="designates">Designates</option>
+											<option value="start">Start</option>
+											<option value="next">Next</option>
+											<option value="prev">Prev</option>
+											<option value="contents">Contents</option>
+											<option value="index">Index</option>
+											<option value="glossary">Glossary</option>
+											<option value="copyright">Copyright</option>
+											<option value="chapter">Chapter</option>
+											<option value="subsection">Subsection</option>
+											<option value="appendix">Appendix</option>
+											<option value="help">Help</option>
+											<option value="bookmark">Bookmark</option>
+										</select> 
+									</td>
+								</tr>
+							</table>
+						</div>
+
+						<div id="link_advanced_panel" class="panel">
+							<table border="0" cellpadding="4" cellspacing="0">
+								<tr>
+									<td class="column1"><label for="element_link_charset">{#fullpage_dlg.charset}</label></td> 
+									<td><select id="element_link_charset"><option value="">{#not_set}</option></select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_hreflang">{#fullpage_dlg.hreflang}</label></td> 
+									<td><input id="element_link_hreflang" name="element_link_hreflang" type="text" value="" /></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_target">{#fullpage_dlg.target}</label></td> 
+									<td><input id="element_link_target" name="element_link_target" type="text" value="" /></td>
+								</tr>
+								<tr>
+									<td><label for="element_style_rev">{#fullpage_dlg.rev}</label></td>
+									<td><select id="element_style_rev" name="element_style_rev"> 
+											<option value="">{#not_set}</option> 
+											<option value="alternate">Alternate</option> 
+											<option value="designates">Designates</option> 
+											<option value="stylesheet">Stylesheet</option> 
+											<option value="start">Start</option> 
+											<option value="next">Next</option> 
+											<option value="prev">Prev</option> 
+											<option value="contents">Contents</option> 
+											<option value="index">Index</option> 
+											<option value="glossary">Glossary</option> 
+											<option value="copyright">Copyright</option> 
+											<option value="chapter">Chapter</option> 
+											<option value="subsection">Subsection</option> 
+											<option value="appendix">Appendix</option> 
+											<option value="help">Help</option> 
+											<option value="bookmark">Bookmark</option> 
+										</select> 
+									</td>
+								</tr>
+							</table>
+						</div>
+					</div>
+
+					<input type="button" id="link_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="comment_element">
+					<legend>{#fullpage_dlg.comment_element}</legend>
+
+					<textarea id="element_comment_value"></textarea>
+
+					<input type="button" id="comment_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<input type="submit" id="insert" name="update" value="{#update}" />
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/js/fullpage.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/js/fullpage.js
new file mode 100644
index 0000000000..222e4ea130
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/js/fullpage.js
@@ -0,0 +1,492 @@
+/**
+ * fullpage.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+tinyMCEPopup.requireLangPack();
+
+var doc;
+
+var defaultDocTypes = 
+	'XHTML 1.0 Transitional=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">,' +
+	'XHTML 1.0 Frameset=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">,' +
+	'XHTML 1.0 Strict=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">,' +
+	'XHTML 1.1=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">,' +
+	'HTML 4.01 Transitional=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">,' +
+	'HTML 4.01 Strict=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">,' +
+	'HTML 4.01 Frameset=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">';
+
+var defaultEncodings = 
+	'Western european (iso-8859-1)=iso-8859-1,' +
+	'Central European (iso-8859-2)=iso-8859-2,' +
+	'Unicode (UTF-8)=utf-8,' +
+	'Chinese traditional (Big5)=big5,' +
+	'Cyrillic (iso-8859-5)=iso-8859-5,' +
+	'Japanese (iso-2022-jp)=iso-2022-jp,' +
+	'Greek (iso-8859-7)=iso-8859-7,' +
+	'Korean (iso-2022-kr)=iso-2022-kr,' +
+	'ASCII (us-ascii)=us-ascii';
+
+var defaultMediaTypes = 
+	'all=all,' +
+	'screen=screen,' +
+	'print=print,' +
+	'tty=tty,' +
+	'tv=tv,' +
+	'projection=projection,' +
+	'handheld=handheld,' +
+	'braille=braille,' +
+	'aural=aural';
+
+var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';
+var defaultFontSizes = '10px,11px,12px,13px,14px,15px,16px';
+
+function init() {
+	var f = document.forms['fullpage'], el = f.elements, e, i, p, doctypes, encodings, mediaTypes, dir, fonts, ed = tinyMCEPopup.editor, dom = tinyMCEPopup.dom, style;
+
+	// Setup doctype select box
+	doctypes = ed.getParam("fullpage_doctypes", defaultDocTypes).split(',');
+	for (i=0; i<doctypes.length; i++) {
+		p = doctypes[i].split('=');
+
+		if (p.length > 1)
+			addSelectValue(f, 'doctypes', p[0], p[1]);
+	}
+
+	// Setup fonts select box
+	fonts = ed.getParam("fullpage_fonts", defaultFontNames).split(';');
+	for (i=0; i<fonts.length; i++) {
+		p = fonts[i].split('=');
+
+		if (p.length > 1)
+			addSelectValue(f, 'fontface', p[0], p[1]);
+	}
+
+	// Setup fontsize select box
+	fonts = ed.getParam("fullpage_fontsizes", defaultFontSizes).split(',');
+	for (i=0; i<fonts.length; i++)
+		addSelectValue(f, 'fontsize', fonts[i], fonts[i]);
+
+	// Setup mediatype select boxs
+	mediaTypes = ed.getParam("fullpage_media_types", defaultMediaTypes).split(',');
+	for (i=0; i<mediaTypes.length; i++) {
+		p = mediaTypes[i].split('=');
+
+		if (p.length > 1) {
+			addSelectValue(f, 'element_style_media', p[0], p[1]);
+			addSelectValue(f, 'element_link_media', p[0], p[1]);
+		}
+	}
+
+	// Setup encodings select box
+	encodings = ed.getParam("fullpage_encodings", defaultEncodings).split(',');
+	for (i=0; i<encodings.length; i++) {
+		p = encodings[i].split('=');
+
+		if (p.length > 1) {
+			addSelectValue(f, 'docencoding', p[0], p[1]);
+			addSelectValue(f, 'element_script_charset', p[0], p[1]);
+			addSelectValue(f, 'element_link_charset', p[0], p[1]);
+		}
+	}
+
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+	document.getElementById('link_color_pickcontainer').innerHTML = getColorPickerHTML('link_color_pick','link_color');
+	//document.getElementById('hover_color_pickcontainer').innerHTML = getColorPickerHTML('hover_color_pick','hover_color');
+	document.getElementById('visited_color_pickcontainer').innerHTML = getColorPickerHTML('visited_color_pick','visited_color');
+	document.getElementById('active_color_pickcontainer').innerHTML = getColorPickerHTML('active_color_pick','active_color');
+	document.getElementById('textcolor_pickcontainer').innerHTML = getColorPickerHTML('textcolor_pick','textcolor');
+	document.getElementById('stylesheet_browsercontainer').innerHTML = getBrowserHTML('stylesheetbrowser','stylesheet','file','fullpage');
+	document.getElementById('link_href_pickcontainer').innerHTML = getBrowserHTML('link_href_browser','element_link_href','file','fullpage');
+	document.getElementById('script_src_pickcontainer').innerHTML = getBrowserHTML('script_src_browser','element_script_src','file','fullpage');
+	document.getElementById('bgimage_pickcontainer').innerHTML = getBrowserHTML('bgimage_browser','bgimage','image','fullpage');
+
+	// Resize some elements
+	if (isVisible('stylesheetbrowser'))
+		document.getElementById('stylesheet').style.width = '220px';
+
+	if (isVisible('link_href_browser'))
+		document.getElementById('element_link_href').style.width = '230px';
+
+	if (isVisible('bgimage_browser'))
+		document.getElementById('bgimage').style.width = '210px';
+
+	// Add iframe
+	dom.add(document.body, 'iframe', {id : 'documentIframe', src : 'javascript:""', style : {display : 'none'}});
+	doc = dom.get('documentIframe').contentWindow.document;
+	h = tinyMCEPopup.getWindowArg('head_html');
+
+	// Preprocess the HTML disable scripts and urls
+	h = h.replace(/<script>/gi, '<script type="text/javascript">');
+	h = h.replace(/type=([\"\'])?/gi, 'type=$1-mce-');
+	h = h.replace(/(src=|href=)/g, 'data-mce-$1');
+
+	// Write in the content in the iframe
+	doc.write(h + '</body></html>');
+	doc.close();
+
+	// Parse xml and doctype
+	xmlVer = getReItem(/<\?\s*?xml.*?version\s*?=\s*?"(.*?)".*?\?>/gi, h, 1);
+	xmlEnc = getReItem(/<\?\s*?xml.*?encoding\s*?=\s*?"(.*?)".*?\?>/gi, h, 1);
+	docType = getReItem(/<\!DOCTYPE.*?>/gi, h.replace(/\n/g, ''), 0).replace(/ +/g, ' ');
+	f.langcode.value = getReItem(/lang="(.*?)"/gi, h, 1);
+	
+	// Get direction and inherit it from the html-tag too (according to w3c recommandation)
+	dir = getReItem(/dir\s*=\s*["']([^"']*)["']/i, h, 1);
+	if(doc.body.hasAttribute('dir') && (doc.body.getAttribute('dir') != ''))
+		dir = doc.body.getAttribute('dir');
+
+	// Parse title
+	if (e = doc.getElementsByTagName('title')[0])
+		el.metatitle.value = e.textContent || e.text;
+
+	// Parse meta
+	tinymce.each(doc.getElementsByTagName('meta'), function(n) {
+		var na = (n.getAttribute('name', 2) || '').toLowerCase(), va = n.getAttribute('content', 2), eq = n.getAttribute('httpEquiv', 2) || '';
+
+		e = el['meta' + na];
+
+		if (na == 'robots') {
+			selectByValue(f, 'metarobots', tinymce.trim(va), true, true);
+			return;
+		}
+
+		switch (eq.toLowerCase()) {
+			case "content-type":
+				tmp = getReItem(/charset\s*=\s*(.*)\s*/gi, va, 1);
+
+				// Override XML encoding
+				if (tmp != "")
+					xmlEnc = tmp;
+
+				return;
+		}
+
+		if (e)
+			e.value = va;
+	});
+
+	selectByValue(f, 'doctypes', docType, true, true);
+	selectByValue(f, 'docencoding', xmlEnc, true, true);
+	selectByValue(f, 'langdir', dir, true, true);
+
+	if (xmlVer != '')
+		el.xml_pi.checked = true;
+
+	// Parse appearance
+
+	// Parse primary stylesheet
+	tinymce.each(doc.getElementsByTagName("link"), function(l) {
+		var m = l.getAttribute('media', 2) || '', t = l.getAttribute('type', 2) || '';
+
+		if (t == "-mce-text/css" && (m == "" || m == "screen" || m == "all") && (l.getAttribute('rel', 2) || '') == "stylesheet") {
+			f.stylesheet.value = l.getAttribute('data-mce-href', 2) || '';
+			return false;
+		}
+	});
+
+	// Get from style elements
+	tinymce.each(doc.getElementsByTagName("style"), function(st) {
+		var tmp = parseStyleElement(st);
+
+		for (x=0; x<tmp.length; x++) {
+			if (tmp[x].rule.indexOf('a:visited') != -1 && tmp[x].data['color'])
+				f.visited_color.value = tmp[x].data['color'];
+
+			if (tmp[x].rule.indexOf('a:link') != -1 && tmp[x].data['color'])
+				f.link_color.value = tmp[x].data['color'];
+
+			if (tmp[x].rule.indexOf('a:active') != -1 && tmp[x].data['color'])
+				f.active_color.value = tmp[x].data['color'];
+		}
+	});
+
+	f.textcolor.value = tinyMCEPopup.dom.getAttrib(doc.body, "text");
+	f.active_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "alink");
+	f.link_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "link");
+	f.visited_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "vlink");
+	f.bgcolor.value = tinyMCEPopup.dom.getAttrib(doc.body, "bgcolor");
+	f.bgimage.value = tinyMCEPopup.dom.getAttrib(doc.body, "background");
+
+	// Get from style info
+	style = tinyMCEPopup.dom.parseStyle(tinyMCEPopup.dom.getAttrib(doc.body, 'style'));
+
+	if (style['font-family'])
+		selectByValue(f, 'fontface', style['font-family'], true, true);
+	else
+		selectByValue(f, 'fontface', ed.getParam("fullpage_default_fontface", ""), true, true);
+
+	if (style['font-size'])
+		selectByValue(f, 'fontsize', style['font-size'], true, true);
+	else
+		selectByValue(f, 'fontsize', ed.getParam("fullpage_default_fontsize", ""), true, true);
+
+	if (style['color'])
+		f.textcolor.value = convertRGBToHex(style['color']);
+
+	if (style['background-image'])
+		f.bgimage.value = style['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+
+	if (style['background-color'])
+		f.bgcolor.value = style['background-color'];
+
+	if (style['margin']) {
+		tmp = style['margin'].replace(/[^0-9 ]/g, '');
+		tmp = tmp.split(/ +/);
+		f.topmargin.value = tmp.length > 0 ? tmp[0] : '';
+		f.rightmargin.value = tmp.length > 1 ? tmp[1] : tmp[0];
+		f.bottommargin.value = tmp.length > 2 ? tmp[2] : tmp[0];
+		f.leftmargin.value = tmp.length > 3 ? tmp[3] : tmp[0];
+	}
+
+	if (style['margin-left'])
+		f.leftmargin.value = style['margin-left'].replace(/[^0-9]/g, '');
+
+	if (style['margin-right'])
+		f.rightmargin.value = style['margin-right'].replace(/[^0-9]/g, '');
+
+	if (style['margin-top'])
+		f.topmargin.value = style['margin-top'].replace(/[^0-9]/g, '');
+
+	if (style['margin-bottom'])
+		f.bottommargin.value = style['margin-bottom'].replace(/[^0-9]/g, '');
+
+	f.style.value = tinyMCEPopup.dom.serializeStyle(style);
+
+	// Update colors
+	updateColor('textcolor_pick', 'textcolor');
+	updateColor('bgcolor_pick', 'bgcolor');
+	updateColor('visited_color_pick', 'visited_color');
+	updateColor('active_color_pick', 'active_color');
+	updateColor('link_color_pick', 'link_color');
+}
+
+function getReItem(r, s, i) {
+	var c = r.exec(s);
+
+	if (c && c.length > i)
+		return c[i];
+
+	return '';
+}
+
+function updateAction() {
+	var f = document.forms[0], nl, i, h, v, s, head, html, l, tmp, addlink = true, ser;
+
+	head = doc.getElementsByTagName('head')[0];
+
+	// Fix scripts without a type
+	nl = doc.getElementsByTagName('script');
+	for (i=0; i<nl.length; i++) {
+		if (tinyMCEPopup.dom.getAttrib(nl[i], 'data-mce-type') == '')
+			nl[i].setAttribute('mce-type', 'text/javascript');
+	}
+
+	// Get primary stylesheet
+	nl = doc.getElementsByTagName("link");
+	for (i=0; i<nl.length; i++) {
+		l = nl[i];
+
+		tmp = tinyMCEPopup.dom.getAttrib(l, 'media');
+
+		if (tinyMCEPopup.dom.getAttrib(l, 'data-mce-type') == "text/css" && (tmp == "" || tmp == "screen" || tmp == "all") && tinyMCEPopup.dom.getAttrib(l, 'rel') == "stylesheet") {
+			addlink = false;
+
+			if (f.stylesheet.value == '')
+				l.parentNode.removeChild(l);
+			else
+				l.setAttribute('data-mce-href', f.stylesheet.value);
+
+			break;
+		}
+	}
+
+	// Add new link
+	if (f.stylesheet.value != '') {
+		l = doc.createElement('link');
+
+		l.setAttribute('type', 'text/css');
+		l.setAttribute('data-mce-href', f.stylesheet.value);
+		l.setAttribute('rel', 'stylesheet');
+
+		head.appendChild(l);
+	}
+
+	setMeta(head, 'keywords', f.metakeywords.value);
+	setMeta(head, 'description', f.metadescription.value);
+	setMeta(head, 'author', f.metaauthor.value);
+	setMeta(head, 'copyright', f.metacopyright.value);
+	setMeta(head, 'robots', getSelectValue(f, 'metarobots'));
+	setMeta(head, 'Content-Type', getSelectValue(f, 'docencoding'));
+
+	setAttr(doc.body, 'dir', getSelectValue(f, 'langdir'));
+	doc.body.style.cssText = f.style.value;
+
+	function setAttr(elm, name, value) {
+		value = "" + value;
+
+		if (value.length > 0)
+			elm.setAttribute(name, value);
+		else
+			elm.removeAttribute(name, value);
+	}
+
+	setAttr(doc.body, 'vLink', f.visited_color.value);
+	setAttr(doc.body, 'link', f.link_color.value);
+	setAttr(doc.body, 'text', f.textcolor.value);
+	setAttr(doc.body, 'aLink', f.active_color.value);
+
+	doc.body.style.fontFamily = getSelectValue(f, 'fontface');
+	doc.body.style.fontSize = getSelectValue(f, 'fontsize');
+	doc.body.style.backgroundColor = f.bgcolor.value;
+
+	if (f.leftmargin.value != '')
+		doc.body.style.marginLeft = f.leftmargin.value + 'px';
+
+	if (f.rightmargin.value != '')
+		doc.body.style.marginRight = f.rightmargin.value + 'px';
+
+	if (f.bottommargin.value != '')
+		doc.body.style.marginBottom = f.bottommargin.value + 'px';
+
+	if (f.topmargin.value != '')
+		doc.body.style.marginTop = f.topmargin.value + 'px';
+
+	html = doc.getElementsByTagName('html')[0];
+	setAttr(html, 'lang', f.langcode.value);
+	setAttr(html, 'xml:lang', f.langcode.value);
+
+	if (f.bgimage.value != '')
+		doc.body.style.backgroundImage = "url('" + f.bgimage.value + "')";
+	else
+		doc.body.style.backgroundImage = '';
+
+	ser = tinyMCEPopup.editor.plugins.fullpage._createSerializer();
+	ser.setRules('-title,meta[http-equiv|name|content],base[href|target],link[href|rel|type|title|media],style[type],script[type|language|src],html[lang|xml::lang|xmlns],body[style|dir|vlink|link|text|alink],head');
+
+	h = ser.serialize(doc.documentElement);
+	h = h.substring(0, h.lastIndexOf('</body>'));
+
+	if (h.indexOf('<title>') == -1)
+		h = h.replace(/<head.*?>/, '$&\n' + '<title>' + tinyMCEPopup.dom.encode(f.metatitle.value) + '</title>');
+	else
+		h = h.replace(/<title>(.*?)<\/title>/, '<title>' + tinyMCEPopup.dom.encode(f.metatitle.value) + '</title>');
+	
+	if(v = f.langcode.value)
+		htmlt = '<html lang="' + v + '" xml:lang="' + v + '">';
+	else 
+		htmlt = '<html>';
+	
+	h = h.replace(/<html.*?>/, htmlt);
+	
+	if ((v = getSelectValue(f, 'doctypes')) != '')
+		h = v + '\n' + h;
+
+	if (f.xml_pi.checked) {
+		s = '<?xml version="1.0"';
+
+		if ((v = getSelectValue(f, 'docencoding')) != '')
+			s += ' encoding="' + v + '"';
+
+		s += '?>\n';
+		h = s + h;
+	}
+
+	h = h.replace(/type=\"\-mce\-/gi, 'type="');
+
+	tinyMCEPopup.editor.plugins.fullpage.head = h;
+	tinyMCEPopup.editor.plugins.fullpage._setBodyAttribs(tinyMCEPopup.editor, {});
+	tinyMCEPopup.close();
+}
+
+function changedStyleField(field) {
+}
+
+function setMeta(he, k, v) {
+	var nl, i, m;
+
+	nl = he.getElementsByTagName('meta');
+	for (i=0; i<nl.length; i++) {
+		if (k == 'Content-Type' && tinyMCEPopup.dom.getAttrib(nl[i], 'http-equiv') == k) {
+			if (v == '')
+				nl[i].parentNode.removeChild(nl[i]);
+			else
+				nl[i].setAttribute('content', "text/html; charset=" + v);
+
+			return;
+		}
+
+		if (tinyMCEPopup.dom.getAttrib(nl[i], 'name') == k) {
+			if (v == '')
+				nl[i].parentNode.removeChild(nl[i]);
+			else
+				nl[i].setAttribute('content', v);
+			return;
+		}
+	}
+
+	if (v == '')
+		return;
+
+	m = doc.createElement('meta');
+
+	if (k == 'Content-Type')
+		m.httpEquiv = k;
+	else
+		m.setAttribute('name', k);
+
+	m.setAttribute('content', v);
+	he.appendChild(m);
+}
+
+function parseStyleElement(e) {
+	var v = e.innerHTML;
+	var p, i, r;
+
+	v = v.replace(/<!--/gi, '');
+	v = v.replace(/-->/gi, '');
+	v = v.replace(/[\n\r]/gi, '');
+	v = v.replace(/\s+/gi, ' ');
+
+	r = [];
+	p = v.split(/{|}/);
+
+	for (i=0; i<p.length; i+=2) {
+		if (p[i] != "")
+			r[r.length] = {rule : tinymce.trim(p[i]), data : tinyMCEPopup.dom.parseStyle(p[i+1])};
+	}
+
+	return r;
+}
+
+function serializeStyleElement(d) {
+	var i, s, st;
+
+	s = '<!--\n';
+
+	for (i=0; i<d.length; i++) {
+		s += d[i].rule + ' {\n';
+
+		st = tinyMCE.serializeStyle(d[i].data);
+
+		if (st != '')
+			st += ';';
+
+		s += st.replace(/;/g, ';\n');
+		s += '}\n';
+
+		if (i != d.length - 1)
+			s += '\n';
+	}
+
+	s += '\n-->';
+
+	return s;
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/da_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/da_dlg.js
new file mode 100644
index 0000000000..eb6b188850
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/da_dlg.js
@@ -0,0 +1,85 @@
+tinyMCE.addI18n('da.fullpage_dlg',{
+title:"Dokumentegenskaber",
+meta_tab:"Generelt",
+appearance_tab:"Udseende",
+advanced_tab:"Advanceret",
+meta_props:"Meta-information",
+langprops:"Sprog og kodning",
+meta_title:"Titel",
+meta_keywords:"N\u00F8gleord",
+meta_description:"Beskrivelse",
+meta_robots:"Robots",
+doctypes:"Doctype",
+langcode:"Sprogkode",
+langdir:"Sprogretning",
+ltr:"Venstre mod h\u00F8jre",
+rtl:"H\u00F8jre md venstre",
+xml_pi:"XML declaration",
+encoding:"Tegns\u00E6t",
+appearance_bgprops:"Baggrundsegenskaber",
+appearance_marginprops:"Body margins",
+appearance_linkprops:"Link farver",
+appearance_textprops:"Tekstegenskaber",
+bgcolor:"Baggrundsfarve",
+bgimage:"Baggrundsbillede",
+left_margin:"Venstre margin",
+right_margin:"H\u00F8jre margin",
+top_margin:"Topmargin",
+bottom_margin:"Bundmargin",
+text_color:"Tekstfarve",
+font_size:"Skriftst\u00F8rrelse",
+font_face:"Skrifttype",
+link_color:"Linkfarve",
+hover_color:"Farve ved aktivering",
+visited_color:"Farve efter museklik",
+active_color:"Farve ved museklik",
+textcolor:"Farve",
+fontsize:"Skriftst\u00F8rrelse",
+fontface:"Skrifttype",
+meta_index_follow:"Indeks og f\u00F8lg links",
+meta_index_nofollow:"Indeks og f\u00F8lg ikke links",
+meta_noindex_follow:"Ingen indeks, men f\u00F8lg links",
+meta_noindex_nofollow:"Ingen indeks og f\u00F8lg ikke links",
+appearance_style:"Stylesheet og style-egenskaber",
+stylesheet:"Stylesheet",
+style:"Style",
+author:"Forfatter",
+copyright:"Copyright",
+add:"Tilf\u00F8j nyt element",
+remove:"Slet valgte element",
+moveup:"Flyt valgte element op",
+movedown:"Flyt valgte element ned",
+head_elements:"Hovedelement",
+info:"Information",
+add_title:"Titelelement",
+add_meta:"Meta-element",
+add_script:"Script-element",
+add_style:"Style-element",
+add_link:"Link-element",
+add_base:"Base-element",
+add_comment:"Kommentar-node",
+title_element:"Titelelement",
+script_element:"Script-element",
+style_element:"Style-element",
+base_element:"Base-element",
+link_element:"Link-element",
+meta_element:"Meta-element",
+comment_element:"Kommentar",
+src:"Src",
+language:"Sprog",
+href:"Href",
+target:"Destination",
+type:"Type",
+charset:"Tegns\u00E6t",
+defer:"Defer",
+media:"Media",
+properties:"Egenskaber",
+name:"Navn",
+value:"V\u00E6rdi",
+content:"Indhold",
+rel:"Rel",
+rev:"Rev",
+hreflang:"Href lang",
+general_props:"Generelt",
+advanced_props:"Advanceret"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/de_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/de_dlg.js
new file mode 100644
index 0000000000..5b10bb64fe
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/de_dlg.js
@@ -0,0 +1,85 @@
+tinyMCE.addI18n('de.fullpage_dlg',{
+title:"Dokument-Eigenschaften",
+meta_tab:"Allgemein",
+appearance_tab:"Aussehen",
+advanced_tab:"Erweitert",
+meta_props:"Meta-Information",
+langprops:"Sprache und Codierung",
+meta_title:"Titel",
+meta_keywords:"Keywords",
+meta_description:"Beschreibung",
+meta_robots:"Robots",
+doctypes:"DocType",
+langcode:"Sprachcode",
+langdir:"Sprachrichtung",
+ltr:"Links nach Rechts",
+rtl:"Rechts nach Links",
+xml_pi:"XML declaration",
+encoding:"Zeichencodierung",
+appearance_bgprops:"Hintergrund-Eigenschaften",
+appearance_marginprops:"Abst\u00E4nde des Body",
+appearance_linkprops:"Linkfarben",
+appearance_textprops:"Text-Eigenschaften",
+bgcolor:"Hintergrundfarbe",
+bgimage:"Hintergrundbild",
+left_margin:"Linker Abstand",
+right_margin:"Rechter Abstand",
+top_margin:"Oberer Abstand",
+bottom_margin:"Unterer Abstand",
+text_color:"Textfarbe",
+font_size:"Schriftgr\u00F6\u00DFe",
+font_face:"Schriftart",
+link_color:"Linkfarbe",
+hover_color:"Hover-Farbe",
+visited_color:"Visited-Farbe",
+active_color:"Active-Farbe",
+textcolor:"Farbe",
+fontsize:"Schriftgr\u00F6\u00DFe",
+fontface:"Schriftart",
+meta_index_follow:"Indizieren und den Links folgen",
+meta_index_nofollow:"Indizieren, aber den Links nicht folgen",
+meta_noindex_follow:"Nicht indizieren, aber den Links folgen",
+meta_noindex_nofollow:"Nicht indizieren und auch nicht den Links folgen",
+appearance_style:"CSS-Stylesheet und Stileigenschaften",
+stylesheet:"CSS-Stylesheet",
+style:"CSS-Stil",
+author:"Autor",
+copyright:"Copyright",
+add:"Neues Element hinzuf\u00FCgen",
+remove:"Ausgew\u00E4hltes Element entfernen",
+moveup:"Ausgew\u00E4hltes Element nach oben bewegen",
+movedown:"Ausgew\u00E4hltes Element nach unten bewegen",
+head_elements:"\u00DCberschriftenelemente",
+info:"Information",
+add_title:"Titel-Element",
+add_meta:"Meta-Element",
+add_script:"Script-Element",
+add_style:"Style-Element",
+add_link:"Link-Element",
+add_base:"Base-Element",
+add_comment:"HTML-Kommentar",
+title_element:"Titel-Element",
+script_element:"Script-Element",
+style_element:"Style-Element",
+base_element:"Base-Element",
+link_element:"Link-Element",
+meta_element:"Meta_Element",
+comment_element:"Kommentar",
+src:"Src",
+language:"Sprache",
+href:"Href",
+target:"Ziel",
+type:"Typ",
+charset:"Zeichensatz",
+defer:"Defer",
+media:"Media",
+properties:"Eigenschaften",
+name:"Name",
+value:"Wert",
+content:"Inhalt",
+rel:"Rel",
+rev:"Rev",
+hreflang:"Href lang",
+general_props:"Allgemein",
+advanced_props:"Erweitert"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/en_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/en_dlg.js
new file mode 100644
index 0000000000..f5801b8b31
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/en_dlg.js
@@ -0,0 +1,85 @@
+tinyMCE.addI18n('en.fullpage_dlg',{
+title:"Document properties",
+meta_tab:"General",
+appearance_tab:"Appearance",
+advanced_tab:"Advanced",
+meta_props:"Meta information",
+langprops:"Language and encoding",
+meta_title:"Title",
+meta_keywords:"Keywords",
+meta_description:"Description",
+meta_robots:"Robots",
+doctypes:"Doctype",
+langcode:"Language code",
+langdir:"Language direction",
+ltr:"Left to right",
+rtl:"Right to left",
+xml_pi:"XML declaration",
+encoding:"Character encoding",
+appearance_bgprops:"Background properties",
+appearance_marginprops:"Body margins",
+appearance_linkprops:"Link colors",
+appearance_textprops:"Text properties",
+bgcolor:"Background color",
+bgimage:"Background image",
+left_margin:"Left margin",
+right_margin:"Right margin",
+top_margin:"Top margin",
+bottom_margin:"Bottom margin",
+text_color:"Text color",
+font_size:"Font size",
+font_face:"Font face",
+link_color:"Link color",
+hover_color:"Hover color",
+visited_color:"Visited color",
+active_color:"Active color",
+textcolor:"Color",
+fontsize:"Font size",
+fontface:"Font family",
+meta_index_follow:"Index and follow the links",
+meta_index_nofollow:"Index and don't follow the links",
+meta_noindex_follow:"Do not index but follow the links",
+meta_noindex_nofollow:"Do not index and don\'t follow the links",
+appearance_style:"Stylesheet and style properties",
+stylesheet:"Stylesheet",
+style:"Style",
+author:"Author",
+copyright:"Copyright",
+add:"Add new element",
+remove:"Remove selected element",
+moveup:"Move selected element up",
+movedown:"Move selected element down",
+head_elements:"Head elements",
+info:"Information",
+add_title:"Title element",
+add_meta:"Meta element",
+add_script:"Script element",
+add_style:"Style element",
+add_link:"Link element",
+add_base:"Base element",
+add_comment:"Comment node",
+title_element:"Title element",
+script_element:"Script element",
+style_element:"Style element",
+base_element:"Base element",
+link_element:"Link element",
+meta_element:"Meta element",
+comment_element:"Comment",
+src:"Src",
+language:"Language",
+href:"Href",
+target:"Target",
+type:"Type",
+charset:"Charset",
+defer:"Defer",
+media:"Media",
+properties:"Properties",
+name:"Name",
+value:"Value",
+content:"Content",
+rel:"Rel",
+rev:"Rev",
+hreflang:"Href lang",
+general_props:"General",
+advanced_props:"Advanced"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/es_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/es_dlg.js
new file mode 100644
index 0000000000..05699c843e
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/es_dlg.js
@@ -0,0 +1,85 @@
+tinyMCE.addI18n('es.fullpage_dlg',{
+title:"Propiedades del documento",
+meta_tab:"General",
+appearance_tab:"Apariencia",
+advanced_tab:"Avanzado",
+meta_props:"Informaci\u00F3n Meta",
+langprops:"Lenguaje y codificaci\u00F3n",
+meta_title:"T\u00EDtulo",
+meta_keywords:"Palabras clave",
+meta_description:"Descripci\u00F3n",
+meta_robots:"Robots",
+doctypes:"Tipo de doc.",
+langcode:"C\u00F3digo del lenguaje",
+langdir:"Direcci\u00F3n del lenguaje",
+ltr:"Izquierda a derecha",
+rtl:"Derecha a izquierda",
+xml_pi:"Declaraci\u00F3n XML",
+encoding:"Codificaci\u00F3n de caracteres",
+appearance_bgprops:"Propiedades del fondo",
+appearance_marginprops:"M\u00E1rgenes",
+appearance_linkprops:"Colores del v\u00EDnculo",
+appearance_textprops:"Propiedades de texto",
+bgcolor:"Color de fondo",
+bgimage:"Imagen de fondo",
+left_margin:"Margen izquierdo",
+right_margin:"Margen derecho",
+top_margin:"Margen superior",
+bottom_margin:"Margen inferior",
+text_color:"Color del texto",
+font_size:"Tama\u00F1o de fuente",
+font_face:"Fuente",
+link_color:"Color de v\u00EDnculo",
+hover_color:"Color rat\u00F3n encima",
+visited_color:"Color visitado",
+active_color:"Color activo",
+textcolor:"Color",
+fontsize:"Tama\u00F1o de fuente",
+fontface:"Fuente",
+meta_index_follow:"Indexar y seguir los v\u00EDnculos",
+meta_index_nofollow:"Indexar y no seguir los v\u00EDnculos",
+meta_noindex_follow:"No indexar pero seguir v\u00EDnculos",
+meta_noindex_nofollow:"No indexar y no seguir v\u00EDnculos",
+appearance_style:"Propiedades de hoja de estilos y estilo",
+stylesheet:"Hoja de estilo",
+style:"Estilo",
+author:"Autor",
+copyright:"Copyright",
+add:"Agregar nuevo elemento",
+remove:"Eliminar elemento seleccionado",
+moveup:"Mover elemento seleccionado hacia arriba",
+movedown:"Mover elemento seleccionado hacia abajo",
+head_elements:"Elemento Head",
+info:"Informaci\u00F3n",
+add_title:"Elemento Title",
+add_meta:"Elemento Meta",
+add_script:"Elemento Script",
+add_style:"Elemento Style",
+add_link:"Elemento Link",
+add_base:"Elemento Base",
+add_comment:"Nodo Comment",
+title_element:"Elemento Title",
+script_element:"Elemento Script",
+style_element:"Elemento Style",
+base_element:"Elemento Base",
+link_element:"Elemento Link",
+meta_element:"Elemento Meta",
+comment_element:"Comentario",
+src:"Src",
+language:"Lenguaje",
+href:"Href",
+target:"Target",
+type:"Tipo",
+charset:"Charset",
+defer:"Defer",
+media:"Medio",
+properties:"Propiedades",
+name:"Nombre",
+value:"Valor",
+content:"Contenido",
+rel:"Rel",
+rev:"Rev",
+hreflang:"Href lang",
+general_props:"General",
+advanced_props:"Avanzado"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/fr_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/fr_dlg.js
new file mode 100644
index 0000000000..6f41a23b8c
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/fr_dlg.js
@@ -0,0 +1,85 @@
+tinyMCE.addI18n('fr.fullpage_dlg',{
+title:"Propri\u00E9t\u00E9s du document",
+meta_tab:"G\u00E9n\u00E9ral",
+appearance_tab:"Apparence",
+advanced_tab:"Avanc\u00E9",
+meta_props:"Meta information",
+langprops:"Langue et encodage",
+meta_title:"Titre",
+meta_keywords:"Mots-cl\u00E9s",
+meta_description:"Description",
+meta_robots:"Robots",
+doctypes:"Doctype",
+langcode:"Code de la langue",
+langdir:"Sens de lecture",
+ltr:"De gauche \u00E0 droite",
+rtl:"De droite \u00E0 gauche",
+xml_pi:"D\u00E9claration XML",
+encoding:"Encodage des caract\u00E8res",
+appearance_bgprops:"Propri\u00E9t\u00E9s du fond",
+appearance_marginprops:"Marge du corps de la page",
+appearance_linkprops:"Couleurs des liens",
+appearance_textprops:"Propri\u00E9t\u00E9s du texte",
+bgcolor:"Couleur de fond",
+bgimage:"Image de fond",
+left_margin:"Marge de gauche",
+right_margin:"Marge de droite",
+top_margin:"Marge du haut",
+bottom_margin:"Marge du bas",
+text_color:"Couleur du texte",
+font_size:"Taille de la police",
+font_face:"Nom de la police",
+link_color:"Couleur des liens",
+hover_color:"Couleur au survol",
+visited_color:"Couleur des liens visit\u00E9s",
+active_color:"Couleur du lien actif",
+textcolor:"Couleur",
+fontsize:"Taille de police",
+fontface:"Nom de la police",
+meta_index_follow:"Indexer et suivre les liens",
+meta_index_nofollow:"Indexer et ne pas suivre les liens",
+meta_noindex_follow:"Ne pas indexer et suivre les liens",
+meta_noindex_nofollow:"Ne pas indexer et ne pas suivre les liens",
+appearance_style:"Propri\u00E9t\u00E9s de la feuille de style et du style",
+stylesheet:"Feuille de style",
+style:"Style",
+author:"Auteur",
+copyright:"Copyright",
+add:"Ajouter nouvel \u00E9l\u00E9ment",
+remove:"Enlever l'\u00E9l\u00E9ment s\u00E9lectionn\u00E9",
+moveup:"D\u00E9placer l'\u00E9l\u00E9ment s\u00E9lectionn\u00E9 vers le haut",
+movedown:"D\u00E9placer l'\u00E9l\u00E9ment s\u00E9lectionn\u00E9 vers le bas",
+head_elements:"\u00C9l\u00E9ments de t\u00EAte",
+info:"Information",
+add_title:"\u00C9l\u00E9ment de titre",
+add_meta:"\u00C9l\u00E9ment Meta",
+add_script:"\u00C9l\u00E9ment de script",
+add_style:"\u00C9l\u00E9ment de style",
+add_link:"\u00C9l\u00E9ment de lien",
+add_base:"\u00C9l\u00E9ment de base",
+add_comment:"Commentaire",
+title_element:"\u00C9l\u00E9ment de titre",
+script_element:"\u00C9l\u00E9ment de script",
+style_element:"\u00C9l\u00E9ment de style",
+base_element:"\u00C9l\u00E9ment de base",
+link_element:"\u00C9l\u00E9ment de lien",
+meta_element:"\u00C9l\u00E9ment Meta",
+comment_element:"Commentaire",
+src:"Source",
+language:"Langue",
+href:"Href",
+target:"Cible",
+type:"Type",
+charset:"Charset",
+defer:"Def\u00E9rer",
+media:"M\u00E9dia",
+properties:"Propri\u00E9t\u00E9s",
+name:"Nom",
+value:"Valeur",
+content:"Contenu",
+rel:"Rel",
+rev:"Rev",
+hreflang:"Href lang",
+general_props:"G\u00E9n\u00E9ral",
+advanced_props:"Avanc\u00E9"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/it_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/it_dlg.js
new file mode 100644
index 0000000000..e09c9bac2f
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/it_dlg.js
@@ -0,0 +1,85 @@
+tinyMCE.addI18n('it.fullpage_dlg',{
+title:"Propriet\u00E0 Documento",
+meta_tab:"Generale",
+appearance_tab:"Aspetto",
+advanced_tab:"Avanzate",
+meta_props:"Informazioni Metatag",
+langprops:"Lingua e codifica",
+meta_title:"Titolo",
+meta_keywords:"Parole chiave",
+meta_description:"Descrizione",
+meta_robots:"Robots",
+doctypes:"Doctype",
+langcode:"Codice lingua",
+langdir:"Direzione testo",
+ltr:"Sinistra verso destra",
+rtl:"Destra verso sinistra",
+xml_pi:"Dichiarazione XML",
+encoding:"Codifica carattere",
+appearance_bgprops:"Propriet\u00E0 sfondo",
+appearance_marginprops:"Margini body",
+appearance_linkprops:"Colori collegamenti",
+appearance_textprops:"Propriet\u00E0 testo",
+bgcolor:"Colore sfondo",
+bgimage:"Immagine sfondo",
+left_margin:"Margine sinistro",
+right_margin:"Margine destro",
+top_margin:"Margine superiore",
+bottom_margin:"Margine inferiore",
+text_color:"Colore testo",
+font_size:"Dimensione carattere",
+font_face:"Tipo carattere",
+link_color:"Colore collegamento",
+hover_color:"Colore \'Hover\'",
+visited_color:"Colore \'Visited\'",
+active_color:"Colore \'Active\'",
+textcolor:"Colore",
+fontsize:"Dimensione carattere",
+fontface:"Famiglia carattere",
+meta_index_follow:"Indicizzare e seguire collegamenti",
+meta_index_nofollow:"Indicizzare e non segure collegamenti",
+meta_noindex_follow:"Non indicizzare ma seguire collegamenti",
+meta_noindex_nofollow:"Non indicizzare e non seguire collegamenti",
+appearance_style:"Propriet\u00E0 stili e fogli di stile",
+stylesheet:"Fogli di stile",
+style:"Stile",
+author:"Autore",
+copyright:"Copyright",
+add:"Aggiungi nuovo elemento",
+remove:"Rimuovi elemento selezionato",
+moveup:"Sposta elemento selezionato in alto",
+movedown:"Sposta elemento selezionato in basso",
+head_elements:"Elementi Head",
+info:"Informazioni",
+add_title:"Elemento Titolo",
+add_meta:"Elemento Meta",
+add_script:"Elemento Script",
+add_style:"Elemento Style",
+add_link:"Elemento Link",
+add_base:"Elemento Base",
+add_comment:"Nodo Commento",
+title_element:"Elemento Titolo",
+script_element:"Elemento Script",
+style_element:"Elemento Style",
+base_element:"Elemento Base",
+link_element:"Elemento Link",
+meta_element:"Elemento Meta",
+comment_element:"Commento",
+src:"Sorgente",
+language:"Linguaggio",
+href:"Href",
+target:"Target",
+type:"Tipo",
+charset:"Set caratteri",
+defer:"Defer",
+media:"Media",
+properties:"Propriet\u00E0",
+name:"Nome",
+value:"Valore",
+content:"Contenuto",
+rel:"Rel",
+rev:"Rev",
+hreflang:"Href lang",
+general_props:"Generale",
+advanced_props:"Avanzate"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/nl_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/nl_dlg.js
new file mode 100644
index 0000000000..b90a1278ac
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/nl_dlg.js
@@ -0,0 +1,85 @@
+tinyMCE.addI18n('nl.fullpage_dlg',{
+title:"Documenteigenschappen",
+meta_tab:"Algemeen",
+appearance_tab:"Weergave",
+advanced_tab:"Geavanceerd",
+meta_props:"Meta informatie",
+langprops:"Taal en codering",
+meta_title:"Titel",
+meta_keywords:"Sleutelwoorden",
+meta_description:"Beschrijving",
+meta_robots:"Robots",
+doctypes:"Doctype",
+langcode:"Taalcode",
+langdir:"Taalrichting",
+ltr:"Van links naar rechts",
+rtl:"Van rechts naar links",
+xml_pi:"XML toewijzing",
+encoding:"Karaktercodering",
+appearance_bgprops:"Achtergrondeigenschappen",
+appearance_marginprops:"Bodymarge",
+appearance_linkprops:"Linkkleuren",
+appearance_textprops:"Teksteigenschappen",
+bgcolor:"Achtergrondkleur",
+bgimage:"Achtergrondafbeelding",
+left_margin:"Linkermarge",
+right_margin:"Rechtermarge",
+top_margin:"Bovenmarge",
+bottom_margin:"Ondermarge",
+text_color:"Tekstkleur",
+font_size:"Tekengrootte",
+font_face:"Lettertype",
+link_color:"Linkkleur",
+hover_color:"Hoverkleur",
+visited_color:"Bezocht kleur",
+active_color:"Actieve kleur",
+textcolor:"Kleur",
+fontsize:"Tekengrootte",
+fontface:"Lettertype",
+meta_index_follow:"Links indexeren en volgen",
+meta_index_nofollow:"Links indexeren maar niet volgen",
+meta_noindex_follow:"Links volgen maar niet indexeren",
+meta_noindex_nofollow:"Links niet indexeren en niet volgen",
+appearance_style:"Stijlblad en stijleigenschappen",
+stylesheet:"Stijlblad",
+style:"Stijl",
+author:"Auteur",
+copyright:"Copyright",
+add:"Nieuw element toevoegen",
+remove:"Geselecteerde elementen verwijderen",
+moveup:"Geselecteerde elementen omhoog verplaatsen",
+movedown:"Geselecteerde elementen omlaag verplaatsen",
+head_elements:"Kopelementen",
+info:"Informatie",
+add_title:"Titelelement",
+add_meta:"Meta-element",
+add_script:"Scriptelement",
+add_style:"Stijlelement",
+add_link:"Linkelement",
+add_base:"Basiselement",
+add_comment:"Opmerkingknooppunt",
+title_element:"Titelelement",
+script_element:"Scriptelement",
+style_element:"Stijlelement",
+base_element:"Basiselement",
+link_element:"Linkelement",
+meta_element:"Meta-element",
+comment_element:"Opmerking",
+src:"Bron",
+language:"Taal",
+href:"Href",
+target:"Doel",
+type:"Type",
+charset:"Karakterset",
+defer:"Uitstellen",
+media:"Media",
+properties:"Eigenschappen",
+name:"Naam",
+value:"Waarde",
+content:"Inhoud",
+rel:"Rel",
+rev:"Rev",
+hreflang:"Href taal",
+general_props:"Algemeen",
+advanced_props:"Geavanceerd"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/no_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/no_dlg.js
new file mode 100644
index 0000000000..df668035e4
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/no_dlg.js
@@ -0,0 +1,85 @@
+tinyMCE.addI18n('no.fullpage_dlg',{
+title:"Dokumentegenskaper",
+meta_tab:"Generelt",
+appearance_tab:"Utseende",
+advanced_tab:"Avansert",
+meta_props:"Metainformasjon",
+langprops:"Spr\u00E5k og koding",
+meta_title:"Tittel",
+meta_keywords:"N\u00F8kkelord",
+meta_description:"Omtale",
+meta_robots:"Roboter",
+doctypes:"Doctype",
+langcode:"Spr\u00E5kkode",
+langdir:"Skriftretning",
+ltr:"Venstre mot h\u00F8yre",
+rtl:"H\u00F8yre mot venstre",
+xml_pi:"XML-deklarasjon",
+encoding:"Tegnkonvertering",
+appearance_bgprops:"Bakgrunnsegenskaper",
+appearance_marginprops:"Body-marg",
+appearance_linkprops:"Lenkefarger",
+appearance_textprops:"Tekstegenskaper",
+bgcolor:"Bakgrunn",
+bgimage:"Bakgrunnsbilde",
+left_margin:"Venstre marg",
+right_margin:"H\u00F8yre marg",
+top_margin:"Toppmarg",
+bottom_margin:"Bunnmarg",
+text_color:"Farge",
+font_size:"Skriftst\u00F8rrelse",
+font_face:"Skrifttype",
+link_color:"Lenkefarge",
+hover_color:"Mus-over-farge",
+visited_color:"Bes\u00F8kt-farge",
+active_color:"Aktiv farge",
+textcolor:"Farge",
+fontsize:"Skriftst\u00F8rrelse",
+fontface:"Skriftfamile",
+meta_index_follow:"Indekser, og f\u00F8lg lenkene",
+meta_index_nofollow:"Indekser, men ikke f\u00F8lg lenkene",
+meta_noindex_follow:"Ikke indekser, men f\u00F8lg lenkene",
+meta_noindex_nofollow:"Ikke indekser, og ikke f\u00F8lg lenkene",
+appearance_style:"Stilark og stilegenskaper",
+stylesheet:"Stilark",
+style:"Stil",
+author:"Forfatter",
+copyright:"Copyright",
+add:"Legg til nytt element",
+remove:"Fjern",
+moveup:"Flytt markert element opp",
+movedown:"Flytt markert element ned",
+head_elements:"Overskriftselement",
+info:"Informasjon",
+add_title:"Tittelelement",
+add_meta:"Metaelement",
+add_script:"Skriptelement",
+add_style:"Stilelement",
+add_link:"Lenkeelement",
+add_base:"Basiselement",
+add_comment:"Kommentarnode",
+title_element:"Tittelelement",
+script_element:"Skriptelement",
+style_element:"Stilelement",
+base_element:"Basiselement",
+link_element:"Lenkeelement",
+meta_element:"Metaelement",
+comment_element:"Kommentar",
+src:"Skjerm",
+language:"Spr\u00E5k",
+href:"Href",
+target:"M\u00E5l",
+type:"Type",
+charset:"Tegnsett",
+defer:"Defer",
+media:"Objekt",
+properties:"Egenskaper",
+name:"Navn",
+value:"Verdi",
+content:"Nytt lag...",
+rel:"Siden sitt tilpasset til m\u00E5let",
+rev:"M\u00E5let sitt tilpasset til siden",
+hreflang:"Href lang",
+general_props:"Generelt",
+advanced_props:"Generelle egenskaper"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/sv_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/sv_dlg.js
new file mode 100644
index 0000000000..14c593988c
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullpage/langs/sv_dlg.js
@@ -0,0 +1,85 @@
+tinyMCE.addI18n('sv.fullpage_dlg',{
+title:"Dokumentinst\u00E4llningar",
+meta_tab:"Generella",
+appearance_tab:"Utseende",
+advanced_tab:"Avancerat",
+meta_props:"Metainformation",
+langprops:"Spr\u00E5k och kodning",
+meta_title:"Titel",
+meta_keywords:"Nyckelord",
+meta_description:"Bekrivning",
+meta_robots:"Robots",
+doctypes:"Doctype",
+langcode:"Spr\u00E5kkod",
+langdir:"Skriftriktning",
+ltr:"V\u00E4nster till h\u00F6ger",
+rtl:"H\u00F6ger till v\u00E4nster",
+xml_pi:"XML deklaration",
+encoding:"Teckenkodning",
+appearance_bgprops:"Bakgrundsinst\u00E4llningar",
+appearance_marginprops:"Body marginaler",
+appearance_linkprops:"L\u00E4nkf\u00E4rger",
+appearance_textprops:"Textinst\u00E4llningar",
+bgcolor:"Bakgrundsf\u00E4rg",
+bgimage:"Bakgrundsbild",
+left_margin:"V\u00E4nstermarginal",
+right_margin:"H\u00F6germarginal",
+top_margin:"Toppmarginal",
+bottom_margin:"Bottenmarginal",
+text_color:"Textf\u00E4rg",
+font_size:"Textstorlek",
+font_face:"Textstil",
+link_color:"L\u00E4nkf\u00E4rg",
+hover_color:"Hover f\u00E4rg",
+visited_color:"Visited f\u00E4rg",
+active_color:"Active f\u00E4rg",
+textcolor:"F\u00E4rg",
+fontsize:"Textstorlek",
+fontface:"Textstil",
+meta_index_follow:"Indexera och f\u00F6lj l\u00E4nkar",
+meta_index_nofollow:"Indexera men f\u00F6lj ej l\u00E4nkar",
+meta_noindex_follow:"Indexera inte men f\u00F6lj l\u00E4nkar",
+meta_noindex_nofollow:"Indexera inte och f\u00F6lj ej l\u00E4nkar",
+appearance_style:"Stilmall och stilegenskaper",
+stylesheet:"Stilmall",
+style:"Stil",
+author:"F\u00F6rfattare",
+copyright:"Copyright",
+add:"L\u00E4gg till element",
+remove:"Radera det markerade elementet",
+moveup:"Flytta det markerade elementet upp\u00E5t",
+movedown:"Flytta det markerade elementet ned\u00E5t",
+head_elements:"Head element",
+info:"Information",
+add_title:"Titel-element",
+add_meta:"Meta-element",
+add_script:"Script-element",
+add_style:"Stil-element",
+add_link:"L\u00E4nk-element",
+add_base:"Base-element",
+add_comment:"Kommentarsnod",
+title_element:"Titel-element",
+script_element:"Script-element",
+style_element:"Style-element",
+base_element:"Base-element",
+link_element:"Link-element",
+meta_element:"Meta-element",
+comment_element:"Comment-element",
+src:"Src",
+language:"Spr\u00E5k",
+href:"Href",
+target:"M\u00E5l",
+type:"Typ",
+charset:"Teckenupps\u00E4ttning",
+defer:"Defer",
+media:"Media",
+properties:"Egenskaper",
+name:"Name",
+value:"Value",
+content:"Inneh\u00E5ll",
+rel:"Rel",
+rev:"Rev",
+hreflang:"Href lang",
+general_props:"Generellt",
+advanced_props:"Avancerat"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullscreen/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullscreen/editor_plugin.js
new file mode 100644
index 0000000000..6eae3ec84a
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullscreen/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent({format:"raw"}),{format:"raw"});tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent({format:"raw"}),{format:"raw"});d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().firstChild);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullscreen/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullscreen/editor_plugin_src.js
new file mode 100644
index 0000000000..3477c86c9b
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullscreen/editor_plugin_src.js
@@ -0,0 +1,159 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var DOM = tinymce.DOM;
+
+	tinymce.create('tinymce.plugins.FullScreenPlugin', {
+		init : function(ed, url) {
+			var t = this, s = {}, vp, posCss;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceFullScreen', function() {
+				var win, de = DOM.doc.documentElement;
+
+				if (ed.getParam('fullscreen_is_enabled')) {
+					if (ed.getParam('fullscreen_new_window'))
+						closeFullscreen(); // Call to close in new window
+					else {
+						DOM.win.setTimeout(function() {
+							tinymce.dom.Event.remove(DOM.win, 'resize', t.resizeFunc);
+							tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent({format : 'raw'}), {format : 'raw'});
+							tinyMCE.remove(ed);
+							DOM.remove('mce_fullscreen_container');
+							de.style.overflow = ed.getParam('fullscreen_html_overflow');
+							DOM.setStyle(DOM.doc.body, 'overflow', ed.getParam('fullscreen_overflow'));
+							DOM.win.scrollTo(ed.getParam('fullscreen_scrollx'), ed.getParam('fullscreen_scrolly'));
+							tinyMCE.settings = tinyMCE.oldSettings; // Restore old settings
+						}, 10);
+					}
+
+					return;
+				}
+
+				if (ed.getParam('fullscreen_new_window')) {
+					win = DOM.win.open(url + "/fullscreen.htm", "mceFullScreenPopup", "fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width=" + screen.availWidth + ",height=" + screen.availHeight);
+					try {
+						win.resizeTo(screen.availWidth, screen.availHeight);
+					} catch (e) {
+						// Ignore
+					}
+				} else {
+					tinyMCE.oldSettings = tinyMCE.settings; // Store old settings
+					s.fullscreen_overflow = DOM.getStyle(DOM.doc.body, 'overflow', 1) || 'auto';
+					s.fullscreen_html_overflow = DOM.getStyle(de, 'overflow', 1);
+					vp = DOM.getViewPort();
+					s.fullscreen_scrollx = vp.x;
+					s.fullscreen_scrolly = vp.y;
+
+					// Fixes an Opera bug where the scrollbars doesn't reappear
+					if (tinymce.isOpera && s.fullscreen_overflow == 'visible')
+						s.fullscreen_overflow = 'auto';
+
+					// Fixes an IE bug where horizontal scrollbars would appear
+					if (tinymce.isIE && s.fullscreen_overflow == 'scroll')
+						s.fullscreen_overflow = 'auto';
+
+					// Fixes an IE bug where the scrollbars doesn't reappear
+					if (tinymce.isIE && (s.fullscreen_html_overflow == 'visible' || s.fullscreen_html_overflow == 'scroll'))
+						s.fullscreen_html_overflow = 'auto'; 
+
+					if (s.fullscreen_overflow == '0px')
+						s.fullscreen_overflow = '';
+
+					DOM.setStyle(DOM.doc.body, 'overflow', 'hidden');
+					de.style.overflow = 'hidden'; //Fix for IE6/7
+					vp = DOM.getViewPort();
+					DOM.win.scrollTo(0, 0);
+
+					if (tinymce.isIE)
+						vp.h -= 1;
+
+					// Use fixed position if it exists
+					if (tinymce.isIE6)
+						posCss = 'absolute;top:' + vp.y;
+					else
+						posCss = 'fixed;top:0';
+
+					n = DOM.add(DOM.doc.body, 'div', {
+						id : 'mce_fullscreen_container', 
+						style : 'position:' + posCss + ';left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});
+					DOM.add(n, 'div', {id : 'mce_fullscreen'});
+
+					tinymce.each(ed.settings, function(v, n) {
+						s[n] = v;
+					});
+
+					s.id = 'mce_fullscreen';
+					s.width = n.clientWidth;
+					s.height = n.clientHeight - 15;
+					s.fullscreen_is_enabled = true;
+					s.fullscreen_editor_id = ed.id;
+					s.theme_advanced_resizing = false;
+					s.save_onsavecallback = function() {
+						ed.setContent(tinyMCE.get(s.id).getContent({format : 'raw'}), {format : 'raw'});
+						ed.execCommand('mceSave');
+					};
+
+					tinymce.each(ed.getParam('fullscreen_settings'), function(v, k) {
+						s[k] = v;
+					});
+
+					if (s.theme_advanced_toolbar_location === 'external')
+						s.theme_advanced_toolbar_location = 'top';
+
+					t.fullscreenEditor = new tinymce.Editor('mce_fullscreen', s);
+					t.fullscreenEditor.onInit.add(function() {
+						t.fullscreenEditor.setContent(ed.getContent());
+						t.fullscreenEditor.focus();
+					});
+
+					t.fullscreenEditor.render();
+
+					t.fullscreenElement = new tinymce.dom.Element('mce_fullscreen_container');
+					t.fullscreenElement.update();
+					//document.body.overflow = 'hidden';
+
+					t.resizeFunc = tinymce.dom.Event.add(DOM.win, 'resize', function() {
+						var vp = tinymce.DOM.getViewPort(), fed = t.fullscreenEditor, outerSize, innerSize;
+
+						// Get outer/inner size to get a delta size that can be used to calc the new iframe size
+						outerSize = fed.dom.getSize(fed.getContainer().firstChild);
+						innerSize = fed.dom.getSize(fed.getContainer().getElementsByTagName('iframe')[0]);
+
+						fed.theme.resizeTo(vp.w - outerSize.w + innerSize.w, vp.h - outerSize.h + innerSize.h);
+					});
+				}
+			});
+
+			// Register buttons
+			ed.addButton('fullscreen', {title : 'fullscreen.desc', cmd : 'mceFullScreen'});
+
+			ed.onNodeChange.add(function(ed, cm) {
+				cm.setActive('fullscreen', ed.getParam('fullscreen_is_enabled'));
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Fullscreen',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('fullscreen', tinymce.plugins.FullScreenPlugin);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/fullscreen/fullscreen.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullscreen/fullscreen.htm
new file mode 100644
index 0000000000..4c4f27e488
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/fullscreen/fullscreen.htm
@@ -0,0 +1,109 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<script type="text/javascript" src="../../tiny_mce.js"></script>
+	<script type="text/javascript">
+		function patchCallback(settings, key) {
+			if (settings[key])
+				settings[key] = "window.opener." + settings[key];
+		}
+
+		var settings = {}, paSe = window.opener.tinyMCE.activeEditor.settings, oeID = window.opener.tinyMCE.activeEditor.id;
+
+		// Clone array
+		for (var n in paSe)
+			settings[n] = paSe[n];
+
+		// Override options for fullscreen
+		for (var n in paSe.fullscreen_settings)
+			settings[n] = paSe.fullscreen_settings[n];
+
+		// Patch callbacks, make them point to window.opener
+		patchCallback(settings, 'urlconverter_callback');
+		patchCallback(settings, 'insertlink_callback');
+		patchCallback(settings, 'insertimage_callback');
+		patchCallback(settings, 'setupcontent_callback');
+		patchCallback(settings, 'save_callback');
+		patchCallback(settings, 'onchange_callback');
+		patchCallback(settings, 'init_instance_callback');
+		patchCallback(settings, 'file_browser_callback');
+		patchCallback(settings, 'cleanup_callback');
+		patchCallback(settings, 'execcommand_callback');
+		patchCallback(settings, 'oninit');
+
+		// Set options
+		delete settings.id;
+		settings['mode'] = 'exact';
+		settings['elements'] = 'fullscreenarea';
+		settings['add_unload_trigger'] = false;
+		settings['ask'] = false;
+		settings['document_base_url'] = window.opener.tinyMCE.activeEditor.documentBaseURI.getURI();
+		settings['fullscreen_is_enabled'] = true;
+		settings['fullscreen_editor_id'] = oeID;
+		settings['theme_advanced_resizing'] = false;
+		settings['strict_loading_mode'] = true;
+
+		settings.save_onsavecallback = function() {
+			window.opener.tinyMCE.get(oeID).setContent(tinyMCE.get('fullscreenarea').getContent({format : 'raw'}), {format : 'raw'});
+			window.opener.tinyMCE.get(oeID).execCommand('mceSave');
+			window.close();
+		};
+
+		function unloadHandler(e) {
+			moveContent();
+		}
+
+		function moveContent() {
+			window.opener.tinyMCE.get(oeID).setContent(tinyMCE.activeEditor.getContent());
+		}
+
+		function closeFullscreen() {
+			moveContent();
+			window.close();
+		}
+
+		function doParentSubmit() {
+			moveContent();
+
+			if (window.opener.tinyMCE.selectedInstance.formElement.form)
+				window.opener.tinyMCE.selectedInstance.formElement.form.submit();
+
+			window.close();
+
+			return false;
+		}
+
+		function render() {
+			var e = document.getElementById('fullscreenarea'), vp, ed, ow, oh, dom = tinymce.DOM;
+
+			e.value = window.opener.tinyMCE.get(oeID).getContent();
+
+			vp = dom.getViewPort();
+			settings.width = vp.w;
+			settings.height = vp.h - 15;
+
+			tinymce.dom.Event.add(window, 'resize', function() {
+				var vp = dom.getViewPort();
+
+				tinyMCE.activeEditor.theme.resizeTo(vp.w, vp.h);
+			});
+
+			tinyMCE.init(settings);
+		}
+
+		// Add onunload
+		tinymce.dom.Event.add(window, "beforeunload", unloadHandler);
+	</script>
+</head>
+<body style="margin:0;overflow:hidden;width:100%;height:100%" scrolling="no" scroll="no">
+<form onsubmit="doParentSubmit();">
+<textarea id="fullscreenarea" style="width:100%; height:100%"></textarea>
+</form>
+
+<script type="text/javascript">
+	render();
+</script>
+
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/iespell/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/iespell/editor_plugin.js
new file mode 100644
index 0000000000..e9cba106c6
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/iespell/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.IESpell",{init:function(a,b){var c=this,d;if(!tinymce.isIE){return}c.editor=a;a.addCommand("mceIESpell",function(){try{d=new ActiveXObject("ieSpell.ieSpellExtension");d.CheckDocumentNode(a.getDoc().documentElement)}catch(f){if(f.number==-2146827859){a.windowManager.confirm(a.getLang("iespell.download"),function(e){if(e){window.open("http://www.iespell.com/download.php","ieSpellDownload","")}})}else{a.windowManager.alert("Error Loading ieSpell: Exception "+f.number)}}});a.addButton("iespell",{title:"iespell.iespell_desc",cmd:"mceIESpell"})},getInfo:function(){return{longname:"IESpell (IE Only)",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/iespell",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("iespell",tinymce.plugins.IESpell)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/iespell/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/iespell/editor_plugin_src.js
new file mode 100644
index 0000000000..1b2bb98460
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/iespell/editor_plugin_src.js
@@ -0,0 +1,54 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.IESpell', {
+		init : function(ed, url) {
+			var t = this, sp;
+
+			if (!tinymce.isIE)
+				return;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceIESpell', function() {
+				try {
+					sp = new ActiveXObject("ieSpell.ieSpellExtension");
+					sp.CheckDocumentNode(ed.getDoc().documentElement);
+				} catch (e) {
+					if (e.number == -2146827859) {
+						ed.windowManager.confirm(ed.getLang("iespell.download"), function(s) {
+							if (s)
+								window.open('http://www.iespell.com/download.php', 'ieSpellDownload', '');
+						});
+					} else
+						ed.windowManager.alert("Error Loading ieSpell: Exception " + e.number);
+				}
+			});
+
+			// Register buttons
+			ed.addButton('iespell', {title : 'iespell.iespell_desc', cmd : 'mceIESpell'});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'IESpell (IE Only)',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/iespell',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('iespell', tinymce.plugins.IESpell);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/editor_plugin.js
new file mode 100644
index 0000000000..ef648174f0
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.settings.inlinepopups_skin||"clearlooks2")+"/window.css")})},getInfo:function(){return{longname:"InlinePopups",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.create("tinymce.InlineWindowManager:tinymce.WindowManager",{InlineWindowManager:function(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(s,j){var z=this,i,k="",r=z.editor,g=0,v=0,h,m,o,q,l,x,y,n;s=s||{};j=j||{};if(!s.inline){return z.parent(s,j)}n=z._frontWindow();if(n&&d.get(n.id+"_ifr")){n.focussedElement=d.get(n.id+"_ifr").contentWindow.document.activeElement}if(!s.type){z.bookmark=r.selection.getBookmark(1)}i=d.uniqueId();h=d.getViewPort();s.width=parseInt(s.width||320);s.height=parseInt(s.height||240)+(tinymce.isIE?8:0);s.min_width=parseInt(s.min_width||150);s.min_height=parseInt(s.min_height||100);s.max_width=parseInt(s.max_width||2000);s.max_height=parseInt(s.max_height||2000);s.left=s.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(s.width/2)));s.top=s.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(s.height/2)));s.movable=s.resizable=true;j.mce_width=s.width;j.mce_height=s.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=s.auto_focus;z.features=s;z.params=j;z.onOpen.dispatch(z,s,j);if(s.type){k+=" mceModal";if(s.type){k+=" mce"+s.type.substring(0,1).toUpperCase()+s.type.substring(1)}s.resizable=false}if(s.statusbar){k+=" mceStatusbar"}if(s.resizable){k+=" mceResizable"}if(s.minimizable){k+=" mceMinimizable"}if(s.maximizable){k+=" mceMaximizable"}if(s.movable){k+=" mceMovable"}z._addAll(d.doc.body,["div",{id:i,role:"dialog","aria-labelledby":s.type?i+"_content":i+"_title","class":(r.settings.inlinepopups_skin||"clearlooks2")+(tinymce.isIE&&window.getSelection?" ie9":""),style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},s.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft",tabindex:"0"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight",tabindex:"0"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_status"},"Content"]],["a",{"class":"mceMove",tabindex:"-1",href:"javascript:;"}],["a",{"class":"mceMin",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMax",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMed",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceClose",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{id:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!s.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;v+=d.get(i+"_top").clientHeight;v+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:s.top,left:s.left,width:s.width+g,height:s.height+v});y=s.url||s.file;if(y){if(tinymce.relaxedDomain){y+=(y.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}y=tinymce._addVer(y)}if(!s.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:s.width,height:s.height});d.setAttrib(i+"_ifr","src",y)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(s.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",s.content.replace("\n","<br />"));a.add(i,"keyup",function(f){var p=27;if(f.keyCode===p){s.button_func(false);return a.cancel(f)}});a.add(i,"keydown",function(f){var t,p=9;if(f.keyCode===p){t=d.select("a.mceCancel",i+"_wrapper")[0];if(t&&t!==f.target){t.focus()}else{d.get(i+"_ok").focus()}return a.cancel(f)}})}o=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=z.windows[i];z.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return z._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return z._startDrag(i,t,u.className.substring(13))}}}}}});q=a.add(i,"click",function(f){var p=f.target;z.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":z.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":s.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});a.add([i+"_left",i+"_right"],"focus",function(p){var t=d.get(i+"_ifr");if(t){var f=t.contentWindow.document.body;var u=d.select(":input:enabled,*[tabindex=0]",f);if(p.target.id===(i+"_left")){u[u.length-1].focus()}else{u[0].focus()}}else{d.get(i+"_ok").focus()}});x=z.windows[i]={id:i,mousedown_func:o,click_func:q,element:new b(i,{blocker:1,container:r.getContainer()}),iframeElement:new b(i+"_ifr"),features:s,deltaWidth:g,deltaHeight:v};x.iframeElement.on("focus",function(){z.focus(i)});if(z.count==0&&z.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(z.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:z.zIndex-1}});d.show("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","true")}else{d.setStyle("mceModalBlocker","z-index",z.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}d.setAttrib(i,"aria-hidden","false");z.focus(i);z._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}z.count++;return x},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h;if(f.focussedElement){f.focussedElement.focus()}else{if(d.get(h+"_ok")){d.get(f.id+"_ok").focus()}else{if(d.get(f.id+"_ifr")){d.get(f.id+"_ifr").focus()}}}}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;g<h.length;g++){f._addAll(k,h[g])}}}},_startDrag:function(v,G,E){var o=this,u,z,C=d.doc,f,l=o.windows[v],h=l.element,y=h.getXY(),x,q,F,g,A,s,r,j,i,m,k,n,B;g={x:0,y:0};A=d.getViewPort();A.w-=2;A.h-=2;j=G.screenX;i=G.screenY;m=k=n=B=0;u=a.add(C,"mouseup",function(p){a.remove(C,"mouseup",u);a.remove(C,"mousemove",z);if(f){f.remove()}h.moveBy(m,k);h.resizeBy(n,B);q=h.getSize();d.setStyles(v+"_ifr",{width:q.w-l.deltaWidth,height:q.h-l.deltaHeight});o._fixIELayout(v,1);return a.cancel(p)});if(E!="Move"){D()}function D(){if(f){return}o._fixIELayout(v,0);d.add(C.body,"div",{id:"mceEventBlocker","class":"mceEventBlocker "+(o.editor.settings.inlinepopups_skin||"clearlooks2"),style:{zIndex:o.zIndex+1}});if(tinymce.isIE6||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceEventBlocker",{position:"absolute",left:A.x,top:A.y,width:A.w-2,height:A.h-2})}f=new b("mceEventBlocker");f.update();x=h.getXY();q=h.getSize();s=g.x+x.x-A.x;r=g.y+x.y-A.y;d.add(f.get(),"div",{id:"mcePlaceHolder","class":"mcePlaceHolder",style:{left:s,top:r,width:q.w,height:q.h}});F=new b("mcePlaceHolder")}z=a.add(C,"mousemove",function(w){var p,H,t;D();p=w.screenX-j;H=w.screenY-i;switch(E){case"ResizeW":m=p;n=0-p;break;case"ResizeE":n=p;break;case"ResizeN":case"ResizeNW":case"ResizeNE":if(E=="ResizeNW"){m=p;n=0-p}else{if(E=="ResizeNE"){n=p}}k=H;B=0-H;break;case"ResizeS":case"ResizeSW":case"ResizeSE":if(E=="ResizeSW"){m=p;n=0-p}else{if(E=="ResizeSE"){n=p}}B=H;break;case"mceMove":m=p;k=H;break}if(n<(t=l.features.min_width-q.w)){if(m!==0){m+=n-t}n=t}if(B<(t=l.features.min_height-q.h)){if(k!==0){k+=B-t}B=t}n=Math.min(n,l.features.max_width-q.w);B=Math.min(B,l.features.max_height-q.h);m=Math.max(m,A.x-(s+A.x));k=Math.max(k,A.y-(r+A.y));m=Math.min(m,(A.w+A.x)-(s+q.w+A.x));k=Math.min(k,(A.h+A.y)-(r+q.h+A.y));if(m+k!==0){if(s+m<0){m=0}if(r+k<0){k=0}F.moveTo(s+m,r+k)}if(n+B!==0){F.resizeTo(q.w+n,q.h+B)}return a.cancel(w)});return a.cancel(G)},resizeBy:function(g,h,i){var f=this.windows[i];if(f){f.element.resizeBy(g,h);f.iframeElement.resizeBy(g,h)}},close:function(i,k){var g=this,f,j=d.doc,h,k;k=g._findId(k||i);if(!g.windows[k]){g.parent(i);return}g.count--;if(g.count==0){d.remove("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","false");g.editor.focus()}if(f=g.windows[k]){g.onClose.dispatch(g);a.remove(j,"mousedown",f.mousedownFunc);a.remove(j,"click",f.clickFunc);a.clear(k);a.clear(k+"_ifr");d.setAttrib(k+"_ifr","src",'javascript:""');f.element.remove();delete g.windows[k];h=g._frontWindow();if(h){g.focus(h.id)}}},_frontWindow:function(){var g,f=0;e(this.windows,function(h){if(h.zIndex>f){g=h;f=h.zIndex}});return g},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/editor_plugin_src.js
new file mode 100644
index 0000000000..ac6fb1cb98
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/editor_plugin_src.js
@@ -0,0 +1,696 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var DOM = tinymce.DOM, Element = tinymce.dom.Element, Event = tinymce.dom.Event, each = tinymce.each, is = tinymce.is;
+
+	tinymce.create('tinymce.plugins.InlinePopups', {
+		init : function(ed, url) {
+			// Replace window manager
+			ed.onBeforeRenderUI.add(function() {
+				ed.windowManager = new tinymce.InlineWindowManager(ed);
+				DOM.loadCSS(url + '/skins/' + (ed.settings.inlinepopups_skin || 'clearlooks2') + "/window.css");
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'InlinePopups',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	tinymce.create('tinymce.InlineWindowManager:tinymce.WindowManager', {
+		InlineWindowManager : function(ed) {
+			var t = this;
+
+			t.parent(ed);
+			t.zIndex = 300000;
+			t.count = 0;
+			t.windows = {};
+		},
+
+		open : function(f, p) {
+			var t = this, id, opt = '', ed = t.editor, dw = 0, dh = 0, vp, po, mdf, clf, we, w, u, parentWindow;
+
+			f = f || {};
+			p = p || {};
+
+			// Run native windows
+			if (!f.inline)
+				return t.parent(f, p);
+
+			parentWindow = t._frontWindow();
+			if (parentWindow && DOM.get(parentWindow.id + '_ifr')) {
+				parentWindow.focussedElement = DOM.get(parentWindow.id + '_ifr').contentWindow.document.activeElement;
+			}
+			
+			// Only store selection if the type is a normal window
+			if (!f.type)
+				t.bookmark = ed.selection.getBookmark(1);
+
+			id = DOM.uniqueId();
+			vp = DOM.getViewPort();
+			f.width = parseInt(f.width || 320);
+			f.height = parseInt(f.height || 240) + (tinymce.isIE ? 8 : 0);
+			f.min_width = parseInt(f.min_width || 150);
+			f.min_height = parseInt(f.min_height || 100);
+			f.max_width = parseInt(f.max_width || 2000);
+			f.max_height = parseInt(f.max_height || 2000);
+			f.left = f.left || Math.round(Math.max(vp.x, vp.x + (vp.w / 2.0) - (f.width / 2.0)));
+			f.top = f.top || Math.round(Math.max(vp.y, vp.y + (vp.h / 2.0) - (f.height / 2.0)));
+			f.movable = f.resizable = true;
+			p.mce_width = f.width;
+			p.mce_height = f.height;
+			p.mce_inline = true;
+			p.mce_window_id = id;
+			p.mce_auto_focus = f.auto_focus;
+
+			// Transpose
+//			po = DOM.getPos(ed.getContainer());
+//			f.left -= po.x;
+//			f.top -= po.y;
+
+			t.features = f;
+			t.params = p;
+			t.onOpen.dispatch(t, f, p);
+
+			if (f.type) {
+				opt += ' mceModal';
+
+				if (f.type)
+					opt += ' mce' + f.type.substring(0, 1).toUpperCase() + f.type.substring(1);
+
+				f.resizable = false;
+			}
+
+			if (f.statusbar)
+				opt += ' mceStatusbar';
+
+			if (f.resizable)
+				opt += ' mceResizable';
+
+			if (f.minimizable)
+				opt += ' mceMinimizable';
+
+			if (f.maximizable)
+				opt += ' mceMaximizable';
+
+			if (f.movable)
+				opt += ' mceMovable';
+
+			// Create DOM objects
+			t._addAll(DOM.doc.body, 
+				['div', {id : id, role : 'dialog', 'aria-labelledby': f.type ? id + '_content' : id + '_title', 'class' : (ed.settings.inlinepopups_skin || 'clearlooks2') + (tinymce.isIE && window.getSelection ? ' ie9' : ''), style : 'width:100px;height:100px'}, 
+					['div', {id : id + '_wrapper', 'class' : 'mceWrapper' + opt},
+						['div', {id : id + '_top', 'class' : 'mceTop'}, 
+							['div', {'class' : 'mceLeft'}],
+							['div', {'class' : 'mceCenter'}],
+							['div', {'class' : 'mceRight'}],
+							['span', {id : id + '_title'}, f.title || '']
+						],
+
+						['div', {id : id + '_middle', 'class' : 'mceMiddle'}, 
+							['div', {id : id + '_left', 'class' : 'mceLeft', tabindex : '0'}],
+							['span', {id : id + '_content'}],
+							['div', {id : id + '_right', 'class' : 'mceRight', tabindex : '0'}]
+						],
+
+						['div', {id : id + '_bottom', 'class' : 'mceBottom'},
+							['div', {'class' : 'mceLeft'}],
+							['div', {'class' : 'mceCenter'}],
+							['div', {'class' : 'mceRight'}],
+							['span', {id : id + '_status'}, 'Content']
+						],
+
+						['a', {'class' : 'mceMove', tabindex : '-1', href : 'javascript:;'}],
+						['a', {'class' : 'mceMin', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],
+						['a', {'class' : 'mceMax', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],
+						['a', {'class' : 'mceMed', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],
+						['a', {'class' : 'mceClose', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],
+						['a', {id : id + '_resize_n', 'class' : 'mceResize mceResizeN', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_s', 'class' : 'mceResize mceResizeS', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_w', 'class' : 'mceResize mceResizeW', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_e', 'class' : 'mceResize mceResizeE', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_nw', 'class' : 'mceResize mceResizeNW', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_ne', 'class' : 'mceResize mceResizeNE', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_sw', 'class' : 'mceResize mceResizeSW', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_se', 'class' : 'mceResize mceResizeSE', tabindex : '-1', href : 'javascript:;'}]
+					]
+				]
+			);
+
+			DOM.setStyles(id, {top : -10000, left : -10000});
+
+			// Fix gecko rendering bug, where the editors iframe messed with window contents
+			if (tinymce.isGecko)
+				DOM.setStyle(id, 'overflow', 'auto');
+
+			// Measure borders
+			if (!f.type) {
+				dw += DOM.get(id + '_left').clientWidth;
+				dw += DOM.get(id + '_right').clientWidth;
+				dh += DOM.get(id + '_top').clientHeight;
+				dh += DOM.get(id + '_bottom').clientHeight;
+			}
+
+			// Resize window
+			DOM.setStyles(id, {top : f.top, left : f.left, width : f.width + dw, height : f.height + dh});
+
+			u = f.url || f.file;
+			if (u) {
+				if (tinymce.relaxedDomain)
+					u += (u.indexOf('?') == -1 ? '?' : '&') + 'mce_rdomain=' + tinymce.relaxedDomain;
+
+				u = tinymce._addVer(u);
+			}
+
+			if (!f.type) {
+				DOM.add(id + '_content', 'iframe', {id : id + '_ifr', src : 'javascript:""', frameBorder : 0, style : 'border:0;width:10px;height:10px'});
+				DOM.setStyles(id + '_ifr', {width : f.width, height : f.height});
+				DOM.setAttrib(id + '_ifr', 'src', u);
+			} else {
+				DOM.add(id + '_wrapper', 'a', {id : id + '_ok', 'class' : 'mceButton mceOk', href : 'javascript:;', onmousedown : 'return false;'}, 'Ok');
+
+				if (f.type == 'confirm')
+					DOM.add(id + '_wrapper', 'a', {'class' : 'mceButton mceCancel', href : 'javascript:;', onmousedown : 'return false;'}, 'Cancel');
+
+				DOM.add(id + '_middle', 'div', {'class' : 'mceIcon'});
+				DOM.setHTML(id + '_content', f.content.replace('\n', '<br />'));
+				
+				Event.add(id, 'keyup', function(evt) {
+					var VK_ESCAPE = 27;
+					if (evt.keyCode === VK_ESCAPE) {
+						f.button_func(false);
+						return Event.cancel(evt);
+					}
+				});
+
+				Event.add(id, 'keydown', function(evt) {
+					var cancelButton, VK_TAB = 9;
+					if (evt.keyCode === VK_TAB) {
+						cancelButton = DOM.select('a.mceCancel', id + '_wrapper')[0];
+						if (cancelButton && cancelButton !== evt.target) {
+							cancelButton.focus();
+						} else {
+							DOM.get(id + '_ok').focus();
+						}
+						return Event.cancel(evt);
+					}
+				});
+			}
+
+			// Register events
+			mdf = Event.add(id, 'mousedown', function(e) {
+				var n = e.target, w, vp;
+
+				w = t.windows[id];
+				t.focus(id);
+
+				if (n.nodeName == 'A' || n.nodeName == 'a') {
+					if (n.className == 'mceMax') {
+						w.oldPos = w.element.getXY();
+						w.oldSize = w.element.getSize();
+
+						vp = DOM.getViewPort();
+
+						// Reduce viewport size to avoid scrollbars
+						vp.w -= 2;
+						vp.h -= 2;
+
+						w.element.moveTo(vp.x, vp.y);
+						w.element.resizeTo(vp.w, vp.h);
+						DOM.setStyles(id + '_ifr', {width : vp.w - w.deltaWidth, height : vp.h - w.deltaHeight});
+						DOM.addClass(id + '_wrapper', 'mceMaximized');
+					} else if (n.className == 'mceMed') {
+						// Reset to old size
+						w.element.moveTo(w.oldPos.x, w.oldPos.y);
+						w.element.resizeTo(w.oldSize.w, w.oldSize.h);
+						w.iframeElement.resizeTo(w.oldSize.w - w.deltaWidth, w.oldSize.h - w.deltaHeight);
+
+						DOM.removeClass(id + '_wrapper', 'mceMaximized');
+					} else if (n.className == 'mceMove')
+						return t._startDrag(id, e, n.className);
+					else if (DOM.hasClass(n, 'mceResize'))
+						return t._startDrag(id, e, n.className.substring(13));
+				}
+			});
+
+			clf = Event.add(id, 'click', function(e) {
+				var n = e.target;
+
+				t.focus(id);
+
+				if (n.nodeName == 'A' || n.nodeName == 'a') {
+					switch (n.className) {
+						case 'mceClose':
+							t.close(null, id);
+							return Event.cancel(e);
+
+						case 'mceButton mceOk':
+						case 'mceButton mceCancel':
+							f.button_func(n.className == 'mceButton mceOk');
+							return Event.cancel(e);
+					}
+				}
+			});
+			
+			// Make sure the tab order loops within the dialog.
+			Event.add([id + '_left', id + '_right'], 'focus', function(evt) {
+				var iframe = DOM.get(id + '_ifr');
+				if (iframe) {
+					var body = iframe.contentWindow.document.body;
+					var focusable = DOM.select(':input:enabled,*[tabindex=0]', body);
+					if (evt.target.id === (id + '_left')) {
+						focusable[focusable.length - 1].focus();
+					} else {
+						focusable[0].focus();
+					}
+				} else {
+					DOM.get(id + '_ok').focus();
+				}
+			});
+			
+			// Add window
+			w = t.windows[id] = {
+				id : id,
+				mousedown_func : mdf,
+				click_func : clf,
+				element : new Element(id, {blocker : 1, container : ed.getContainer()}),
+				iframeElement : new Element(id + '_ifr'),
+				features : f,
+				deltaWidth : dw,
+				deltaHeight : dh
+			};
+
+			w.iframeElement.on('focus', function() {
+				t.focus(id);
+			});
+
+			// Setup blocker
+			if (t.count == 0 && t.editor.getParam('dialog_type', 'modal') == 'modal') {
+				DOM.add(DOM.doc.body, 'div', {
+					id : 'mceModalBlocker',
+					'class' : (t.editor.settings.inlinepopups_skin || 'clearlooks2') + '_modalBlocker',
+					style : {zIndex : t.zIndex - 1}
+				});
+
+				DOM.show('mceModalBlocker'); // Reduces flicker in IE
+				DOM.setAttrib(DOM.doc.body, 'aria-hidden', 'true');
+			} else
+				DOM.setStyle('mceModalBlocker', 'z-index', t.zIndex - 1);
+
+			if (tinymce.isIE6 || /Firefox\/2\./.test(navigator.userAgent) || (tinymce.isIE && !DOM.boxModel))
+				DOM.setStyles('mceModalBlocker', {position : 'absolute', left : vp.x, top : vp.y, width : vp.w - 2, height : vp.h - 2});
+
+			DOM.setAttrib(id, 'aria-hidden', 'false');
+			t.focus(id);
+			t._fixIELayout(id, 1);
+
+			// Focus ok button
+			if (DOM.get(id + '_ok'))
+				DOM.get(id + '_ok').focus();
+			t.count++;
+
+			return w;
+		},
+
+		focus : function(id) {
+			var t = this, w;
+
+			if (w = t.windows[id]) {
+				w.zIndex = this.zIndex++;
+				w.element.setStyle('zIndex', w.zIndex);
+				w.element.update();
+
+				id = id + '_wrapper';
+				DOM.removeClass(t.lastId, 'mceFocus');
+				DOM.addClass(id, 'mceFocus');
+				t.lastId = id;
+				
+				if (w.focussedElement) {
+					w.focussedElement.focus();
+				} else if (DOM.get(id + '_ok')) {
+					DOM.get(w.id + '_ok').focus();
+				} else if (DOM.get(w.id + '_ifr')) {
+					DOM.get(w.id + '_ifr').focus();
+				}
+			}
+		},
+
+		_addAll : function(te, ne) {
+			var i, n, t = this, dom = tinymce.DOM;
+
+			if (is(ne, 'string'))
+				te.appendChild(dom.doc.createTextNode(ne));
+			else if (ne.length) {
+				te = te.appendChild(dom.create(ne[0], ne[1]));
+
+				for (i=2; i<ne.length; i++)
+					t._addAll(te, ne[i]);
+			}
+		},
+
+		_startDrag : function(id, se, ac) {
+			var t = this, mu, mm, d = DOM.doc, eb, w = t.windows[id], we = w.element, sp = we.getXY(), p, sz, ph, cp, vp, sx, sy, sex, sey, dx, dy, dw, dh;
+
+			// Get positons and sizes
+//			cp = DOM.getPos(t.editor.getContainer());
+			cp = {x : 0, y : 0};
+			vp = DOM.getViewPort();
+
+			// Reduce viewport size to avoid scrollbars while dragging
+			vp.w -= 2;
+			vp.h -= 2;
+
+			sex = se.screenX;
+			sey = se.screenY;
+			dx = dy = dw = dh = 0;
+
+			// Handle mouse up
+			mu = Event.add(d, 'mouseup', function(e) {
+				Event.remove(d, 'mouseup', mu);
+				Event.remove(d, 'mousemove', mm);
+
+				if (eb)
+					eb.remove();
+
+				we.moveBy(dx, dy);
+				we.resizeBy(dw, dh);
+				sz = we.getSize();
+				DOM.setStyles(id + '_ifr', {width : sz.w - w.deltaWidth, height : sz.h - w.deltaHeight});
+				t._fixIELayout(id, 1);
+
+				return Event.cancel(e);
+			});
+
+			if (ac != 'Move')
+				startMove();
+
+			function startMove() {
+				if (eb)
+					return;
+
+				t._fixIELayout(id, 0);
+
+				// Setup event blocker
+				DOM.add(d.body, 'div', {
+					id : 'mceEventBlocker',
+					'class' : 'mceEventBlocker ' + (t.editor.settings.inlinepopups_skin || 'clearlooks2'),
+					style : {zIndex : t.zIndex + 1}
+				});
+
+				if (tinymce.isIE6 || (tinymce.isIE && !DOM.boxModel))
+					DOM.setStyles('mceEventBlocker', {position : 'absolute', left : vp.x, top : vp.y, width : vp.w - 2, height : vp.h - 2});
+
+				eb = new Element('mceEventBlocker');
+				eb.update();
+
+				// Setup placeholder
+				p = we.getXY();
+				sz = we.getSize();
+				sx = cp.x + p.x - vp.x;
+				sy = cp.y + p.y - vp.y;
+				DOM.add(eb.get(), 'div', {id : 'mcePlaceHolder', 'class' : 'mcePlaceHolder', style : {left : sx, top : sy, width : sz.w, height : sz.h}});
+				ph = new Element('mcePlaceHolder');
+			};
+
+			// Handle mouse move/drag
+			mm = Event.add(d, 'mousemove', function(e) {
+				var x, y, v;
+
+				startMove();
+
+				x = e.screenX - sex;
+				y = e.screenY - sey;
+
+				switch (ac) {
+					case 'ResizeW':
+						dx = x;
+						dw = 0 - x;
+						break;
+
+					case 'ResizeE':
+						dw = x;
+						break;
+
+					case 'ResizeN':
+					case 'ResizeNW':
+					case 'ResizeNE':
+						if (ac == "ResizeNW") {
+							dx = x;
+							dw = 0 - x;
+						} else if (ac == "ResizeNE")
+							dw = x;
+
+						dy = y;
+						dh = 0 - y;
+						break;
+
+					case 'ResizeS':
+					case 'ResizeSW':
+					case 'ResizeSE':
+						if (ac == "ResizeSW") {
+							dx = x;
+							dw = 0 - x;
+						} else if (ac == "ResizeSE")
+							dw = x;
+
+						dh = y;
+						break;
+
+					case 'mceMove':
+						dx = x;
+						dy = y;
+						break;
+				}
+
+				// Boundary check
+				if (dw < (v = w.features.min_width - sz.w)) {
+					if (dx !== 0)
+						dx += dw - v;
+
+					dw = v;
+				}
+	
+				if (dh < (v = w.features.min_height - sz.h)) {
+					if (dy !== 0)
+						dy += dh - v;
+
+					dh = v;
+				}
+
+				dw = Math.min(dw, w.features.max_width - sz.w);
+				dh = Math.min(dh, w.features.max_height - sz.h);
+				dx = Math.max(dx, vp.x - (sx + vp.x));
+				dy = Math.max(dy, vp.y - (sy + vp.y));
+				dx = Math.min(dx, (vp.w + vp.x) - (sx + sz.w + vp.x));
+				dy = Math.min(dy, (vp.h + vp.y) - (sy + sz.h + vp.y));
+
+				// Move if needed
+				if (dx + dy !== 0) {
+					if (sx + dx < 0)
+						dx = 0;
+	
+					if (sy + dy < 0)
+						dy = 0;
+
+					ph.moveTo(sx + dx, sy + dy);
+				}
+
+				// Resize if needed
+				if (dw + dh !== 0)
+					ph.resizeTo(sz.w + dw, sz.h + dh);
+
+				return Event.cancel(e);
+			});
+
+			return Event.cancel(se);
+		},
+
+		resizeBy : function(dw, dh, id) {
+			var w = this.windows[id];
+
+			if (w) {
+				w.element.resizeBy(dw, dh);
+				w.iframeElement.resizeBy(dw, dh);
+			}
+		},
+
+		close : function(win, id) {
+			var t = this, w, d = DOM.doc, fw, id;
+
+			id = t._findId(id || win);
+
+			// Probably not inline
+			if (!t.windows[id]) {
+				t.parent(win);
+				return;
+			}
+
+			t.count--;
+
+			if (t.count == 0) {
+				DOM.remove('mceModalBlocker');
+				DOM.setAttrib(DOM.doc.body, 'aria-hidden', 'false');
+				t.editor.focus();
+			}
+
+			if (w = t.windows[id]) {
+				t.onClose.dispatch(t);
+				Event.remove(d, 'mousedown', w.mousedownFunc);
+				Event.remove(d, 'click', w.clickFunc);
+				Event.clear(id);
+				Event.clear(id + '_ifr');
+
+				DOM.setAttrib(id + '_ifr', 'src', 'javascript:""'); // Prevent leak
+				w.element.remove();
+				delete t.windows[id];
+
+				fw = t._frontWindow();
+
+				if (fw)
+					t.focus(fw.id);
+			}
+		},
+		
+		// Find front most window
+		_frontWindow : function() {
+			var fw, ix = 0;
+			// Find front most window and focus that
+			each (this.windows, function(w) {
+				if (w.zIndex > ix) {
+					fw = w;
+					ix = w.zIndex;
+				}
+			});
+			return fw;
+		},
+
+		setTitle : function(w, ti) {
+			var e;
+
+			w = this._findId(w);
+
+			if (e = DOM.get(w + '_title'))
+				e.innerHTML = DOM.encode(ti);
+		},
+
+		alert : function(txt, cb, s) {
+			var t = this, w;
+
+			w = t.open({
+				title : t,
+				type : 'alert',
+				button_func : function(s) {
+					if (cb)
+						cb.call(s || t, s);
+
+					t.close(null, w.id);
+				},
+				content : DOM.encode(t.editor.getLang(txt, txt)),
+				inline : 1,
+				width : 400,
+				height : 130
+			});
+		},
+
+		confirm : function(txt, cb, s) {
+			var t = this, w;
+
+			w = t.open({
+				title : t,
+				type : 'confirm',
+				button_func : function(s) {
+					if (cb)
+						cb.call(s || t, s);
+
+					t.close(null, w.id);
+				},
+				content : DOM.encode(t.editor.getLang(txt, txt)),
+				inline : 1,
+				width : 400,
+				height : 130
+			});
+		},
+
+		// Internal functions
+
+		_findId : function(w) {
+			var t = this;
+
+			if (typeof(w) == 'string')
+				return w;
+
+			each(t.windows, function(wo) {
+				var ifr = DOM.get(wo.id + '_ifr');
+
+				if (ifr && w == ifr.contentWindow) {
+					w = wo.id;
+					return false;
+				}
+			});
+
+			return w;
+		},
+
+		_fixIELayout : function(id, s) {
+			var w, img;
+
+			if (!tinymce.isIE6)
+				return;
+
+			// Fixes the bug where hover flickers and does odd things in IE6
+			each(['n','s','w','e','nw','ne','sw','se'], function(v) {
+				var e = DOM.get(id + '_resize_' + v);
+
+				DOM.setStyles(e, {
+					width : s ? e.clientWidth : '',
+					height : s ? e.clientHeight : '',
+					cursor : DOM.getStyle(e, 'cursor', 1)
+				});
+
+				DOM.setStyle(id + "_bottom", 'bottom', '-1px');
+
+				e = 0;
+			});
+
+			// Fixes graphics glitch
+			if (w = this.windows[id]) {
+				// Fixes rendering bug after resize
+				w.element.hide();
+				w.element.show();
+
+				// Forced a repaint of the window
+				//DOM.get(id).style.filter = '';
+
+				// IE has a bug where images used in CSS won't get loaded
+				// sometimes when the cache in the browser is disabled
+				// This fix tries to solve it by loading the images using the image object
+				each(DOM.select('div,a', id), function(e, i) {
+					if (e.currentStyle.backgroundImage != 'none') {
+						img = new Image();
+						img.src = e.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/, '$1');
+					}
+				});
+
+				DOM.get(id).style.filter = '';
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('inlinepopups', tinymce.plugins.InlinePopups);
+})();
+
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
new file mode 100644
index 0000000000000000000000000000000000000000..94abd08763fffdaa0dd5c5afb470a97294f2b94d
GIT binary patch
literal 818
zcmV-21I_$LNk%w1VITk?0OkMyy?1uhZf>Is3*B5?sT&&Hqoc$;Jkrt6&k+&QHa5gV
zL)l77I5;@fLqpYMWV<abwUm?7QBkxrGu*<$+j)7$S6A9;Y1?*oyK8FI)Y8t+&Cwbf
z0|Nuh0s^}{Jk10I;B0K)Vq&Z$B;j>+*+oUyj*ia`4%)P|vrSClaB!?EE7K$--(_XZ
zOH0lO2-#9n!;Fik78a-!6wR}-yS%#378ch%J=j4(x@2V5*3{b0&C|=t(mFcQDJi8A
z60bTsucxKY8XD3{O5bW~+gDfHP*AZbD54S)*gHGL#>A(co5`c08yg$Yzr7_TCCA9d
zs-U0MFfhzxW4%d9s-K?K($LSkxy-Sz(7?Xdn3%wSe#oDmxL#e?qN1My0^C(q&nzt3
zjEvWFbJcly)5*uu)6w93eACp@*{!X#QBc56PRYv1%goBm&CA4*kj9vnyFx<e!NJmB
zU(r85yc`_bZEdF@Amh5a-++MIVq($7!@-4wp8x>N00960|JK*lA^8LV00000EC2ui
z03ZM$000O7fPaF6goTEOh>41ejE#<k00IISkBo0Jbrv!(m5O!&HzaZ~Rh@@>5-A-Y
zDMkRMg$FSdD>XGe76Lo4g8*<LeI;2PArd&ee`G#*8(@BZ2^+ahyj*HueO=FJ9Yr1}
zuuU>}CUeivLI}B6rYIE)9Vh306CXDUKb=<uW-bx)&*Zqs<6}#uA5xIGnDC4PhjS*P
zC=iju(Gn3OJ~%k%@Z5zDL<n$dq#{5R1oJwc3$mgGDMoH24Cyc?<->Dfx`}wT=u<6#
zD$n)U&_b6YEgl901IUC4zyf`27&(S$$E;fb{Wx)wm4^u-0<a*$Fr`SgtZ4n*=@8{X
znnQYzW|c$BfC1VUE*c1!VTjAScy#S%)!|~rgM5Un%<`AEu^$T`cnDZR$Q_cij?u>H
zv*CdXLINn%=tH`+>C>qDxJcmTfS@*Z45S!AI|Ya#EOHOnP2`2|1;88Ju#tey5e=^)
w9O1*fx%21Hn;(HtX3!cMK%gku&b_<$??7lEkM$&p`Sa-0r)T3DnWI1eJD_KQDgXcg

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/button.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e671094cb0eb210b756117f992cf5ca2caa698fd
GIT binary patch
literal 280
zcmZ?wbhEHb3}BFB*v!Ci>hy`^<m7ADuRePG@c#XKPoF(yU|_g*<J$lK|A7olp!kyo
zET{t_L1r+p91UP`UcJ}i^;v8FNsT=zne#GMt$UN@ldE&S#OrFsy6NBF{a+(j;Nim2
z?Qz%e<Q(1E0n=AFtc_ZKV@=uVw`KYFHdOeWYdZa6%dD!n-S=;s)!6NqefMKe-TC*w
z|2Nb#lr^@twRcoCD|Pnv^_O>ZOqepYsb$*CnUiMCojPaU!rn<NOP4KQv2xYwHEY+c
zU9x`D<}F)SY}~eU*X|v=_wC<ce&Fzt<$IY=oIG{<%-M72FI+rx{L<BH*KaU43*WqZ
U@BRsWMY$(WpFI~>5M;0h0LDv<C;$Ke

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6baf64ad321ab3d35330f2aaae7504aa519644bd
GIT binary patch
literal 1195
zcmV;c1XTM+Nk%w1VRQg60K^&qo}rxY@9u7Ug;85$H#j%{|NpDH#%p|xwZqR~a)67K
zo_>*_&)DBrWN@OfznH1FT4{BUps!wTd|YdJ0002^_xJYp^u)%)d3$)z&B_1&{{R30
z000000000000000A^8LW000^QEC2ui0CWH_000I5phk>jX`ZJhqHH^=Zk(=iEn-2g
z?|i>wBOI?nEE<hGAVKJBHkC}LRHw8|uQ|)eIy`!bJS~BXm5Ryb<~eQN_P*b+o2{PH
zd+R&iu7i8!V@(u;go93bJ%&1pK8SicjyXhygMT}bi<FFefj)#epLLy&kbIIAnwF)b
zJer$;XswiOtfZKeMii=9ri+P(y*q_dViy3%$j7b}$;}rd#?8tZ8I;n<&jiuZ%+1}`
z+1uBJ*U91K%jE#)<J1(@)#~ir^yTy1*7DHkuKL>ih2q)UH?AHyg7~@-@+VH6!(;c_
zxnl@0-@$+5z5y6S@uA0c2rFuI7V_gjj3zt(raakjrMZ$WvB8W9atTdoP;NHMsS_E`
zo&bQ*s1XAOQ5i;$x=5;&g^B@Cqe`7hmFm-~ShGUCs<o?Bu3o)rfXbk(*|TWVo|US$
zty>0c-^w)`cdp#12=eOP%eQY|sD1+r)(d#BVZMbAD~4*IvE#>(BS&T|xw7TPlrL+3
zoO$zRs18Dl9!<J*Y0#!qs}7CYbb;5fU$1UmTDEB0si8jD&AYen-@kPOe-Qii@ZQ3K
z7l(cPLGs_si5ou-HG=i)*t2WbUVVFn<=(M(-@g2H_z2_47e9}Fz=HSi<IA5vA1eL#
z1>)zw58wX%{rd5@fPehOCg6KeHK5@Cf($n3po0lM*gyda7AK*C5k5#^gBwbip@gwr
zxFA#zlxU)f<rQ$^iV%><Vu>n3pyG@#n&{$-F`k&?i#Os}T#YskFu{;S5}9I=NKOD%
zl13IcK><t>xnz`3B3WgWQ!)wLkXuHn<Ny+cDW;eyj%lU@P@Q>Z0c5HvW}0r6=_Z<B
z#>pm`ce)8x0(|!A=bwNAx@Vw%7Dp(bgC44=paU%GsGm?BAnBx(R%)rGkzT6lrjlmL
z>8F%>3M!~kDPZcUsHUnas#2}$>Z=O03hS(=%1Z03TZN@7Sh{A#Yp+%P3hY!W2w?27
z$R?|-vc)dz?6bx;3+=SXN=q&OwHg>}*IdYMD_6JPx&>~yY8|WCxyGKWSi0&O#%{ZU
z8SB}+^3J<iz4l&)Z@!foyV}2{`3vyC4hZa8d8-**TLGitW}30hMf@AY!!0K<#mbe}
z9LCU17u|5ivL`ZjA$tcNdnK!PvUe$~3>(S<94K>q#ugahfi?d(AAt1bTp(;R8!O__
z4hjuog&|&Ow1y6L_~6nY!bY^QK&A*J1XR};BaJ(<m^F?pcD>@)KE`%6)&h8Wq?g93
z?c|kAwoPS{a3?9ZmalP{H`@ZtDW{vp&e>*|d8!$>oy!S+xSFqx+4!8sJ}P<SiyC?;
z<&rOodFGc3FzV;Vem-g_=%Rm0dg+@Udn>KTu0Ct)uD=R<?5jq5?d{gy{%r2LFUx!H
J$!ZV+06W;kU)}%!

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..497307a85ad32e00b67c5f27d6f3b46ac566d89b
GIT binary patch
literal 915
zcmV;E18n?9Nk%w1VITk?0OkMy&&j~|k1Co}49|EKqh~0+ri!6j6Z*7U`lU1e^XU7^
zod5p+om&^t%*Cs9J)E4I)z#6vZX5cfOQfZw_J9bzzPy@aE7*uE$H2Mzs7<(K4$*}x
z?4CLJokRMqQrd$ZlS~7knw0jXHTSe!o0*mDqeS+82K9OY`oWCJ%E-LEy7!Ya^?nJ(
z#>DxVCHlB}`m%1))6x2zDYdq=`Kv|wmLm3t8~B<$_Jb3xuB^__&G?WTylN4utE$1m
z!1=ILv9hrCi66PSxc~e2>z6G0pe^@^5&5A-&VntacS+opK(T{V_m()r#KOD0y0na8
z%goB5UmeoU$gX`!&(O}**3|y@@xQ>n(9zHMmpZewvaqqQx45?Js#L_q!_309tE{Tf
zhBEo9Vadb0m3v>7ePP{-Blnp<{MWPlxL*0GU8$dvuduJ(k1^BK(#Ocgm{14%#gX`?
zRrPxW_?tJVsi*s^Ih9Zd`n!Ms{rtGOx2&zJ_Iw2Oc>wp7H`dqHA^8LV00000EC2ui
z03ZM$000O7fPaF6gntbM4p9Oi0#ObH4TX}Ee_sv)5lUSnX(L@q5dschl$1*XVQCp1
zeyy$<2VnwB5T%0+1Q8<=Os>AJM<Wpgk);g`NC#QJ%&$lc#ghcdz0KAc8w9nIPrB9C
z*AY*W00zp<3Rdb0);|USg;N*2=nMAj%^eq0gi-=&-+rO6w*Un=4+5kNDiFZ~xEBQR
zfRn(Zz#s>0j(~$f5C*s#Z5#}WQsM?UH3Y?cED>eUzkt6a5bO}dMvwr^Xb5l#@FPJS
zeS!wHvEmgRmp@>-3c_NDJ)uzN1ZkynBnOke0ssw~U_pYYQEhN&DagSGI<2(wiP}L<
z2e47_&4?6KK!XdoP`Bdkv!miI0SHd)Rj>ff-abVV5}Gn#$6lukSl~7CfghoAf$`$8
z5@&CbciebnJ`7g|k8#ol6q!Rhs*3^IC>>Kxp>@zA1EAR&LqLOw8f*9N5TStp1}s%3
zVM*boLJ~NtT^KPTcxVj-0|X>-(j<kBZT(tY5u#;{1vnZ$5D{TV1d$IK;8<7#giD3)
zR3t$WPd>+l5M`Wq2O|PlKt>1?^svPY_j#uua~0?Tgn$1%K*EI<CJ4rY+`aLga{KuZ
p;S3Y*(Zh)wvY~~2S9sx|Ef7$_ToWQj=){fp`OpFs$Vn0i06Ts(yS)Ga

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/corners.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c894b2e83522ae29d32e0ed57007d1285c715a7f
GIT binary patch
literal 911
zcmd6kdrwkv06>2i?j<x$Fc&q=@P#<CjHy{o!`u@3%Qe?r%SElVW?R#it<7cE3u4+*
z^O4zWLS)c%sAyRWy=E#@W@#;agk-5Gh=9Blk?LD?KEXLVnY^PZ2hPL-8kpmOW#c>m
zAoXC1c4Wxs^ZEJtUB4q<T9{d!{ejg#Ev}K=sC{By{AIT;tyqjMht09F{8*tf&FhVG
zx?7K18)Pqy^V3%ILfL(JtyEbhZu{_Us<6CqaZb1DcA5-7O$I$$CoQRy4)?#3bl{#f
zx7WMg{Gxx|v)0x8P}!^A*zhWQ)OMS>T{UQ1HY%Uh+pQ*t&D_y5<X!i4sD=hczOT9+
zZs*FI!Ov@}uGjBAy?pzzvsdHstgTp0yJA>9>e1Hjx9TtBow%m&!&jTd_<n5C?Xv&P
z`J48i6R`?I0Pw)>f1dxIfK5J>hhd07SSo@<yf^@e1PHE-yA7fU0t8{)M?x771ffs`
zR$FyPCTnQqAuQG-MQ9hJ{brXGtCZKMRQD7N=71tIRx`j9^E9!U6{_l9yj77HGoi?c
z)=k7Dmg=H2Mk~LzL>U1ANej1zBgs@J)fS$HxTwj{ShgdWQ_Y8V1_h@vv!qzRzyB@+
z)6#Z?iW=a9&+kg`Kr%f7CfA71iK;1=LJ}Gy$VX4NJcj@#Eg2?3moI4LKhG1RIoI;k
zR(9^*MkqfeXOWI?@z07&C`6+;+5U$r@?g~7SE`^9EI4NyQM);aP&a^Qu#OXmrWw+;
zlBPWv*b`t#;?w$Wfug|f{7_}xnb%jXB(rC~MUS#+NW!T2av4Ypxp0F2N<hUQT%?#|
z#`}b0TL~YvEx;jcCMAz-U*g(=Hh0Iv{PrdnHnpu7IES%hpxGDAY-pQwVY9(!1D12c
z*sS054gt9-Qs|;gq;vOMa!U&|foU=yo+~V(8V~CeExI>_qva>Vv^VISDi|>EX(%41
z@Cm688>Uf+QlLkXaIO#&z;q&UJDY-1!mg;(MFDCGS{6p8a!wV<G08a^8xR9TJDicC
Q$ibXr>F{_rmktj70is)Xxc~qF

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c2a2ad454db194e428a7b9da40f62d5376a17428
GIT binary patch
literal 769
zcmb7?=`WiB0LI^D)(HC`v6*aD4AW#LGRb0Oi$t<fW)_L~Kx~mM4a>H~CP=nb%N%8n
zy02ceuewTUUDeW|RaMp*TlLV6R$o=rQOY{@AME+?`}QQiCwU%4Jq)?`{5B8=ECT1T
z+wH!7{<!M4+^W_x3X9mvt_8U*Jv?fkfX)#zho;^a)qkj<V5?d`5osSQsRa$~gqAMJ
z;>zji$)-UA>D9({)xO1SJGLHK54Mat(}s4_unMiKjB85EHng*~!Ddt+?(c5uHG4ZI
zsc>jP#5Y6w6Wj5!Y<hs+bU!o%27{ex{L}eAcpo{y03Z+uIIo>=0^oK*&D+R;Yh@ze
z7vfi;q<Qcix+@`mxieE@%Hh|uvSI=oWth?&>FW{owiOfGqcB@XkwUZ0j?Km4{qjE-
z6c!Z|O1!?5l~+^}tE#<g>*^aCo0?lZ$rLKBwT;dI+nLO(UEMvb-ad9elEWPw8Xg(t
zx$y<#6T+{PQ@$ecjAT|iC%dxnP5yoH$I`OLFU5*drPiz>bidcu^@a^2v}rP3-`?4^
z?Cl>M-Z(n8ot*x$0~Z|;ku35!-qAHSQN*GM3tW8AN#VWJNrHQD+6qXfO_zB^6eFVU
z<cf)?cxIBg&kt7{lseNC#imOygk%_3#B7GlPJ-i{Jkb5%0xi-Rl|0kmE@#Bi&~@km
z=3+-8JFQeO(6Q9>OjzupAb0*`W8}<a38zcJed8@^j^=hNN3twNrKHx3=VLE8BVz_x
ztHMH8|4hMPuWq{BC%Pqu+_xsF3r<(fW@Gg-as&bSc({K<4n7S|lnxI-ORQ80JbZ*>
zQVeE5Djt<<RtxaXp0SAh9i51HD`jqU$fBR8MUx&V^Y)=-cDj0w7e+8^gapqgW1~l|
z26;z{Y>a0+Owme6r2OGio7DoTWqkhGKj0`0*1-*<$#uL5YH*kC8Z>wpCvYO~asp;G
r-~A;>$wp)vkltB=c_?k6Zw*FUgrbAm;sB08O9+}m=}H3OFd*zN8L+JA

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
new file mode 100644
index 0000000000000000000000000000000000000000..43a735f22c81d6d7d99c1ba9f034f38bfdd1a92b
GIT binary patch
literal 92
zcmZ?wbhEHb<YM4sSj52a{`GSP28ON6=G?h*=KufyKsE#@{$v3&bU-9XEd#Tn27|Dp
lx5hJt39I*7Y(09VtW<RR)W@1l^Cat@NFCPt>&D4o4FLHO9PR)B

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/window.css b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/window.css
new file mode 100644
index 0000000000..a50d4fc573
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/clearlooks2/window.css
@@ -0,0 +1,90 @@
+/* Clearlooks 2 */
+
+/* Reset */
+.clearlooks2, .clearlooks2 div, .clearlooks2 span, .clearlooks2 a {vertical-align:baseline; text-align:left; position:absolute; border:0; padding:0; margin:0; background:transparent; font-family:Arial,Verdana; font-size:11px; color:#000; text-decoration:none; font-weight:normal; width:auto; height:auto; overflow:hidden; display:block}
+
+/* General */
+.clearlooks2 {position:absolute; direction:ltr}
+.clearlooks2 .mceWrapper {position:static}
+.mceEventBlocker {position:fixed; left:0; top:0; background:url(img/horizontal.gif) no-repeat 0 -75px; width:100%; height:100%}
+.clearlooks2 .mcePlaceHolder {border:1px solid #000; background:#888; top:0; left:0; opacity:0.5; -ms-filter:'alpha(opacity=50)'; filter:alpha(opacity=50)}
+.clearlooks2_modalBlocker {position:fixed; left:0; top:0; width:100%; height:100%; background:#FFF; opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60); display:none}
+
+/* Top */
+.clearlooks2 .mceTop, .clearlooks2 .mceTop div {top:0; width:100%; height:23px}
+.clearlooks2 .mceTop .mceLeft {width:6px; background:url(img/corners.gif)}
+.clearlooks2 .mceTop .mceCenter {right:6px; width:100%; height:23px; background:url(img/horizontal.gif) 12px 0; clip:rect(auto auto auto 12px)}
+.clearlooks2 .mceTop .mceRight {right:0; width:6px; height:23px; background:url(img/corners.gif) -12px 0}
+.clearlooks2 .mceTop span {width:100%; text-align:center; vertical-align:middle; line-height:23px; font-weight:bold}
+.clearlooks2 .mceFocus .mceTop .mceLeft {background:url(img/corners.gif) -6px 0}
+.clearlooks2 .mceFocus .mceTop .mceCenter {background:url(img/horizontal.gif) 0 -23px}
+.clearlooks2 .mceFocus .mceTop .mceRight {background:url(img/corners.gif) -18px 0}
+.clearlooks2 .mceFocus .mceTop span {color:#FFF}
+
+/* Middle */
+.clearlooks2 .mceMiddle, .clearlooks2 .mceMiddle div {top:0}
+.clearlooks2 .mceMiddle {width:100%; height:100%; clip:rect(23px auto auto auto)}
+.clearlooks2 .mceMiddle .mceLeft {left:0; width:5px; height:100%; background:url(img/vertical.gif) -5px 0}
+.clearlooks2 .mceMiddle span {top:23px; left:5px; width:100%; height:100%; background:#FFF}
+.clearlooks2 .mceMiddle .mceRight {right:0; width:5px; height:100%; background:url(img/vertical.gif)}
+
+/* Bottom */
+.clearlooks2 .mceBottom, .clearlooks2 .mceBottom div {height:6px}
+.clearlooks2 .mceBottom {left:0; bottom:0; width:100%}
+.clearlooks2 .mceBottom div {top:0}
+.clearlooks2 .mceBottom .mceLeft {left:0; width:5px; background:url(img/corners.gif) -34px -6px}
+.clearlooks2 .mceBottom .mceCenter {left:5px; width:100%; background:url(img/horizontal.gif) 0 -46px}
+.clearlooks2 .mceBottom .mceRight {right:0; width:5px; background: url(img/corners.gif) -34px 0}
+.clearlooks2 .mceBottom span {display:none}
+.clearlooks2 .mceStatusbar .mceBottom, .clearlooks2 .mceStatusbar .mceBottom div {height:23px}
+.clearlooks2 .mceStatusbar .mceBottom .mceLeft {background:url(img/corners.gif) -29px 0}
+.clearlooks2 .mceStatusbar .mceBottom .mceCenter {background:url(img/horizontal.gif) 0 -52px}
+.clearlooks2 .mceStatusbar .mceBottom .mceRight {background:url(img/corners.gif) -24px 0}
+.clearlooks2 .mceStatusbar .mceBottom span {display:block; left:7px; font-family:Arial, Verdana; font-size:11px; line-height:23px}
+
+/* Actions */
+.clearlooks2 a {width:29px; height:16px; top:3px;}
+.clearlooks2 .mceClose {right:6px; background:url(img/buttons.gif) -87px 0}
+.clearlooks2 .mceMin {display:none; right:68px; background:url(img/buttons.gif) 0 0}
+.clearlooks2 .mceMed {display:none; right:37px; background:url(img/buttons.gif) -29px 0}
+.clearlooks2 .mceMax {display:none; right:37px; background:url(img/buttons.gif) -58px 0}
+.clearlooks2 .mceMove {display:none;width:100%;cursor:move;background:url(img/corners.gif) no-repeat -100px -100px}
+.clearlooks2 .mceMovable .mceMove {display:block}
+.clearlooks2 .mceFocus .mceClose {right:6px; background:url(img/buttons.gif) -87px -16px}
+.clearlooks2 .mceFocus .mceMin {right:68px; background:url(img/buttons.gif) 0 -16px}
+.clearlooks2 .mceFocus .mceMed {right:37px; background:url(img/buttons.gif) -29px -16px}
+.clearlooks2 .mceFocus .mceMax {right:37px; background:url(img/buttons.gif) -58px -16px}
+.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.gif) -87px -32px}
+.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.gif) -87px -32px}
+.clearlooks2 .mceFocus .mceMin:hover {right:68px; background:url(img/buttons.gif) 0 -32px}
+.clearlooks2 .mceFocus .mceMed:hover {right:37px; background:url(img/buttons.gif) -29px -32px}
+.clearlooks2 .mceFocus .mceMax:hover {right:37px; background:url(img/buttons.gif) -58px -32px}
+
+/* Resize */
+.clearlooks2 .mceResize {top:auto; left:auto; display:none; width:5px; height:5px; background:url(img/horizontal.gif) no-repeat 0 -75px}
+.clearlooks2 .mceResizable .mceResize {display:block}
+.clearlooks2 .mceResizable .mceMin, .clearlooks2 .mceMax {display:none}
+.clearlooks2 .mceMinimizable .mceMin {display:block}
+.clearlooks2 .mceMaximizable .mceMax {display:block}
+.clearlooks2 .mceMaximized .mceMed {display:block}
+.clearlooks2 .mceMaximized .mceMax {display:none}
+.clearlooks2 a.mceResizeN {top:0; left:0; width:100%; cursor:n-resize}
+.clearlooks2 a.mceResizeNW {top:0; left:0; cursor:nw-resize}
+.clearlooks2 a.mceResizeNE {top:0; right:0; cursor:ne-resize}
+.clearlooks2 a.mceResizeW {top:0; left:0; height:100%; cursor:w-resize;}
+.clearlooks2 a.mceResizeE {top:0; right:0; height:100%; cursor:e-resize}
+.clearlooks2 a.mceResizeS {bottom:0; left:0; width:100%; cursor:s-resize}
+.clearlooks2 a.mceResizeSW {bottom:0; left:0; cursor:sw-resize}
+.clearlooks2 a.mceResizeSE {bottom:0; right:0; cursor:se-resize}
+
+/* Alert/Confirm */
+.clearlooks2 .mceButton {font-weight:bold; bottom:10px; width:80px; height:30px; background:url(img/button.gif); line-height:30px; vertical-align:middle; text-align:center; outline:0}
+.clearlooks2 .mceMiddle .mceIcon {left:15px; top:35px; width:32px; height:32px}
+.clearlooks2 .mceAlert .mceMiddle span, .clearlooks2 .mceConfirm .mceMiddle span {background:transparent;left:60px; top:35px; width:320px; height:50px; font-weight:bold; overflow:auto; white-space:normal}
+.clearlooks2 a:hover {font-weight:bold;}
+.clearlooks2 .mceAlert .mceMiddle, .clearlooks2 .mceConfirm .mceMiddle {background:#D6D7D5}
+.clearlooks2 .mceAlert .mceOk {left:50%; top:auto; margin-left: -40px}
+.clearlooks2 .mceAlert .mceIcon {background:url(img/alert.gif)}
+.clearlooks2 .mceConfirm .mceOk {left:50%; top:auto; margin-left: -90px}
+.clearlooks2 .mceConfirm .mceCancel {left:50%; top:auto}
+.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.gif)}
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/alert.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/alert.gif
new file mode 100644
index 0000000000000000000000000000000000000000..94abd08763fffdaa0dd5c5afb470a97294f2b94d
GIT binary patch
literal 818
zcmV-21I_$LNk%w1VITk?0OkMyy?1uhZf>Is3*B5?sT&&Hqoc$;Jkrt6&k+&QHa5gV
zL)l77I5;@fLqpYMWV<abwUm?7QBkxrGu*<$+j)7$S6A9;Y1?*oyK8FI)Y8t+&Cwbf
z0|Nuh0s^}{Jk10I;B0K)Vq&Z$B;j>+*+oUyj*ia`4%)P|vrSClaB!?EE7K$--(_XZ
zOH0lO2-#9n!;Fik78a-!6wR}-yS%#378ch%J=j4(x@2V5*3{b0&C|=t(mFcQDJi8A
z60bTsucxKY8XD3{O5bW~+gDfHP*AZbD54S)*gHGL#>A(co5`c08yg$Yzr7_TCCA9d
zs-U0MFfhzxW4%d9s-K?K($LSkxy-Sz(7?Xdn3%wSe#oDmxL#e?qN1My0^C(q&nzt3
zjEvWFbJcly)5*uu)6w93eACp@*{!X#QBc56PRYv1%goBm&CA4*kj9vnyFx<e!NJmB
zU(r85yc`_bZEdF@Amh5a-++MIVq($7!@-4wp8x>N00960|JK*lA^8LV00000EC2ui
z03ZM$000O7fPaF6goTEOh>41ejE#<k00IISkBo0Jbrv!(m5O!&HzaZ~Rh@@>5-A-Y
zDMkRMg$FSdD>XGe76Lo4g8*<LeI;2PArd&ee`G#*8(@BZ2^+ahyj*HueO=FJ9Yr1}
zuuU>}CUeivLI}B6rYIE)9Vh306CXDUKb=<uW-bx)&*Zqs<6}#uA5xIGnDC4PhjS*P
zC=iju(Gn3OJ~%k%@Z5zDL<n$dq#{5R1oJwc3$mgGDMoH24Cyc?<->Dfx`}wT=u<6#
zD$n)U&_b6YEgl901IUC4zyf`27&(S$$E;fb{Wx)wm4^u-0<a*$Fr`SgtZ4n*=@8{X
znnQYzW|c$BfC1VUE*c1!VTjAScy#S%)!|~rgM5Un%<`AEu^$T`cnDZR$Q_cij?u>H
zv*CdXLINn%=tH`+>C>qDxJcmTfS@*Z45S!AI|Ya#EOHOnP2`2|1;88Ju#tey5e=^)
w9O1*fx%21Hn;(HtX3!cMK%gku&b_<$??7lEkM$&p`Sa-0r)T3DnWI1eJD_KQDgXcg

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/button.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/button.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e671094cb0eb210b756117f992cf5ca2caa698fd
GIT binary patch
literal 280
zcmZ?wbhEHb3}BFB*v!Ci>hy`^<m7ADuRePG@c#XKPoF(yU|_g*<J$lK|A7olp!kyo
zET{t_L1r+p91UP`UcJ}i^;v8FNsT=zne#GMt$UN@ldE&S#OrFsy6NBF{a+(j;Nim2
z?Qz%e<Q(1E0n=AFtc_ZKV@=uVw`KYFHdOeWYdZa6%dD!n-S=;s)!6NqefMKe-TC*w
z|2Nb#lr^@twRcoCD|Pnv^_O>ZOqepYsb$*CnUiMCojPaU!rn<NOP4KQv2xYwHEY+c
zU9x`D<}F)SY}~eU*X|v=_wC<ce&Fzt<$IY=oIG{<%-M72FI+rx{L<BH*KaU43*WqZ
U@BRsWMY$(WpFI~>5M;0h0LDv<C;$Ke

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/buttons.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/buttons.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6baf64ad321ab3d35330f2aaae7504aa519644bd
GIT binary patch
literal 1195
zcmV;c1XTM+Nk%w1VRQg60K^&qo}rxY@9u7Ug;85$H#j%{|NpDH#%p|xwZqR~a)67K
zo_>*_&)DBrWN@OfznH1FT4{BUps!wTd|YdJ0002^_xJYp^u)%)d3$)z&B_1&{{R30
z000000000000000A^8LW000^QEC2ui0CWH_000I5phk>jX`ZJhqHH^=Zk(=iEn-2g
z?|i>wBOI?nEE<hGAVKJBHkC}LRHw8|uQ|)eIy`!bJS~BXm5Ryb<~eQN_P*b+o2{PH
zd+R&iu7i8!V@(u;go93bJ%&1pK8SicjyXhygMT}bi<FFefj)#epLLy&kbIIAnwF)b
zJer$;XswiOtfZKeMii=9ri+P(y*q_dViy3%$j7b}$;}rd#?8tZ8I;n<&jiuZ%+1}`
z+1uBJ*U91K%jE#)<J1(@)#~ir^yTy1*7DHkuKL>ih2q)UH?AHyg7~@-@+VH6!(;c_
zxnl@0-@$+5z5y6S@uA0c2rFuI7V_gjj3zt(raakjrMZ$WvB8W9atTdoP;NHMsS_E`
zo&bQ*s1XAOQ5i;$x=5;&g^B@Cqe`7hmFm-~ShGUCs<o?Bu3o)rfXbk(*|TWVo|US$
zty>0c-^w)`cdp#12=eOP%eQY|sD1+r)(d#BVZMbAD~4*IvE#>(BS&T|xw7TPlrL+3
zoO$zRs18Dl9!<J*Y0#!qs}7CYbb;5fU$1UmTDEB0si8jD&AYen-@kPOe-Qii@ZQ3K
z7l(cPLGs_si5ou-HG=i)*t2WbUVVFn<=(M(-@g2H_z2_47e9}Fz=HSi<IA5vA1eL#
z1>)zw58wX%{rd5@fPehOCg6KeHK5@Cf($n3po0lM*gyda7AK*C5k5#^gBwbip@gwr
zxFA#zlxU)f<rQ$^iV%><Vu>n3pyG@#n&{$-F`k&?i#Os}T#YskFu{;S5}9I=NKOD%
zl13IcK><t>xnz`3B3WgWQ!)wLkXuHn<Ny+cDW;eyj%lU@P@Q>Z0c5HvW}0r6=_Z<B
z#>pm`ce)8x0(|!A=bwNAx@Vw%7Dp(bgC44=paU%GsGm?BAnBx(R%)rGkzT6lrjlmL
z>8F%>3M!~kDPZcUsHUnas#2}$>Z=O03hS(=%1Z03TZN@7Sh{A#Yp+%P3hY!W2w?27
z$R?|-vc)dz?6bx;3+=SXN=q&OwHg>}*IdYMD_6JPx&>~yY8|WCxyGKWSi0&O#%{ZU
z8SB}+^3J<iz4l&)Z@!foyV}2{`3vyC4hZa8d8-**TLGitW}30hMf@AY!!0K<#mbe}
z9LCU17u|5ivL`ZjA$tcNdnK!PvUe$~3>(S<94K>q#ugahfi?d(AAt1bTp(;R8!O__
z4hjuog&|&Ow1y6L_~6nY!bY^QK&A*J1XR};BaJ(<m^F?pcD>@)KE`%6)&h8Wq?g93
z?c|kAwoPS{a3?9ZmalP{H`@ZtDW{vp&e>*|d8!$>oy!S+xSFqx+4!8sJ}P<SiyC?;
z<&rOodFGc3FzV;Vem-g_=%Rm0dg+@Udn>KTu0Ct)uD=R<?5jq5?d{gy{%r2LFUx!H
J$!ZV+06W;kU)}%!

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/close.png b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdd1ff748be09e65bd33239433e07308d424c563
GIT binary patch
literal 3728
zcmeH~`8yP98^<4q>|3&g#vwuz#_rgev9Dn?V<}q<NtT>!ktKVFBzq$&#-7M%EZKL)
zmUS%I5)PdVjl#_9{Qmv}?{&TRb$##eFVB5n&-1ySAMQK(x|J~ps}L&yfWy?p!1m0A
z&cww`f0jqmVV};7CBVetJ^*YN{uLd_e{m52R%;&w;`()O|6u?7-u?lirU-;+K#;$e
z&s|RdLg%q|7^K}6zcyv*0B)WX{oLH&mXBG~7M>c-n;{7mW8pSS5-XnLv*|c*XviSk
zUz9|jmKObl&qjtlg>{x`UF=m_-0P&2!Q+*P*S^y&lrJOHh8dmBDl)cyl&PJWJ=;Xd
zMkSiP94>PHb6j6{@5;KIUJR>50N`e>zb$tERGbbRMQLeWyWGz75zvKBvN3~p%Yt_K
zONlhDZFrtDUG!tR_TY>^%$cKkfnInTycFme(M4l(CG9{F18^Pka9;!0Wr3^Iqc4*n
z8hex%K?j_ki}BGFWdP9&o=FD4TN6}`-bgV7XnDZvW!|k0W@UlADay+P)HZ^4A~#zd
zU}gvMHc9bU0Ye0E?H3mh1&{LpuhBkA>-)7D?oH?!sk}NZf`qzZj1#kLAQK8DCn8NW
z6}ZN$>h_ykzMfoXSe~F_j560}@-P5J8GL82C7*^8IctbS)igY(i|lqABki)g`x<p)
zv@$>sfR*5=ajFcgUMO0VG1`y%>dGF2_bs-fKPjnRbzFK4plE9zMGp9vjbZUq!ra`(
z`ueO{H{8i>5EV(qbh@;oPVfGV(mJ6We*U;B5u<oB#+c#gbLa4ZMaiYnXDpB17rvw$
zpER=3P9T$)yG`8*XejTR4NqX2LH-l6V#(!X__M1$S0-q;SC?gu>2;P>K<ynJx`+(f
zvYQ_CKg^}L(ZTJj6ae;{{X0HMGt)<V$E}Qp(7x%O8W&vw(O#y{0s**XAR&hwtk>;h
z2Ed>w23o5xe9&=Grk(Lp$GL?Lwi8#?$8d@6PB=H5^>*~7AlIu^v2f{xky;4U74}IF
zqTFudosb#8Dc5QLfm1tx>z5mIVTW`}3=4yPKl24QvH2uA_Y|~v8nZxN{E=9P2?I~6
zgy=vLugzui3>6av+Z3dzy$NJrJLos{L}#O>49$L^7<-b?Vyy5yrp`wD6MF-KP^KpI
z*yt78*zI72{B-`Jg0Z0YLfTJMi#NwAy}9Pobr5~>?O!i4DRtkKm+S3<zxzXmCDUW*
z-Q_Cw%3h(`8&&kp$%h`J??M=OVhr0^R2f3xqHZGkCTI(^)vQUG=p_l|^YbifEcB0U
zI;AdWmYKhoY&!q5`=Yy|LL%BkMtqtl{Q`_TA_>v0Cc%@8P?RD({mt~<8{`Dfgwe!3
zTk$QK@&aWOA@R(C`P;sAOzO{NM6dP7uVdG{)|J+U*TwdoSh4PUfp3oNR;6tR@0ba0
zaBnDYFnZ=H>f680w_PkNMxIwmcZ63L<89yCB$i!J{xe^FB#z(IyrlY7)})ZPfH%eG
z?bqO@^NU#`Rykv+iJ>jyuQ^}o4?@^E68Pf!k}%SO1s9nvVgy4jzRk5L6`V{J>_f_{
zDeUBK=5giu+oPd)=tI7YLDnp@EXgckC=6L%QChK7!DdgkA3~;=-?EFWF|t>(TPtVz
zlwE0GfxW(CCv1l)*DOn{z?AtTb>BoeoF+3mbXjy+Bi`5)y>nS>=@n)35UdZC5%cA!
zO!zZKrCajd$lSvR(B|AzNOP)oMR~D0Ldi@CRc}jv?xoALmK%8VBG`&$QyP~;j!IeL
z{dRTrs&J{Y1wp~n*|#D)CmUU9QfX6Zywj>$vx~!)wi-4&9LI3#_nApKOBrL*iRZAJ
zc5`-%I943LrMAXlja-FqiEweVK}g#@++J?s$6L{b7XG-Uu-46Amm*=O$Wy;xxI<%h
zG-Exx1S5%^cu}iICD30B0_!7vw?W+O(nFNEWx3_7JkB7DYrUQ_`pbyxiBGTdn#7u4
zuV3$LNk&OANps6>%e{PCOG4?@QcVj@i@uTJkyj(rc`60k3NwnE1)Bvk1<Q@Dj-ie+
z_%i$lPt&?}$5Mwqe9OIfM|Fo1w7uiadZTJ=^_A)7>So+|9KkBns<Lnz(^dN&KY%Z9
z6s+BtWhB+${qT`)7<U0oV^2-jUS?}%WK-l{r`k*$iF2Hl5JyPV{r5q<8aFhS@`*3@
zbR&BXvbSIu^eFe}tkN3(!qC-jAFN%$q%lSSL%1JDPD)KSj~$ZB(UB_<?p^F}T{jCp
z47|A#K5>XGs4wW;EhD|%Q{D5~OI&z4to-t7p@Y)>v95l^XPb?2UAC85^1jPeQPv3S
z7)-;aILrf<fvTRVZ7d0?ptyY#(D|Vg^m0vSO-pS_amm4DSgpOWzj4UA%fHYiei`vd
zoOYWQP8$cf=qq#>`s5h>7^mNkkHQ~{wWaB5kUW3X&F$(xDI)0e>8Hn5$8K~~i+T6|
z{j^$)vYAWFAo_5|Uyu4aJ;vnr#Vxffid`x`F&>qmn--9S78+N`Q3)AeK-^z8_+^l7
zuvCCiuvUL7Yo-F#sgS#)HLupB+@#wp=jAXwg~p;y@0wpymxI=*-n;v8`DB-zxQbn6
zTZ<6Lh4tSI2rDLb9>nAL%jI}vG_v(9lC1uC{*OL4w2c4BmHi7LSJGI+Iw75y%dm0P
z@uXRVGgQQC-vnwI{_O9J7L_oG9;FhQ4Z>ro@~15p92ScO8ioA%4@CVGwKZB5;+|zZ
z4TM*SS!Uuf+n6t24~D8d<LjtB_fi{SB3VoWzV%P5&N;}k;^C!Vk&e<cP^LPJC(5gB
zBzaIhyRz`w$nJ3cAnB>vi*GM!yF8sdE6?yH3FatS2>MHF)gARZt-vr6>l)v=YY8_P
ztF%6(;Gup~)|I=coSLXs$#6^Gm|Go#u^kO`zB_F8tQ+x>I}0<rH?7eyhvf#hUkO-Y
z9lqq08eWn>4&S3$>4ne@;Y9zzw!DSs@5?K@3AabRCcL)3EXfu+ab{QKe97Uw$1ykm
zo@4pO``yDIh9p?dh%~7=4v!$bZqxeE;)xp|j%ey4-yjc=zmTeX6N?RQGe`Hv_k<%_
zeklJvMRIDPoazjGB-zv1TTXdRc^;b{*Hd(Bk}I~3vXA|4R$KW6?)K47(4R7ibK++R
zpQa!a+DO~<>1#X2oPEE4q+-8?$a1K1*#GsScU3&VAZ&e$!m>;e;n0|W@Fb#Yg=zBl
z2M`Pdb_brnpKnxPmw)W!?$l&GtTR5ny%c_8O!}Scg|e1Im>C&4;4{A!JDG{uAAN$&
z!bV2P{akP*y~0OqdJvcIaQT00;tpP!Fr=k!YPM(+o%cTk@7IwwE}%Z3^51H>_-zMo
zYf&>Nt^1l^H0Re4oP7y<;jIl3UX(52LN(&zL2KA|e%ka@p}O{BD>>Ys(nC31=3k5o
zk~$?0HP3}e?Nzr}x40bW?ds1V789p*ou~`5-xeO-X%8tPk1rTg7~|tcsTqgqT!?e&
zdFew590@yxf9R;Iuj&S!Zk^x|qqj#T3k9gJs6#aZ{IIB_sht_(c<y*{&VEj2o8QBd
z)9v;h!MCK|&R&s^1EER^w+?O`?{<VNgh0N%Ugol1e<=D$n&$oU-J#tW?l@C0Gn2+Z
zpG!XRP?9B`&6}bgCbpIUgkJ$5Iu3xJv@_oV;7@q~wp{_x$OS;a|CvjV5dieyx&_kk
ztcFIT^>mMY-~V|xt$J;3etUbht&Pyp(Y(96Nu?f>$@`0>$>U!?4iEkz&5nN>>;G{`
zZmKOL_BFLNl#r&0KaVI>D)p?%S*!oY{|WqW5wJ5*i8#BlV6d%~-Ps@huL0<kSsTv|
zrI;G%BSYtdpN_M}>Tw&65>4K5z0x<J(IWX7`L~-8TxNUBi#U3wJ&5GO+$7&{1JqK^
z9#x^JCSuhC(LIklFrJ!?u>Y?3DYiIBq{mtrev9K0?_aKE??1CCX}nc7Hp21vD0VC2
zf~B3a2gV%xt?gZACC`00+r97>T}CPg)J`@0IcAzJ4Fc$~^1uI6`H=2k*rtY71~qWk
G*#7{bGQF<=

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/confirm.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/confirm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..497307a85ad32e00b67c5f27d6f3b46ac566d89b
GIT binary patch
literal 915
zcmV;E18n?9Nk%w1VITk?0OkMy&&j~|k1Co}49|EKqh~0+ri!6j6Z*7U`lU1e^XU7^
zod5p+om&^t%*Cs9J)E4I)z#6vZX5cfOQfZw_J9bzzPy@aE7*uE$H2Mzs7<(K4$*}x
z?4CLJokRMqQrd$ZlS~7knw0jXHTSe!o0*mDqeS+82K9OY`oWCJ%E-LEy7!Ya^?nJ(
z#>DxVCHlB}`m%1))6x2zDYdq=`Kv|wmLm3t8~B<$_Jb3xuB^__&G?WTylN4utE$1m
z!1=ILv9hrCi66PSxc~e2>z6G0pe^@^5&5A-&VntacS+opK(T{V_m()r#KOD0y0na8
z%goB5UmeoU$gX`!&(O}**3|y@@xQ>n(9zHMmpZewvaqqQx45?Js#L_q!_309tE{Tf
zhBEo9Vadb0m3v>7ePP{-Blnp<{MWPlxL*0GU8$dvuduJ(k1^BK(#Ocgm{14%#gX`?
zRrPxW_?tJVsi*s^Ih9Zd`n!Ms{rtGOx2&zJ_Iw2Oc>wp7H`dqHA^8LV00000EC2ui
z03ZM$000O7fPaF6gntbM4p9Oi0#ObH4TX}Ee_sv)5lUSnX(L@q5dschl$1*XVQCp1
zeyy$<2VnwB5T%0+1Q8<=Os>AJM<Wpgk);g`NC#QJ%&$lc#ghcdz0KAc8w9nIPrB9C
z*AY*W00zp<3Rdb0);|USg;N*2=nMAj%^eq0gi-=&-+rO6w*Un=4+5kNDiFZ~xEBQR
zfRn(Zz#s>0j(~$f5C*s#Z5#}WQsM?UH3Y?cED>eUzkt6a5bO}dMvwr^Xb5l#@FPJS
zeS!wHvEmgRmp@>-3c_NDJ)uzN1ZkynBnOke0ssw~U_pYYQEhN&DagSGI<2(wiP}L<
z2e47_&4?6KK!XdoP`Bdkv!miI0SHd)Rj>ff-abVV5}Gn#$6lukSl~7CfghoAf$`$8
z5@&CbciebnJ`7g|k8#ol6q!Rhs*3^IC>>Kxp>@zA1EAR&LqLOw8f*9N5TStp1}s%3
zVM*boLJ~NtT^KPTcxVj-0|X>-(j<kBZT(tY5u#;{1vnZ$5D{TV1d$IK;8<7#giD3)
zR3t$WPd>+l5M`Wq2O|PlKt>1?^svPY_j#uua~0?Tgn$1%K*EI<CJ4rY+`aLga{KuZ
p;S3Y*(Zh)wvY~~2S9sx|Ef7$_ToWQj=){fp`OpFs$Vn0i06Ts(yS)Ga

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/corners.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/corners.gif
new file mode 100644
index 0000000000000000000000000000000000000000..878a993ec49717d88f8d313574945b39a131de0e
GIT binary patch
literal 569
zcmZ?wbhEHbRA&%pxXJ(m|NsC0_4C({??1kN`TG6)kDtGOefj$J^Ow*6{{8*+>*tRj
z-@ktS^8Wq1zkmMx`2PLN=g*%%eR}`y-L<P%PoFw<>g36P|Ni~?^XK>P-@kyWe*)G2
z`1bAFSD*<Xg`Ylt{P^L+hxb7J@7}$B{rcg<hiA^50on+*nF@sBPZmZ726YA<kXax<
zF|hqVF!_VaN}kTCTu)cn6wRBXQX(ZA<i)6M77)d?^WNnUuUaX8;Yml8eAZuI(kY-P
z?tC(JvFDVC`QK{uIhEAZvzuF!MN`vU_{1mlO_(gs=RJ8^Sz33Gm*5nU`BNqficDGB
z)#d3WC9zIIWbOLRQX*SKR+c9-Nl9|CiSF6Q#>OQn#Uy(4_{p7V$x;_Die9>U>B`kP
zvy+qgrMX#|MejXeW@hD<<`;eb^7XmEJD++!eh$3#_58QWkRKJ_S8K_<IIw`3v5|#W
z$fIJxp+il)4`nR_85`L-I0QoW%rI1D;g_;)`qG}C)XJ|BIM3%~P^$N&V4tQLmYbQ*
z&Nj)t*TQ);r6X*<y*7g^SICQidHz0K5xcf9U0&`p*Ut6S!6zN7m8C)s%-YI$ohxo*
z&{i$SHyxW|&iCD@+WIC!E%W9w)8C;=ch(nwytX&^Q(pAW^owz86)JKM98PZohO#vP
DZZ8Ks

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/horizontal.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/horizontal.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d7ce1a707fffb45f37c1dfbf4500d6dd615325f0
GIT binary patch
literal 436
zcmV;l0ZaZzNk%w1VJ!eq0K@<Q00030|NqUyxzWhK@9XFM`})|=$F-)MJvunb$;tly
z{{8*^{QUg;`}_L(`uX|!`1ttu_xJYp_Vo1h^Yioa^78TV@&Et-000000000000000
z000000000000000A^8LW000*NEC2ui04)Ge000I5U?PrWX`W~rtZeJPa4aiyZQppV
z?|kq3i=c2wEE<o<q;k1rIG@m{bV{u@uGp-0%k6r<;BeSME}PHjw0iw$yWjA*d`_?1
z?{|oP&+q&HfPoQ%goTEOh>404jE#<ukdcy;6P1>in3<ZJoD`m)prN9pq@@+7sHv)}
ztgWsVu(7hUw6(UkxVgH!yuH4^z`?@3DaFReBQna%%q&08(9zP+Ox4!c*w$6s+}%%N
z;Njxq;cMpS=w*28?CtLCf${S5dy4k=_=J=D{QZrb00RoNRH~rCgP&X}T*wgBu!j&M
zN}NcsqQ#3CGiuz(@glO1AV*vnNwTELlPFU$s$9vkrOTHvW6GRKv!>0PICJXU$+M@=
epFo2O9ZIyQ(W6L{DqYI7sne%Wqe>+j0suSLH}w1f

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/vertical.gif b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/img/vertical.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d6ed79382fa4f1094f6fd7fbdeef0317cb580722
GIT binary patch
literal 140
zcmZ?wbhEHb<YM4s*vtR||NsC0{{6?7uU|iZ`TXO@_pe{S{P_O;%jeIhPM-Yn<Hxse
z-@XE+K7ao7=@U?;;!hSv1_pix9gt3t84N6z0V1VAR;xOWPJg>#dV^4EqSTMpJEsiU
qj3b!O2zWS0xHJnaJ*B$&<qjwJ+d6^W4@+$14?31ctm@-num%9@Zb(T0

literal 0
HcmV?d00001

diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/window.css b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/window.css
new file mode 100644
index 0000000000..9596734464
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/skins/umbraco/window.css
@@ -0,0 +1,77 @@
+/* Clearlooks 2 */
+
+/* Reset */
+.umbraco, .umbraco div, .umbraco span, .umbraco a {vertical-align:baseline; text-align:left; position:absolute; border:0; padding:0; margin:0; background:transparent; font-family:Arial,Verdana; font-size:11px; color:#000; text-decoration:none; font-weight:normal; width:auto; height:auto; overflow:hidden; display:block}
+
+/* General */
+.umbraco {position:absolute; direction:ltr; border: 5px solid #a3a3a3; overflow: hidden;}
+.umbraco .mceWrapper {position:static;}
+#mceEventBlocker{border: none !Important;}
+.mceEventBlocker {position:fixed; left:0; top:0;  width:100%; height:100%}
+.umbraco .mcePlaceHolder {border:1px solid #a3a3a3; background:#fff; top:0; left:0;}
+.umbraco_modalBlocker {position:fixed; left:0; top:0; width:100%; height:100%; display:none; background: url(../../../../../modal/modalBackground.gif)}
+
+/* Top */
+.umbraco .mceTop{top:0;  height:15px; padding: 5px 0px 5px 0px; width: 100%; border-bottom: 1px solid #ccc; background: url(../../../../../modal/modalGradiant.gif) repeat-x;}
+.umbraco .mceTop .mceLeft {display: none;}
+.umbraco .mceTop .mceCenter {display: none;}
+.umbraco .mceTop .mceRight {display: none;}
+
+.umbraco .mceTop span {color: #378080; font-weight: bold; text-align:left; vertical-align:middle; display: block; padding-left: 10px;}
+
+/* Middle */
+.umbraco .mceMiddle, .umbraco .mceMiddle div {top:0;}
+.umbraco .mceMiddle {width:100%; height:100%; clip:rect(26px auto auto auto); background:#FFF; overflow: hidden;}
+.umbraco .mceMiddle .mceLeft {display: none;}
+.umbraco .mceMiddle span {top:25px; left:0px; width:100%; height:100%; background:#FFF}
+.umbraco .mceMiddle .mceRight {display: none;}
+
+/* Bottom */
+.umbraco .mceBottom, .umbraco .mceBottom div {display: none !Important;}
+
+/* Actions */
+.umbraco a {width:29px; height:16px; top:3px;}
+.umbraco .mceClose {right:6px; background:url(img/close.png) no-repeat}
+.umbraco .mceMin {display:none; right:68px; background:url(img/buttons.gif) 0 0}
+.umbraco .mceMed {display:none; right:37px; background:url(img/buttons.gif) -29px 0}
+.umbraco .mceMax {display:none; right:37px; background:url(img/buttons.gif) -58px 0}
+.umbraco .mceMove {display:none;width:100%;cursor:move;background:url(img/corners.gif) no-repeat -100px -100px}
+.umbraco .mceMovable .mceMove {display:block}
+.umbraco .mceFocus .mceClose {right:6px; top: 6px;}
+
+.umbraco .mceFocus .mceMin {right:68px; background:url(img/buttons.gif) 0 -16px}
+.umbraco .mceFocus .mceMed {right:37px; background:url(img/buttons.gif) -29px -16px}
+.umbraco .mceFocus .mceMax {right:37px; background:url(img/buttons.gif) -58px -16px}
+
+.umbraco .mceFocus .mceMin:hover {right:68px; background:url(img/buttons.gif) 0 -32px}
+.umbraco .mceFocus .mceMed:hover {right:37px; background:url(img/buttons.gif) -29px -32px}
+.umbraco .mceFocus .mceMax:hover {right:37px; background:url(img/buttons.gif) -58px -32px}
+
+/* Resize */
+.umbraco .mceResize {top:auto; left:auto; display:none; width:5px; height:5px; background:url(img/horizontal.gif) no-repeat 0 -75px}
+.umbraco .mceResizable .mceResize {display:block}
+.umbraco .mceResizable .mceMin, .umbraco .mceMax {display:none}
+.umbraco .mceMinimizable .mceMin {display:block}
+.umbraco .mceMaximizable .mceMax {display:block}
+.umbraco .mceMaximized .mceMed {display:block}
+.umbraco .mceMaximized .mceMax {display:none}
+.umbraco a.mceResizeN {top:0; left:0; width:100%; cursor:n-resize}
+.umbraco a.mceResizeNW {top:0; left:0; cursor:nw-resize}
+.umbraco a.mceResizeNE {top:0; right:0; cursor:ne-resize}
+.umbraco a.mceResizeW {top:0; left:0; height:100%; cursor:w-resize;}
+.umbraco a.mceResizeE {top:0; right:0; height:100%; cursor:e-resize}
+.umbraco a.mceResizeS {bottom:0; left:0; width:100%; cursor:s-resize}
+.umbraco a.mceResizeSW {bottom:0; left:0; cursor:sw-resize}
+.umbraco a.mceResizeSE {bottom:0; right:0; cursor:se-resize}
+
+/* Alert/Confirm */
+.umbraco .mceButton {font-weight:bold; bottom:10px; width:80px; height:30px; background:url(img/button.gif); line-height:30px; vertical-align:middle; text-align:center; outline:0}
+.umbraco .mceMiddle .mceIcon {left:15px; top:35px; width:32px; height:32px}
+.umbraco .mceAlert .mceMiddle span, .umbraco .mceConfirm .mceMiddle span {background:transparent;left:60px; top:35px; width:320px; height:50px; font-weight:bold; overflow:auto; white-space:normal}
+.umbraco a:hover {font-weight:bold;}
+.umbraco .mceAlert .mceMiddle, .umbraco .mceConfirm .mceMiddle {background:#D6D7D5}
+.umbraco .mceAlert .mceOk {left:50%; top:auto; margin-left: -40px}
+.umbraco .mceAlert .mceIcon {background:url(img/alert.gif)}
+.umbraco .mceConfirm .mceOk {left:50%; top:auto; margin-left: -90px}
+.umbraco .mceConfirm .mceCancel {left:50%; top:auto}
+.umbraco .mceConfirm .mceIcon {background:url(img/confirm.gif)} 
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/template.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/template.htm
new file mode 100644
index 0000000000..f9ec64219d
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/inlinepopups/template.htm
@@ -0,0 +1,387 @@
+<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Template for dialogs</title>
+<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css" />
+</head>
+<body>
+
+<div class="mceEditor">
+	<div class="clearlooks2" style="width:400px; height:100px; left:10px;">
+		<div class="mceWrapper">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Blured</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:100px; left:420px;">
+		<div class="mceWrapper mceMovable mceFocus">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Focused</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:120px;">
+		<div class="mceWrapper mceMovable mceFocus mceStatusbar">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:120px;">
+		<div class="mceWrapper mceMovable mceFocus mceStatusbar mceResizable">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar, Resizable</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:230px;">
+		<div class="mceWrapper mceMovable mceFocus mceResizable mceMaximizable">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Resizable, Maximizable</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:230px;">
+		<div class="mceWrapper mceMovable mceStatusbar mceResizable mceMaximizable">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Blurred, Maximizable, Statusbar, Resizable</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:340px;">
+		<div class="mceWrapper mceMovable mceFocus mceResizable mceMaximized mceMinimizable mceMaximizable">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Maximized, Maximizable, Minimizable</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:340px;">
+		<div class="mceWrapper mceMovable mceStatusbar mceResizable mceMaximized mceMinimizable mceMaximizable">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Blured</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:130px; left:10px; top:450px;">
+		<div class="mceWrapper mceMovable mceFocus mceModal mceAlert">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Alert</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+				</span>
+				<div class="mceRight"></div>
+				<div class="mceIcon"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceButton mceOk" href="#">Ok</a>
+			<a class="mceClose" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:130px; left:420px; top:450px;">
+		<div class="mceWrapper mceMovable mceFocus mceModal mceConfirm">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Confirm</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					</span>
+				<div class="mceRight"></div>
+				<div class="mceIcon"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceButton mceOk" href="#">Ok</a>
+			<a class="mceButton mceCancel" href="#">Cancel</a>
+			<a class="mceClose" href="#"></a>
+		</div>
+	</div>
+</div>
+
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/insertdatetime/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/insertdatetime/editor_plugin.js
new file mode 100644
index 0000000000..938ce6b17d
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/insertdatetime/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.InsertDateTime",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertDate",function(){var d=c._getDateTime(new Date(),a.getParam("plugin_insertdate_dateFormat",a.getLang("insertdatetime.date_fmt")));a.execCommand("mceInsertContent",false,d)});a.addCommand("mceInsertTime",function(){var d=c._getDateTime(new Date(),a.getParam("plugin_insertdate_timeFormat",a.getLang("insertdatetime.time_fmt")));a.execCommand("mceInsertContent",false,d)});a.addButton("insertdate",{title:"insertdatetime.insertdate_desc",cmd:"mceInsertDate"});a.addButton("inserttime",{title:"insertdatetime.inserttime_desc",cmd:"mceInsertTime"})},getInfo:function(){return{longname:"Insert date/time",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getDateTime:function(e,a){var c=this.editor;function b(g,d){g=""+g;if(g.length<d){for(var f=0;f<(d-g.length);f++){g="0"+g}}return g}a=a.replace("%D","%m/%d/%y");a=a.replace("%r","%I:%M:%S %p");a=a.replace("%Y",""+e.getFullYear());a=a.replace("%y",""+e.getYear());a=a.replace("%m",b(e.getMonth()+1,2));a=a.replace("%d",b(e.getDate(),2));a=a.replace("%H",""+b(e.getHours(),2));a=a.replace("%M",""+b(e.getMinutes(),2));a=a.replace("%S",""+b(e.getSeconds(),2));a=a.replace("%I",""+((e.getHours()+11)%12+1));a=a.replace("%p",""+(e.getHours()<12?"AM":"PM"));a=a.replace("%B",""+c.getLang("insertdatetime.months_long").split(",")[e.getMonth()]);a=a.replace("%b",""+c.getLang("insertdatetime.months_short").split(",")[e.getMonth()]);a=a.replace("%A",""+c.getLang("insertdatetime.day_long").split(",")[e.getDay()]);a=a.replace("%a",""+c.getLang("insertdatetime.day_short").split(",")[e.getDay()]);a=a.replace("%%","%");return a}});tinymce.PluginManager.add("insertdatetime",tinymce.plugins.InsertDateTime)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/insertdatetime/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/insertdatetime/editor_plugin_src.js
new file mode 100644
index 0000000000..181c791eca
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/insertdatetime/editor_plugin_src.js
@@ -0,0 +1,83 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.InsertDateTime', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			ed.addCommand('mceInsertDate', function() {
+				var str = t._getDateTime(new Date(), ed.getParam("plugin_insertdate_dateFormat", ed.getLang('insertdatetime.date_fmt')));
+
+				ed.execCommand('mceInsertContent', false, str);
+			});
+
+			ed.addCommand('mceInsertTime', function() {
+				var str = t._getDateTime(new Date(), ed.getParam("plugin_insertdate_timeFormat", ed.getLang('insertdatetime.time_fmt')));
+
+				ed.execCommand('mceInsertContent', false, str);
+			});
+
+			ed.addButton('insertdate', {title : 'insertdatetime.insertdate_desc', cmd : 'mceInsertDate'});
+			ed.addButton('inserttime', {title : 'insertdatetime.inserttime_desc', cmd : 'mceInsertTime'});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Insert date/time',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_getDateTime : function(d, fmt) {
+			var ed = this.editor;
+
+			function addZeros(value, len) {
+				value = "" + value;
+
+				if (value.length < len) {
+					for (var i=0; i<(len-value.length); i++)
+						value = "0" + value;
+				}
+
+				return value;
+			};
+
+			fmt = fmt.replace("%D", "%m/%d/%y");
+			fmt = fmt.replace("%r", "%I:%M:%S %p");
+			fmt = fmt.replace("%Y", "" + d.getFullYear());
+			fmt = fmt.replace("%y", "" + d.getYear());
+			fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));
+			fmt = fmt.replace("%d", addZeros(d.getDate(), 2));
+			fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));
+			fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));
+			fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));
+			fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));
+			fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));
+			fmt = fmt.replace("%B", "" + ed.getLang("insertdatetime.months_long").split(',')[d.getMonth()]);
+			fmt = fmt.replace("%b", "" + ed.getLang("insertdatetime.months_short").split(',')[d.getMonth()]);
+			fmt = fmt.replace("%A", "" + ed.getLang("insertdatetime.day_long").split(',')[d.getDay()]);
+			fmt = fmt.replace("%a", "" + ed.getLang("insertdatetime.day_short").split(',')[d.getDay()]);
+			fmt = fmt.replace("%%", "%");
+
+			return fmt;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('insertdatetime', tinymce.plugins.InsertDateTime);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/layer/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/layer/editor_plugin.js
new file mode 100644
index 0000000000..d610f7e9de
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/layer/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.Layer",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertLayer",c._insertLayer,c);a.addCommand("mceMoveForward",function(){c._move(1)});a.addCommand("mceMoveBackward",function(){c._move(-1)});a.addCommand("mceMakeAbsolute",function(){c._toggleAbsolute()});a.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"});a.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"});a.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"});a.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"});a.onInit.add(function(){if(tinymce.isIE){a.getDoc().execCommand("2D-Position",false,true)}});a.onNodeChange.add(c._nodeChange,c);a.onVisualAid.add(c._visualAid,c)},getInfo:function(){return{longname:"Layer",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var c,d;c=this._getParentLayer(e);d=b.dom.getParent(e,"DIV,P,IMG");if(!d){a.setDisabled("absolute",1);a.setDisabled("moveforward",1);a.setDisabled("movebackward",1)}else{a.setDisabled("absolute",0);a.setDisabled("moveforward",!c);a.setDisabled("movebackward",!c);a.setActive("absolute",c&&c.style.position.toLowerCase()=="absolute")}},_visualAid:function(a,c,b){var d=a.dom;tinymce.each(d.select("div,p",c),function(f){if(/^(absolute|relative|static)$/i.test(f.style.position)){if(b){d.addClass(f,"mceItemVisualAid")}else{d.removeClass(f,"mceItemVisualAid")}}})},_move:function(h){var b=this.editor,f,g=[],e=this._getParentLayer(b.selection.getNode()),c=-1,j=-1,a;a=[];tinymce.walk(b.getBody(),function(d){if(d.nodeType==1&&/^(absolute|relative|static)$/i.test(d.style.position)){a.push(d)}},"childNodes");for(f=0;f<a.length;f++){g[f]=a[f].style.zIndex?parseInt(a[f].style.zIndex):0;if(c<0&&a[f]==e){c=f}}if(h<0){for(f=0;f<g.length;f++){if(g[f]<g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{if(g[c]>0){a[c].style.zIndex=g[c]-1}}}else{for(f=0;f<g.length;f++){if(g[f]>g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{a[c].style.zIndex=g[c]+1}}b.execCommand("mceRepaint")},_getParentLayer:function(a){return this.editor.dom.getParent(a,function(b){return b.nodeType==1&&/^(absolute|relative|static)$/i.test(b.style.position)})},_insertLayer:function(){var a=this.editor,b=a.dom.getPos(a.dom.getParent(a.selection.getNode(),"*"));a.dom.add(a.getBody(),"div",{style:{position:"absolute",left:b.x,top:(b.y>20?b.y:20),width:100,height:100},"class":"mceItemVisualAid"},a.selection.getContent()||a.getLang("layer.content"))},_toggleAbsolute:function(){var a=this.editor,b=this._getParentLayer(a.selection.getNode());if(!b){b=a.dom.getParent(a.selection.getNode(),"DIV,P,IMG")}if(b){if(b.style.position.toLowerCase()=="absolute"){a.dom.setStyles(b,{position:"",left:"",top:"",width:"",height:""});a.dom.removeClass(b,"mceItemVisualAid")}else{if(b.style.left==""){b.style.left=20+"px"}if(b.style.top==""){b.style.top=20+"px"}if(b.style.width==""){b.style.width=b.width?(b.width+"px"):"100px"}if(b.style.height==""){b.style.height=b.height?(b.height+"px"):"100px"}b.style.position="absolute";a.dom.setAttrib(b,"data-mce-style","");a.addVisual(a.getBody())}a.execCommand("mceRepaint");a.nodeChanged()}}});tinymce.PluginManager.add("layer",tinymce.plugins.Layer)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/layer/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/layer/editor_plugin_src.js
new file mode 100644
index 0000000000..a8ac5a72fc
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/layer/editor_plugin_src.js
@@ -0,0 +1,214 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Layer', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceInsertLayer', t._insertLayer, t);
+
+			ed.addCommand('mceMoveForward', function() {
+				t._move(1);
+			});
+
+			ed.addCommand('mceMoveBackward', function() {
+				t._move(-1);
+			});
+
+			ed.addCommand('mceMakeAbsolute', function() {
+				t._toggleAbsolute();
+			});
+
+			// Register buttons
+			ed.addButton('moveforward', {title : 'layer.forward_desc', cmd : 'mceMoveForward'});
+			ed.addButton('movebackward', {title : 'layer.backward_desc', cmd : 'mceMoveBackward'});
+			ed.addButton('absolute', {title : 'layer.absolute_desc', cmd : 'mceMakeAbsolute'});
+			ed.addButton('insertlayer', {title : 'layer.insertlayer_desc', cmd : 'mceInsertLayer'});
+
+			ed.onInit.add(function() {
+				if (tinymce.isIE)
+					ed.getDoc().execCommand('2D-Position', false, true);
+			});
+
+			ed.onNodeChange.add(t._nodeChange, t);
+			ed.onVisualAid.add(t._visualAid, t);
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Layer',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_nodeChange : function(ed, cm, n) {
+			var le, p;
+
+			le = this._getParentLayer(n);
+			p = ed.dom.getParent(n, 'DIV,P,IMG');
+
+			if (!p) {
+				cm.setDisabled('absolute', 1);
+				cm.setDisabled('moveforward', 1);
+				cm.setDisabled('movebackward', 1);
+			} else {
+				cm.setDisabled('absolute', 0);
+				cm.setDisabled('moveforward', !le);
+				cm.setDisabled('movebackward', !le);
+				cm.setActive('absolute', le && le.style.position.toLowerCase() == "absolute");
+			}
+		},
+
+		// Private methods
+
+		_visualAid : function(ed, e, s) {
+			var dom = ed.dom;
+
+			tinymce.each(dom.select('div,p', e), function(e) {
+				if (/^(absolute|relative|static)$/i.test(e.style.position)) {
+					if (s)
+						dom.addClass(e, 'mceItemVisualAid');
+					else
+						dom.removeClass(e, 'mceItemVisualAid');	
+				}
+			});
+		},
+
+		_move : function(d) {
+			var ed = this.editor, i, z = [], le = this._getParentLayer(ed.selection.getNode()), ci = -1, fi = -1, nl;
+
+			nl = [];
+			tinymce.walk(ed.getBody(), function(n) {
+				if (n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position))
+					nl.push(n); 
+			}, 'childNodes');
+
+			// Find z-indexes
+			for (i=0; i<nl.length; i++) {
+				z[i] = nl[i].style.zIndex ? parseInt(nl[i].style.zIndex) : 0;
+
+				if (ci < 0 && nl[i] == le)
+					ci = i;
+			}
+
+			if (d < 0) {
+				// Move back
+
+				// Try find a lower one
+				for (i=0; i<z.length; i++) {
+					if (z[i] < z[ci]) {
+						fi = i;
+						break;
+					}
+				}
+
+				if (fi > -1) {
+					nl[ci].style.zIndex = z[fi];
+					nl[fi].style.zIndex = z[ci];
+				} else {
+					if (z[ci] > 0)
+						nl[ci].style.zIndex = z[ci] - 1;
+				}
+			} else {
+				// Move forward
+
+				// Try find a higher one
+				for (i=0; i<z.length; i++) {
+					if (z[i] > z[ci]) {
+						fi = i;
+						break;
+					}
+				}
+
+				if (fi > -1) {
+					nl[ci].style.zIndex = z[fi];
+					nl[fi].style.zIndex = z[ci];
+				} else
+					nl[ci].style.zIndex = z[ci] + 1;
+			}
+
+			ed.execCommand('mceRepaint');
+		},
+
+		_getParentLayer : function(n) {
+			return this.editor.dom.getParent(n, function(n) {
+				return n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position);
+			});
+		},
+
+		_insertLayer : function() {
+			var ed = this.editor, p = ed.dom.getPos(ed.dom.getParent(ed.selection.getNode(), '*'));
+
+			ed.dom.add(ed.getBody(), 'div', {
+				style : {
+					position : 'absolute',
+					left : p.x,
+					top : (p.y > 20 ? p.y : 20),
+					width : 100,
+					height : 100
+				},
+				'class' : 'mceItemVisualAid'
+			}, ed.selection.getContent() || ed.getLang('layer.content'));
+		},
+
+		_toggleAbsolute : function() {
+			var ed = this.editor, le = this._getParentLayer(ed.selection.getNode());
+
+			if (!le)
+				le = ed.dom.getParent(ed.selection.getNode(), 'DIV,P,IMG');
+
+			if (le) {
+				if (le.style.position.toLowerCase() == "absolute") {
+					ed.dom.setStyles(le, {
+						position : '',
+						left : '',
+						top : '',
+						width : '',
+						height : ''
+					});
+
+					ed.dom.removeClass(le, 'mceItemVisualAid');
+				} else {
+					if (le.style.left == "")
+						le.style.left = 20 + 'px';
+
+					if (le.style.top == "")
+						le.style.top = 20 + 'px';
+
+					if (le.style.width == "")
+						le.style.width = le.width ? (le.width + 'px') : '100px';
+
+					if (le.style.height == "")
+						le.style.height = le.height ? (le.height + 'px') : '100px';
+
+					le.style.position = "absolute";
+
+					ed.dom.setAttrib(le, 'data-mce-style', '');
+					ed.addVisual(ed.getBody());
+				}
+
+				ed.execCommand('mceRepaint');
+				ed.nodeChanged();
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('layer', tinymce.plugins.Layer);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/legacyoutput/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/legacyoutput/editor_plugin.js
new file mode 100644
index 0000000000..5dbc17f339
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/legacyoutput/editor_plugin.js
@@ -0,0 +1 @@
+(function(a){a.onAddEditor.addToTop(function(c,b){b.settings.inline_styles=false});a.create("tinymce.plugins.LegacyOutput",{init:function(b){b.onInit.add(function(){var c="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",e=a.explode(b.settings.font_size_style_values),d=b.schema;b.formatter.register({alignleft:{selector:c,attributes:{align:"left"}},aligncenter:{selector:c,attributes:{align:"center"}},alignright:{selector:c,attributes:{align:"right"}},alignfull:{selector:c,attributes:{align:"full"}},bold:[{inline:"b",remove:"all"},{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}}],italic:[{inline:"i",remove:"all"},{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}}],underline:[{inline:"u",remove:"all"},{inline:"span",styles:{textDecoration:"underline"},exact:true}],strikethrough:[{inline:"strike",remove:"all"},{inline:"span",styles:{textDecoration:"line-through"},exact:true}],fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(f){return a.inArray(e,f.value)+1}}},forecolor:{inline:"font",styles:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}});a.each("b,i,u,strike".split(","),function(f){d.addValidElements(f+"[*]")});if(!d.getElementRule("font")){d.addValidElements("font[face|size|color|style]")}a.each(c.split(","),function(f){var h=d.getElementRule(f),g;if(h){if(!h.attributes.align){h.attributes.align={};h.attributesOrder.push("align")}}});b.onNodeChange.add(function(g,k){var j,f,h,i;f=g.dom.getParent(g.selection.getNode(),"font");if(f){h=f.face;i=f.size}if(j=k.get("fontselect")){j.select(function(l){return l==h})}if(j=k.get("fontsizeselect")){j.select(function(m){var l=a.inArray(e,m.fontSize);return l+1==i})}})})},getInfo:function(){return{longname:"LegacyOutput",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("legacyoutput",a.plugins.LegacyOutput)})(tinymce);
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/legacyoutput/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/legacyoutput/editor_plugin_src.js
new file mode 100644
index 0000000000..5c0aea0608
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/legacyoutput/editor_plugin_src.js
@@ -0,0 +1,139 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ *
+ * This plugin will force TinyMCE to produce deprecated legacy output such as font elements, u elements, align
+ * attributes and so forth. There are a few cases where these old items might be needed for example in email applications or with Flash
+ *
+ * However you should NOT use this plugin if you are building some system that produces web contents such as a CMS. All these elements are
+ * not apart of the newer specifications for HTML and XHTML.
+ */
+
+(function(tinymce) {
+	// Override inline_styles setting to force TinyMCE to produce deprecated contents
+	tinymce.onAddEditor.addToTop(function(tinymce, editor) {
+		editor.settings.inline_styles = false;
+	});
+
+	// Create the legacy ouput plugin
+	tinymce.create('tinymce.plugins.LegacyOutput', {
+		init : function(editor) {
+			editor.onInit.add(function() {
+				var alignElements = 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img',
+					fontSizes = tinymce.explode(editor.settings.font_size_style_values),
+					schema = editor.schema;
+
+				// Override some internal formats to produce legacy elements and attributes
+				editor.formatter.register({
+					// Change alignment formats to use the deprecated align attribute
+					alignleft : {selector : alignElements, attributes : {align : 'left'}},
+					aligncenter : {selector : alignElements, attributes : {align : 'center'}},
+					alignright : {selector : alignElements, attributes : {align : 'right'}},
+					alignfull : {selector : alignElements, attributes : {align : 'full'}},
+
+					// Change the basic formatting elements to use deprecated element types
+					bold : [
+						{inline : 'b', remove : 'all'},
+						{inline : 'strong', remove : 'all'},
+						{inline : 'span', styles : {fontWeight : 'bold'}}
+					],
+					italic : [
+						{inline : 'i', remove : 'all'},
+						{inline : 'em', remove : 'all'},
+						{inline : 'span', styles : {fontStyle : 'italic'}}
+					],
+					underline : [
+						{inline : 'u', remove : 'all'},
+						{inline : 'span', styles : {textDecoration : 'underline'}, exact : true}
+					],
+					strikethrough : [
+						{inline : 'strike', remove : 'all'},
+						{inline : 'span', styles : {textDecoration: 'line-through'}, exact : true}
+					],
+
+					// Change font size and font family to use the deprecated font element
+					fontname : {inline : 'font', attributes : {face : '%value'}},
+					fontsize : {
+						inline : 'font',
+						attributes : {
+							size : function(vars) {
+								return tinymce.inArray(fontSizes, vars.value) + 1;
+							}
+						}
+					},
+
+					// Setup font elements for colors as well
+					forecolor : {inline : 'font', styles : {color : '%value'}},
+					hilitecolor : {inline : 'font', styles : {backgroundColor : '%value'}}
+				});
+
+				// Check that deprecated elements are allowed if not add them
+				tinymce.each('b,i,u,strike'.split(','), function(name) {
+					schema.addValidElements(name + '[*]');
+				});
+
+				// Add font element if it's missing
+				if (!schema.getElementRule("font"))
+					schema.addValidElements("font[face|size|color|style]");
+
+				// Add the missing and depreacted align attribute for the serialization engine
+				tinymce.each(alignElements.split(','), function(name) {
+					var rule = schema.getElementRule(name), found;
+
+					if (rule) {
+						if (!rule.attributes.align) {
+							rule.attributes.align = {};
+							rule.attributesOrder.push('align');
+						}
+					}
+				});
+
+				// Listen for the onNodeChange event so that we can do special logic for the font size and font name drop boxes
+				editor.onNodeChange.add(function(editor, control_manager) {
+					var control, fontElm, fontName, fontSize;
+
+					// Find font element get it's name and size
+					fontElm = editor.dom.getParent(editor.selection.getNode(), 'font');
+					if (fontElm) {
+						fontName = fontElm.face;
+						fontSize = fontElm.size;
+					}
+
+					// Select/unselect the font name in droplist
+					if (control = control_manager.get('fontselect')) {
+						control.select(function(value) {
+							return value == fontName;
+						});
+					}
+
+					// Select/unselect the font size in droplist
+					if (control = control_manager.get('fontsizeselect')) {
+						control.select(function(value) {
+							var index = tinymce.inArray(fontSizes, value.fontSize);
+
+							return index + 1 == fontSize;
+						});
+					}
+				});
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'LegacyOutput',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('legacyoutput', tinymce.plugins.LegacyOutput);
+})(tinymce);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/css/media.css b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/css/media.css
new file mode 100644
index 0000000000..0c45c7ff6d
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/css/media.css
@@ -0,0 +1,17 @@
+#id, #name, #hspace, #vspace, #class_name, #align { width: 100px }
+#hspace, #vspace { width: 50px }
+#flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px }
+#flash_base, #flash_flashvars, #html5_altsource1, #html5_altsource2, #html5_poster { width: 240px }
+#width, #height { width: 40px }
+#src, #media_type { width: 250px }
+#class { width: 120px }
+#prev { margin: 0; border: 1px solid black; width: 380px; height: 260px; overflow: auto }
+.panel_wrapper div.current { height: 420px; overflow: auto }
+#flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none }
+.mceAddSelectValue { background-color: #DDDDDD }
+#qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px }
+#wmp_balance, #wmp_baseurl, #wmp_captioningid, #wmp_currentmarker, #wmp_currentposition, #wmp_defaultframe, #wmp_playcount, #wmp_rate, #wmp_uimode, #wmp_volume { width: 70px }
+#rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px }
+#shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px }
+#qt_qtsrc { width: 200px }
+iframe {border: 1px solid gray}
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/editor_plugin.js
new file mode 100644
index 0000000000..66219078cb
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var d=tinymce.explode("id,name,width,height,style,align,class,hspace,vspace,bgcolor,type"),h=tinymce.makeMap(d.join(",")),b=tinymce.html.Node,f,a,g=tinymce.util.JSON,e;f=[["Flash","d27cdb6e-ae6d-11cf-96b8-444553540000","application/x-shockwave-flash","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["ShockWave","166b1bca-3f9c-11cf-8075-444553540000","application/x-director","http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],["WindowsMedia","6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a","application/x-mplayer2","http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],["QuickTime","02bf25d5-8c17-4b23-bc80-d3488abddc6b","video/quicktime","http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],["RealMedia","cfcdaa03-8be4-11cf-b84b-0020afbbccfa","audio/x-pn-realaudio-plugin","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["Java","8ad9c840-044e-11d1-b3e9-00805f499d93","application/x-java-applet","http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],["Silverlight","dfeaf541-f3e1-4c24-acac-99c30715084a","application/x-silverlight-2"],["Iframe"],["Video"]];function c(m){var l,j,k;if(m&&!m.splice){j=[];for(k=0;true;k++){if(m[k]){j[k]=m[k]}else{break}}return j}return m}tinymce.create("tinymce.plugins.MediaPlugin",{init:function(n,j){var r=this,l={},m,p,q,k;function o(i){return i&&i.nodeName==="IMG"&&n.dom.hasClass(i,"mceItemMedia")}r.editor=n;r.url=j;a="";for(m=0;m<f.length;m++){k=f[m][0];q={name:k,clsids:tinymce.explode(f[m][1]||""),mimes:tinymce.explode(f[m][2]||""),codebase:f[m][3]};for(p=0;p<q.clsids.length;p++){l["clsid:"+q.clsids[p]]=q}for(p=0;p<q.mimes.length;p++){l[q.mimes[p]]=q}l["mceItem"+k]=q;l[k.toLowerCase()]=q;a+=(a?"|":"")+k}tinymce.each(n.getParam("media_types","video=mp4,m4v,ogv,webm;silverlight=xap;flash=swf,flv;shockwave=dcr;quicktime=mov,qt,mpg,mp3,mpeg;shockwave=dcr;windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;realmedia=rm,ra,ram;java=jar").split(";"),function(v){var s,u,t;v=v.split(/=/);u=tinymce.explode(v[1].toLowerCase());for(s=0;s<u.length;s++){t=l[v[0].toLowerCase()];if(t){l[u[s]]=t}}});a=new RegExp("write("+a+")\\(([^)]+)\\)");r.lookup=l;n.onPreInit.add(function(){n.schema.addValidElements("object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]");n.parser.addNodeFilter("object,embed,video,audio,script,iframe",function(s){var t=s.length;while(t--){r.objectToImg(s[t])}});n.serializer.addNodeFilter("img",function(s,u,t){var v=s.length,w;while(v--){w=s[v];if((w.attr("class")||"").indexOf("mceItemMedia")!==-1){r.imgToObject(w,t)}}})});n.onInit.add(function(){if(n.theme&&n.theme.onResolveName){n.theme.onResolveName.add(function(i,s){if(s.name==="img"&&n.dom.hasClass(s.node,"mceItemMedia")){s.name="media"}})}if(n&&n.plugins.contextmenu){n.plugins.contextmenu.onContextMenu.add(function(s,t,i){if(i.nodeName==="IMG"&&i.className.indexOf("mceItemMedia")!==-1){t.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});n.addCommand("mceMedia",function(){var s,i;i=n.selection.getNode();if(o(i)){s=g.parse(n.dom.getAttrib(i,"data-mce-json"));tinymce.each(d,function(t){var u=n.dom.getAttrib(i,t);if(u){s[t]=u}});s.type=r.getType(i.className).name.toLowerCase()}if(!s){s={type:"flash",video:{sources:[]},params:{}}}n.windowManager.open({file:j+"/media.htm",width:430+parseInt(n.getLang("media.delta_width",0)),height:500+parseInt(n.getLang("media.delta_height",0)),inline:1},{plugin_url:j,data:s})});n.addButton("media",{title:"media.desc",cmd:"mceMedia"});n.onNodeChange.add(function(s,i,t){i.setActive("media",o(t))})},convertUrl:function(k,n){var j=this,m=j.editor,l=m.settings,o=l.url_converter,i=l.url_converter_scope||j;if(!k){return k}if(n){return m.documentBaseURI.toAbsolute(k)}return o.call(i,k,"src","object")},getInfo:function(){return{longname:"Media",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media",version:tinymce.majorVersion+"."+tinymce.minorVersion}},dataToImg:function(m,k){var r=this,o=r.editor,p=o.documentBaseURI,j,q,n,l;m.params.src=r.convertUrl(m.params.src,k);q=m.video.attrs;if(q){q.src=r.convertUrl(q.src,k)}if(q){q.poster=r.convertUrl(q.poster,k)}j=c(m.video.sources);if(j){for(l=0;l<j.length;l++){j[l].src=r.convertUrl(j[l].src,k)}}n=r.editor.dom.create("img",{id:m.id,style:m.style,align:m.align,src:r.editor.theme.url+"/img/trans.gif","class":"mceItemMedia mceItem"+r.getType(m.type).name,"data-mce-json":g.serialize(m,"'")});n.width=m.width||"320";n.height=m.height||"240";return n},dataToHtml:function(i,j){return this.editor.serializer.serialize(this.dataToImg(i,j),{force_absolute:j})},htmlToData:function(k){var j,i,l;l={type:"flash",video:{sources:[]},params:{}};j=this.editor.parser.parse(k);i=j.getAll("img")[0];if(i){l=g.parse(i.attr("data-mce-json"));l.type=this.getType(i.attr("class")).name.toLowerCase();tinymce.each(d,function(m){var n=i.attr(m);if(n){l[m]=n}})}return l},getType:function(m){var k,j,l;j=tinymce.explode(m," ");for(k=0;k<j.length;k++){l=this.lookup[j[k]];if(l){return l}}},imgToObject:function(x,n){var t=this,o=t.editor,A,E,j,s,F,w,D,u,k,C,r,p,y,B,m,v,l,z;function q(i,G){var K,J,L,I,H;H=o.getParam("flash_video_player_url",t.convertUrl(t.url+"/moxieplayer.swf"));if(H){K=o.documentBaseURI;D.params.src=H;if(o.getParam("flash_video_player_absvideourl",true)){i=K.toAbsolute(i||"",true);G=K.toAbsolute(G||"",true)}L="";J=o.getParam("flash_video_player_flashvars",{url:"$url",poster:"$poster"});tinymce.each(J,function(N,M){N=N.replace(/\$url/,i||"");N=N.replace(/\$poster/,G||"");if(N.length>0){L+=(L?"&":"")+M+"="+escape(N)}});if(L.length){D.params.flashvars=L}I=o.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(I,function(N,M){D.params[M]=""+N})}}D=g.parse(x.attr("data-mce-json"));p=this.getType(x.attr("class"));z=x.attr("data-mce-style");if(!z){z=x.attr("style");if(z){z=o.dom.serializeStyle(o.dom.parseStyle(z,"img"))}}if(p.name==="Iframe"){v=new b("iframe",1);tinymce.each(d,function(i){var G=x.attr(i);if(i=="class"&&G){G=G.replace(/mceItem.+ ?/g,"")}if(G&&G.length>0){v.attr(i,G)}});for(F in D.params){v.attr(F,D.params[F])}v.attr({style:z,src:D.params.src});x.replace(v);return}if(this.editor.settings.media_use_script){v=new b("script",1).attr("type","text/javascript");w=new b("#text",3);w.value="write"+p.name+"("+g.serialize(tinymce.extend(D.params,{width:x.attr("width"),height:x.attr("height")}))+");";v.append(w);x.replace(v);return}if(p.name==="Video"&&D.video.sources[0]){A=new b("video",1).attr(tinymce.extend({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z},D.video.attrs));if(D.video.attrs){l=D.video.attrs.poster}k=D.video.sources=c(D.video.sources);for(y=0;y<k.length;y++){if(/\.mp4$/.test(k[y].src)){m=k[y].src}}if(!k[0].type){A.attr("src",k[0].src);k.splice(0,1)}for(y=0;y<k.length;y++){u=new b("source",1).attr(k[y]);u.shortEnded=true;A.append(u)}if(m){q(m,l);p=t.getType("flash")}else{D.params.src=""}}if(D.params.src){if(/\.flv$/i.test(D.params.src)){q(D.params.src,"")}if(n&&n.force_absolute){D.params.src=o.documentBaseURI.toAbsolute(D.params.src)}E=new b("object",1).attr({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z});tinymce.each(d,function(i){if(D[i]&&i!="type"){E.attr(i,D[i])}});for(F in D.params){r=new b("param",1);r.shortEnded=true;w=D.params[F];if(F==="src"&&p.name==="WindowsMedia"){F="url"}r.attr({name:F,value:w});E.append(r)}if(this.editor.getParam("media_strict",true)){E.attr({data:D.params.src,type:p.mimes[0]})}else{E.attr({classid:"clsid:"+p.clsids[0],codebase:p.codebase});j=new b("embed",1);j.shortEnded=true;j.attr({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z,type:p.mimes[0]});for(F in D.params){j.attr(F,D.params[F])}tinymce.each(d,function(i){if(D[i]&&i!="type"){j.attr(i,D[i])}});E.append(j)}if(D.object_html){w=new b("#text",3);w.raw=true;w.value=D.object_html;E.append(w)}if(A){A.append(E)}}if(A){if(D.video_html){w=new b("#text",3);w.raw=true;w.value=D.video_html;A.append(w)}}if(A||E){x.replace(A||E)}else{x.remove()}},objectToImg:function(y){var F,j,A,p,G,H,u,w,t,B,z,q,o,D,x,k,E,n,C=this.lookup,l,v,s=this.editor.settings.url_converter,m=this.editor.settings.url_converter_scope;function r(i){return new tinymce.html.Serializer({inner:true,validate:false}).serialize(i)}if(!y.parent){return}if(y.name==="script"){if(y.firstChild){l=a.exec(y.firstChild.value)}if(!l){return}n=l[1];E={video:{},params:g.parse(l[2])};w=E.params.width;t=E.params.height}E=E||{video:{},params:{}};G=new b("img",1);G.attr({src:this.editor.theme.url+"/img/trans.gif"});H=y.name;if(H==="video"){A=y;F=y.getAll("object")[0];j=y.getAll("embed")[0];w=A.attr("width");t=A.attr("height");u=A.attr("id");E.video={attrs:{},sources:[]};v=E.video.attrs;for(H in A.attributes.map){v[H]=A.attributes.map[H]}x=y.attr("src");if(x){E.video.sources.push({src:s.call(m,x,"src","video")})}k=A.getAll("source");for(z=0;z<k.length;z++){x=k[z].remove();E.video.sources.push({src:s.call(m,x.attr("src"),"src","source"),type:x.attr("type"),media:x.attr("media")})}if(v.poster){v.poster=s.call(m,v.poster,"poster","video")}}if(y.name==="object"){F=y;j=y.getAll("embed")[0]}if(y.name==="embed"){j=y}if(y.name==="iframe"){p=y;n="Iframe"}if(F){w=w||F.attr("width");t=t||F.attr("height");B=B||F.attr("style");u=u||F.attr("id");D=F.getAll("param");for(z=0;z<D.length;z++){o=D[z];H=o.remove().attr("name");if(!h[H]){E.params[H]=o.attr("value")}}E.params.src=E.params.src||F.attr("data")}if(j){w=w||j.attr("width");t=t||j.attr("height");B=B||j.attr("style");u=u||j.attr("id");for(H in j.attributes.map){if(!h[H]&&!E.params[H]){E.params[H]=j.attributes.map[H]}}}if(p){w=p.attr("width");t=p.attr("height");B=B||p.attr("style");u=p.attr("id");tinymce.each(d,function(i){G.attr(i,p.attr(i))});for(H in p.attributes.map){if(!h[H]&&!E.params[H]){E.params[H]=p.attributes.map[H]}}}if(E.params.movie){E.params.src=E.params.src||E.params.movie;delete E.params.movie}if(E.params.src){E.params.src=s.call(m,E.params.src,"src","object")}if(A){n=C.video.name}if(F&&!n){n=(C[(F.attr("clsid")||"").toLowerCase()]||C[(F.attr("type")||"").toLowerCase()]||{}).name}if(j&&!n){n=(C[(j.attr("type")||"").toLowerCase()]||{}).name}y.replace(G);if(j){j.remove()}if(F){q=r(F.remove());if(q){E.object_html=q}}if(A){q=r(A.remove());if(q){E.video_html=q}}G.attr({id:u,"class":"mceItemMedia mceItem"+(n||"Flash"),style:B,width:w||"320",height:t||"240","data-mce-json":g.serialize(E,"'")})}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/editor_plugin_src.js
new file mode 100644
index 0000000000..e640bd3663
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/editor_plugin_src.js
@@ -0,0 +1,770 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var rootAttributes = tinymce.explode('id,name,width,height,style,align,class,hspace,vspace,bgcolor,type'), excludedAttrs = tinymce.makeMap(rootAttributes.join(',')), Node = tinymce.html.Node,
+		mediaTypes, scriptRegExp, JSON = tinymce.util.JSON, mimeTypes;
+
+	// Media types supported by this plugin
+	mediaTypes = [
+		// Type, clsid:s, mime types, codebase
+		["Flash", "d27cdb6e-ae6d-11cf-96b8-444553540000", "application/x-shockwave-flash", "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],
+		["ShockWave", "166b1bca-3f9c-11cf-8075-444553540000", "application/x-director", "http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],
+		["WindowsMedia", "6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a", "application/x-mplayer2", "http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],
+		["QuickTime", "02bf25d5-8c17-4b23-bc80-d3488abddc6b", "video/quicktime", "http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],
+		["RealMedia", "cfcdaa03-8be4-11cf-b84b-0020afbbccfa", "audio/x-pn-realaudio-plugin", "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],
+		["Java", "8ad9c840-044e-11d1-b3e9-00805f499d93", "application/x-java-applet", "http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],
+		["Silverlight", "dfeaf541-f3e1-4c24-acac-99c30715084a", "application/x-silverlight-2"],
+		["Iframe"],
+		["Video"]
+	];
+
+	function toArray(obj) {
+		var undef, out, i;
+
+		if (obj && !obj.splice) {
+			out = [];
+
+			for (i = 0; true; i++) {
+				if (obj[i])
+					out[i] = obj[i];
+				else
+					break;
+			}
+
+			return out;
+		}
+
+		return obj;
+	};
+
+	tinymce.create('tinymce.plugins.MediaPlugin', {
+		init : function(ed, url) {
+			var self = this, lookup = {}, i, y, item, name;
+
+			function isMediaImg(node) {
+				return node && node.nodeName === 'IMG' && ed.dom.hasClass(node, 'mceItemMedia');
+			};
+
+			self.editor = ed;
+			self.url = url;
+
+			// Parse media types into a lookup table
+			scriptRegExp = '';
+			for (i = 0; i < mediaTypes.length; i++) {
+				name = mediaTypes[i][0];
+
+				item = {
+					name : name,
+					clsids : tinymce.explode(mediaTypes[i][1] || ''),
+					mimes : tinymce.explode(mediaTypes[i][2] || ''),
+					codebase : mediaTypes[i][3]
+				};
+
+				for (y = 0; y < item.clsids.length; y++)
+					lookup['clsid:' + item.clsids[y]] = item;
+
+				for (y = 0; y < item.mimes.length; y++)
+					lookup[item.mimes[y]] = item;
+
+				lookup['mceItem' + name] = item;
+				lookup[name.toLowerCase()] = item;
+
+				scriptRegExp += (scriptRegExp ? '|' : '') + name;
+			}
+
+			// Handle the media_types setting
+			tinymce.each(ed.getParam("media_types",
+				"video=mp4,m4v,ogv,webm;" +
+				"silverlight=xap;" +
+				"flash=swf,flv;" +
+				"shockwave=dcr;" +
+				"quicktime=mov,qt,mpg,mp3,mpeg;" +
+				"shockwave=dcr;" +
+				"windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;" +
+				"realmedia=rm,ra,ram;" +
+				"java=jar"
+			).split(';'), function(item) {
+				var i, extensions, type;
+
+				item = item.split(/=/);
+				extensions = tinymce.explode(item[1].toLowerCase());
+				for (i = 0; i < extensions.length; i++) {
+					type = lookup[item[0].toLowerCase()];
+
+					if (type)
+						lookup[extensions[i]] = type;
+				}
+			});
+
+			scriptRegExp = new RegExp('write(' + scriptRegExp + ')\\(([^)]+)\\)');
+			self.lookup = lookup;
+
+			ed.onPreInit.add(function() {
+				// Allow video elements
+				ed.schema.addValidElements('object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]');
+
+				// Convert video elements to image placeholder
+				ed.parser.addNodeFilter('object,embed,video,audio,script,iframe', function(nodes) {
+					var i = nodes.length;
+
+					while (i--)
+						self.objectToImg(nodes[i]);
+				});
+
+				// Convert image placeholders to video elements
+				ed.serializer.addNodeFilter('img', function(nodes, name, args) {
+					var i = nodes.length, node;
+
+					while (i--) {
+						node = nodes[i];
+						if ((node.attr('class') || '').indexOf('mceItemMedia') !== -1)
+							self.imgToObject(node, args);
+					}
+				});
+			});
+
+			ed.onInit.add(function() {
+				// Display "media" instead of "img" in element path
+				if (ed.theme && ed.theme.onResolveName) {
+					ed.theme.onResolveName.add(function(theme, path_object) {
+						if (path_object.name === 'img' && ed.dom.hasClass(path_object.node, 'mceItemMedia'))
+							path_object.name = 'media';
+					});
+				}
+
+				// Add contect menu if it's loaded
+				if (ed && ed.plugins.contextmenu) {
+					ed.plugins.contextmenu.onContextMenu.add(function(plugin, menu, element) {
+						if (element.nodeName === 'IMG' && element.className.indexOf('mceItemMedia') !== -1)
+							menu.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});
+					});
+				}
+			});
+
+			// Register commands
+			ed.addCommand('mceMedia', function() {
+				var data, img;
+
+				img = ed.selection.getNode();
+				if (isMediaImg(img)) {
+					data = JSON.parse(ed.dom.getAttrib(img, 'data-mce-json'));
+
+					// Add some extra properties to the data object
+					tinymce.each(rootAttributes, function(name) {
+						var value = ed.dom.getAttrib(img, name);
+
+						if (value)
+							data[name] = value;
+					});
+
+					data.type = self.getType(img.className).name.toLowerCase();
+				}
+
+				if (!data) {
+					data = {
+						type : 'flash',
+						video: {sources:[]},
+						params: {}
+					};
+				}
+
+				ed.windowManager.open({
+					file : url + '/media.htm',
+					width : 430 + parseInt(ed.getLang('media.delta_width', 0)),
+					height : 500 + parseInt(ed.getLang('media.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url,
+					data : data
+				});
+			});
+
+			// Register buttons
+			ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});
+
+			// Update media selection status
+			ed.onNodeChange.add(function(ed, cm, node) {
+				cm.setActive('media', isMediaImg(node));
+			});
+		},
+
+		convertUrl : function(url, force_absolute) {
+			var self = this, editor = self.editor, settings = editor.settings,
+				urlConverter = settings.url_converter,
+				urlConverterScope = settings.url_converter_scope || self;
+
+			if (!url)
+				return url;
+
+			if (force_absolute)
+				return editor.documentBaseURI.toAbsolute(url);
+
+			return urlConverter.call(urlConverterScope, url, 'src', 'object');
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Media',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		/**
+		 * Converts the JSON data object to an img node.
+		 */
+		dataToImg : function(data, force_absolute) {
+			var self = this, editor = self.editor, baseUri = editor.documentBaseURI, sources, attrs, img, i;
+
+			data.params.src = self.convertUrl(data.params.src, force_absolute);
+
+			attrs = data.video.attrs;
+			if (attrs)
+				attrs.src = self.convertUrl(attrs.src, force_absolute);
+
+			if (attrs)
+				attrs.poster = self.convertUrl(attrs.poster, force_absolute);
+
+			sources = toArray(data.video.sources);
+			if (sources) {
+				for (i = 0; i < sources.length; i++)
+					sources[i].src = self.convertUrl(sources[i].src, force_absolute);
+			}
+
+			img = self.editor.dom.create('img', {
+				id : data.id,
+				style : data.style,
+				align : data.align,
+				src : self.editor.theme.url + '/img/trans.gif',
+				'class' : 'mceItemMedia mceItem' + self.getType(data.type).name,
+				'data-mce-json' : JSON.serialize(data, "'")
+			});
+
+			img.width = data.width || "320";
+			img.height = data.height || "240";
+
+			return img;
+		},
+
+		/**
+		 * Converts the JSON data object to a HTML string.
+		 */
+		dataToHtml : function(data, force_absolute) {
+			return this.editor.serializer.serialize(this.dataToImg(data, force_absolute), {force_absolute : force_absolute});
+		},
+
+		/**
+		 * Converts the JSON data object to a HTML string.
+		 */
+		htmlToData : function(html) {
+			var fragment, img, data;
+
+			data = {
+				type : 'flash',
+				video: {sources:[]},
+				params: {}
+			};
+
+			fragment = this.editor.parser.parse(html);
+			img = fragment.getAll('img')[0];
+
+			if (img) {
+				data = JSON.parse(img.attr('data-mce-json'));
+				data.type = this.getType(img.attr('class')).name.toLowerCase();
+
+				// Add some extra properties to the data object
+				tinymce.each(rootAttributes, function(name) {
+					var value = img.attr(name);
+
+					if (value)
+						data[name] = value;
+				});
+			}
+
+			return data;
+		},
+
+		/**
+		 * Get type item by extension, class, clsid or mime type.
+		 *
+		 * @method getType
+		 * @param {String} value Value to get type item by.
+		 * @return {Object} Type item object or undefined.
+		 */
+		getType : function(value) {
+			var i, values, typeItem;
+
+			// Find type by checking the classes
+			values = tinymce.explode(value, ' ');
+			for (i = 0; i < values.length; i++) {
+				typeItem = this.lookup[values[i]];
+
+				if (typeItem)
+					return typeItem;
+			}
+		},
+
+		/**
+		 * Converts a tinymce.html.Node image element to video/object/embed.
+		 */
+		imgToObject : function(node, args) {
+			var self = this, editor = self.editor, video, object, embed, iframe, name, value, data,
+				source, sources, params, param, typeItem, i, item, mp4Source, replacement,
+				posterSrc, style;
+
+			// Adds the flash player
+			function addPlayer(video_src, poster_src) {
+				var baseUri, flashVars, flashVarsOutput, params, flashPlayer;
+
+				flashPlayer = editor.getParam('flash_video_player_url', self.convertUrl(self.url + '/moxieplayer.swf'));
+				if (flashPlayer) {
+					baseUri = editor.documentBaseURI;
+					data.params.src = flashPlayer;
+
+					// Convert the movie url to absolute urls
+					if (editor.getParam('flash_video_player_absvideourl', true)) {
+						video_src = baseUri.toAbsolute(video_src || '', true);
+						poster_src = baseUri.toAbsolute(poster_src || '', true);
+					}
+
+					// Generate flash vars
+					flashVarsOutput = '';
+					flashVars = editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'});
+					tinymce.each(flashVars, function(value, name) {
+						// Replace $url and $poster variables in flashvars value
+						value = value.replace(/\$url/, video_src || '');
+						value = value.replace(/\$poster/, poster_src || '');
+
+						if (value.length > 0)
+							flashVarsOutput += (flashVarsOutput ? '&' : '') + name + '=' + escape(value);
+					});
+
+					if (flashVarsOutput.length)
+						data.params.flashvars = flashVarsOutput;
+
+					params = editor.getParam('flash_video_player_params', {
+						allowfullscreen: true,
+						allowscriptaccess: true
+					});
+
+					tinymce.each(params, function(value, name) {
+						data.params[name] = "" + value;
+					});
+				}
+			};
+
+			data = JSON.parse(node.attr('data-mce-json'));
+			typeItem = this.getType(node.attr('class'));
+
+			style = node.attr('data-mce-style')
+			if (!style) {
+				style = node.attr('style');
+
+				if (style)
+					style = editor.dom.serializeStyle(editor.dom.parseStyle(style, 'img'));
+			}
+
+			// Handle iframe
+			if (typeItem.name === 'Iframe') {
+				replacement = new Node('iframe', 1);
+
+				tinymce.each(rootAttributes, function(name) {
+					var value = node.attr(name);
+
+					if (name == 'class' && value)
+						value = value.replace(/mceItem.+ ?/g, '');
+
+					if (value && value.length > 0)
+						replacement.attr(name, value);
+				});
+
+				for (name in data.params)
+					replacement.attr(name, data.params[name]);
+
+				replacement.attr({
+					style: style,
+					src: data.params.src
+				});
+
+				node.replace(replacement);
+
+				return;
+			}
+
+			// Handle scripts
+			if (this.editor.settings.media_use_script) {
+				replacement = new Node('script', 1).attr('type', 'text/javascript');
+
+				value = new Node('#text', 3);
+				value.value = 'write' + typeItem.name + '(' + JSON.serialize(tinymce.extend(data.params, {
+					width: node.attr('width'),
+					height: node.attr('height')
+				})) + ');';
+
+				replacement.append(value);
+				node.replace(replacement);
+
+				return;
+			}
+
+			// Add HTML5 video element
+			if (typeItem.name === 'Video' && data.video.sources[0]) {
+				// Create new object element
+				video = new Node('video', 1).attr(tinymce.extend({
+					id : node.attr('id'),
+					width: node.attr('width'),
+					height: node.attr('height'),
+					style : style
+				}, data.video.attrs));
+
+				// Get poster source and use that for flash fallback
+				if (data.video.attrs)
+					posterSrc = data.video.attrs.poster;
+
+				sources = data.video.sources = toArray(data.video.sources);
+				for (i = 0; i < sources.length; i++) {
+					if (/\.mp4$/.test(sources[i].src))
+						mp4Source = sources[i].src;
+				}
+
+				if (!sources[0].type) {
+					video.attr('src', sources[0].src);
+					sources.splice(0, 1);
+				}
+
+				for (i = 0; i < sources.length; i++) {
+					source = new Node('source', 1).attr(sources[i]);
+					source.shortEnded = true;
+					video.append(source);
+				}
+
+				// Create flash fallback for video if we have a mp4 source
+				if (mp4Source) {
+					addPlayer(mp4Source, posterSrc);
+					typeItem = self.getType('flash');
+				} else
+					data.params.src = '';
+			}
+
+			// Do we have a params src then we can generate object
+			if (data.params.src) {
+				// Is flv movie add player for it
+				if (/\.flv$/i.test(data.params.src))
+					addPlayer(data.params.src, '');
+
+				if (args && args.force_absolute)
+					data.params.src = editor.documentBaseURI.toAbsolute(data.params.src);
+
+				// Create new object element
+				object = new Node('object', 1).attr({
+					id : node.attr('id'),
+					width: node.attr('width'),
+					height: node.attr('height'),
+					style : style
+				});
+
+				tinymce.each(rootAttributes, function(name) {
+					if (data[name] && name != 'type')
+						object.attr(name, data[name]);
+				});
+
+				// Add params
+				for (name in data.params) {
+					param = new Node('param', 1);
+					param.shortEnded = true;
+					value = data.params[name];
+
+					// Windows media needs to use url instead of src for the media URL
+					if (name === 'src' && typeItem.name === 'WindowsMedia')
+						name = 'url';
+
+					param.attr({name: name, value: value});
+					object.append(param);
+				}
+
+				// Setup add type and classid if strict is disabled
+				if (this.editor.getParam('media_strict', true)) {
+					object.attr({
+						data: data.params.src,
+						type: typeItem.mimes[0]
+					});
+				} else {
+					object.attr({
+						classid: "clsid:" + typeItem.clsids[0],
+						codebase: typeItem.codebase
+					});
+
+					embed = new Node('embed', 1);
+					embed.shortEnded = true;
+					embed.attr({
+						id: node.attr('id'),
+						width: node.attr('width'),
+						height: node.attr('height'),
+						style : style,
+						type: typeItem.mimes[0]
+					});
+
+					for (name in data.params)
+						embed.attr(name, data.params[name]);
+
+					tinymce.each(rootAttributes, function(name) {
+						if (data[name] && name != 'type')
+							embed.attr(name, data[name]);
+					});
+
+					object.append(embed);
+				}
+
+				// Insert raw HTML
+				if (data.object_html) {
+					value = new Node('#text', 3);
+					value.raw = true;
+					value.value = data.object_html;
+					object.append(value);
+				}
+
+				// Append object to video element if it exists
+				if (video)
+					video.append(object);
+			}
+
+			if (video) {
+				// Insert raw HTML
+				if (data.video_html) {
+					value = new Node('#text', 3);
+					value.raw = true;
+					value.value = data.video_html;
+					video.append(value);
+				}
+			}
+
+			if (video || object)
+				node.replace(video || object);
+			else
+				node.remove();
+		},
+
+		/**
+		 * Converts a tinymce.html.Node video/object/embed to an img element.
+		 *
+		 * The video/object/embed will be converted into an image placeholder with a JSON data attribute like this:
+		 * <img class="mceItemMedia mceItemFlash" width="100" height="100" data-mce-json="{..}" />
+		 *
+		 * The JSON structure will be like this:
+		 * {'params':{'flashvars':'something','quality':'high','src':'someurl'}, 'video':{'sources':[{src: 'someurl', type: 'video/mp4'}]}}
+		 */
+		objectToImg : function(node) {
+			var object, embed, video, iframe, img, name, id, width, height, style, i, html,
+				param, params, source, sources, data, type, lookup = this.lookup,
+				matches, attrs, urlConverter = this.editor.settings.url_converter,
+				urlConverterScope = this.editor.settings.url_converter_scope;
+
+			function getInnerHTML(node) {
+				return new tinymce.html.Serializer({
+					inner: true,
+					validate: false
+				}).serialize(node);
+			};
+
+			// If node isn't in document
+			if (!node.parent)
+				return;
+
+			// Handle media scripts
+			if (node.name === 'script') {
+				if (node.firstChild)
+					matches = scriptRegExp.exec(node.firstChild.value);
+
+				if (!matches)
+					return;
+
+				type = matches[1];
+				data = {video : {}, params : JSON.parse(matches[2])};
+				width = data.params.width;
+				height = data.params.height;
+			}
+
+			// Setup data objects
+			data = data || {
+				video : {},
+				params : {}
+			};
+
+			// Setup new image object
+			img = new Node('img', 1);
+			img.attr({
+				src : this.editor.theme.url + '/img/trans.gif'
+			});
+
+			// Video element
+			name = node.name;
+			if (name === 'video') {
+				video = node;
+				object = node.getAll('object')[0];
+				embed = node.getAll('embed')[0];
+				width = video.attr('width');
+				height = video.attr('height');
+				id = video.attr('id');
+				data.video = {attrs : {}, sources : []};
+
+				// Get all video attributes
+				attrs = data.video.attrs;
+				for (name in video.attributes.map)
+					attrs[name] = video.attributes.map[name];
+
+				source = node.attr('src');
+				if (source)
+					data.video.sources.push({src : urlConverter.call(urlConverterScope, source, 'src', 'video')});
+
+				// Get all sources
+				sources = video.getAll("source");
+				for (i = 0; i < sources.length; i++) {
+					source = sources[i].remove();
+
+					data.video.sources.push({
+						src: urlConverter.call(urlConverterScope, source.attr('src'), 'src', 'source'),
+						type: source.attr('type'),
+						media: source.attr('media')
+					});
+				}
+
+				// Convert the poster URL
+				if (attrs.poster)
+					attrs.poster = urlConverter.call(urlConverterScope, attrs.poster, 'poster', 'video');
+			}
+
+			// Object element
+			if (node.name === 'object') {
+				object = node;
+				embed = node.getAll('embed')[0];
+			}
+
+			// Embed element
+			if (node.name === 'embed')
+				embed = node;
+
+			// Iframe element
+			if (node.name === 'iframe') {
+				iframe = node;
+				type = 'Iframe';
+			}
+
+			if (object) {
+				// Get width/height
+				width = width || object.attr('width');
+				height = height || object.attr('height');
+				style = style || object.attr('style');
+				id = id || object.attr('id');
+
+				// Get all object params
+				params = object.getAll("param");
+				for (i = 0; i < params.length; i++) {
+					param = params[i];
+					name = param.remove().attr('name');
+
+					if (!excludedAttrs[name])
+						data.params[name] = param.attr('value');
+				}
+
+				data.params.src = data.params.src || object.attr('data');
+			}
+
+			if (embed) {
+				// Get width/height
+				width = width || embed.attr('width');
+				height = height || embed.attr('height');
+				style = style || embed.attr('style');
+				id = id || embed.attr('id');
+
+				// Get all embed attributes
+				for (name in embed.attributes.map) {
+					if (!excludedAttrs[name] && !data.params[name])
+						data.params[name] = embed.attributes.map[name];
+				}
+			}
+
+			if (iframe) {
+				// Get width/height
+				width = iframe.attr('width');
+				height = iframe.attr('height');
+				style = style || iframe.attr('style');
+				id = iframe.attr('id');
+
+				tinymce.each(rootAttributes, function(name) {
+					img.attr(name, iframe.attr(name));
+				});
+
+				// Get all iframe attributes
+				for (name in iframe.attributes.map) {
+					if (!excludedAttrs[name] && !data.params[name])
+						data.params[name] = iframe.attributes.map[name];
+				}
+			}
+
+			// Use src not movie
+			if (data.params.movie) {
+				data.params.src = data.params.src || data.params.movie;
+				delete data.params.movie;
+			}
+
+			// Convert the URL to relative/absolute depending on configuration
+			if (data.params.src)
+				data.params.src = urlConverter.call(urlConverterScope, data.params.src, 'src', 'object');
+
+			if (video)
+				type = lookup.video.name;
+
+			if (object && !type)
+				type = (lookup[(object.attr('clsid') || '').toLowerCase()] || lookup[(object.attr('type') || '').toLowerCase()] || {}).name;
+
+			if (embed && !type)
+				type = (lookup[(embed.attr('type') || '').toLowerCase()] || {}).name;
+
+			// Replace the video/object/embed element with a placeholder image containing the data
+			node.replace(img);
+
+			// Remove embed
+			if (embed)
+				embed.remove();
+
+			// Serialize the inner HTML of the object element
+			if (object) {
+				html = getInnerHTML(object.remove());
+
+				if (html)
+					data.object_html = html;
+			}
+
+			// Serialize the inner HTML of the video element
+			if (video) {
+				html = getInnerHTML(video.remove());
+
+				if (html)
+					data.video_html = html;
+			}
+
+			// Set width/height of placeholder
+			img.attr({
+				id : id,
+				'class' : 'mceItemMedia mceItem' + (type || 'Flash'),
+				style : style,
+				width : width || "320",
+				height : height || "240",
+				"data-mce-json" : JSON.serialize(data, "'")
+			});
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('media', tinymce.plugins.MediaPlugin);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/js/embed.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/js/embed.js
new file mode 100644
index 0000000000..f8dc810527
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/js/embed.js
@@ -0,0 +1,73 @@
+/**
+ * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.
+ */
+
+function writeFlash(p) {
+	writeEmbed(
+		'D27CDB6E-AE6D-11cf-96B8-444553540000',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'application/x-shockwave-flash',
+		p
+	);
+}
+
+function writeShockWave(p) {
+	writeEmbed(
+	'166B1BCA-3F9C-11CF-8075-444553540000',
+	'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',
+	'application/x-director',
+		p
+	);
+}
+
+function writeQuickTime(p) {
+	writeEmbed(
+		'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',
+		'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',
+		'video/quicktime',
+		p
+	);
+}
+
+function writeRealMedia(p) {
+	writeEmbed(
+		'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'audio/x-pn-realaudio-plugin',
+		p
+	);
+}
+
+function writeWindowsMedia(p) {
+	p.url = p.src;
+	writeEmbed(
+		'6BF52A52-394A-11D3-B153-00C04F79FAA6',
+		'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',
+		'application/x-mplayer2',
+		p
+	);
+}
+
+function writeEmbed(cls, cb, mt, p) {
+	var h = '', n;
+
+	h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
+	h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';
+	h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';
+	h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';
+	h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';
+	h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';
+	h += '>';
+
+	for (n in p)
+		h += '<param name="' + n + '" value="' + p[n] + '">';
+
+	h += '<embed type="' + mt + '"';
+
+	for (n in p)
+		h += n + '="' + p[n] + '" ';
+
+	h += '></embed></object>';
+
+	document.write(h);
+}
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/js/media.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/js/media.js
new file mode 100644
index 0000000000..fcf0ca26c9
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/js/media.js
@@ -0,0 +1,340 @@
+(function() {
+	var url;
+
+	if (url = tinyMCEPopup.getParam("media_external_list_url"))
+		document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+
+	function get(id) {
+		return document.getElementById(id);
+	}
+
+	function getVal(id) {
+		var elm = get(id);
+
+		if (elm.nodeName == "SELECT")
+			return elm.options[elm.selectedIndex].value;
+
+		if (elm.type == "checkbox")
+			return elm.checked;
+
+		return elm.value;
+	}
+
+	function setVal(id, value) {
+		if (typeof(value) != 'undefined') {
+			var elm = get(id);
+
+			if (elm.nodeName == "SELECT")
+				selectByValue(document.forms[0], id, value);
+			else if (elm.type == "checkbox")
+				elm.checked = !!value;
+			else
+				elm.value = value;
+		}
+	}
+
+	window.Media = {
+		init : function() {
+			var html, editor;
+
+			this.editor = editor = tinyMCEPopup.editor;
+
+			// Setup file browsers and color pickers
+			get('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
+			get('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','quicktime_qtsrc','media','media');
+			get('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+			get('video_altsource1_filebrowser').innerHTML = getBrowserHTML('filebrowser_altsource1','video_altsource1','media','media');
+			get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('filebrowser_altsource2','video_altsource2','media','media');
+			get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','media','image');
+
+			html = this.getMediaListHTML('medialist', 'src', 'media', 'media');
+			if (html == "")
+				get("linklistrow").style.display = 'none';
+			else
+				get("linklistcontainer").innerHTML = html;
+
+			if (isVisible('filebrowser'))
+				get('src').style.width = '230px';
+
+			if (isVisible('filebrowser_altsource1'))
+				get('video_altsource1').style.width = '220px';
+
+			if (isVisible('filebrowser_altsource2'))
+				get('video_altsource2').style.width = '220px';
+
+			if (isVisible('filebrowser_poster'))
+				get('video_poster').style.width = '220px';
+
+			this.data = tinyMCEPopup.getWindowArg('data');
+			this.dataToForm();
+			this.preview();
+		},
+
+		insert : function() {
+			var editor = tinyMCEPopup.editor;
+
+			this.formToData();
+			editor.execCommand('mceRepaint');
+			tinyMCEPopup.restoreSelection();
+			editor.selection.setNode(editor.plugins.media.dataToImg(this.data));
+			tinyMCEPopup.close();
+		},
+
+		preview : function() {
+			get('prev').innerHTML = this.editor.plugins.media.dataToHtml(this.data, true);
+		},
+
+		moveStates : function(to_form, field) {
+			var data = this.data, editor = this.editor, data = this.data,
+				mediaPlugin = editor.plugins.media, ext, src, typeInfo, defaultStates, src;
+
+			defaultStates = {
+				// QuickTime
+				quicktime_autoplay : true,
+				quicktime_controller : true,
+
+				// Flash
+				flash_play : true,
+				flash_loop : true,
+				flash_menu : true,
+
+				// WindowsMedia
+				windowsmedia_autostart : true,
+				windowsmedia_enablecontextmenu : true,
+				windowsmedia_invokeurls : true,
+
+				// RealMedia
+				realmedia_autogotourl : true,
+				realmedia_imagestatus : true
+			};
+
+			function parseQueryParams(str) {
+				var out = {};
+
+				if (str) {
+					tinymce.each(str.split('&'), function(item) {
+						var parts = item.split('=');
+
+						out[unescape(parts[0])] = unescape(parts[1]);
+					});
+				}
+
+				return out;
+			};
+
+			function setOptions(type, names) {
+				var i, name, formItemName, value, list;
+
+				if (type == data.type || type == 'global') {
+					names = tinymce.explode(names);
+					for (i = 0; i < names.length; i++) {
+						name = names[i];
+						formItemName = type == 'global' ? name : type + '_' + name;
+
+						if (type == 'global')
+							list = data;
+						else if (type == 'video') {
+							list = data.video.attrs;
+
+							if (!list && !to_form)
+								data.video.attrs = list = {};
+						} else
+							list = data.params;
+
+						if (list) {
+							if (to_form) {
+								setVal(formItemName, list[name]);
+							} else {
+								delete list[name];
+
+								value = getVal(formItemName);
+								if (type == 'video' && value === true)
+									value = name;
+
+								if (defaultStates[formItemName]) {
+									if (value !== defaultStates[formItemName]) {
+										value = "" + value;
+										list[name] = value;
+									}
+								} else if (value) {
+									value = "" + value;
+									list[name] = value;
+								}
+							}
+						}
+					}
+				}
+			}
+
+			if (!to_form) {
+				data.type = get('media_type').options[get('media_type').selectedIndex].value;
+				data.width = getVal('width');
+				data.height = getVal('height');
+
+				// Switch type based on extension
+				src = getVal('src');
+				if (field == 'src') {
+					ext = src.replace(/^.*\.([^.]+)$/, '$1');
+					if (typeInfo = mediaPlugin.getType(ext))
+						data.type = typeInfo.name.toLowerCase();
+
+					setVal('media_type', data.type);
+				}
+
+				if (data.type == "video") {
+					if (!data.video.sources)
+						data.video.sources = [];
+
+					data.video.sources[0] = {src: getVal('src')};
+				}
+			}
+
+			// Hide all fieldsets and show the one active
+			get('video_options').style.display = 'none';
+			get('flash_options').style.display = 'none';
+			get('quicktime_options').style.display = 'none';
+			get('shockwave_options').style.display = 'none';
+			get('windowsmedia_options').style.display = 'none';
+			get('realmedia_options').style.display = 'none';
+
+			if (get(data.type + '_options'))
+				get(data.type + '_options').style.display = 'block';
+
+			setVal('media_type', data.type);
+
+			setOptions('flash', 'play,loop,menu,swliveconnect,quality,scale,salign,wmode,base,flashvars');
+			setOptions('quicktime', 'loop,autoplay,cache,controller,correction,enablejavascript,kioskmode,autohref,playeveryframe,targetcache,scale,starttime,endtime,target,qtsrcchokespeed,volume,qtsrc');
+			setOptions('shockwave', 'sound,progress,autostart,swliveconnect,swvolume,swstretchstyle,swstretchhalign,swstretchvalign');
+			setOptions('windowsmedia', 'autostart,enabled,enablecontextmenu,fullscreen,invokeurls,mute,stretchtofit,windowlessvideo,balance,baseurl,captioningid,currentmarker,currentposition,defaultframe,playcount,rate,uimode,volume');
+			setOptions('realmedia', 'autostart,loop,autogotourl,center,imagestatus,maintainaspect,nojava,prefetch,shuffle,console,controls,numloop,scriptcallbacks');
+			setOptions('video', 'poster,autoplay,loop,preload,controls');
+			setOptions('global', 'id,name,vspace,hspace,bgcolor,align,width,height');
+
+			if (to_form) {
+				if (data.type == 'video') {
+					if (data.video.sources[0])
+						setVal('src', data.video.sources[0].src);
+
+					src = data.video.sources[1];
+					if (src)
+						setVal('video_altsource1', src.src);
+
+					src = data.video.sources[2];
+					if (src)
+						setVal('video_altsource2', src.src);
+				} else {
+					// Check flash vars
+					if (data.type == 'flash') {
+						tinymce.each(editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'}), function(value, name) {
+							if (value == '$url')
+								data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src;
+						});
+					}
+
+					setVal('src', data.params.src);
+				}
+			} else {
+				src = getVal("src");
+	
+				// YouTube
+				if (src.match(/youtube.com(.+)v=([^&]+)/)) {
+					data.width = 425;
+					data.height = 350;
+					data.params.frameborder = '0';
+					data.type = 'iframe';
+					src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1];
+					setVal('src', src);
+				}
+
+				// Google video
+				if (src.match(/video.google.com(.+)docid=([^&]+)/)) {
+					data.width = 425;
+					data.height = 326;
+					data.type = 'flash';
+					src = 'http://video.google.com/googleplayer.swf?docId=' + src.match(/docid=([^&]+)/)[1] + '&hl=en';
+					setVal('src', src);
+				}
+
+				if (data.type == 'video') {
+					if (!data.video.sources)
+						data.video.sources = [];
+
+					data.video.sources[0] = {src : src};
+
+					src = getVal("video_altsource1");
+					if (src)
+						data.video.sources[1] = {src : src};
+
+					src = getVal("video_altsource2");
+					if (src)
+						data.video.sources[2] = {src : src};
+				} else
+					data.params.src = src;
+
+				// Set default size
+				setVal('width', data.width || 320);
+				setVal('height', data.height || 240);
+			}
+		},
+
+		dataToForm : function() {
+			this.moveStates(true);
+		},
+
+		formToData : function(field) {
+			if (field == 'source') {
+				this.moveStates(false, field);
+				setVal('source', this.editor.plugins.media.dataToHtml(this.data));
+				this.panel = 'source';
+			} else {
+				if (this.panel == 'source') {
+					this.data = this.editor.plugins.media.htmlToData(getVal('source'));
+					this.dataToForm();
+					this.panel = '';
+				}
+
+				this.moveStates(false, field);
+				this.preview();
+			}
+		},
+
+		changeSize : function(type) {
+			var width, height, scale, size;
+
+			if (get('constrain').checked) {
+				width = parseInt(getVal('width') || "320", 10);
+				height = parseInt(getVal('height') || "240", 10);
+
+				if (type == 'width')
+					setVal('height', Math.round((width / this.data.width) * width));
+				else
+					setVal('width', Math.round((height / this.data.height) * height));
+			}
+
+			this.formToData();
+		},
+
+		getMediaListHTML : function() {
+			if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {
+				var html = "";
+
+				html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;Media.formToData(\'src\');">';
+				html += '<option value="">---</option>';
+
+				for (var i=0; i<tinyMCEMediaList.length; i++)
+					html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
+
+				html += '</select>';
+
+				return html;
+			}
+
+			return "";
+		}
+	};
+
+	tinyMCEPopup.requireLangPack();
+	tinyMCEPopup.onInit.add(function() {
+		Media.init();
+	});
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/da_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/da_dlg.js
new file mode 100644
index 0000000000..10e6a08b3a
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/da_dlg.js
@@ -0,0 +1,103 @@
+tinyMCE.addI18n('da.media_dlg',{
+title:"Inds\u00E6t/rediger indlejret mediefil",
+general:"Generelt",
+advanced:"Advanceret",
+file:"Fil/URL",
+list:"Liste",
+size:"Dimensioner",
+preview:"Vis udskrift",
+constrain_proportions:"Bevar proportioner",
+type:"Type",
+id:"Id",
+name:"Navn",
+class_name:"Klasse",
+vspace:"V-afstand",
+hspace:"H-afstand",
+play:"Start",
+loop:"Gentag",
+menu:"Vis menu",
+quality:"Kvalitet",
+scale:"Skaler",
+align:"Juster",
+salign:"SAlign",
+wmode:"WMode",
+bgcolor:"Baggrund",
+base:"Base",
+flashvars:"Flashvars",
+liveconnect:"SWLiveConnect",
+autohref:"AutoHREF",
+cache:"Cache",
+hidden:"Skjul",
+controller:"Controller",
+kioskmode:"Kiosk-tilstand",
+playeveryframe:"Afsplil alle rammer",
+targetcache:"M\u00E5l-cache",
+correction:"Ingen korrektion",
+enablejavascript:"Tillad JavaScript",
+starttime:"Starttidspunkt",
+endtime:"Sluttidspunkt",
+href:"Href",
+qtsrcchokespeed:"Choke-hastighed",
+target:"M\u00E5l",
+volume:"Lydstyrke",
+autostart:"Afspil automatisk",
+enabled:"Valgt",
+fullscreen:"Fulssk\u00E6rm",
+invokeurls:"Aktiver URL'er",
+mute:"Lydl\u00F8s",
+stretchtofit:"Str\u00E6k for at tilpasse",
+windowlessvideo:"Vinduesl\u00F8s video",
+balance:"Balance",
+baseurl:"Base URL",
+captioningid:"Captioning id",
+currentmarker:"Aktuel mark\u00F8r",
+currentposition:"Aktuel position",
+defaultframe:"Standard ramme",
+playcount:"Afspil indhold",
+rate:"Vurder",
+uimode:"UI-tilstand",
+flash_options:"Flash egenskaber",
+qt_options:"Quicktime egenskaber",
+wmp_options:"Windows media player egenskaber",
+rmp_options:"Real media player egenskaber",
+shockwave_options:"Shockwave options",
+autogotourl:"Auto g\u00E5 til URL",
+center:"Center",
+imagestatus:"Billedstatus",
+maintainaspect:"Bevar aspekt",
+nojava:"Ingen java",
+prefetch:"Forh\u00E5ndshent",
+shuffle:"Bland",
+console:"Konsol",
+numloop:"Antal loops",
+controls:"Kontroller",
+scriptcallbacks:"Script callbacks",
+swstretchstyle:"Str\u00E6k stil",
+swstretchhalign:"Str\u00E6k H-justering",
+swstretchvalign:"Str\u00E6k V-justering",
+sound:"Lyd",
+progress:"Fremskridt",
+qtsrc:"QT Src",
+qt_stream_warn:"Streamede rtsp resourcer skal tilf\u00F8jes til QT Src feltet under tabben avanceret.\nDu skal ogs\u00E5 tilf\u00F8je en ikke streamet version til Src feltet..",
+align_top:"Top",
+align_right:"H\u00F8jret",
+align_bottom:"Bund",
+align_left:"Venstre",
+align_center:"Centreret",
+align_top_left:"\u00D8verste venstre hj\u00F8rne",
+align_top_right:"\u00D8verste h\u00F8jre hj\u00F8rne",
+align_bottom_left:"Nederste venstre hj\u00F8rne",
+align_bottom_right:"\u00D8verste h\u00F8jre hj\u00F8rne",
+flv_options:"Flash video egenskaber",
+flv_scalemode:"Skaleringstilstand",
+flv_buffer:"Buffer",
+flv_startimage:"Startbillede",
+flv_starttime:"Starttidspunkt",
+flv_defaultvolume:"Standard lydstyrke",
+flv_hiddengui:"Skjul sk\u00E6rmbillede",
+flv_autostart:"Autostart",
+flv_loop:"Gentag",
+flv_showscalemodes:"Vis skaleringstilstande",
+flv_smoothvideo:"Smooth video",
+flv_jscallback:"JS Callback"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/de_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/de_dlg.js
new file mode 100644
index 0000000000..5483da9e78
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/de_dlg.js
@@ -0,0 +1,103 @@
+tinyMCE.addI18n('de.media_dlg',{
+title:"Multimedia-Inhalte einf\u00FCgen/bearbeiten",
+general:"Allgemein",
+advanced:"Erweitert",
+file:"Datei/URL",
+list:"Liste",
+size:"Abmessungen",
+preview:"Vorschau",
+constrain_proportions:"Proportionen erhalten",
+type:"Typ",
+id:"Id",
+name:"Name",
+class_name:"CSS-Klasse",
+vspace:"Vertikaler Abstand",
+hspace:"Horizontaler Abstand",
+play:"Automatisches Abspielen",
+loop:"Wiederholung",
+menu:"Men\u00FC anzeigen",
+quality:"Qualit\u00E4t",
+scale:"Skalierung",
+align:"Ausrichtung",
+salign:"S-Ausrichtung",
+wmode:"WMode",
+bgcolor:"Hintergrund",
+base:"Base",
+flashvars:"Flashvariablen",
+liveconnect:"SWLiveConnect",
+autohref:"AutoHREF",
+cache:"Zwischenspeicher",
+hidden:"Versteckt",
+controller:"Controller",
+kioskmode:"Kioskmodus",
+playeveryframe:"Jeden Frame abspielen",
+targetcache:"Ziel zwischenspeichern",
+correction:"Ohne Korrektur",
+enablejavascript:"JavaScript aktivieren",
+starttime:"Startzeitpunkt",
+endtime:"Endzeitpunkt",
+href:"Href",
+qtsrcchokespeed:"Choke speed",
+target:"Ziel",
+volume:"Lautst\u00E4rke",
+autostart:"Autostart",
+enabled:"Aktiviert",
+fullscreen:"Vollbild",
+invokeurls:"Invoke URLs",
+mute:"Stumm",
+stretchtofit:"Anzeigefl\u00E4che an verf\u00FCgbaren Platz anpassen",
+windowlessvideo:"Fensterloses Video",
+balance:"Balance",
+baseurl:"Base URL",
+captioningid:"Captioning id",
+currentmarker:"Aktueller Marker",
+currentposition:"Aktuelle Position",
+defaultframe:"Frame-Voreinstellung",
+playcount:"Z\u00E4hler",
+rate:"Rate",
+uimode:"UI Modus",
+flash_options:"Flash-Optionen",
+qt_options:"Quicktime-Optionen",
+wmp_options:"Optionen f\u00FCr Windows Media Player",
+rmp_options:"Optionen f\u00FCr Real Media Player",
+shockwave_options:"Shockwave-Optionen",
+autogotourl:"Auto goto URL",
+center:"Zentriert",
+imagestatus:"Bildstatus",
+maintainaspect:"Bildverh\u00E4ltnis beibehalten",
+nojava:"Kein Java",
+prefetch:"Prefetch",
+shuffle:"Zuf\u00E4llige Wiedergabe",
+console:"Konsole",
+numloop:"Anzahl Wiederholungen",
+controls:"Steuerung",
+scriptcallbacks:"Script callbacks",
+swstretchstyle:"Stretch style",
+swstretchhalign:"Stretch H-Ausrichtung",
+swstretchvalign:"Stretch V-Ausrichtung",
+sound:"Ton",
+progress:"Fortschritt",
+qtsrc:"QT Src",
+qt_stream_warn:"In den Erweiterten Einstellungen sollten im Feld 'QT Src' gestreamte rtsp Resourcen hinzugef\u00FCgt werden.\nzus\u00E4tzlich sollten Sie dort auch eine nicht-gestreamte Resource angeben.",
+align_top:"Oben",
+align_right:"Rechts",
+align_bottom:"Unten",
+align_left:"Links",
+align_center:"Zentriert",
+align_top_left:"Oben Links",
+align_top_right:"Oben Rechts",
+align_bottom_left:"Unten Links",
+align_bottom_right:"Unten Rechts",
+flv_options:"Optionen f\u00FCr Flash Video",
+flv_scalemode:"Skalierungsmodus",
+flv_buffer:"Puffer",
+flv_startimage:"Startbild",
+flv_starttime:"Startzeitpunkt",
+flv_defaultvolume:"Standardlautst\u00E4rke",
+flv_hiddengui:"Versteckte GUI",
+flv_autostart:"Autostart",
+flv_loop:"Wiederholung",
+flv_showscalemodes:"Skalierungsmodi anzeigen",
+flv_smoothvideo:"Smooth Video",
+flv_jscallback:"JS Callback"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/en_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/en_dlg.js
new file mode 100644
index 0000000000..29d26a0d41
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/en_dlg.js
@@ -0,0 +1,109 @@
+tinyMCE.addI18n('en.media_dlg',{
+title:"Insert / edit embedded media",
+general:"General",
+advanced:"Advanced",
+file:"File/URL",
+list:"List",
+size:"Dimensions",
+preview:"Preview",
+constrain_proportions:"Constrain proportions",
+type:"Type",
+id:"Id",
+name:"Name",
+class_name:"Class",
+vspace:"V-Space",
+hspace:"H-Space",
+play:"Auto play",
+loop:"Loop",
+menu:"Show menu",
+quality:"Quality",
+scale:"Scale",
+align:"Align",
+salign:"SAlign",
+wmode:"WMode",
+bgcolor:"Background",
+base:"Base",
+flashvars:"Flashvars",
+liveconnect:"SWLiveConnect",
+autohref:"AutoHREF",
+cache:"Cache",
+hidden:"Hidden",
+controller:"Controller",
+kioskmode:"Kiosk mode",
+playeveryframe:"Play every frame",
+targetcache:"Target cache",
+correction:"No correction",
+enablejavascript:"Enable JavaScript",
+starttime:"Start time",
+endtime:"End time",
+href:"Href",
+qtsrcchokespeed:"Choke speed",
+target:"Target",
+volume:"Volume",
+autostart:"Auto start",
+enabled:"Enabled",
+fullscreen:"Fullscreen",
+invokeurls:"Invoke URLs",
+mute:"Mute",
+stretchtofit:"Stretch to fit",
+windowlessvideo:"Windowless video",
+balance:"Balance",
+baseurl:"Base URL",
+captioningid:"Captioning id",
+currentmarker:"Current marker",
+currentposition:"Current position",
+defaultframe:"Default frame",
+playcount:"Play count",
+rate:"Rate",
+uimode:"UI Mode",
+flash_options:"Flash options",
+qt_options:"Quicktime options",
+wmp_options:"Windows media player options",
+rmp_options:"Real media player options",
+shockwave_options:"Shockwave options",
+autogotourl:"Auto goto URL",
+center:"Center",
+imagestatus:"Image status",
+maintainaspect:"Maintain aspect",
+nojava:"No java",
+prefetch:"Prefetch",
+shuffle:"Shuffle",
+console:"Console",
+numloop:"Num loops",
+controls:"Controls",
+scriptcallbacks:"Script callbacks",
+swstretchstyle:"Stretch style",
+swstretchhalign:"Stretch H-Align",
+swstretchvalign:"Stretch V-Align",
+sound:"Sound",
+progress:"Progress",
+qtsrc:"QT Src",
+qt_stream_warn:"Streamed rtsp resources should be added to the QT Src field under the advanced tab.\nYou should also add a non streamed version to the Src field..",
+align_top:"Top",
+align_right:"Right",
+align_bottom:"Bottom",
+align_left:"Left",
+align_center:"Center",
+align_top_left:"Top left",
+align_top_right:"Top right",
+align_bottom_left:"Bottom left",
+align_bottom_right:"Bottom right",
+flv_options:"Flash video options",
+flv_scalemode:"Scale mode",
+flv_buffer:"Buffer",
+flv_starttime:"Start time",
+flv_defaultvolume:"Default volumne",
+flv_hiddengui:"Hidden GUI",
+flv_autostart:"Auto start",
+flv_loop:"Loop",
+flv_showscalemodes:"Show scale modes",
+flv_smoothvideo:"Smooth video",
+flv_jscallback:"JS Callback",
+html5_video_options:"HTML5 Video Options",
+altsource1:"Alternative source 1",
+altsource2:"Alternative source 2",
+preload:"Preload",
+poster:"Poster",
+
+source:"Source"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/es_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/es_dlg.js
new file mode 100644
index 0000000000..7765ab3307
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/es_dlg.js
@@ -0,0 +1,103 @@
+tinyMCE.addI18n('es.media_dlg',{
+title:"Insertar/editar medio embebido",
+general:"General",
+advanced:"Avanzado",
+file:"Archivo/URL",
+list:"Lista",
+size:"Dimensiones",
+preview:"Vista Previa",
+constrain_proportions:"Bloquear relaci\u00F3n de aspecto",
+type:"Tipo",
+id:"Id",
+name:"Nombre",
+class_name:"Clase",
+vspace:"V-Space",
+hspace:"H-Space",
+play:"Comienzo Autom\u00E1tico",
+loop:"Repetitivo",
+menu:"Mostrar Men\u00FA",
+quality:"Calidad",
+scale:"Scale",
+align:"Alineaci\u00F3n",
+salign:"SAlign",
+wmode:"WMode",
+bgcolor:"Fondo",
+base:"Base",
+flashvars:"Flashvars",
+liveconnect:"SWLiveConnect",
+autohref:"AutoHREF",
+cache:"Cach\u00E9",
+hidden:"Hidden",
+controller:"Controller",
+kioskmode:"Kiosk mode",
+playeveryframe:"Reproducir todo los frames",
+targetcache:"Target cache",
+correction:"Sin correci\u00F3n",
+enablejavascript:"Habilitar JavaScript",
+starttime:"Inicio",
+endtime:"Fin",
+href:"Href",
+qtsrcchokespeed:"Vel. de choque",
+target:"Target",
+volume:"Volumen",
+autostart:"Comienzo Autom\u00E1tico",
+enabled:"Habilitado",
+fullscreen:"Pantalla Completa",
+invokeurls:"Invocar URLs",
+mute:"Silencio",
+stretchtofit:"Estirar para ajustar",
+windowlessvideo:"Video sin ventana",
+balance:"Balance",
+baseurl:"URL Base",
+captioningid:"Captioning id",
+currentmarker:"Marcador actual",
+currentposition:"Posici\u00F3n actual",
+defaultframe:"Frame predet.",
+playcount:"Cuantas reproducciones",
+rate:"Ratio",
+uimode:"Modo UI",
+flash_options:"Opciones Flash",
+qt_options:"Opciones Quicktime",
+wmp_options:"Opciones Windows media player",
+rmp_options:"Opciones Real media player",
+shockwave_options:"Opciones Shockwave",
+autogotourl:"Ir a URL autom\u00E1t.",
+center:"Centrado",
+imagestatus:"Estado de imagen",
+maintainaspect:"Mantener aspecto",
+nojava:"No java",
+prefetch:"Preb\u00FAsqueda",
+shuffle:"Aleatorio",
+console:"Consola",
+numloop:"N\u00FAm. repeticiones",
+controls:"Controles",
+scriptcallbacks:"Script callbacks",
+swstretchstyle:"Estilo estiramiento",
+swstretchhalign:"Alin. H. Estiramiento",
+swstretchvalign:"Alin. V. Estiramiento",
+sound:"Sonido",
+progress:"Progreso",
+qtsrc:"QT Src",
+qt_stream_warn:"Los recursos rtsp de Streaming deber\u00EDan a\u00F1adirse en el campo QT Src de la pesta\u00F1a avanzada.\nAdem\u00E1s deber\u00EDa a\u00F1adir una versi\u00F3n no Streaming en el campo Src.",
+align_top:"Arriba",
+align_right:"Derecha",
+align_bottom:"Debajo",
+align_left:"Izquierda",
+align_center:"Centrado",
+align_top_left:"Arriba Izda.",
+align_top_right:"Arriba Dcha.",
+align_bottom_left:"Debajo Izda.",
+align_bottom_right:"Debajo Dcha.",
+flv_options:"Opciones Video Flash",
+flv_scalemode:"Modo escalado",
+flv_buffer:"Buffer",
+flv_startimage:"Imagen inicio",
+flv_starttime:"Tiempo inicio",
+flv_defaultvolume:"Volumen predet.",
+flv_hiddengui:"Ocultar GUI",
+flv_autostart:"Inicio auto.",
+flv_loop:"Repetitivo",
+flv_showscalemodes:"Mostrar modos escala",
+flv_smoothvideo:"Video suave",
+flv_jscallback:"JS Callback"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/fr_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/fr_dlg.js
new file mode 100644
index 0000000000..f3b6448ae8
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/fr_dlg.js
@@ -0,0 +1,103 @@
+tinyMCE.addI18n('fr.media_dlg',{
+title:"Ins\u00E9rer/\u00C9diter un fichier m\u00E9dia",
+general:"G\u00E9n\u00E9ral",
+advanced:"Avanc\u00E9",
+file:"Fichier / URL",
+list:"Liste",
+size:"Dimensions",
+preview:"Pr\u00E9visualiser",
+constrain_proportions:"Conserver les proportions",
+type:"Type",
+id:"Id",
+name:"Nom",
+class_name:"Classe",
+vspace:"Espacement vertical",
+hspace:"Espacement horizontal",
+play:"Lecture automatique",
+loop:"Lire en boucle",
+menu:"Afficher le menu",
+quality:"Qualit\u00E9",
+scale:"\u00C9chelle",
+align:"Alignement",
+salign:"SAlign",
+wmode:"WMode",
+bgcolor:"Fond",
+base:"Base",
+flashvars:"Variables flash",
+liveconnect:"SWLiveConnect",
+autohref:"AutoHREF",
+cache:"Cache",
+hidden:"Cach\u00E9",
+controller:"Controlleur",
+kioskmode:"Mode kiosque",
+playeveryframe:"Jouer toutes les images",
+targetcache:"Cache cible",
+correction:"Pas de correction",
+enablejavascript:"Activer le JavaScript",
+starttime:"Temps de d\u00E9but",
+endtime:"Temps de fin",
+href:"Href",
+qtsrcchokespeed:"Choke speed",
+target:"Cible",
+volume:"Volume",
+autostart:"Lire automatiquement",
+enabled:"Activ\u00E9",
+fullscreen:"Plein \u00E9cran",
+invokeurls:"Invoquer URLs",
+mute:"Silence",
+stretchtofit:"\u00C9tendre pour adapter la taille",
+windowlessvideo:"Vid\u00E9o sans fen\u00EAtre",
+balance:"Balance",
+baseurl:"Adresse de base",
+captioningid:"Captioning id",
+currentmarker:"Marqueur actuel",
+currentposition:"Position actuelle",
+defaultframe:"Image par d\u00E9faut",
+playcount:"Compteur",
+rate:"Taux",
+uimode:"Mode UI",
+flash_options:"Options Flash",
+qt_options:"Options Quicktime",
+wmp_options:"Windows media player options",
+rmp_options:"Options Real media player",
+shockwave_options:"Options Shockwave",
+autogotourl:"Aller automatiquement \u00E0 l'URL",
+center:"Centrer",
+imagestatus:"Statut de l'image",
+maintainaspect:"Maintenir l'aspect",
+nojava:"Pas java",
+prefetch:"Prefetch",
+shuffle:"Al\u00E9atoire",
+console:"Console",
+numloop:"Nombre de tours",
+controls:"Contr\u00F4les",
+scriptcallbacks:"Callback de script",
+swstretchstyle:"Stretch style",
+swstretchhalign:"Stretch horizontal",
+swstretchvalign:"Stretch vertical",
+sound:"Son",
+progress:"Progr\u00E8s",
+qtsrc:"QT Src",
+qt_stream_warn:"Les ressources stream\u00E9es rtsp doivent \u00EAtre ajout\u00E9es au champs QT Src dans l'onglet avanc\u00E9.\nVous devriez aussi ajouter une version non stream\u00E9e au QT src.",
+align_top:"Haut",
+align_right:"Droit",
+align_bottom:"Bas",
+align_left:"Gauche",
+align_center:"Centr\u00E9",
+align_top_left:"Haut gauche",
+align_top_right:"haut droit",
+align_bottom_left:"Bas gauche",
+align_bottom_right:"Bas droite",
+flv_options:"Options de la vid\u00E9o Flash",
+flv_scalemode:"Mode \u00E0 l'\u00E9chelle",
+flv_buffer:"Tampon",
+flv_startimage:"Image de d\u00E9but",
+flv_starttime:"Temps au d\u00E9but",
+flv_defaultvolume:"Volume par d\u00E9faut",
+flv_hiddengui:"Interface utilisateur cach\u00E9e",
+flv_autostart:"D\u00E9marage automatique",
+flv_loop:"En boucle",
+flv_showscalemodes:"Montrer les diff\u00E9rentes \u00E9chelles",
+flv_smoothvideo:"Vid\u00E9o adoucie",
+flv_jscallback:"Callback JavaScript"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/it_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/it_dlg.js
new file mode 100644
index 0000000000..265c30bd23
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/it_dlg.js
@@ -0,0 +1,103 @@
+tinyMCE.addI18n('it.media_dlg',{
+title:"Inserisci/modifica file multimediale",
+general:"Generale",
+advanced:"Avanzate",
+file:"File/URL",
+list:"Lista",
+size:"Dimensioni",
+preview:"Anteprima",
+constrain_proportions:"Mantieni proporzioni",
+type:"Tipo",
+id:"Id",
+name:"Nome",
+class_name:"Classe",
+vspace:"V-Space",
+hspace:"H-Space",
+play:"Esecuzione automatica",
+loop:"Riproduzione ciclica",
+menu:"Mostra menu",
+quality:"Qualit\u00E0",
+scale:"Scala",
+align:"Allineamento",
+salign:"SAlign",
+wmode:"WMode",
+bgcolor:"Sfondo",
+base:"Base",
+flashvars:"Flashvars",
+liveconnect:"SWLiveConnect",
+autohref:"AutoHREF",
+cache:"Cache",
+hidden:"Nascosto",
+controller:"Controller",
+kioskmode:"Modalit\u00E0 Kiosk",
+playeveryframe:"Esegui ogni frame",
+targetcache:"Cache del target",
+correction:"Nessuna correzione",
+enablejavascript:"Abilita JavaScript",
+starttime:"Ora inizio",
+endtime:"Ora fine",
+href:"Href",
+qtsrcchokespeed:"Velocit\u00E0 cursore",
+target:"Target",
+volume:"Volume",
+autostart:"Avvio automatico",
+enabled:"Abilitato",
+fullscreen:"Tutto schermo",
+invokeurls:"Invoca URLs",
+mute:"Muto",
+stretchtofit:"Adatta dimensioni",
+windowlessvideo:"Video senza finestra",
+balance:"Bilanciamento",
+baseurl:"URL base",
+captioningid:"Didascalia dell'Id",
+currentmarker:"Indicatore corrente",
+currentposition:"Posizione corrente",
+defaultframe:"frame predefinito",
+playcount:"Conteggio esecuzione",
+rate:"Qualit\u00E0",
+uimode:"Modalit\u00E0 Interfaccia Utente",
+flash_options:"Opzioni Flash",
+qt_options:"Opzioni Quicktime",
+wmp_options:"Opzioni Windows media player",
+rmp_options:"Opzioni Real media player",
+shockwave_options:"Opzioni Shockwave",
+autogotourl:"Vai a URL automatico",
+center:"Centra",
+imagestatus:"Stato immagine",
+maintainaspect:"Mantieni aspetto",
+nojava:"No java",
+prefetch:"Precaricamento",
+shuffle:"Shuffle",
+console:"Console",
+numloop:"Numero cicli",
+controls:"Controlli",
+scriptcallbacks:"Script callbacks",
+swstretchstyle:"Stretch style",
+swstretchhalign:"Stretch H-Align",
+swstretchvalign:"Stretch V-Align",
+sound:"Suono",
+progress:"Avanzamento",
+qtsrc:"Sorgente QT",
+qt_stream_warn:"Le risorse rstp 'streamed' devono essere aggiunte al campo Sorgente QT nella tabella Avanzate.\nSi dovrebbe inserire anche una versione non 'streamed' al campo Sorgente..",
+align_top:"Alto",
+align_right:"Destra",
+align_bottom:"Basso",
+align_left:"Sinistra",
+align_center:"Centro",
+align_top_left:"Alto a sinistra",
+align_top_right:"Alto a destra",
+align_bottom_left:"Basso a sinistra",
+align_bottom_right:"Basso a destra",
+flv_options:"Opzioni video Flash",
+flv_scalemode:"Scale mode",
+flv_buffer:"Buffer",
+flv_startimage:"Immagine avvio",
+flv_starttime:"Tempo avvio",
+flv_defaultvolume:"Volume predefinito",
+flv_hiddengui:"GUI nascosta",
+flv_autostart:"Avvio automatico",
+flv_loop:"Riproduzione ciclica",
+flv_showscalemodes:"Mostra scale modes",
+flv_smoothvideo:"Smooth video",
+flv_jscallback:"JS Callback"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/nl_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/nl_dlg.js
new file mode 100644
index 0000000000..46ab6affb2
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/nl_dlg.js
@@ -0,0 +1,103 @@
+tinyMCE.addI18n('nl.media_dlg',{
+title:"Media invoegen/bewerken",
+general:"Algemeen",
+advanced:"Geavanceerd",
+file:"Bestand/URL",
+list:"Lijst",
+size:"Afmetingen",
+preview:"Voorbeeld",
+constrain_proportions:"Verhouding bewaren",
+type:"Type",
+id:"Id",
+name:"Naam",
+class_name:"Klasse",
+vspace:"V-Ruimte",
+hspace:"H-Ruimte",
+play:"Automatisch afspelen",
+loop:"Herhalen",
+menu:"Menu Weergeven",
+quality:"Kwaliteit",
+scale:"Schaal",
+align:"Uitlijning",
+salign:"Schaaluitlijning",
+wmode:"WMode",
+bgcolor:"Achtergrond",
+base:"Basis",
+flashvars:"Variabelen",
+liveconnect:"SWLiveConnect",
+autohref:"AutoHREF",
+cache:"Cache",
+hidden:"Verborgen",
+controller:"Controller",
+kioskmode:"Kioskmodus",
+playeveryframe:"Elk frame afspelen",
+targetcache:"Doelcache",
+correction:"Geen correctie",
+enablejavascript:"JavaScript Inschakelen",
+starttime:"Starttijd",
+endtime:"Eindtijd",
+href:"HREF",
+qtsrcchokespeed:"Chokesnelheid",
+target:"Doel",
+volume:"Volume",
+autostart:"Automatisch afspelen",
+enabled:"Ingeschakeld",
+fullscreen:"Volledig scherm",
+invokeurls:"URLs laden",
+mute:"Geluid dempen",
+stretchtofit:"Passend maken",
+windowlessvideo:"Video zonder venster",
+balance:"Balans",
+baseurl:"BasisURL",
+captioningid:"Ondertiteling id",
+currentmarker:"Huidige markering",
+currentposition:"Huidige positie",
+defaultframe:"Standaard frame",
+playcount:"Afspeelteller",
+rate:"Snelheid",
+uimode:"UI Modus",
+flash_options:"Flash opties",
+qt_options:"Quicktime opties",
+wmp_options:"Windows mediaspeler opties",
+rmp_options:"Real mediaspeler opties",
+shockwave_options:"Shockwave opties",
+autogotourl:"Automatisch naar URL",
+center:"Centreren",
+imagestatus:"Afbeeldingstatus",
+maintainaspect:"Verhouding bewaren",
+nojava:"Geen java",
+prefetch:"Voorladen",
+shuffle:"Willekeurige volgorde",
+console:"Console",
+numloop:"Aantal herhalingen",
+controls:"Bediening",
+scriptcallbacks:"Script callbacks",
+swstretchstyle:"Schaal",
+swstretchhalign:"H-Schaal",
+swstretchvalign:"V-Schaal",
+sound:"Geluid",
+progress:"Voortgang",
+qtsrc:"Quicktime bron",
+qt_stream_warn:"Gestreamde RTSP bronnen dienen op het tabblad geavanceerd bij Quicktime bron te worden opgegeven.\nDe niet-gestreamde versie kan dan bij het tabblad algemeen worden opgegeven.",
+align_top:"Boven",
+align_right:"Rechts",
+align_bottom:"Onder",
+align_left:"Links",
+align_center:"Centreren",
+align_top_left:"Linksboven",
+align_top_right:"Rechtsboven",
+align_bottom_left:"Linksonder",
+align_bottom_right:"Rechtsonder",
+flv_options:"Flash video-opties",
+flv_scalemode:"Schaalmodus",
+flv_buffer:"Buffer",
+flv_startimage:"Startafbeelding",
+flv_starttime:"Starttijd",
+flv_defaultvolume:"Standaard volumne",
+flv_hiddengui:"GUI verbergen",
+flv_autostart:"Automatisch afspelen",
+flv_loop:"Herhalen",
+flv_showscalemodes:"Schaalmodus weergeven",
+flv_smoothvideo:"Soepele video",
+flv_jscallback:"JS Callback"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/no_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/no_dlg.js
new file mode 100644
index 0000000000..cc32b590b7
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/no_dlg.js
@@ -0,0 +1,103 @@
+tinyMCE.addI18n('no.media_dlg',{
+title:"Sett inn / rediger inkludert objekt",
+general:"Generelt",
+advanced:"Avansert",
+file:"Fil/URL",
+list:"Liste",
+size:"St\u00F8rrelse",
+preview:"Forh\u00E5ndsvis",
+constrain_proportions:"Behold proporsjoner",
+type:"Type",
+id:"Id",
+name:"Navn",
+class_name:"Klasse",
+vspace:"Vertikal avstand",
+hspace:"Horisontal avstand",
+play:"Autostart",
+loop:"L\u00F8kke",
+menu:"Vis meny",
+quality:"Kvalitet",
+scale:"Skalering",
+align:"Justering",
+salign:"S-justering",
+wmode:"W-modus",
+bgcolor:"Bakgrunn",
+base:"Base",
+flashvars:"Flash-variabler",
+liveconnect:"SWLiveConnect",
+autohref:"AutoHREF",
+cache:"Cache",
+hidden:"Skjult",
+controller:"Kontroller",
+kioskmode:"Kiosk-modus",
+playeveryframe:"Spill hver ramme",
+targetcache:"M\u00E5l-cache",
+correction:"Ingen korreksjon",
+enablejavascript:"Tillat Javaskript",
+starttime:"Starttid",
+endtime:"Stopptid",
+href:"Href",
+qtsrcchokespeed:"Choke speed",
+target:"M\u00E5l",
+volume:"Volum",
+autostart:"Autostart",
+enabled:"Kj\u00F8rbar",
+fullscreen:"Fullskjerm",
+invokeurls:"Aktiviser URL-ar",
+mute:"Demp",
+stretchtofit:"Strekk for \u00E5 passe inn",
+windowlessvideo:"Video uten vindu",
+balance:"Balanse",
+baseurl:"Base URL",
+captioningid:"Fange opp id",
+currentmarker:"Aktiv mark\u00F8r",
+currentposition:"Aktiv posisjon",
+defaultframe:"Standardramme",
+playcount:"Teller",
+rate:"Rangering",
+uimode:"UI-modus",
+flash_options:"Flash-egenskaper",
+qt_options:"Quicktime-innstillinger",
+wmp_options:"Windows mediaplayer-innstillinger",
+rmp_options:"Real mediaplayer-innstillinger",
+shockwave_options:"Shockwave-innstillinger",
+autogotourl:"Auto-g\u00E5-til-URL",
+center:"Midtstill",
+imagestatus:"Status for bilde",
+maintainaspect:"Behold proporsjoner",
+nojava:"Ikke Java",
+prefetch:"Registrer p\u00E5 forh\u00E5nd",
+shuffle:"Miks",
+console:"Konsoll",
+numloop:"Antall gjennomganger",
+controls:"Kontroller",
+scriptcallbacks:"Skript-referanser",
+swstretchstyle:"Strekkstil",
+swstretchhalign:"Strekk H-justering",
+swstretchvalign:"Strekk V-justering",
+sound:"Lyd",
+progress:"Framdrift",
+qtsrc:"QT Src",
+qt_stream_warn:"Streama rtsp-ressurser b\u00F8r leggest til QT Src-feltet i avansert-fanen.\nDu b\u00F8r ogs\u00E5 legge til en ikke-streama versjon i src-feltet",
+align_top:"Topp",
+align_right:"H\u00F8yre",
+align_bottom:"Bunn",
+align_left:"Venstre",
+align_center:"Midt",
+align_top_left:"Topp venstre",
+align_top_right:"Topp h\u00F8yre",
+align_bottom_left:"Bunn venste",
+align_bottom_right:"Bunn h\u00F8gre",
+flv_options:"Flash video-valg",
+flv_scalemode:"Skalering",
+flv_buffer:"Buffer",
+flv_startimage:"Startbilde",
+flv_starttime:"Starttid",
+flv_defaultvolume:"Standardvolum",
+flv_hiddengui:"Skjult GUI",
+flv_autostart:"Autostart",
+flv_loop:"L\u00F8kke",
+flv_showscalemodes:"Vis skalering",
+flv_smoothvideo:"Jevn video",
+flv_jscallback:"JS Callback"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/sv_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/sv_dlg.js
new file mode 100644
index 0000000000..4b8f2c97d3
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/langs/sv_dlg.js
@@ -0,0 +1,103 @@
+tinyMCE.addI18n('sv.media_dlg',{
+title:"Infoga/redigera inb\u00E4ddad media",
+general:"Generellt",
+advanced:"Avancerat",
+file:"Fil/URL",
+list:"Lista",
+size:"Dimensioner",
+preview:"F\u00F6rhandsvisning",
+constrain_proportions:"Bibeh\u00E5ll proportionerna",
+type:"Typ",
+id:"Id",
+name:"Namn",
+class_name:"Klass",
+vspace:"V-Space",
+hspace:"H-Space",
+play:"Spela upp automatiskt",
+loop:"Loopa",
+menu:"Visa menyn",
+quality:"Kvalit\u00E9",
+scale:"Skala",
+align:"Justera",
+salign:"SAlign",
+wmode:"WMode",
+bgcolor:"Bakgrundsf\u00E4rg",
+base:"Base",
+flashvars:"Flashvars",
+liveconnect:"SWLiveConnect",
+autohref:"AutoHREF",
+cache:"Cache",
+hidden:"Hidden",
+controller:"Controller",
+kioskmode:"Kiosk mode",
+playeveryframe:"Spela varje bildruta",
+targetcache:"Target cache",
+correction:"No correction",
+enablejavascript:"Enable JavaScript",
+starttime:"Start time",
+endtime:"End time",
+href:"Href",
+qtsrcchokespeed:"Choke speed",
+target:"Target",
+volume:"Volym",
+autostart:"Starta automatiskt",
+enabled:"Enabled",
+fullscreen:"Fullsk\u00E4rm",
+invokeurls:"Invoke URLs",
+mute:"Mute",
+stretchtofit:"Stretch to fit",
+windowlessvideo:"Windowless video",
+balance:"Balance",
+baseurl:"Base URL",
+captioningid:"Captioning id",
+currentmarker:"Current marker",
+currentposition:"Current position",
+defaultframe:"Default frame",
+playcount:"Play count",
+rate:"Rate",
+uimode:"UI Mode",
+flash_options:"Flash options",
+qt_options:"Quicktime options",
+wmp_options:"Windows media player options",
+rmp_options:"Real media player options",
+shockwave_options:"Shockwave options",
+autogotourl:"Auto goto URL",
+center:"Center",
+imagestatus:"Image status",
+maintainaspect:"Maintain aspect",
+nojava:"No java",
+prefetch:"Prefetch",
+shuffle:"Shuffle",
+console:"Console",
+numloop:"Num loops",
+controls:"Controls",
+scriptcallbacks:"Script callbacks",
+swstretchstyle:"Stretch style",
+swstretchhalign:"Stretch H-Align",
+swstretchvalign:"Stretch V-Align",
+sound:"Sound",
+progress:"Progress",
+qtsrc:"QT Src",
+qt_stream_warn:"Streamed rtsp resources should be added to the QT Src field under the advanced tab.\nYou should also add a non streamed version to the Src field..",
+align_top:"Top",
+align_right:"Right",
+align_bottom:"Bottom",
+align_left:"Left",
+align_center:"Center",
+align_top_left:"Top left",
+align_top_right:"Top right",
+align_bottom_left:"Bottom left",
+align_bottom_right:"Bottom right",
+flv_options:"Flash video options",
+flv_scalemode:"Scale mode",
+flv_buffer:"Buffer",
+flv_startimage:"Start image",
+flv_starttime:"Start time",
+flv_defaultvolume:"Default volumne",
+flv_hiddengui:"Hidden GUI",
+flv_autostart:"Auto start",
+flv_loop:"Loop",
+flv_showscalemodes:"Show scale modes",
+flv_smoothvideo:"Smooth video",
+flv_jscallback:"JS Callback"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/media/media.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/media.htm
new file mode 100644
index 0000000000..09d94e7523
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/media/media.htm
@@ -0,0 +1,812 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#media_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/media.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/validate.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<link href="css/media.css" rel="stylesheet" type="text/css" />
+</head>
+<body style="display: none" role="application">
+<form onsubmit="Media.insert();return false;" action="#">
+		<div class="tabs" role="presentation">
+			<ul>
+				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');Media.formToData();" onmousedown="return false;">{#media_dlg.general}</a></span></li>
+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');Media.formToData();" onmousedown="return false;">{#media_dlg.advanced}</a></span></li>
+				<li id="source_tab" aria-controls="source_panel"><span><a href="javascript:mcTabs.displayTab('source_tab','source_panel');Media.formToData('source');" onmousedown="return false;">{#media_dlg.source}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+					<legend>{#media_dlg.general}</legend>
+
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
+							<tr>
+								<td><label for="media_type">{#media_dlg.type}</label></td>
+								<td>
+									<select id="media_type" name="media_type" onchange="Media.formToData('type');">
+										<option value="video">HTML5 Video</option>
+										<option value="flash">Flash</option>
+										<option value="quicktime">QuickTime</option>
+										<option value="shockwave">Shockwave</option>
+										<option value="windowsmedia">Windows Media</option>
+										<option value="realmedia">Real Media</option>
+										<option value="iframe">Iframe</option>
+									</select>
+								</td>
+							</tr>
+							<tr>
+							<td><label for="src">{#media_dlg.file}</label></td>
+								<td>
+									<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td><input id="src" name="src" type="text" value="" class="mceFocus" onchange="switchType(this.value);Media.formToData();" /></td>
+										<td id="filebrowsercontainer">&nbsp;</td>
+									</tr>
+									</table>
+								</td>
+							</tr>
+							<tr id="linklistrow">
+								<td><label for="linklist">{#media_dlg.list}</label></td>
+								<td id="linklistcontainer"><select id="linklist"><option value=""></option></select></td>
+							</tr>
+							<tr>
+								<td><label for="width">{#media_dlg.size}</label></td>
+								<td>
+									<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+										<tr>
+											<td><input type="text" id="width" name="width" value="" class="size" onchange="Media.formToData('width');" /> x <input type="text" id="height" name="height" value="" class="size"  onchange="Media.formToData('height');" /></td>
+											<td>&nbsp;&nbsp;<input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>
+											<td><label id="constrainlabel" for="constrain">{#media_dlg.constrain_proportions}</label></td>
+										</tr>
+									</table>
+								</td>
+							</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{#media_dlg.preview}</legend>
+					<div id="prev"></div>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<fieldset>
+					<legend>{#media_dlg.advanced}</legend>
+
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0" width="100%">
+						<tr>
+							<td><label for="id">{#media_dlg.id}</label></td>
+							<td><input type="text" id="id" name="id" onchange="Media.formToData();" /></td>
+							<td><label for="name">{#media_dlg.name}</label></td>
+							<td><input type="text" id="name" name="name" onchange="Media.formToData();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="align">{#media_dlg.align}</label></td>
+							<td>
+								<select id="align" name="align" onchange="Media.formToData();">
+									<option value="">{#not_set}</option> 
+									<option value="top">{#media_dlg.align_top}</option>
+									<option value="right">{#media_dlg.align_right}</option>
+									<option value="bottom">{#media_dlg.align_bottom}</option>
+									<option value="left">{#media_dlg.align_left}</option>
+								</select>
+							</td>
+
+							<td><label for="bgcolor">{#media_dlg.bgcolor}</label></td>
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');Media.formToData();" /></td>
+										<td id="bgcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="vspace">{#media_dlg.vspace}</label></td>
+							<td><input type="text" id="vspace" name="vspace" class="number" onchange="Media.formToData();" /></td>
+							<td><label for="hspace">{#media_dlg.hspace}</label></td>
+							<td><input type="text" id="hspace" name="hspace" class="number" onchange="Media.formToData();" /></td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset id="video_options">
+					<legend>{#media_dlg.html5_video_options}</legend>
+
+					<table role="presentation">
+						<tr>
+							<td><label for="video_altsource1">{#media_dlg.altsource1}</label></td>
+							<td>
+								<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td><input type="text" id="video_altsource1" name="video_altsource1" onchange="Media.formToData();" style="width: 240px" /></td>
+										<td id="video_altsource1_filebrowser">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="video_altsource2">{#media_dlg.altsource2}</label></td>
+							<td>
+								<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td><input type="text" id="video_altsource2" name="video_altsource2" onchange="Media.formToData();" style="width: 240px" /></td>
+										<td id="video_altsource2_filebrowser">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="video_poster">{#media_dlg.poster}</label></td>
+							<td>
+								<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td><input type="text" id="video_poster" name="video_poster" onchange="Media.formToData();" style="width: 240px" /></td>
+										<td id="video_poster_filebrowser">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="video_autoplay" name="video_autoplay" onchange="Media.formToData();" /></td>
+										<td><label for="video_autoplay">{#media_dlg.play}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="video_loop" name="video_loop" onchange="Media.formToData();" /></td>
+										<td><label for="video_loop">{#media_dlg.loop}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="video_preload" name="video_preload" onchange="Media.formToData();" /></td>
+										<td><label for="video_preload">{#media_dlg.preload}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="video_controls" name="video_controls" onchange="Media.formToData();" /></td>
+										<td><label for="video_controls">{#media_dlg.controls}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset id="flash_options">
+					<legend>{#media_dlg.flash_options}</legend>
+
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td><label for="flash_quality">{#media_dlg.quality}</label></td>
+							<td>
+								<select id="flash_quality" name="flash_quality" onchange="Media.formToData();">
+									<option value="">{#not_set}</option> 
+									<option value="high">high</option>
+									<option value="low">low</option>
+									<option value="autolow">autolow</option>
+									<option value="autohigh">autohigh</option>
+									<option value="best">best</option>
+								</select>
+							</td>
+
+							<td><label for="flash_scale">{#media_dlg.scale}</label></td>
+							<td>
+								<select id="flash_scale" name="flash_scale" onchange="Media.formToData();">
+									<option value="">{#not_set}</option> 
+									<option value="showall">showall</option>
+									<option value="noborder">noborder</option>
+									<option value="exactfit">exactfit</option>
+									<option value="noscale">noscale</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="flash_wmode">{#media_dlg.wmode}</label></td>
+							<td>
+								<select id="flash_wmode" name="flash_wmode" onchange="Media.formToData();">
+									<option value="">{#not_set}</option> 
+									<option value="window">window</option>
+									<option value="opaque">opaque</option>
+									<option value="transparent">transparent</option>
+								</select>
+							</td>
+
+							<td><label for="flash_salign">{#media_dlg.salign}</label></td>
+							<td>
+								<select id="flash_salign" name="flash_salign" onchange="Media.formToData();">
+									<option value="">{#not_set}</option> 
+									<option value="l">{#media_dlg.align_left}</option>
+									<option value="t">{#media_dlg.align_top}</option>
+									<option value="r">{#media_dlg.align_right}</option>
+									<option value="b">{#media_dlg.align_bottom}</option>
+									<option value="tl">{#media_dlg.align_top_left}</option>
+									<option value="tr">{#media_dlg.align_top_right}</option>
+									<option value="bl">{#media_dlg.align_bottom_left}</option>
+									<option value="br">{#media_dlg.align_bottom_right}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="flash_play" name="flash_play" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="flash_play">{#media_dlg.play}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="flash_loop" name="flash_loop" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="flash_loop">{#media_dlg.loop}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="flash_menu" name="flash_menu" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="flash_menu">{#media_dlg.menu}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="flash_swliveconnect" name="flash_swliveconnect" onchange="Media.formToData();" /></td>
+										<td><label for="flash_swliveconnect">{#media_dlg.liveconnect}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+
+					<table role="presentation">
+						<tr>
+							<td><label for="flash_base">{#media_dlg.base}</label></td>
+							<td><input type="text" id="flash_base" name="flash_base" onchange="Media.formToData();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="flash_flashvars">{#media_dlg.flashvars}</label></td>
+							<td><input type="text" id="flash_flashvars" name="flash_flashvars" onchange="Media.formToData();" /></td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset id="quicktime_options">
+					<legend>{#media_dlg.qt_options}</legend>
+
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="quicktime_loop" name="quicktime_loop" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_loop">{#media_dlg.loop}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="quicktime_autoplay" name="quicktime_autoplay" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_autoplay">{#media_dlg.play}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="quicktime_cache" name="quicktime_cache" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_cache">{#media_dlg.cache}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="quicktime_controller" name="quicktime_controller" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_controller">{#media_dlg.controller}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="quicktime_correction" name="quicktime_correction" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_correction">{#media_dlg.correction}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="quicktime_enablejavascript" name="quicktime_enablejavascript" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_enablejavascript">{#media_dlg.enablejavascript}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="quicktime_kioskmode" name="quicktime_kioskmode" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_kioskmode">{#media_dlg.kioskmode}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="quicktime_autohref" name="quicktime_autohref" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_autohref">{#media_dlg.autohref}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="quicktime_playeveryframe" name="quicktime_playeveryframe" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_playeveryframe">{#media_dlg.playeveryframe}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="quicktime_targetcache" name="quicktime_targetcache" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_targetcache">{#media_dlg.targetcache}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="quicktime_scale">{#media_dlg.scale}</label></td>
+							<td><select id="quicktime_scale" name="quicktime_scale" class="mceEditableSelect" onchange="Media.formToData();">
+									<option value="">{#not_set}</option> 
+									<option value="tofit">tofit</option>
+									<option value="aspect">aspect</option>
+								</select>
+							</td>
+
+							<td colspan="2">&nbsp;</td>
+						</tr>
+
+						<tr>
+							<td><label for="quicktime_starttime">{#media_dlg.starttime}</label></td>
+							<td><input type="text" id="quicktime_starttime" name="quicktime_starttime" onchange="Media.formToData();" /></td>
+
+							<td><label for="quicktime_endtime">{#media_dlg.endtime}</label></td>
+							<td><input type="text" id="quicktime_endtime" name="quicktime_endtime" onchange="Media.formToData();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="quicktime_target">{#media_dlg.target}</label></td>
+							<td><input type="text" id="quicktime_target" name="quicktime_target" onchange="Media.formToData();" /></td>
+
+							<td><label for="quicktime_href">{#media_dlg.href}</label></td>
+							<td><input type="text" id="quicktime_href" name="quicktime_href" onchange="Media.formToData();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="quicktime_qtsrcchokespeed">{#media_dlg.qtsrcchokespeed}</label></td>
+							<td><input type="text" id="quicktime_qtsrcchokespeed" name="quicktime_qtsrcchokespeed" onchange="Media.formToData();" /></td>
+
+							<td><label for="quicktime_volume">{#media_dlg.volume}</label></td>
+							<td><input type="text" id="quicktime_volume" name="quicktime_volume" onchange="Media.formToData();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="quicktime_qtsrc">{#media_dlg.qtsrc}</label></td>
+							<td colspan="4">
+								<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td><input type="text" id="quicktime_qtsrc" name="quicktime_qtsrc" onchange="Media.formToData();" /></td>
+										<td id="qtsrcfilebrowsercontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset id="windowsmedia_options">
+					<legend>{#media_dlg.wmp_options}</legend>
+
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_autostart" name="windowsmedia_autostart" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_autostart">{#media_dlg.autostart}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_enabled" name="windowsmedia_enabled" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_enabled">{#media_dlg.enabled}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_enablecontextmenu" name="windowsmedia_enablecontextmenu" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_enablecontextmenu">{#media_dlg.menu}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_fullscreen" name="windowsmedia_fullscreen" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_fullscreen">{#media_dlg.fullscreen}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_invokeurls" name="windowsmedia_invokeurls" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_invokeurls">{#media_dlg.invokeurls}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_mute" name="windowsmedia_mute" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_mute">{#media_dlg.mute}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_stretchtofit" name="windowsmedia_stretchtofit" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_stretchtofit">{#media_dlg.stretchtofit}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_windowlessvideo" name="windowsmedia_windowlessvideo" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_windowlessvideo">{#media_dlg.windowlessvideo}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="windowsmedia_balance">{#media_dlg.balance}</label></td>
+							<td><input type="text" id="windowsmedia_balance" name="windowsmedia_balance" onchange="Media.formToData();" /></td>
+
+							<td><label for="windowsmedia_baseurl">{#media_dlg.baseurl}</label></td>
+							<td><input type="text" id="windowsmedia_baseurl" name="windowsmedia_baseurl" onchange="Media.formToData();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="windowsmedia_captioningid">{#media_dlg.captioningid}</label></td>
+							<td><input type="text" id="windowsmedia_captioningid" name="windowsmedia_captioningid" onchange="Media.formToData();" /></td>
+
+							<td><label for="windowsmedia_currentmarker">{#media_dlg.currentmarker}</label></td>
+							<td><input type="text" id="windowsmedia_currentmarker" name="windowsmedia_currentmarker" onchange="Media.formToData();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="windowsmedia_currentposition">{#media_dlg.currentposition}</label></td>
+							<td><input type="text" id="windowsmedia_currentposition" name="windowsmedia_currentposition" onchange="Media.formToData();" /></td>
+
+							<td><label for="windowsmedia_defaultframe">{#media_dlg.defaultframe}</label></td>
+							<td><input type="text" id="windowsmedia_defaultframe" name="windowsmedia_defaultframe" onchange="Media.formToData();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="windowsmedia_playcount">{#media_dlg.playcount}</label></td>
+							<td><input type="text" id="windowsmedia_playcount" name="windowsmedia_playcount" onchange="Media.formToData();" /></td>
+
+							<td><label for="windowsmedia_rate">{#media_dlg.rate}</label></td>
+							<td><input type="text" id="windowsmedia_rate" name="windowsmedia_rate" onchange="Media.formToData();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="windowsmedia_uimode">{#media_dlg.uimode}</label></td>
+							<td><input type="text" id="windowsmedia_uimode" name="windowsmedia_uimode" onchange="Media.formToData();" /></td>
+
+							<td><label for="windowsmedia_volume">{#media_dlg.volume}</label></td>
+							<td><input type="text" id="windowsmedia_volume" name="windowsmedia_volume" onchange="Media.formToData();" /></td>
+						</tr>
+
+					</table>
+				</fieldset>
+
+				<fieldset id="realmedia_options">
+					<legend>{#media_dlg.rmp_options}</legend>
+
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="realmedia_autostart" name="realmedia_autostart" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_autostart">{#media_dlg.autostart}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="realmedia_loop" name="realmedia_loop" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_loop">{#media_dlg.loop}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="realmedia_autogotourl" name="realmedia_autogotourl" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_autogotourl">{#media_dlg.autogotourl}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="realmedia_center" name="realmedia_center" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_center">{#media_dlg.center}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="realmedia_imagestatus" name="realmedia_imagestatus" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_imagestatus">{#media_dlg.imagestatus}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="realmedia_maintainaspect" name="realmedia_maintainaspect" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_maintainaspect">{#media_dlg.maintainaspect}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="realmedia_nojava" name="realmedia_nojava" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_nojava">{#media_dlg.nojava}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="realmedia_prefetch" name="realmedia_prefetch" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_prefetch">{#media_dlg.prefetch}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="realmedia_shuffle" name="realmedia_shuffle" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_shuffle">{#media_dlg.shuffle}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								&nbsp;
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="realmedia_console">{#media_dlg.console}</label></td>
+							<td><input type="text" id="realmedia_console" name="realmedia_console" onchange="Media.formToData();" /></td>
+
+							<td><label for="realmedia_controls">{#media_dlg.controls}</label></td>
+							<td><input type="text" id="realmedia_controls" name="realmedia_controls" onchange="Media.formToData();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="realmedia_numloop">{#media_dlg.numloop}</label></td>
+							<td><input type="text" id="realmedia_numloop" name="realmedia_numloop" onchange="Media.formToData();" /></td>
+
+							<td><label for="realmedia_scriptcallbacks">{#media_dlg.scriptcallbacks}</label></td>
+							<td><input type="text" id="realmedia_scriptcallbacks" name="realmedia_scriptcallbacks" onchange="Media.formToData();" /></td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset id="shockwave_options">
+					<legend>{#media_dlg.shockwave_options}</legend>
+
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td><label for="shockwave_swstretchstyle">{#media_dlg.swstretchstyle}</label></td>
+							<td>
+								<select id="shockwave_swstretchstyle" name="shockwave_swstretchstyle" onchange="Media.formToData();">
+									<option value="none">{#not_set}</option>
+									<option value="meet">Meet</option>
+									<option value="fill">Fill</option>
+									<option value="stage">Stage</option>
+								</select>
+							</td>
+
+							<td><label for="shockwave_swvolume">{#media_dlg.volume}</label></td>
+							<td><input type="text" id="shockwave_swvolume" name="shockwave_swvolume" onchange="Media.formToData();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="shockwave_swstretchhalign">{#media_dlg.swstretchhalign}</label></td>
+							<td>
+								<select id="shockwave_swstretchhalign" name="shockwave_swstretchhalign" onchange="Media.formToData();">
+									<option value="none">{#not_set}</option>
+									<option value="left">{#media_dlg.align_left}</option>
+									<option value="center">{#media_dlg.align_center}</option>
+									<option value="right">{#media_dlg.align_right}</option>
+								</select>
+							</td>
+
+							<td><label for="shockwave_swstretchvalign">{#media_dlg.swstretchvalign}</label></td>
+							<td>
+								<select id="shockwave_swstretchvalign" name="shockwave_swstretchvalign" onchange="Media.formToData();">
+									<option value="none">{#not_set}</option>
+									<option value="meet">Meet</option>
+									<option value="fill">Fill</option>
+									<option value="stage">Stage</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="shockwave_autostart" name="shockwave_autostart" onchange="Media.formToData();" checked="checked" /></td>
+										<td><label for="shockwave_autostart">{#media_dlg.autostart}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="shockwave_sound" name="shockwave_sound" onchange="Media.formToData();" checked="checked" /></td>
+										<td><label for="shockwave_sound">{#media_dlg.sound}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+
+						<tr>
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="shockwave_swliveconnect" name="shockwave_swliveconnect" onchange="Media.formToData();" /></td>
+										<td><label for="shockwave_swliveconnect">{#media_dlg.liveconnect}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="shockwave_progress" name="shockwave_progress" onchange="Media.formToData();" checked="checked" /></td>
+										<td><label for="shockwave_progress">{#media_dlg.progress}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="source_panel" class="panel">
+				<fieldset>
+					<legend>{#media_dlg.source}</legend>
+					<textarea id="source" style="width: 100%; height: 390px"></textarea>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<input type="submit" id="insert" name="insert" value="{#insert}" />
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/nonbreaking/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/nonbreaking/editor_plugin.js
new file mode 100644
index 0000000000..73947355f0
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/nonbreaking/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.Nonbreaking",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceNonBreaking",function(){a.execCommand("mceInsertContent",false,(a.plugins.visualchars&&a.plugins.visualchars.state)?'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>':"&nbsp;")});a.addButton("nonbreaking",{title:"nonbreaking.nonbreaking_desc",cmd:"mceNonBreaking"});if(a.getParam("nonbreaking_force_tab")){a.onKeyDown.add(function(d,f){if(tinymce.isIE&&f.keyCode==9){d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");tinymce.dom.Event.cancel(f)}})}},getInfo:function(){return{longname:"Nonbreaking space",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("nonbreaking",tinymce.plugins.Nonbreaking)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/nonbreaking/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/nonbreaking/editor_plugin_src.js
new file mode 100644
index 0000000000..b3ea82ee03
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/nonbreaking/editor_plugin_src.js
@@ -0,0 +1,53 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Nonbreaking', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceNonBreaking', function() {
+				ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>' : '&nbsp;');
+			});
+
+			// Register buttons
+			ed.addButton('nonbreaking', {title : 'nonbreaking.nonbreaking_desc', cmd : 'mceNonBreaking'});
+
+			if (ed.getParam('nonbreaking_force_tab')) {
+				ed.onKeyDown.add(function(ed, e) {
+					if (tinymce.isIE && e.keyCode == 9) {
+						ed.execCommand('mceNonBreaking');
+						ed.execCommand('mceNonBreaking');
+						ed.execCommand('mceNonBreaking');
+						tinymce.dom.Event.cancel(e);
+					}
+				});
+			}
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Nonbreaking space',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+
+		// Private methods
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('nonbreaking', tinymce.plugins.Nonbreaking);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/noneditable/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/noneditable/editor_plugin.js
new file mode 100644
index 0000000000..9945cd8580
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/noneditable/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var a=tinymce.dom.Event;tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(d,e){var f=this,c,b;f.editor=d;c=d.getParam("noneditable_editable_class","mceEditable");b=d.getParam("noneditable_noneditable_class","mceNonEditable");d.onNodeChange.addToTop(function(h,g,k){var j,i;j=h.dom.getParent(h.selection.getStart(),function(l){return h.dom.hasClass(l,b)});i=h.dom.getParent(h.selection.getEnd(),function(l){return h.dom.hasClass(l,b)});if(j||i){f._setDisabled(1);return false}else{f._setDisabled(0)}})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_block:function(c,d){var b=d.keyCode;if((b>32&&b<41)||(b>111&&b<124)){return}return a.cancel(d)},_setDisabled:function(d){var c=this,b=c.editor;tinymce.each(b.controlManager.controls,function(e){e.setDisabled(d)});if(d!==c.disabled){if(d){b.onKeyDown.addToTop(c._block);b.onKeyPress.addToTop(c._block);b.onKeyUp.addToTop(c._block);b.onPaste.addToTop(c._block)}else{b.onKeyDown.remove(c._block);b.onKeyPress.remove(c._block);b.onKeyUp.remove(c._block);b.onPaste.remove(c._block)}c.disabled=d}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/noneditable/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/noneditable/editor_plugin_src.js
new file mode 100644
index 0000000000..656c971b8c
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/noneditable/editor_plugin_src.js
@@ -0,0 +1,90 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var Event = tinymce.dom.Event;
+
+	tinymce.create('tinymce.plugins.NonEditablePlugin', {
+		init : function(ed, url) {
+			var t = this, editClass, nonEditClass;
+
+			t.editor = ed;
+			editClass = ed.getParam("noneditable_editable_class", "mceEditable");
+			nonEditClass = ed.getParam("noneditable_noneditable_class", "mceNonEditable");
+
+			ed.onNodeChange.addToTop(function(ed, cm, n) {
+				var sc, ec;
+
+				// Block if start or end is inside a non editable element
+				sc = ed.dom.getParent(ed.selection.getStart(), function(n) {
+					return ed.dom.hasClass(n, nonEditClass);
+				});
+
+				ec = ed.dom.getParent(ed.selection.getEnd(), function(n) {
+					return ed.dom.hasClass(n, nonEditClass);
+				});
+
+				// Block or unblock
+				if (sc || ec) {
+					t._setDisabled(1);
+					return false;
+				} else
+					t._setDisabled(0);
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Non editable elements',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		_block : function(ed, e) {
+			var k = e.keyCode;
+
+			// Don't block arrow keys, pg up/down, and F1-F12
+			if ((k > 32 && k < 41) || (k > 111 && k < 124))
+				return;
+
+			return Event.cancel(e);
+		},
+
+		_setDisabled : function(s) {
+			var t = this, ed = t.editor;
+
+			tinymce.each(ed.controlManager.controls, function(c) {
+				c.setDisabled(s);
+			});
+
+			if (s !== t.disabled) {
+				if (s) {
+					ed.onKeyDown.addToTop(t._block);
+					ed.onKeyPress.addToTop(t._block);
+					ed.onKeyUp.addToTop(t._block);
+					ed.onPaste.addToTop(t._block);
+				} else {
+					ed.onKeyDown.remove(t._block);
+					ed.onKeyPress.remove(t._block);
+					ed.onKeyUp.remove(t._block);
+					ed.onPaste.remove(t._block);
+				}
+
+				t.disabled = s;
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('noneditable', tinymce.plugins.NonEditablePlugin);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/pagebreak/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/pagebreak/editor_plugin.js
new file mode 100644
index 0000000000..35085e8adc
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/pagebreak/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.PageBreakPlugin",{init:function(b,d){var f='<img src="'+b.theme.url+'/img/trans.gif" class="mcePageBreak mceItemNoResize" />',a="mcePageBreak",c=b.getParam("pagebreak_separator","<!-- pagebreak -->"),e;e=new RegExp(c.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(g){return"\\"+g}),"g");b.addCommand("mcePageBreak",function(){b.execCommand("mceInsertContent",0,f)});b.addButton("pagebreak",{title:"pagebreak.desc",cmd:a});b.onInit.add(function(){if(b.theme.onResolveName){b.theme.onResolveName.add(function(g,h){if(h.node.nodeName=="IMG"&&b.dom.hasClass(h.node,a)){h.name="pagebreak"}})}});b.onClick.add(function(g,h){h=h.target;if(h.nodeName==="IMG"&&g.dom.hasClass(h,a)){g.selection.select(h)}});b.onNodeChange.add(function(h,g,i){g.setActive("pagebreak",i.nodeName==="IMG"&&h.dom.hasClass(i,a))});b.onBeforeSetContent.add(function(g,h){h.content=h.content.replace(e,f)});b.onPostProcess.add(function(g,h){if(h.get){h.content=h.content.replace(/<img[^>]+>/g,function(i){if(i.indexOf('class="mcePageBreak')!==-1){i=c}return i})}})},getInfo:function(){return{longname:"PageBreak",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("pagebreak",tinymce.plugins.PageBreakPlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/pagebreak/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/pagebreak/editor_plugin_src.js
new file mode 100644
index 0000000000..a094c19162
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/pagebreak/editor_plugin_src.js
@@ -0,0 +1,74 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.PageBreakPlugin', {
+		init : function(ed, url) {
+			var pb = '<img src="' + ed.theme.url + '/img/trans.gif" class="mcePageBreak mceItemNoResize" />', cls = 'mcePageBreak', sep = ed.getParam('pagebreak_separator', '<!-- pagebreak -->'), pbRE;
+
+			pbRE = new RegExp(sep.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g, function(a) {return '\\' + a;}), 'g');
+
+			// Register commands
+			ed.addCommand('mcePageBreak', function() {
+				ed.execCommand('mceInsertContent', 0, pb);
+			});
+
+			// Register buttons
+			ed.addButton('pagebreak', {title : 'pagebreak.desc', cmd : cls});
+
+			ed.onInit.add(function() {
+				if (ed.theme.onResolveName) {
+					ed.theme.onResolveName.add(function(th, o) {
+						if (o.node.nodeName == 'IMG' && ed.dom.hasClass(o.node, cls))
+							o.name = 'pagebreak';
+					});
+				}
+			});
+
+			ed.onClick.add(function(ed, e) {
+				e = e.target;
+
+				if (e.nodeName === 'IMG' && ed.dom.hasClass(e, cls))
+					ed.selection.select(e);
+			});
+
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setActive('pagebreak', n.nodeName === 'IMG' && ed.dom.hasClass(n, cls));
+			});
+
+			ed.onBeforeSetContent.add(function(ed, o) {
+				o.content = o.content.replace(pbRE, pb);
+			});
+
+			ed.onPostProcess.add(function(ed, o) {
+				if (o.get)
+					o.content = o.content.replace(/<img[^>]+>/g, function(im) {
+						if (im.indexOf('class="mcePageBreak') !== -1)
+							im = sep;
+
+						return im;
+					});
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'PageBreak',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('pagebreak', tinymce.plugins.PageBreakPlugin);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/editor_plugin.js
new file mode 100644
index 0000000000..7bdd7cc2d2
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var c=tinymce.each,a={paste_auto_cleanup_on_paste:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_text_use_dialog:false,paste_text_sticky:false,paste_text_notifyalways:false,paste_text_linebreaktype:"p",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(d,e){return d.getParam(e,a[e])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(d,e){var f=this;f.editor=d;f.url=e;f.onPreProcess=new tinymce.util.Dispatcher(f);f.onPostProcess=new tinymce.util.Dispatcher(f);f.onPreProcess.add(f._preProcess);f.onPostProcess.add(f._postProcess);f.onPreProcess.add(function(i,j){d.execCallback("paste_preprocess",i,j)});f.onPostProcess.add(function(i,j){d.execCallback("paste_postprocess",i,j)});d.pasteAsPlainText=false;function h(m,k){var l=d.dom,i,j;f.onPreProcess.dispatch(f,m);m.node=l.create("div",0,m.content);if(tinymce.isGecko){i=d.selection.getRng(true);if(i.startContainer==i.endContainer&&i.startContainer.nodeType==3){j=l.select("p,h1,h2,h3,h4,h5,h6,pre",m.node);if(j.length==1){l.remove(j.reverse(),true)}}}f.onPostProcess.dispatch(f,m);m.content=d.serializer.serialize(m.node,{getInner:1});if((!k)&&(d.pasteAsPlainText)){f._insertPlainText(d,l,m.content);if(!b(d,"paste_text_sticky")){d.pasteAsPlainText=false;d.controlManager.setActive("pastetext",false)}}else{f._insert(m.content)}}d.addCommand("mceInsertClipboardContent",function(i,j){h(j,true)});if(!b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(j,i){var k=tinymce.util.Cookie;d.pasteAsPlainText=!d.pasteAsPlainText;d.controlManager.setActive("pastetext",d.pasteAsPlainText);if((d.pasteAsPlainText)&&(!k.get("tinymcePasteText"))){if(b(d,"paste_text_sticky")){d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}else{d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}if(!b(d,"paste_text_notifyalways")){k.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}d.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});d.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function g(s){var l,p,j,k=d.selection,o=d.dom,q=d.getBody(),i,r;if(s.clipboardData||o.doc.dataTransfer){r=(s.clipboardData||o.doc.dataTransfer).getData("Text");if(d.pasteAsPlainText){s.preventDefault();h({content:r.replace(/\r?\n/g,"<br />")});return}}if(o.get("_mcePaste")){return}l=o.add(q,"div",{id:"_mcePaste","class":"mcePaste","data-mce-bogus":"1"},'\uFEFF<br data-mce-bogus="1">');if(q!=d.getDoc().body){i=o.getPos(d.selection.getStart(),q).y}else{i=q.scrollTop+o.getViewPort().y}o.setStyles(l,{position:"absolute",left:-10000,top:i,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){j=o.doc.body.createTextRange();j.moveToElementText(l);j.execCommand("Paste");o.remove(l);if(l.innerHTML==="\uFEFF"){d.execCommand("mcePasteWord");s.preventDefault();return}h({content:l.innerHTML});return tinymce.dom.Event.cancel(s)}else{function m(n){n.preventDefault()}o.bind(d.getDoc(),"mousedown",m);o.bind(d.getDoc(),"keydown",m);p=d.selection.getRng();l=l.firstChild;j=d.getDoc().createRange();j.setStart(l,0);j.setEnd(l,1);k.setRng(j);window.setTimeout(function(){var t="",n;if(!o.select("div.mcePaste > div.mcePaste").length){n=o.select("div.mcePaste");c(n,function(v){var u=v.firstChild;if(u&&u.nodeName=="DIV"&&u.style.marginTop&&u.style.backgroundColor){o.remove(u,1)}c(o.select("span.Apple-style-span",v),function(w){o.remove(w,1)});c(o.select("br[data-mce-bogus]",v),function(w){o.remove(w)});if(v.parentNode.className!="mcePaste"){t+=v.innerHTML}})}else{t="<pre>"+o.encode(r).replace(/\r?\n/g,"<br />")+"</pre>"}c(o.select("div.mcePaste"),function(u){o.remove(u)});if(p){k.setRng(p)}h({content:t});o.unbind(d.getDoc(),"mousedown",m);o.unbind(d.getDoc(),"keydown",m)},0)}}if(b(d,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){d.onKeyDown.add(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){g(j)}})}else{d.onPaste.addToTop(function(i,j){return g(j)})}}if(b(d,"paste_block_drop")){d.onInit.add(function(){d.dom.bind(d.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(i){i.preventDefault();i.stopPropagation();return false})})}f._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(g,e){var k=this.editor,j=e.content,p=tinymce.grep,n=tinymce.explode,f=tinymce.trim,l,i;function d(h){c(h,function(o){if(o.constructor==RegExp){j=j.replace(o,"")}else{j=j.replace(o[0],o[1])}})}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(j)||e.wordContent){e.wordContent=true;d([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(k,"paste_convert_headers_to_strong")){j=j.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(k,"paste_convert_middot_lists")){d([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"],[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi,"$1__MCE_ITEM__"]])}d([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{l=j.length;j=j.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(l!=j.length);if(b(k,"paste_retain_style_properties").replace(/^none$/i,"").length==0){j=j.replace(/<\/?span[^>]*>/gi,"")}else{d([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(t,h,r){var u=[],o=0,q=n(f(r).replace(/&quot;/gi,"'"),";");c(q,function(s){var w,y,z=n(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":u[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":u[o++]="text-align:"+y;return;case"vert-align":u[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":u[o++]="color:"+y;return;case"mso-background":case"mso-highlight":u[o++]="background:"+y;return;case"mso-default-height":u[o++]="min-height:"+x(y);return;case"mso-default-width":u[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":u[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){u[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){u[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}u[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+u.join(";")+'"'}else{return h}}]])}}if(b(k,"paste_convert_headers_to_strong")){d([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}d([[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi,""]]);i=b(k,"paste_strip_class_attributes");if(i!=="none"){function m(q,o){if(i==="all"){return""}var h=p(n(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(r){return(/^(?!mso)/i.test(r))});return h.length?' class="'+h.join(" ")+'"':""}j=j.replace(/ class="([^"]+)"/gi,m);j=j.replace(/ class=([\-\w]+)/gi,m)}if(b(k,"paste_remove_spans")){j=j.replace(/<\/?span[^>]*>/gi,"")}e.content=j},_postProcess:function(g,i){var f=this,e=f.editor,h=e.dom,d;if(i.wordContent){c(h.select("a",i.node),function(j){if(!j.href||j.href.indexOf("#_Toc")!=-1){h.remove(j,1)}});if(b(e,"paste_convert_middot_lists")){f._convertLists(g,i)}d=b(e,"paste_retain_style_properties");if((tinymce.is(d,"string"))&&(d!=="all")&&(d!=="*")){d=tinymce.explode(d.replace(/^none$/i,""));c(h.select("*",i.node),function(m){var n={},k=0,l,o,j;if(d){for(l=0;l<d.length;l++){o=d[l];j=h.getStyle(m,o);if(j){n[o]=j;k++}}}h.setAttrib(m,"style","");if(d&&k>0){h.setStyles(m,n)}else{if(m.nodeName=="SPAN"&&!m.className){h.remove(m,true)}}})}}if(b(e,"paste_remove_styles")||(b(e,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(h.select("*[style]",i.node),function(j){j.removeAttribute("style");j.removeAttribute("data-mce-style")})}else{if(tinymce.isWebKit){c(h.select("*",i.node),function(j){j.removeAttribute("data-mce-style")})}}},_convertLists:function(g,e){var i=g.editor.dom,h,l,d=-1,f,m=[],k,j;c(i.select("p",e.node),function(t){var q,u="",s,r,n,o;for(q=t.firstChild;q&&q.nodeType==3;q=q.nextSibling){u+=q.nodeValue}u=t.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(u)){s="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(u)){s="ol"}if(s){f=parseFloat(t.style.marginLeft||0);if(f>d){m.push(f)}if(!h||s!=k){h=i.create(s);i.insertAfter(h,t)}else{if(f>d){h=l.appendChild(i.create(s))}else{if(f<d){n=tinymce.inArray(m,f);o=i.getParents(h.parentNode,s);h=o[o.length-1-n]||h}}}c(i.select("span",t),function(v){var p=v.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(s=="ul"&&/^[\u2022\u00b7\u00a7\u00d8o]/.test(p)){i.remove(v)}else{if(/^[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){i.remove(v)}}});r=t.innerHTML;if(s=="ul"){r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*(&nbsp;|\u00a0)+\s*/,"")}else{r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/,"")}l=h.appendChild(i.create("li",0,r));i.remove(t);d=f;k=s}else{h=d=0}});j=e.node.innerHTML;if(j.indexOf("__MCE_ITEM__")!=-1){e.node.innerHTML=j.replace(/__MCE_ITEM__/g,"")}},_insert:function(f,d){var e=this.editor,g=e.selection.getRng();if(!e.selection.isCollapsed()&&g.startContainer!=g.endContainer){e.getDoc().execCommand("Delete",false,null)}e.execCommand("mceInsertContent",false,f,{skip_undo:d})},_insertPlainText:function(j,x,v){var t,u,l,k,r,e,p,f,n=j.getWin(),z=j.getDoc(),s=j.selection,m=tinymce.is,y=tinymce.inArray,g=b(j,"paste_text_linebreaktype"),o=b(j,"paste_text_replacements");function q(d){c(d,function(h){if(h.constructor==RegExp){v=v.replace(h,"")}else{v=v.replace(h[0],h[1])}})}if((typeof(v)==="string")&&(v.length>0)){if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(v)){q([/[\n\r]+/g])}else{q([/\r+/g])}q([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"],[/\n{3,}/g,"\n\n"],/^\s+|\s+$/g]);v=x.decode(tinymce.html.Entities.encodeRaw(v));if(!s.isCollapsed()){z.execCommand("Delete",false,null)}if(m(o,"array")||(m(o,"array"))){q(o)}else{if(m(o,"string")){q(new RegExp(o,"gi"))}}if(g=="none"){q([[/\n+/g," "]])}else{if(g=="br"){q([[/\n/g,"<br />"]])}else{q([/^\s+|\s+$/g,[/\n\n/g,"</p><p>"],[/\n/g,"<br />"]])}}if((l=v.indexOf("</p><p>"))!=-1){k=v.lastIndexOf("</p><p>");r=s.getNode();e=[];do{if(r.nodeType==1){if(r.nodeName=="TD"||r.nodeName=="BODY"){break}e[e.length]=r}}while(r=r.parentNode);if(e.length>0){p=v.substring(0,l);f="";for(t=0,u=e.length;t<u;t++){p+="</"+e[t].nodeName.toLowerCase()+">";f+="<"+e[e.length-t-1].nodeName.toLowerCase()+">"}if(l==k){v=p+f+v.substring(l+7)}else{v=p+v.substring(l+4,k+4)+f+v.substring(k+7)}}}j.execCommand("mceInsertRawHTML",false,v+'<span id="_plain_text_marker">&nbsp;</span>');window.setTimeout(function(){var d=x.get("_plain_text_marker"),A,h,w,i;s.select(d,false);z.execCommand("Delete",false,null);d=null;A=s.getStart();h=x.getViewPort(n);w=x.getPos(A).y;i=A.clientHeight;if((w<h.y)||(w+i>h.y+h.h)){z.body.scrollTop=w<h.y?w:w-h.h+25}},0)}},_legacySupport:function(){var e=this,d=e.editor;d.addCommand("mcePasteWord",function(){d.windowManager.open({file:e.url+"/pasteword.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})});if(b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(){d.windowManager.open({file:e.url+"/pastetext.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})})}d.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/editor_plugin_src.js
new file mode 100644
index 0000000000..53adbe1b50
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/editor_plugin_src.js
@@ -0,0 +1,910 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var each = tinymce.each,
+		defs = {
+			paste_auto_cleanup_on_paste : true,
+			paste_block_drop : false,
+			paste_retain_style_properties : "none",
+			paste_strip_class_attributes : "mso",
+			paste_remove_spans : false,
+			paste_remove_styles : false,
+			paste_remove_styles_if_webkit : true,
+			paste_convert_middot_lists : true,
+			paste_convert_headers_to_strong : false,
+			paste_dialog_width : "450",
+			paste_dialog_height : "400",
+			paste_text_use_dialog : false,
+			paste_text_sticky : false,
+			paste_text_notifyalways : false,
+			paste_text_linebreaktype : "p",
+			paste_text_replacements : [
+				[/\u2026/g, "..."],
+				[/[\x93\x94\u201c\u201d]/g, '"'],
+				[/[\x60\x91\x92\u2018\u2019]/g, "'"]
+			]
+		};
+
+	function getParam(ed, name) {
+		return ed.getParam(name, defs[name]);
+	}
+
+	tinymce.create('tinymce.plugins.PastePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+			t.url = url;
+
+			// Setup plugin events
+			t.onPreProcess = new tinymce.util.Dispatcher(t);
+			t.onPostProcess = new tinymce.util.Dispatcher(t);
+
+			// Register default handlers
+			t.onPreProcess.add(t._preProcess);
+			t.onPostProcess.add(t._postProcess);
+
+			// Register optional preprocess handler
+			t.onPreProcess.add(function(pl, o) {
+				ed.execCallback('paste_preprocess', pl, o);
+			});
+
+			// Register optional postprocess
+			t.onPostProcess.add(function(pl, o) {
+				ed.execCallback('paste_postprocess', pl, o);
+			});
+
+			// Initialize plain text flag
+			ed.pasteAsPlainText = false;
+
+			// This function executes the process handlers and inserts the contents
+			// force_rich overrides plain text mode set by user, important for pasting with execCommand
+			function process(o, force_rich) {
+				var dom = ed.dom, rng, nodes;
+
+				// Execute pre process handlers
+				t.onPreProcess.dispatch(t, o);
+
+				// Create DOM structure
+				o.node = dom.create('div', 0, o.content);
+
+				// If pasting inside the same element and the contents is only one block
+				// remove the block and keep the text since Firefox will copy parts of pre and h1-h6 as a pre element
+				if (tinymce.isGecko) {
+					rng = ed.selection.getRng(true);
+					if (rng.startContainer == rng.endContainer && rng.startContainer.nodeType == 3) {
+						nodes = dom.select('p,h1,h2,h3,h4,h5,h6,pre', o.node);
+
+						if (nodes.length == 1)
+							dom.remove(nodes.reverse(), true);
+					}
+				}
+
+				// Execute post process handlers
+				t.onPostProcess.dispatch(t, o);
+
+				// Serialize content
+				o.content = ed.serializer.serialize(o.node, {getInner : 1});
+
+				// Plain text option active?
+				if ((!force_rich) && (ed.pasteAsPlainText)) {
+					t._insertPlainText(ed, dom, o.content);
+
+					if (!getParam(ed, "paste_text_sticky")) {
+						ed.pasteAsPlainText = false;
+						ed.controlManager.setActive("pastetext", false);
+					}
+				} else {
+					t._insert(o.content);
+				}
+			}
+
+			// Add command for external usage
+			ed.addCommand('mceInsertClipboardContent', function(u, o) {
+				process(o, true);
+			});
+
+			if (!getParam(ed, "paste_text_use_dialog")) {
+				ed.addCommand('mcePasteText', function(u, v) {
+					var cookie = tinymce.util.Cookie;
+
+					ed.pasteAsPlainText = !ed.pasteAsPlainText;
+					ed.controlManager.setActive('pastetext', ed.pasteAsPlainText);
+
+					if ((ed.pasteAsPlainText) && (!cookie.get("tinymcePasteText"))) {
+						if (getParam(ed, "paste_text_sticky")) {
+							ed.windowManager.alert(ed.translate('paste.plaintext_mode_sticky'));
+						} else {
+							ed.windowManager.alert(ed.translate('paste.plaintext_mode_sticky'));
+						}
+
+						if (!getParam(ed, "paste_text_notifyalways")) {
+							cookie.set("tinymcePasteText", "1", new Date(new Date().getFullYear() + 1, 12, 31))
+						}
+					}
+				});
+			}
+
+			ed.addButton('pastetext', {title: 'paste.paste_text_desc', cmd: 'mcePasteText'});
+			ed.addButton('selectall', {title: 'paste.selectall_desc', cmd: 'selectall'});
+
+			// This function grabs the contents from the clipboard by adding a
+			// hidden div and placing the caret inside it and after the browser paste
+			// is done it grabs that contents and processes that
+			function grabContent(e) {
+				var n, or, rng, sel = ed.selection, dom = ed.dom, body = ed.getBody(), posY, textContent;
+
+				// Check if browser supports direct plaintext access
+				if (e.clipboardData || dom.doc.dataTransfer) {
+					textContent = (e.clipboardData || dom.doc.dataTransfer).getData('Text');
+
+					if (ed.pasteAsPlainText) {
+						e.preventDefault();
+						process({content : textContent.replace(/\r?\n/g, '<br />')});
+						return;
+					}
+				}
+
+				if (dom.get('_mcePaste'))
+					return;
+
+				// Create container to paste into
+				n = dom.add(body, 'div', {id : '_mcePaste', 'class' : 'mcePaste', 'data-mce-bogus' : '1'}, '\uFEFF<br data-mce-bogus="1">');
+
+				// If contentEditable mode we need to find out the position of the closest element
+				if (body != ed.getDoc().body)
+					posY = dom.getPos(ed.selection.getStart(), body).y;
+				else
+					posY = body.scrollTop + dom.getViewPort().y;
+
+				// Styles needs to be applied after the element is added to the document since WebKit will otherwise remove all styles
+				dom.setStyles(n, {
+					position : 'absolute',
+					left : -10000,
+					top : posY,
+					width : 1,
+					height : 1,
+					overflow : 'hidden'
+				});
+
+				if (tinymce.isIE) {
+					// Select the container
+					rng = dom.doc.body.createTextRange();
+					rng.moveToElementText(n);
+					rng.execCommand('Paste');
+
+					// Remove container
+					dom.remove(n);
+
+					// Check if the contents was changed, if it wasn't then clipboard extraction failed probably due
+					// to IE security settings so we pass the junk though better than nothing right
+					if (n.innerHTML === '\uFEFF') {
+						ed.execCommand('mcePasteWord');
+						e.preventDefault();
+						return;
+					}
+
+					// Process contents
+					process({content : n.innerHTML});
+
+					// Block the real paste event
+					return tinymce.dom.Event.cancel(e);
+				} else {
+					function block(e) {
+						e.preventDefault();
+					};
+
+					// Block mousedown and click to prevent selection change
+					dom.bind(ed.getDoc(), 'mousedown', block);
+					dom.bind(ed.getDoc(), 'keydown', block);
+
+					or = ed.selection.getRng();
+
+					// Move caret into hidden div
+					n = n.firstChild;
+					rng = ed.getDoc().createRange();
+					rng.setStart(n, 0);
+					rng.setEnd(n, 1);
+					sel.setRng(rng);
+
+					// Wait a while and grab the pasted contents
+					window.setTimeout(function() {
+						var h = '', nl;
+
+						// Paste divs duplicated in paste divs seems to happen when you paste plain text so lets first look for that broken behavior in WebKit
+						if (!dom.select('div.mcePaste > div.mcePaste').length) {
+							nl = dom.select('div.mcePaste');
+
+							// WebKit will split the div into multiple ones so this will loop through then all and join them to get the whole HTML string
+							each(nl, function(n) {
+								var child = n.firstChild;
+
+								// WebKit inserts a DIV container with lots of odd styles
+								if (child && child.nodeName == 'DIV' && child.style.marginTop && child.style.backgroundColor) {
+									dom.remove(child, 1);
+								}
+
+								// Remove apply style spans
+								each(dom.select('span.Apple-style-span', n), function(n) {
+									dom.remove(n, 1);
+								});
+
+								// Remove bogus br elements
+								each(dom.select('br[data-mce-bogus]', n), function(n) {
+									dom.remove(n);
+								});
+
+								// WebKit will make a copy of the DIV for each line of plain text pasted and insert them into the DIV
+								if (n.parentNode.className != 'mcePaste')
+									h += n.innerHTML;
+							});
+						} else {
+							// Found WebKit weirdness so force the content into plain text mode
+							h = '<pre>' + dom.encode(textContent).replace(/\r?\n/g, '<br />') + '</pre>';
+						}
+
+						// Remove the nodes
+						each(dom.select('div.mcePaste'), function(n) {
+							dom.remove(n);
+						});
+
+						// Restore the old selection
+						if (or)
+							sel.setRng(or);
+
+						process({content : h});
+
+						// Unblock events ones we got the contents
+						dom.unbind(ed.getDoc(), 'mousedown', block);
+						dom.unbind(ed.getDoc(), 'keydown', block);
+					}, 0);
+				}
+			}
+
+			// Check if we should use the new auto process method			
+			if (getParam(ed, "paste_auto_cleanup_on_paste")) {
+				// Is it's Opera or older FF use key handler
+				if (tinymce.isOpera || /Firefox\/2/.test(navigator.userAgent)) {
+					ed.onKeyDown.add(function(ed, e) {
+						if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45))
+							grabContent(e);
+					});
+				} else {
+					// Grab contents on paste event on Gecko and WebKit
+					ed.onPaste.addToTop(function(ed, e) {
+						return grabContent(e);
+					});
+				}
+			}
+
+			// Block all drag/drop events
+			if (getParam(ed, "paste_block_drop")) {
+				ed.onInit.add(function() {
+					ed.dom.bind(ed.getBody(), ['dragend', 'dragover', 'draggesture', 'dragdrop', 'drop', 'drag'], function(e) {
+						e.preventDefault();
+						e.stopPropagation();
+
+						return false;
+					});
+				});
+			}
+
+			// Add legacy support
+			t._legacySupport();
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Paste text/word',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		_preProcess : function(pl, o) {
+			//console.log('Before preprocess:' + o.content);
+
+			var ed = this.editor,
+				h = o.content,
+				grep = tinymce.grep,
+				explode = tinymce.explode,
+				trim = tinymce.trim,
+				len, stripClass;
+
+			function process(items) {
+				each(items, function(v) {
+					// Remove or replace
+					if (v.constructor == RegExp)
+						h = h.replace(v, '');
+					else
+						h = h.replace(v[0], v[1]);
+				});
+
+	            // UMBRACO SPECIFIC, remove all headers that's not in the style list
+
+	            var umbracoAllowedStyles = ed.getParam('theme_umbraco_styles');
+	            for (var i = 1; i < 7; i++) {
+	                if (umbracoAllowedStyles.indexOf("h" + i) == -1) {
+	                    h = h.replace(new RegExp('<h' + i + '>', 'gi'), '<p><b>');
+	                    h = h.replace(new RegExp('</h' + i + '>', 'gi'), '</b></p>');
+	                }
+	            }
+
+			}
+
+			// Detect Word content and process it more aggressive
+			if (/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(h) || o.wordContent) {
+				o.wordContent = true;			// Mark the pasted contents as word specific content
+				//console.log('Word contents detected.');
+
+				// Process away some basic content
+				process([
+					/^\s*(&nbsp;)+/gi,				// &nbsp; entities at the start of contents
+					/(&nbsp;|<br[^>]*>)+\s*$/gi		// &nbsp; entities at the end of contents
+				]);
+
+				if (getParam(ed, "paste_convert_headers_to_strong")) {
+					h = h.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi, "<p><strong>$1</strong></p>");
+				}
+
+				if (getParam(ed, "paste_convert_middot_lists")) {
+					process([
+						[/<!--\[if !supportLists\]-->/gi, '$&__MCE_ITEM__'],					// Convert supportLists to a list item marker
+						[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi, '$1__MCE_ITEM__'],		// Convert mso-list and symbol spans to item markers
+						[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi, '$1__MCE_ITEM__']				// Convert mso-list and symbol paragraphs to item markers (FF)
+					]);
+				}
+
+				process([
+					// Word comments like conditional comments etc
+					/<!--[\s\S]+?-->/gi,
+
+					// Remove comments, scripts (e.g., msoShowComment), XML tag, VML content, MS Office namespaced tags, and a few other tags
+					/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,
+
+					// Convert <s> into <strike> for line-though
+					[/<(\/?)s>/gi, "<$1strike>"],
+
+					// Replace nsbp entites to char since it's easier to handle
+					[/&nbsp;/gi, "\u00a0"]
+				]);
+
+				// Remove bad attributes, with or without quotes, ensuring that attribute text is really inside a tag.
+				// If JavaScript had a RegExp look-behind, we could have integrated this with the last process() array and got rid of the loop. But alas, it does not, so we cannot.
+				do {
+					len = h.length;
+					h = h.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi, "$1");
+				} while (len != h.length);
+
+				// Remove all spans if no styles is to be retained
+				if (getParam(ed, "paste_retain_style_properties").replace(/^none$/i, "").length == 0) {
+					h = h.replace(/<\/?span[^>]*>/gi, "");
+				} else {
+					// We're keeping styles, so at least clean them up.
+					// CSS Reference: http://msdn.microsoft.com/en-us/library/aa155477.aspx
+
+					process([
+						// Convert <span style="mso-spacerun:yes">___</span> to string of alternating breaking/non-breaking spaces of same length
+						[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,
+							function(str, spaces) {
+								return (spaces.length > 0)? spaces.replace(/./, " ").slice(Math.floor(spaces.length/2)).split("").join("\u00a0") : "";
+							}
+						],
+
+						// Examine all styles: delete junk, transform some, and keep the rest
+						[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,
+							function(str, tag, style) {
+								var n = [],
+									i = 0,
+									s = explode(trim(style).replace(/&quot;/gi, "'"), ";");
+
+								// Examine each style definition within the tag's style attribute
+								each(s, function(v) {
+									var name, value,
+										parts = explode(v, ":");
+
+									function ensureUnits(v) {
+										return v + ((v !== "0") && (/\d$/.test(v)))? "px" : "";
+									}
+
+									if (parts.length == 2) {
+										name = parts[0].toLowerCase();
+										value = parts[1].toLowerCase();
+
+										// Translate certain MS Office styles into their CSS equivalents
+										switch (name) {
+											case "mso-padding-alt":
+											case "mso-padding-top-alt":
+											case "mso-padding-right-alt":
+											case "mso-padding-bottom-alt":
+											case "mso-padding-left-alt":
+											case "mso-margin-alt":
+											case "mso-margin-top-alt":
+											case "mso-margin-right-alt":
+											case "mso-margin-bottom-alt":
+											case "mso-margin-left-alt":
+											case "mso-table-layout-alt":
+											case "mso-height":
+											case "mso-width":
+											case "mso-vertical-align-alt":
+												n[i++] = name.replace(/^mso-|-alt$/g, "") + ":" + ensureUnits(value);
+												return;
+
+											case "horiz-align":
+												n[i++] = "text-align:" + value;
+												return;
+
+											case "vert-align":
+												n[i++] = "vertical-align:" + value;
+												return;
+
+											case "font-color":
+											case "mso-foreground":
+												n[i++] = "color:" + value;
+												return;
+
+											case "mso-background":
+											case "mso-highlight":
+												n[i++] = "background:" + value;
+												return;
+
+											case "mso-default-height":
+												n[i++] = "min-height:" + ensureUnits(value);
+												return;
+
+											case "mso-default-width":
+												n[i++] = "min-width:" + ensureUnits(value);
+												return;
+
+											case "mso-padding-between-alt":
+												n[i++] = "border-collapse:separate;border-spacing:" + ensureUnits(value);
+												return;
+
+											case "text-line-through":
+												if ((value == "single") || (value == "double")) {
+													n[i++] = "text-decoration:line-through";
+												}
+												return;
+
+											case "mso-zero-height":
+												if (value == "yes") {
+													n[i++] = "display:none";
+												}
+												return;
+										}
+
+										// Eliminate all MS Office style definitions that have no CSS equivalent by examining the first characters in the name
+										if (/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(name)) {
+											return;
+										}
+
+										// If it reached this point, it must be a valid CSS style
+										n[i++] = name + ":" + parts[1];		// Lower-case name, but keep value case
+									}
+								});
+
+								// If style attribute contained any valid styles the re-write it; otherwise delete style attribute.
+								if (i > 0) {
+									return tag + ' style="' + n.join(';') + '"';
+								} else {
+									return tag;
+								}
+							}
+						]
+					]);
+				}
+			}
+
+			// Replace headers with <strong>
+			if (getParam(ed, "paste_convert_headers_to_strong")) {
+				process([
+					[/<h[1-6][^>]*>/gi, "<p><strong>"],
+					[/<\/h[1-6][^>]*>/gi, "</strong></p>"]
+				]);
+			}
+
+			process([
+				// Copy paste from Java like Open Office will produce this junk on FF
+				[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi, '']
+			]);
+
+			// Class attribute options are: leave all as-is ("none"), remove all ("all"), or remove only those starting with mso ("mso").
+			// Note:-  paste_strip_class_attributes: "none", verify_css_classes: true is also a good variation.
+			stripClass = getParam(ed, "paste_strip_class_attributes");
+
+			if (stripClass !== "none") {
+				function removeClasses(match, g1) {
+						if (stripClass === "all")
+							return '';
+
+						var cls = grep(explode(g1.replace(/^(["'])(.*)\1$/, "$2"), " "),
+							function(v) {
+								return (/^(?!mso)/i.test(v));
+							}
+						);
+
+						return cls.length ? ' class="' + cls.join(" ") + '"' : '';
+				};
+
+				h = h.replace(/ class="([^"]+)"/gi, removeClasses);
+				h = h.replace(/ class=([\-\w]+)/gi, removeClasses);
+			}
+
+			// Remove spans option
+			if (getParam(ed, "paste_remove_spans")) {
+				h = h.replace(/<\/?span[^>]*>/gi, "");
+			}
+
+			//console.log('After preprocess:' + h);
+
+			o.content = h;
+		},
+
+		/**
+		 * Various post process items.
+		 */
+		_postProcess : function(pl, o) {
+			var t = this, ed = t.editor, dom = ed.dom, styleProps;
+
+			if (o.wordContent) {
+				// Remove named anchors or TOC links
+				each(dom.select('a', o.node), function(a) {
+					if (!a.href || a.href.indexOf('#_Toc') != -1)
+						dom.remove(a, 1);
+				});
+
+				if (getParam(ed, "paste_convert_middot_lists")) {
+					t._convertLists(pl, o);
+				}
+
+				// Process styles
+				styleProps = getParam(ed, "paste_retain_style_properties"); // retained properties
+
+				// Process only if a string was specified and not equal to "all" or "*"
+				if ((tinymce.is(styleProps, "string")) && (styleProps !== "all") && (styleProps !== "*")) {
+					styleProps = tinymce.explode(styleProps.replace(/^none$/i, ""));
+
+					// Retains some style properties
+					each(dom.select('*', o.node), function(el) {
+						var newStyle = {}, npc = 0, i, sp, sv;
+
+						// Store a subset of the existing styles
+						if (styleProps) {
+							for (i = 0; i < styleProps.length; i++) {
+								sp = styleProps[i];
+								sv = dom.getStyle(el, sp);
+
+								if (sv) {
+									newStyle[sp] = sv;
+									npc++;
+								}
+							}
+						}
+
+						// Remove all of the existing styles
+						dom.setAttrib(el, 'style', '');
+
+						if (styleProps && npc > 0)
+							dom.setStyles(el, newStyle); // Add back the stored subset of styles
+						else // Remove empty span tags that do not have class attributes
+							if (el.nodeName == 'SPAN' && !el.className)
+								dom.remove(el, true);
+					});
+				}
+			}
+
+			// Remove all style information or only specifically on WebKit to avoid the style bug on that browser
+			if (getParam(ed, "paste_remove_styles") || (getParam(ed, "paste_remove_styles_if_webkit") && tinymce.isWebKit)) {
+				each(dom.select('*[style]', o.node), function(el) {
+					el.removeAttribute('style');
+					el.removeAttribute('data-mce-style');
+				});
+			} else {
+				if (tinymce.isWebKit) {
+					// We need to compress the styles on WebKit since if you paste <img border="0" /> it will become <img border="0" style="... lots of junk ..." />
+					// Removing the mce_style that contains the real value will force the Serializer engine to compress the styles
+					each(dom.select('*', o.node), function(el) {
+						el.removeAttribute('data-mce-style');
+					});
+				}
+			}
+		},
+
+		/**
+		 * Converts the most common bullet and number formats in Office into a real semantic UL/LI list.
+		 */
+		_convertLists : function(pl, o) {
+			var dom = pl.editor.dom, listElm, li, lastMargin = -1, margin, levels = [], lastType, html;
+
+			// Convert middot lists into real semantic lists
+			each(dom.select('p', o.node), function(p) {
+				var sib, val = '', type, html, idx, parents;
+
+				// Get text node value at beginning of paragraph
+				for (sib = p.firstChild; sib && sib.nodeType == 3; sib = sib.nextSibling)
+					val += sib.nodeValue;
+
+				val = p.innerHTML.replace(/<\/?\w+[^>]*>/gi, '').replace(/&nbsp;/g, '\u00a0');
+
+				// Detect unordered lists look for bullets
+				if (/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(val))
+					type = 'ul';
+
+				// Detect ordered lists 1., a. or ixv.
+				if (/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(val))
+					type = 'ol';
+
+				// Check if node value matches the list pattern: o&nbsp;&nbsp;
+				if (type) {
+					margin = parseFloat(p.style.marginLeft || 0);
+
+					if (margin > lastMargin)
+						levels.push(margin);
+
+					if (!listElm || type != lastType) {
+						listElm = dom.create(type);
+						dom.insertAfter(listElm, p);
+					} else {
+						// Nested list element
+						if (margin > lastMargin) {
+							listElm = li.appendChild(dom.create(type));
+						} else if (margin < lastMargin) {
+							// Find parent level based on margin value
+							idx = tinymce.inArray(levels, margin);
+							parents = dom.getParents(listElm.parentNode, type);
+							listElm = parents[parents.length - 1 - idx] || listElm;
+						}
+					}
+
+					// Remove middot or number spans if they exists
+					each(dom.select('span', p), function(span) {
+						var html = span.innerHTML.replace(/<\/?\w+[^>]*>/gi, '');
+
+						// Remove span with the middot or the number
+						if (type == 'ul' && /^[\u2022\u00b7\u00a7\u00d8o]/.test(html))
+							dom.remove(span);
+						else if (/^[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(html))
+							dom.remove(span);
+					});
+
+					html = p.innerHTML;
+
+					// Remove middot/list items
+					if (type == 'ul')
+						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*(&nbsp;|\u00a0)+\s*/, '');
+					else
+						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/, '');
+
+					// Create li and add paragraph data into the new li
+					li = listElm.appendChild(dom.create('li', 0, html));
+					dom.remove(p);
+
+					lastMargin = margin;
+					lastType = type;
+				} else
+					listElm = lastMargin = 0; // End list element
+			});
+
+			// Remove any left over makers
+			html = o.node.innerHTML;
+			if (html.indexOf('__MCE_ITEM__') != -1)
+				o.node.innerHTML = html.replace(/__MCE_ITEM__/g, '');
+		},
+
+		/**
+		 * Inserts the specified contents at the caret position.
+		 */
+		_insert : function(h, skip_undo) {
+			var ed = this.editor, r = ed.selection.getRng();
+
+			// First delete the contents seems to work better on WebKit when the selection spans multiple list items or multiple table cells.
+			if (!ed.selection.isCollapsed() && r.startContainer != r.endContainer)
+				ed.getDoc().execCommand('Delete', false, null);
+
+			// It's better to use the insertHTML method on Gecko since it will combine paragraphs correctly before inserting the contents
+			ed.execCommand('mceInsertContent', false, h, {skip_undo : skip_undo});
+		},
+
+		/**
+		 * Instead of the old plain text method which tried to re-create a paste operation, the
+		 * new approach adds a plain text mode toggle switch that changes the behavior of paste.
+		 * This function is passed the same input that the regular paste plugin produces.
+		 * It performs additional scrubbing and produces (and inserts) the plain text.
+		 * This approach leverages all of the great existing functionality in the paste
+		 * plugin, and requires minimal changes to add the new functionality.
+		 * Speednet - June 2009
+		 */
+		_insertPlainText : function(ed, dom, h) {
+			var i, len, pos, rpos, node, breakElms, before, after,
+				w = ed.getWin(),
+				d = ed.getDoc(),
+				sel = ed.selection,
+				is = tinymce.is,
+				inArray = tinymce.inArray,
+				linebr = getParam(ed, "paste_text_linebreaktype"),
+				rl = getParam(ed, "paste_text_replacements");
+
+			function process(items) {
+				each(items, function(v) {
+					if (v.constructor == RegExp)
+						h = h.replace(v, "");
+					else
+						h = h.replace(v[0], v[1]);
+				});
+			};
+
+			if ((typeof(h) === "string") && (h.length > 0)) {
+				// If HTML content with line-breaking tags, then remove all cr/lf chars because only tags will break a line
+				if (/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(h)) {
+					process([
+						/[\n\r]+/g
+					]);
+				} else {
+					// Otherwise just get rid of carriage returns (only need linefeeds)
+					process([
+						/\r+/g
+					]);
+				}
+
+				process([
+					[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi, "\n\n"],		// Block tags get a blank line after them
+					[/<br[^>]*>|<\/tr>/gi, "\n"],				// Single linebreak for <br /> tags and table rows
+					[/<\/t[dh]>\s*<t[dh][^>]*>/gi, "\t"],		// Table cells get tabs betweem them
+					/<[a-z!\/?][^>]*>/gi,						// Delete all remaining tags
+					[/&nbsp;/gi, " "],							// Convert non-break spaces to regular spaces (remember, *plain text*)
+					[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi, "$1"],	// Cool little RegExp deletes whitespace around linebreak chars.
+					[/\n{3,}/g, "\n\n"],							// Max. 2 consecutive linebreaks
+					/^\s+|\s+$/g									// Trim the front & back
+				]);
+
+				h = dom.decode(tinymce.html.Entities.encodeRaw(h));
+
+				// Delete any highlighted text before pasting
+				if (!sel.isCollapsed()) {
+					d.execCommand("Delete", false, null);
+				}
+
+				// Perform default or custom replacements
+				if (is(rl, "array") || (is(rl, "array"))) {
+					process(rl);
+				}
+				else if (is(rl, "string")) {
+					process(new RegExp(rl, "gi"));
+				}
+
+				// Treat paragraphs as specified in the config
+				if (linebr == "none") {
+					process([
+						[/\n+/g, " "]
+					]);
+				}
+				else if (linebr == "br") {
+					process([
+						[/\n/g, "<br />"]
+					]);
+				}
+				else {
+					process([
+						/^\s+|\s+$/g,
+						[/\n\n/g, "</p><p>"],
+						[/\n/g, "<br />"]
+					]);
+				}
+
+				// This next piece of code handles the situation where we're pasting more than one paragraph of plain
+				// text, and we are pasting the content into the middle of a block node in the editor.  The block
+				// node gets split at the selection point into "Para A" and "Para B" (for the purposes of explaining).
+				// The first paragraph of the pasted text is appended to "Para A", and the last paragraph of the
+				// pasted text is prepended to "Para B".  Any other paragraphs of pasted text are placed between
+				// "Para A" and "Para B".  This code solves a host of problems with the original plain text plugin and
+				// now handles styles correctly.  (Pasting plain text into a styled paragraph is supposed to make the
+				// plain text take the same style as the existing paragraph.)
+				if ((pos = h.indexOf("</p><p>")) != -1) {
+					rpos = h.lastIndexOf("</p><p>");
+					node = sel.getNode(); 
+					breakElms = [];		// Get list of elements to break 
+
+					do {
+						if (node.nodeType == 1) {
+							// Don't break tables and break at body
+							if (node.nodeName == "TD" || node.nodeName == "BODY") {
+								break;
+							}
+
+							breakElms[breakElms.length] = node;
+						}
+					} while (node = node.parentNode);
+
+					// Are we in the middle of a block node?
+					if (breakElms.length > 0) {
+						before = h.substring(0, pos);
+						after = "";
+
+						for (i=0, len=breakElms.length; i<len; i++) {
+							before += "</" + breakElms[i].nodeName.toLowerCase() + ">";
+							after += "<" + breakElms[breakElms.length-i-1].nodeName.toLowerCase() + ">";
+						}
+
+						if (pos == rpos) {
+							h = before + after + h.substring(pos+7);
+						}
+						else {
+							h = before + h.substring(pos+4, rpos+4) + after + h.substring(rpos+7);
+						}
+					}
+				}
+
+				// Insert content at the caret, plus add a marker for repositioning the caret
+				ed.execCommand("mceInsertRawHTML", false, h + '<span id="_plain_text_marker">&nbsp;</span>');
+
+				// Reposition the caret to the marker, which was placed immediately after the inserted content.
+				// Needs to be done asynchronously (in window.setTimeout) or else it doesn't work in all browsers.
+				// The second part of the code scrolls the content up if the caret is positioned off-screen.
+				// This is only necessary for WebKit browsers, but it doesn't hurt to use for all.
+				window.setTimeout(function() {
+					var marker = dom.get('_plain_text_marker'),
+						elm, vp, y, elmHeight;
+
+					sel.select(marker, false);
+					d.execCommand("Delete", false, null);
+					marker = null;
+
+					// Get element, position and height
+					elm = sel.getStart();
+					vp = dom.getViewPort(w);
+					y = dom.getPos(elm).y;
+					elmHeight = elm.clientHeight;
+
+					// Is element within viewport if not then scroll it into view
+					if ((y < vp.y) || (y + elmHeight > vp.y + vp.h)) {
+						d.body.scrollTop = y < vp.y ? y : y - vp.h + 25;
+					}
+				}, 0);
+			}
+		},
+
+		/**
+		 * This method will open the old style paste dialogs. Some users might want the old behavior but still use the new cleanup engine.
+		 */
+		_legacySupport : function() {
+			var t = this, ed = t.editor;
+
+			// Register command(s) for backwards compatibility
+			ed.addCommand("mcePasteWord", function() {
+				ed.windowManager.open({
+					file: t.url + "/pasteword.htm",
+					width: parseInt(getParam(ed, "paste_dialog_width")),
+					height: parseInt(getParam(ed, "paste_dialog_height")),
+					inline: 1
+				});
+			});
+
+			if (getParam(ed, "paste_text_use_dialog")) {
+				ed.addCommand("mcePasteText", function() {
+					ed.windowManager.open({
+						file : t.url + "/pastetext.htm",
+						width: parseInt(getParam(ed, "paste_dialog_width")),
+						height: parseInt(getParam(ed, "paste_dialog_height")),
+						inline : 1
+					});
+				});
+			}
+
+			// Register button for backwards compatibility
+			ed.addButton("pasteword", {title : "paste.paste_word_desc", cmd : "mcePasteWord"});
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add("paste", tinymce.plugins.PastePlugin);
+})();
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/js/pastetext.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/js/pastetext.js
new file mode 100644
index 0000000000..c524f9eb03
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/js/pastetext.js
@@ -0,0 +1,36 @@
+tinyMCEPopup.requireLangPack();
+
+var PasteTextDialog = {
+	init : function() {
+		this.resize();
+	},
+
+	insert : function() {
+		var h = tinyMCEPopup.dom.encode(document.getElementById('content').value), lines;
+
+		// Convert linebreaks into paragraphs
+		if (document.getElementById('linebreaks').checked) {
+			lines = h.split(/\r?\n/);
+			if (lines.length > 1) {
+				h = '';
+				tinymce.each(lines, function(row) {
+					h += '<p>' + row + '</p>';
+				});
+			}
+		}
+
+		tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, {content : h});
+		tinyMCEPopup.close();
+	},
+
+	resize : function() {
+		var vp = tinyMCEPopup.dom.getViewPort(window), el;
+
+		el = document.getElementById('content');
+
+		el.style.width  = (vp.w - 20) + 'px';
+		el.style.height = (vp.h - 90) + 'px';
+	}
+};
+
+tinyMCEPopup.onInit.add(PasteTextDialog.init, PasteTextDialog);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/js/pasteword.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/js/pasteword.js
new file mode 100644
index 0000000000..a52731c368
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/js/pasteword.js
@@ -0,0 +1,51 @@
+tinyMCEPopup.requireLangPack();
+
+var PasteWordDialog = {
+	init : function() {
+		var ed = tinyMCEPopup.editor, el = document.getElementById('iframecontainer'), ifr, doc, css, cssHTML = '';
+
+		// Create iframe
+		el.innerHTML = '<iframe id="iframe" src="javascript:\'\';" frameBorder="0" style="border: 1px solid gray"></iframe>';
+		ifr = document.getElementById('iframe');
+		doc = ifr.contentWindow.document;
+
+		// Force absolute CSS urls
+		css = [ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css")];
+		css = css.concat(tinymce.explode(ed.settings.content_css) || []);
+		tinymce.each(css, function(u) {
+			cssHTML += '<link href="' + ed.documentBaseURI.toAbsolute('' + u) + '" rel="stylesheet" type="text/css" />';
+		});
+
+		// Write content into iframe
+		doc.open();
+		doc.write('<html><head>' + cssHTML + '</head><body class="mceContentBody" spellcheck="false"></body></html>');
+		doc.close();
+
+		doc.designMode = 'on';
+		this.resize();
+
+		window.setTimeout(function() {
+			ifr.contentWindow.focus();
+		}, 10);
+	},
+
+	insert : function() {
+		var h = document.getElementById('iframe').contentWindow.document.body.innerHTML;
+
+		tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, {content : h, wordContent : true});
+		tinyMCEPopup.close();
+	},
+
+	resize : function() {
+		var vp = tinyMCEPopup.dom.getViewPort(window), el;
+
+		el = document.getElementById('iframe');
+
+		if (el) {
+			el.style.width  = (vp.w - 20) + 'px';
+			el.style.height = (vp.h - 90) + 'px';
+		}
+	}
+};
+
+tinyMCEPopup.onInit.add(PasteWordDialog.init, PasteWordDialog);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/da_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/da_dlg.js
new file mode 100644
index 0000000000..22abfe4516
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/da_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('da.paste_dlg',{
+text_title:"Anvend CTRL+V p\u00E5 tastaturet for at inds\u00E6tte teksten.",
+text_linebreaks:"Bevar linieskift",
+word_title:"Anvend CTRL+V p\u00E5 tastaturet for at inds\u00E6tte teksten."
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/de_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/de_dlg.js
new file mode 100644
index 0000000000..5a3f5e8c60
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/de_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('de.paste_dlg',{
+text_title:"Dr\u00FCcken Sie auf Ihrer Tastatur Strg+V, um den Text einzuf\u00FCgen.",
+text_linebreaks:"Zeilenumbr\u00FCche beibehalten",
+word_title:"Dr\u00FCcken Sie auf Ihrer Tastatur Strg+V, um den Text einzuf\u00FCgen."
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/en_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/en_dlg.js
new file mode 100644
index 0000000000..eeac778960
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/en_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('en.paste_dlg',{
+text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
+text_linebreaks:"Keep linebreaks",
+word_title:"Use CTRL+V on your keyboard to paste the text into the window."
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/es_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/es_dlg.js
new file mode 100644
index 0000000000..d5edb6912e
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/es_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('es.paste_dlg',{
+text_title:"Use CTRL+V en su teclado para pegar el texto en la ventana.",
+text_linebreaks:"Keep linebreaks",
+word_title:"Use CTRL+V en su teclado para pegar el texto en la ventana."
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/fr_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/fr_dlg.js
new file mode 100644
index 0000000000..ae8dd5a406
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/fr_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('fr.paste_dlg',{
+text_title:"Utilisez CTRL+V sur votre clavier pour coller le texte dans la fen\u00EAtre.",
+text_linebreaks:"Conserver les sauts de ligne",
+word_title:"Utilisez CTRL+V sur votre clavier pour coller le texte dans la fen\u00EAtre."
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/it_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/it_dlg.js
new file mode 100644
index 0000000000..98543942af
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/it_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('it.paste_dlg',{
+text_title:"Premere CTRL+V sulla tastiera per incollare il testo nella finestra.",
+text_linebreaks:"Mantieni interruzioni di riga",
+word_title:"Premere CTRL+V sulla tastiera per incollare il testo nella finestra."
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/nl_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/nl_dlg.js
new file mode 100644
index 0000000000..99e604fe5b
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/nl_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('nl.paste_dlg',{
+text_title:"Gebruik Ctrl+V om tekst in het venster te plakken.",
+text_linebreaks:"Regelafbreking bewaren",
+word_title:"Gebruik Ctrl+V om tekst in het venster te plakken."
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/no_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/no_dlg.js
new file mode 100644
index 0000000000..eba405d548
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/no_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('no.paste_dlg',{
+text_title:"Bruk CTRL+V p\u00E5 tastaturet for \u00E5 lime inn i dette vinduet.",
+text_linebreaks:"Behold tekstbryting",
+word_title:"Bruk CTRL+V p\u00E5 tastaturet for \u00E5 lime inn i dette vinduet."
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/sv_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/sv_dlg.js
new file mode 100644
index 0000000000..4cea4b221f
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/langs/sv_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('sv.paste_dlg',{
+text_title:"Anv\u00E4nd ctrl-v p\u00E5 ditt tangentbord f\u00F6r att klistra in i detta f\u00F6nster.",
+text_linebreaks:"Spara radbrytningar",
+word_title:"Anv\u00E4nd ctrl-v p\u00E5 ditt tangentbord f\u00F6r att klistra in i detta f\u00F6nster."
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/pastetext.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/pastetext.htm
new file mode 100644
index 0000000000..b655945476
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/pastetext.htm
@@ -0,0 +1,27 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#paste.paste_text_desc}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/pastetext.js"></script>
+</head>
+<body onresize="PasteTextDialog.resize();" style="display:none; overflow:hidden;">
+	<form name="source" onsubmit="return PasteTextDialog.insert();" action="#">
+		<div style="float: left" class="title">{#paste.paste_text_desc}</div>
+
+		<div style="float: right">
+			<input type="checkbox" name="linebreaks" id="linebreaks" class="wordWrapCode" checked="checked" /><label for="linebreaks">{#paste_dlg.text_linebreaks}</label>
+		</div>
+
+		<br style="clear: both" />
+
+		<div>{#paste_dlg.text_title}</div>
+
+		<textarea id="content" name="content" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,mono; font-size: 12px;" dir="ltr" wrap="soft" class="mceFocus"></textarea>
+
+		<div class="mceActionPanel">
+			<input type="submit" name="insert" value="{#insert}" id="insert" />
+			<input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
+		</div>
+	</form>
+</body> 
+</html>
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/pasteword.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/pasteword.htm
new file mode 100644
index 0000000000..0f6bb41210
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/paste/pasteword.htm
@@ -0,0 +1,21 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#paste.paste_word_desc}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/pasteword.js"></script>
+</head>
+<body onresize="PasteWordDialog.resize();" style="display:none; overflow:hidden;">
+	<form name="source" onsubmit="return PasteWordDialog.insert();" action="#">
+		<div class="title">{#paste.paste_word_desc}</div>
+
+		<div>{#paste_dlg.word_title}</div>
+
+		<div id="iframecontainer"></div>
+
+		<div class="mceActionPanel">
+			<input type="submit" id="insert" name="insert" value="{#insert}" />
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/editor_plugin.js
new file mode 100644
index 0000000000..507909c5f0
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.Preview",{init:function(a,b){var d=this,c=tinymce.explode(a.settings.content_css);d.editor=a;tinymce.each(c,function(f,e){c[e]=a.documentBaseURI.toAbsolute(f)});a.addCommand("mcePreview",function(){a.windowManager.open({file:a.getParam("plugin_preview_pageurl",b+"/preview.html"),width:parseInt(a.getParam("plugin_preview_width","550")),height:parseInt(a.getParam("plugin_preview_height","600")),resizable:"yes",scrollbars:"yes",popup_css:c?c.join(","):a.baseURI.toAbsolute("themes/"+a.settings.theme+"/skins/"+a.settings.skin+"/content.css"),inline:a.getParam("plugin_preview_inline",1)},{base:a.documentBaseURI.getURI()})});a.addButton("preview",{title:"preview.preview_desc",cmd:"mcePreview"})},getInfo:function(){return{longname:"Preview",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("preview",tinymce.plugins.Preview)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/editor_plugin_src.js
new file mode 100644
index 0000000000..80f00f0d9f
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/editor_plugin_src.js
@@ -0,0 +1,53 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Preview', {
+		init : function(ed, url) {
+			var t = this, css = tinymce.explode(ed.settings.content_css);
+
+			t.editor = ed;
+
+			// Force absolute CSS urls	
+			tinymce.each(css, function(u, k) {
+				css[k] = ed.documentBaseURI.toAbsolute(u);
+			});
+
+			ed.addCommand('mcePreview', function() {
+				ed.windowManager.open({
+					file : ed.getParam("plugin_preview_pageurl", url + "/preview.html"),
+					width : parseInt(ed.getParam("plugin_preview_width", "550")),
+					height : parseInt(ed.getParam("plugin_preview_height", "600")),
+					resizable : "yes",
+					scrollbars : "yes",
+					popup_css : css ? css.join(',') : ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css"),
+					inline : ed.getParam("plugin_preview_inline", 1)
+				}, {
+					base : ed.documentBaseURI.getURI()
+				});
+			});
+
+			ed.addButton('preview', {title : 'preview.preview_desc', cmd : 'mcePreview'});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Preview',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('preview', tinymce.plugins.Preview);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/example.html b/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/example.html
new file mode 100644
index 0000000000..b2c3d90ce0
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/example.html
@@ -0,0 +1,28 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<script language="javascript" src="../../tiny_mce_popup.js"></script>
+<script type="text/javascript" src="jscripts/embed.js"></script>
+<script type="text/javascript">
+tinyMCEPopup.onInit.add(function(ed) {
+	var dom = tinyMCEPopup.dom;
+
+	// Load editor content_css
+	tinymce.each(ed.settings.content_css.split(','), function(u) {
+		dom.loadCSS(ed.documentBaseURI.toAbsolute(u));
+	});
+
+	// Place contents inside div container
+	dom.setHTML('content', ed.getContent());
+});
+</script>
+<title>Example of a custom preview page</title>
+</head>
+<body>
+
+Editor contents: <br />
+<div id="content">
+<!-- Gets filled with editor contents -->
+</div>
+
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/jscripts/embed.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/jscripts/embed.js
new file mode 100644
index 0000000000..f8dc810527
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/jscripts/embed.js
@@ -0,0 +1,73 @@
+/**
+ * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.
+ */
+
+function writeFlash(p) {
+	writeEmbed(
+		'D27CDB6E-AE6D-11cf-96B8-444553540000',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'application/x-shockwave-flash',
+		p
+	);
+}
+
+function writeShockWave(p) {
+	writeEmbed(
+	'166B1BCA-3F9C-11CF-8075-444553540000',
+	'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',
+	'application/x-director',
+		p
+	);
+}
+
+function writeQuickTime(p) {
+	writeEmbed(
+		'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',
+		'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',
+		'video/quicktime',
+		p
+	);
+}
+
+function writeRealMedia(p) {
+	writeEmbed(
+		'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'audio/x-pn-realaudio-plugin',
+		p
+	);
+}
+
+function writeWindowsMedia(p) {
+	p.url = p.src;
+	writeEmbed(
+		'6BF52A52-394A-11D3-B153-00C04F79FAA6',
+		'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',
+		'application/x-mplayer2',
+		p
+	);
+}
+
+function writeEmbed(cls, cb, mt, p) {
+	var h = '', n;
+
+	h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
+	h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';
+	h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';
+	h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';
+	h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';
+	h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';
+	h += '>';
+
+	for (n in p)
+		h += '<param name="' + n + '" value="' + p[n] + '">';
+
+	h += '<embed type="' + mt + '"';
+
+	for (n in p)
+		h += n + '="' + p[n] + '" ';
+
+	h += '></embed></object>';
+
+	document.write(h);
+}
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/preview.html b/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/preview.html
new file mode 100644
index 0000000000..67e7b142fa
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/preview/preview.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+<script type="text/javascript" src="jscripts/embed.js"></script>
+<script type="text/javascript"><!--
+document.write('<base href="' + tinyMCEPopup.getWindowArg("base") + '">');
+// -->
+</script>
+<title>{#preview.preview_desc}</title>
+</head>
+<body id="content">
+<script type="text/javascript">
+	document.write(tinyMCEPopup.editor.getContent());
+</script>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/print/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/print/editor_plugin.js
new file mode 100644
index 0000000000..b5b3a55edf
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/print/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.Print",{init:function(a,b){a.addCommand("mcePrint",function(){a.getWin().print()});a.addButton("print",{title:"print.print_desc",cmd:"mcePrint"})},getInfo:function(){return{longname:"Print",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("print",tinymce.plugins.Print)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/print/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/print/editor_plugin_src.js
new file mode 100644
index 0000000000..3933fe656c
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/print/editor_plugin_src.js
@@ -0,0 +1,34 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Print', {
+		init : function(ed, url) {
+			ed.addCommand('mcePrint', function() {
+				ed.getWin().print();
+			});
+
+			ed.addButton('print', {title : 'print.print_desc', cmd : 'mcePrint'});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Print',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('print', tinymce.plugins.Print);
+})();
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/save/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/save/editor_plugin.js
new file mode 100644
index 0000000000..8e93996671
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/save/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.Save",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceSave",c._save,c);a.addCommand("mceCancel",c._cancel,c);a.addButton("save",{title:"save.save_desc",cmd:"mceSave"});a.addButton("cancel",{title:"save.cancel_desc",cmd:"mceCancel"});a.onNodeChange.add(c._nodeChange,c);a.addShortcut("ctrl+s",a.getLang("save.save_desc"),"mceSave")},getInfo:function(){return{longname:"Save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/save",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,c){var b=this.editor;if(b.getParam("save_enablewhendirty")){a.setDisabled("save",!b.isDirty());a.setDisabled("cancel",!b.isDirty())}},_save:function(){var c=this.editor,a,e,d,b;a=tinymce.DOM.get(c.id).form||tinymce.DOM.getParent(c.id,"form");if(c.getParam("save_enablewhendirty")&&!c.isDirty()){return}tinyMCE.triggerSave();if(e=c.getParam("save_onsavecallback")){if(c.execCallback("save_onsavecallback",c)){c.startContent=tinymce.trim(c.getContent({format:"raw"}));c.nodeChanged()}return}if(a){c.isNotDirty=true;if(a.onsubmit==null||a.onsubmit()!=false){a.submit()}c.nodeChanged()}else{c.windowManager.alert("Error: No form element found.")}},_cancel:function(){var a=this.editor,c,b=tinymce.trim(a.startContent);if(c=a.getParam("save_oncancelcallback")){a.execCallback("save_oncancelcallback",a);return}a.setContent(b);a.undoManager.clear();a.nodeChanged()}});tinymce.PluginManager.add("save",tinymce.plugins.Save)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/save/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/save/editor_plugin_src.js
new file mode 100644
index 0000000000..f5a3de8f5f
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/save/editor_plugin_src.js
@@ -0,0 +1,101 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Save', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceSave', t._save, t);
+			ed.addCommand('mceCancel', t._cancel, t);
+
+			// Register buttons
+			ed.addButton('save', {title : 'save.save_desc', cmd : 'mceSave'});
+			ed.addButton('cancel', {title : 'save.cancel_desc', cmd : 'mceCancel'});
+
+			ed.onNodeChange.add(t._nodeChange, t);
+			ed.addShortcut('ctrl+s', ed.getLang('save.save_desc'), 'mceSave');
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Save',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/save',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_nodeChange : function(ed, cm, n) {
+			var ed = this.editor;
+
+			if (ed.getParam('save_enablewhendirty')) {
+				cm.setDisabled('save', !ed.isDirty());
+				cm.setDisabled('cancel', !ed.isDirty());
+			}
+		},
+
+		// Private methods
+
+		_save : function() {
+			var ed = this.editor, formObj, os, i, elementId;
+
+			formObj = tinymce.DOM.get(ed.id).form || tinymce.DOM.getParent(ed.id, 'form');
+
+			if (ed.getParam("save_enablewhendirty") && !ed.isDirty())
+				return;
+
+			tinyMCE.triggerSave();
+
+			// Use callback instead
+			if (os = ed.getParam("save_onsavecallback")) {
+				if (ed.execCallback('save_onsavecallback', ed)) {
+					ed.startContent = tinymce.trim(ed.getContent({format : 'raw'}));
+					ed.nodeChanged();
+				}
+
+				return;
+			}
+
+			if (formObj) {
+				ed.isNotDirty = true;
+
+				if (formObj.onsubmit == null || formObj.onsubmit() != false)
+					formObj.submit();
+
+				ed.nodeChanged();
+			} else
+				ed.windowManager.alert("Error: No form element found.");
+		},
+
+		_cancel : function() {
+			var ed = this.editor, os, h = tinymce.trim(ed.startContent);
+
+			// Use callback instead
+			if (os = ed.getParam("save_oncancelcallback")) {
+				ed.execCallback('save_oncancelcallback', ed);
+				return;
+			}
+
+			ed.setContent(h);
+			ed.undoManager.clear();
+			ed.nodeChanged();
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('save', tinymce.plugins.Save);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/css/searchreplace.css b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/css/searchreplace.css
new file mode 100644
index 0000000000..ecdf58c7b5
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/css/searchreplace.css
@@ -0,0 +1,6 @@
+.panel_wrapper {height:85px;}
+.panel_wrapper div.current {height:85px;}
+
+/* IE */
+* html .panel_wrapper {height:100px;}
+* html .panel_wrapper div.current {height:100px;}
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/editor_plugin.js
new file mode 100644
index 0000000000..165bc12df5
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){window.focus();a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/editor_plugin_src.js
new file mode 100644
index 0000000000..4c87e8fa79
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/editor_plugin_src.js
@@ -0,0 +1,61 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.SearchReplacePlugin', {
+		init : function(ed, url) {
+			function open(m) {
+				// Keep IE from writing out the f/r character to the editor
+				// instance while initializing a new dialog. See: #3131190
+				window.focus();
+
+				ed.windowManager.open({
+					file : url + '/searchreplace.htm',
+					width : 420 + parseInt(ed.getLang('searchreplace.delta_width', 0)),
+					height : 170 + parseInt(ed.getLang('searchreplace.delta_height', 0)),
+					inline : 1,
+					auto_focus : 0
+				}, {
+					mode : m,
+					search_string : ed.selection.getContent({format : 'text'}),
+					plugin_url : url
+				});
+			};
+
+			// Register commands
+			ed.addCommand('mceSearch', function() {
+				open('search');
+			});
+
+			ed.addCommand('mceReplace', function() {
+				open('replace');
+			});
+
+			// Register buttons
+			ed.addButton('search', {title : 'searchreplace.search_desc', cmd : 'mceSearch'});
+			ed.addButton('replace', {title : 'searchreplace.replace_desc', cmd : 'mceReplace'});
+
+			ed.addShortcut('ctrl+f', 'searchreplace.search_desc', 'mceSearch');
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Search/Replace',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('searchreplace', tinymce.plugins.SearchReplacePlugin);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/js/searchreplace.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/js/searchreplace.js
new file mode 100644
index 0000000000..862411233f
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/js/searchreplace.js
@@ -0,0 +1,140 @@
+tinyMCEPopup.requireLangPack();
+
+var SearchReplaceDialog = {
+	init : function(ed) {
+		var t = this, f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");
+
+		t.switchMode(m);
+
+		f[m + '_panel_searchstring'].value = tinyMCEPopup.getWindowArg("search_string");
+
+		// Focus input field
+		f[m + '_panel_searchstring'].focus();
+		
+		mcTabs.onChange.add(function(tab_id, panel_id) {
+			t.switchMode(tab_id.substring(0, tab_id.indexOf('_')));
+		});
+	},
+
+	switchMode : function(m) {
+		var f, lm = this.lastMode;
+
+		if (lm != m) {
+			f = document.forms[0];
+
+			if (lm) {
+				f[m + '_panel_searchstring'].value = f[lm + '_panel_searchstring'].value;
+				f[m + '_panel_backwardsu'].checked = f[lm + '_panel_backwardsu'].checked;
+				f[m + '_panel_backwardsd'].checked = f[lm + '_panel_backwardsd'].checked;
+				f[m + '_panel_casesensitivebox'].checked = f[lm + '_panel_casesensitivebox'].checked;
+			}
+
+			mcTabs.displayTab(m + '_tab',  m + '_panel');
+			document.getElementById("replaceBtn").style.display = (m == "replace") ? "inline" : "none";
+			document.getElementById("replaceAllBtn").style.display = (m == "replace") ? "inline" : "none";
+			this.lastMode = m;
+		}
+	},
+
+	searchNext : function(a) {
+		var ed = tinyMCEPopup.editor, se = ed.selection, r = se.getRng(), f, m = this.lastMode, s, b, fl = 0, w = ed.getWin(), wm = ed.windowManager, fo = 0;
+
+		// Get input
+		f = document.forms[0];
+		s = f[m + '_panel_searchstring'].value;
+		b = f[m + '_panel_backwardsu'].checked;
+		ca = f[m + '_panel_casesensitivebox'].checked;
+		rs = f['replace_panel_replacestring'].value;
+
+		if (tinymce.isIE) {
+			r = ed.getDoc().selection.createRange();
+		}
+
+		if (s == '')
+			return;
+
+		function fix() {
+			// Correct Firefox graphics glitches
+			// TODO: Verify if this is actually needed any more, maybe it was for very old FF versions? 
+			r = se.getRng().cloneRange();
+			ed.getDoc().execCommand('SelectAll', false, null);
+			se.setRng(r);
+		};
+
+		function replace() {
+			ed.selection.setContent(rs); // Needs to be duplicated due to selection bug in IE
+		};
+
+		// IE flags
+		if (ca)
+			fl = fl | 4;
+
+		switch (a) {
+			case 'all':
+				// Move caret to beginning of text
+				ed.execCommand('SelectAll');
+				ed.selection.collapse(true);
+
+				if (tinymce.isIE) {
+					while (r.findText(s, b ? -1 : 1, fl)) {
+						r.scrollIntoView();
+						r.select();
+						replace();
+						fo = 1;
+
+						if (b) {
+							r.moveEnd("character", -(rs.length)); // Otherwise will loop forever
+						}
+					}
+
+					tinyMCEPopup.storeSelection();
+				} else {
+					while (w.find(s, ca, b, false, false, false, false)) {
+						replace();
+						fo = 1;
+					}
+				}
+
+				if (fo)
+					tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.allreplaced'));
+				else
+					tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));
+
+				return;
+
+			case 'current':
+				if (!ed.selection.isCollapsed())
+					replace();
+
+				break;
+		}
+
+		se.collapse(b);
+		r = se.getRng();
+
+		if (tinymce.isIE) {
+			r = ed.getDoc().selection.createRange();
+		}
+
+		// Whats the point
+		if (!s)
+			return;
+
+		if (tinymce.isIE) {
+			if (r.findText(s, b ? -1 : 1, fl)) {
+				r.scrollIntoView();
+				r.select();
+			} else
+				tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));
+
+			tinyMCEPopup.storeSelection();
+		} else {
+			if (!w.find(s, ca, b, false, false, false, false))
+				tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));
+			else
+				fix();
+		}
+	}
+};
+
+tinyMCEPopup.onInit.add(SearchReplaceDialog.init, SearchReplaceDialog);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/da_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/da_dlg.js
new file mode 100644
index 0000000000..9c49354df3
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/da_dlg.js
@@ -0,0 +1,16 @@
+tinyMCE.addI18n('da.searchreplace_dlg',{
+searchnext_desc:"S\u00F8g igen",
+notfound:"S\u00F8gningen gav intet resultat.",
+search_title:"S\u00F8g",
+replace_title:"S\u00F8g / erstat",
+allreplaced:"Alle forekomster af s\u00F8gestrengen er erstattet.",
+findwhat:"S\u00F8g efter",
+replacewith:"Erstat med",
+direction:"Retning",
+up:"Op",
+down:"Ned",
+mcase:"Forskel p\u00E5 store og sm\u00E5 bogstaver",
+findnext:"Find n\u00E6ste",
+replace:"Erstat",
+replaceall:"Erstat alle"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/de_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/de_dlg.js
new file mode 100644
index 0000000000..52c0b0625c
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/de_dlg.js
@@ -0,0 +1,16 @@
+tinyMCE.addI18n('de.searchreplace_dlg',{
+searchnext_desc:"Weitersuchen",
+notfound:"Die Suche ist am Ende angelangt. Die Zeichenkette konnte nicht gefunden werden.",
+search_title:"Suchen",
+replace_title:"Suchen/Ersetzen",
+allreplaced:"Alle Vorkommen der Zeichenkette wurden ersetzt.",
+findwhat:"Zu suchender Text",
+replacewith:"Ersetzen durch",
+direction:"Suchrichtung",
+up:"Aufw\u00E4rts",
+down:"Abw\u00E4rts",
+mcase:"Gro\u00DF-/Kleinschreibung beachten",
+findnext:"Weitersuchen",
+replace:"Ersetzen",
+replaceall:"Alle ersetzen"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/en_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/en_dlg.js
new file mode 100644
index 0000000000..370959afa3
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/en_dlg.js
@@ -0,0 +1,16 @@
+tinyMCE.addI18n('en.searchreplace_dlg',{
+searchnext_desc:"Find again",
+notfound:"The search has been completed. The search string could not be found.",
+search_title:"Find",
+replace_title:"Find/Replace",
+allreplaced:"All occurrences of the search string were replaced.",
+findwhat:"Find what",
+replacewith:"Replace with",
+direction:"Direction",
+up:"Up",
+down:"Down",
+mcase:"Match case",
+findnext:"Find next",
+replace:"Replace",
+replaceall:"Replace all"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/es_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/es_dlg.js
new file mode 100644
index 0000000000..b54c74bb24
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/es_dlg.js
@@ -0,0 +1,16 @@
+tinyMCE.addI18n('es.searchreplace_dlg',{
+searchnext_desc:"Buscar de nuevo",
+notfound:"La b\u00FAsqueda se ha completado. No se encontr\u00F3 el texto introducido.",
+search_title:"Buscar",
+replace_title:"Buscar/Reemplazar",
+allreplaced:"Se ha reemplazado el texto.",
+findwhat:"Qu\u00E9 buscar",
+replacewith:"Reemplazar por",
+direction:"Direcci\u00F3n",
+up:"Arriba",
+down:"Abajo",
+mcase:"Min\u00FAs./May\u00FAs.",
+findnext:"Buscar siguiente",
+replace:"Reemplazar",
+replaceall:"Reemplazar todo"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/fr_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/fr_dlg.js
new file mode 100644
index 0000000000..fbdd1f3573
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/fr_dlg.js
@@ -0,0 +1,16 @@
+tinyMCE.addI18n('fr.searchreplace_dlg',{
+searchnext_desc:"Suivant",
+notfound:"La recherche est termin\u00E9e. La cha\u00EEne recherch\u00E9e n'a pas \u00E9t\u00E9 trouv\u00E9e.",
+search_title:"Chercher",
+replace_title:"Chercher/Remplacer",
+allreplaced:"Toutes les occurences de la cha\u00EEne recherch\u00E9e ont \u00E9t\u00E9 remplac\u00E9es.",
+findwhat:"Chercher",
+replacewith:"Remplacer par",
+direction:"Direction",
+up:"Haut",
+down:"Bas",
+mcase:"Prendre la casse en compte",
+findnext:"Chercher suivant",
+replace:"Remplacer",
+replaceall:"Rempl. tous"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/it_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/it_dlg.js
new file mode 100644
index 0000000000..cbaf13ab20
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/it_dlg.js
@@ -0,0 +1,16 @@
+tinyMCE.addI18n('it.searchreplace_dlg',{
+searchnext_desc:"Trova successivo",
+notfound:"Ricerca completata. Nessun risultato trovato.",
+search_title:"Trova",
+replace_title:"Trova/Sostituisci",
+allreplaced:"Tutte le occorrenze del criterio di ricerca sono state sostituite.",
+findwhat:"Trova:",
+replacewith:"Sostituisci con:",
+direction:"Direzione",
+up:"Avanti",
+down:"Indietro",
+mcase:"Maiuscole/minuscole",
+findnext:"Trova succ.",
+replace:"Sostituisci",
+replaceall:"Sost. tutto"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/nl_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/nl_dlg.js
new file mode 100644
index 0000000000..6ad59dbfe8
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/nl_dlg.js
@@ -0,0 +1,16 @@
+tinyMCE.addI18n('nl.searchreplace_dlg',{
+searchnext_desc:"Opnieuw zoeken",
+notfound:"Het doorzoeken is voltooid. De zoekterm kon niet meer worden gevonden.",
+search_title:"Zoeken",
+replace_title:"Zoeken/Vervangen",
+allreplaced:"Alle instanties van de zoekterm zijn vervangen.",
+findwhat:"Zoeken naar",
+replacewith:"Vervangen door",
+direction:"Richting",
+up:"Omhoog",
+down:"Omlaag",
+mcase:"Identieke hoofdletters/kleine letters",
+findnext:"Zoeken",
+replace:"Vervangen",
+replaceall:"Alles verv."
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/no_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/no_dlg.js
new file mode 100644
index 0000000000..416f617d0b
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/no_dlg.js
@@ -0,0 +1,16 @@
+tinyMCE.addI18n('no.searchreplace_dlg',{
+searchnext_desc:"S\u00F8k igjen",
+notfound:"S\u00F8ket avsluttet. Fant ikke s\u00F8kestrengen.",
+search_title:"S\u00F8k",
+replace_title:"S\u00F8k/Erstatt",
+allreplaced:"Alle forekomster av s\u00F8kestrengen er erstattet.",
+findwhat:"Finn hva",
+replacewith:"Erstatt med",
+direction:"Retning",
+up:"Oppover",
+down:"Nedover",
+mcase:"Skill mellom store og sm\u00E5 tegn",
+findnext:"Finn neste",
+replace:"Erstatt",
+replaceall:"Erstatt alt"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/sv_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/sv_dlg.js
new file mode 100644
index 0000000000..a3f6f196af
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/langs/sv_dlg.js
@@ -0,0 +1,16 @@
+tinyMCE.addI18n('sv.searchreplace_dlg',{
+searchnext_desc:"S\u00F6k igen",
+notfound:"S\u00F6kningen har slutf\u00F6rts. S\u00F6kstr\u00E4ngen kunde inte hittas.",
+search_title:"S\u00F6k",
+replace_title:"S\u00F6k/ers\u00E4tt",
+allreplaced:"Alla st\u00E4llen d\u00E4r s\u00F6kstr\u00E4ngen kunde hittas har ersatts.",
+findwhat:"Hitta vad",
+replacewith:"Ers\u00E4tt med",
+direction:"Riktning",
+up:"Upp\u00E5t",
+down:"Ner\u00E5t",
+mcase:"Matcha gemener/versaler",
+findnext:"Hitta n\u00E4sta",
+replace:"Ers\u00E4tt",
+replaceall:"Ers\u00E4tt alla"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/searchreplace.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/searchreplace.htm
new file mode 100644
index 0000000000..5a22d8aa4d
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/searchreplace/searchreplace.htm
@@ -0,0 +1,100 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#searchreplace_dlg.replace_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="js/searchreplace.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/searchreplace.css" />
+</head>
+<body style="display:none;" role="application" aria-labelledby="app_title">
+<span id="app_title" style="display:none">{#searchreplace_dlg.replace_title}</span>
+<form onsubmit="SearchReplaceDialog.searchNext('none');return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="search_tab" aria-controls="search_panel"><span><a href="javascript:SearchReplaceDialog.switchMode('search');" onmousedown="return false;">{#searchreplace.search_desc}</a></span></li>
+			<li id="replace_tab" aria-controls="replace_panel"><span><a href="javascript:SearchReplaceDialog.switchMode('replace');" onmousedown="return false;">{#searchreplace_dlg.replace}</a></span></li>
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="search_panel" class="panel">
+			<table role="presentation" border="0" cellspacing="0" cellpadding="2">
+				<tr>
+					<td><label for="search_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>
+					<td><input type="text" id="search_panel_searchstring" name="search_panel_searchstring" style="width: 200px" aria-required="true" /></td>
+				</tr>
+				<tr>
+					<td colspan="2">
+						<table role="presentation" border="0" cellspacing="0" cellpadding="0" class="direction">
+							<tr role="group" aria-labelledby="search_panel_backwards_label">
+								<td><label id="search_panel_backwards_label">{#searchreplace_dlg.direction}</label></td>
+								<td><input id="search_panel_backwardsu" name="search_panel_backwards" class="radio" type="radio" /></td>
+								<td><label for="search_panel_backwardsu">{#searchreplace_dlg.up}</label></td>
+								<td><input id="search_panel_backwardsd" name="search_panel_backwards" class="radio" type="radio" checked="checked" /></td>
+								<td><label for="search_panel_backwardsd">{#searchreplace_dlg.down}</label></td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2">
+						<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+							<tr>
+								<td><input id="search_panel_casesensitivebox" name="search_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>
+								<td><label for="search_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table>
+		</div>
+
+		<div id="replace_panel" class="panel">
+			<table role="presentation" border="0" cellspacing="0" cellpadding="2">
+				<tr>
+					<td><label for="replace_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>
+					<td><input type="text" id="replace_panel_searchstring" name="replace_panel_searchstring" style="width: 200px" aria-required="true" /></td>
+				</tr>
+				<tr>
+					<td><label for="replace_panel_replacestring">{#searchreplace_dlg.replacewith}</label></td>
+					<td><input type="text" id="replace_panel_replacestring" name="replace_panel_replacestring" style="width: 200px" aria-required="true" /></td>
+				</tr>
+				<tr>
+					<td colspan="2">
+						<table role="presentation" border="0" cellspacing="0" cellpadding="0" class="direction">
+							<tr role="group" aria-labelledby="replace_panel_dir_label">
+								<td><label id="replace_panel_dir_label">{#searchreplace_dlg.direction}</label></td>
+								<td><input id="replace_panel_backwardsu" name="replace_panel_backwards" class="radio" type="radio" /></td>
+								<td><label for="replace_panel_backwardsu">{#searchreplace_dlg.up}</label></td>
+								<td><input id="replace_panel_backwardsd" name="replace_panel_backwards" class="radio" type="radio" checked="checked" /></td>
+								<td><label for="replace_panel_backwardsd">{#searchreplace_dlg.down}</label></td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2">
+						<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+							<tr>
+								<td><input id="replace_panel_casesensitivebox" name="replace_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>
+								<td><label for="replace_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table>
+		</div>
+
+	</div>
+
+	<div class="mceActionPanel">
+		<input type="submit" id="insert" name="insert" value="{#searchreplace_dlg.findnext}" />
+		<input type="button" class="button" id="replaceBtn" name="replaceBtn" value="{#searchreplace_dlg.replace}" onclick="SearchReplaceDialog.searchNext('current');" />
+		<input type="button" class="button" id="replaceAllBtn" name="replaceAllBtn" value="{#searchreplace_dlg.replaceall}" onclick="SearchReplaceDialog.searchNext('all');" />
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+	</div>
+</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/style/css/props.css b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/css/props.css
new file mode 100644
index 0000000000..eb1f264960
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/css/props.css
@@ -0,0 +1,13 @@
+#text_font {width:250px;}
+#text_size {width:70px;}
+.mceAddSelectValue {background:#DDD;}
+select, #block_text_indent, #box_width, #box_height, #box_padding_top, #box_padding_right, #box_padding_bottom, #box_padding_left {width:70px;}
+#box_margin_top, #box_margin_right, #box_margin_bottom, #box_margin_left, #positioning_width, #positioning_height, #positioning_zindex {width:70px;}
+#positioning_placement_top, #positioning_placement_right, #positioning_placement_bottom, #positioning_placement_left {width:70px;}
+#positioning_clip_top, #positioning_clip_right, #positioning_clip_bottom, #positioning_clip_left {width:70px;}
+.panel_wrapper div.current {padding-top:10px;height:230px;}
+.delim {border-left:1px solid gray;}
+.tdelim {border-bottom:1px solid gray;}
+#block_display {width:145px;}
+#list_type {width:115px;}
+.disabled {background:#EEE;}
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/style/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/editor_plugin.js
new file mode 100644
index 0000000000..cab2153c40
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.StylePlugin",{init:function(a,b){a.addCommand("mceStyleProps",function(){a.windowManager.open({file:b+"/props.htm",width:480+parseInt(a.getLang("style.delta_width",0)),height:320+parseInt(a.getLang("style.delta_height",0)),inline:1},{plugin_url:b,style_text:a.selection.getNode().style.cssText})});a.addCommand("mceSetElementStyle",function(d,c){if(e=a.selection.getNode()){a.dom.setAttrib(e,"style",c);a.execCommand("mceRepaint")}});a.onNodeChange.add(function(d,c,f){c.setDisabled("styleprops",f.nodeName==="BODY")});a.addButton("styleprops",{title:"style.desc",cmd:"mceStyleProps"})},getInfo:function(){return{longname:"Style",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("style",tinymce.plugins.StylePlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/style/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/editor_plugin_src.js
new file mode 100644
index 0000000000..5f7755f184
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/editor_plugin_src.js
@@ -0,0 +1,55 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.StylePlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceStyleProps', function() {
+				ed.windowManager.open({
+					file : url + '/props.htm',
+					width : 480 + parseInt(ed.getLang('style.delta_width', 0)),
+					height : 320 + parseInt(ed.getLang('style.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url,
+					style_text : ed.selection.getNode().style.cssText
+				});
+			});
+
+			ed.addCommand('mceSetElementStyle', function(ui, v) {
+				if (e = ed.selection.getNode()) {
+					ed.dom.setAttrib(e, 'style', v);
+					ed.execCommand('mceRepaint');
+				}
+			});
+
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setDisabled('styleprops', n.nodeName === 'BODY');
+			});
+
+			// Register buttons
+			ed.addButton('styleprops', {title : 'style.desc', cmd : 'mceStyleProps'});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Style',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('style', tinymce.plugins.StylePlugin);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/style/js/props.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/js/props.js
new file mode 100644
index 0000000000..c8e1604245
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/js/props.js
@@ -0,0 +1,635 @@
+tinyMCEPopup.requireLangPack();
+
+var defaultFonts = "" + 
+	"Arial, Helvetica, sans-serif=Arial, Helvetica, sans-serif;" + 
+	"Times New Roman, Times, serif=Times New Roman, Times, serif;" + 
+	"Courier New, Courier, mono=Courier New, Courier, mono;" + 
+	"Times New Roman, Times, serif=Times New Roman, Times, serif;" + 
+	"Georgia, Times New Roman, Times, serif=Georgia, Times New Roman, Times, serif;" + 
+	"Verdana, Arial, Helvetica, sans-serif=Verdana, Arial, Helvetica, sans-serif;" + 
+	"Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif";
+
+var defaultSizes = "9;10;12;14;16;18;24;xx-small;x-small;small;medium;large;x-large;xx-large;smaller;larger";
+var defaultMeasurement = "+pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%";
+var defaultSpacingMeasurement = "pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;+ems=em;exs=ex;%";
+var defaultIndentMeasurement = "pixels=px;+points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%";
+var defaultWeight = "normal;bold;bolder;lighter;100;200;300;400;500;600;700;800;900";
+var defaultTextStyle = "normal;italic;oblique";
+var defaultVariant = "normal;small-caps";
+var defaultLineHeight = "normal";
+var defaultAttachment = "fixed;scroll";
+var defaultRepeat = "no-repeat;repeat;repeat-x;repeat-y";
+var defaultPosH = "left;center;right";
+var defaultPosV = "top;center;bottom";
+var defaultVAlign = "baseline;sub;super;top;text-top;middle;bottom;text-bottom";
+var defaultDisplay = "inline;block;list-item;run-in;compact;marker;table;inline-table;table-row-group;table-header-group;table-footer-group;table-row;table-column-group;table-column;table-cell;table-caption;none";
+var defaultBorderStyle = "none;solid;dashed;dotted;double;groove;ridge;inset;outset";
+var defaultBorderWidth = "thin;medium;thick";
+var defaultListType = "disc;circle;square;decimal;lower-roman;upper-roman;lower-alpha;upper-alpha;none";
+
+function init() {
+	var ce = document.getElementById('container'), h;
+
+	ce.style.cssText = tinyMCEPopup.getWindowArg('style_text');
+
+	h = getBrowserHTML('background_image_browser','background_image','image','advimage');
+	document.getElementById("background_image_browser").innerHTML = h;
+
+	document.getElementById('text_color_pickcontainer').innerHTML = getColorPickerHTML('text_color_pick','text_color');
+	document.getElementById('background_color_pickcontainer').innerHTML = getColorPickerHTML('background_color_pick','background_color');
+	document.getElementById('border_color_top_pickcontainer').innerHTML = getColorPickerHTML('border_color_top_pick','border_color_top');
+	document.getElementById('border_color_right_pickcontainer').innerHTML = getColorPickerHTML('border_color_right_pick','border_color_right');
+	document.getElementById('border_color_bottom_pickcontainer').innerHTML = getColorPickerHTML('border_color_bottom_pick','border_color_bottom');
+	document.getElementById('border_color_left_pickcontainer').innerHTML = getColorPickerHTML('border_color_left_pick','border_color_left');
+
+	fillSelect(0, 'text_font', 'style_font', defaultFonts, ';', true);
+	fillSelect(0, 'text_size', 'style_font_size', defaultSizes, ';', true);
+	fillSelect(0, 'text_size_measurement', 'style_font_size_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'text_case', 'style_text_case', "capitalize;uppercase;lowercase", ';', true);
+	fillSelect(0, 'text_weight', 'style_font_weight', defaultWeight, ';', true);
+	fillSelect(0, 'text_style', 'style_font_style', defaultTextStyle, ';', true);
+	fillSelect(0, 'text_variant', 'style_font_variant', defaultVariant, ';', true);
+	fillSelect(0, 'text_lineheight', 'style_font_line_height', defaultLineHeight, ';', true);
+	fillSelect(0, 'text_lineheight_measurement', 'style_font_line_height_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'background_attachment', 'style_background_attachment', defaultAttachment, ';', true);
+	fillSelect(0, 'background_repeat', 'style_background_repeat', defaultRepeat, ';', true);
+
+	fillSelect(0, 'background_hpos_measurement', 'style_background_hpos_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'background_vpos_measurement', 'style_background_vpos_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'background_hpos', 'style_background_hpos', defaultPosH, ';', true);
+	fillSelect(0, 'background_vpos', 'style_background_vpos', defaultPosV, ';', true);
+
+	fillSelect(0, 'block_wordspacing', 'style_wordspacing', 'normal', ';', true);
+	fillSelect(0, 'block_wordspacing_measurement', 'style_wordspacing_measurement', defaultSpacingMeasurement, ';', true);
+	fillSelect(0, 'block_letterspacing', 'style_letterspacing', 'normal', ';', true);
+	fillSelect(0, 'block_letterspacing_measurement', 'style_letterspacing_measurement', defaultSpacingMeasurement, ';', true);
+	fillSelect(0, 'block_vertical_alignment', 'style_vertical_alignment', defaultVAlign, ';', true);
+	fillSelect(0, 'block_text_align', 'style_text_align', "left;right;center;justify", ';', true);
+	fillSelect(0, 'block_whitespace', 'style_whitespace', "normal;pre;nowrap", ';', true);
+	fillSelect(0, 'block_display', 'style_display', defaultDisplay, ';', true);
+	fillSelect(0, 'block_text_indent_measurement', 'style_text_indent_measurement', defaultIndentMeasurement, ';', true);
+
+	fillSelect(0, 'box_width_measurement', 'style_box_width_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_height_measurement', 'style_box_height_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_float', 'style_float', 'left;right;none', ';', true);
+	fillSelect(0, 'box_clear', 'style_clear', 'left;right;both;none', ';', true);
+	fillSelect(0, 'box_padding_left_measurement', 'style_padding_left_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_top_measurement', 'style_padding_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_bottom_measurement', 'style_padding_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_right_measurement', 'style_padding_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_left_measurement', 'style_margin_left_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_top_measurement', 'style_margin_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_bottom_measurement', 'style_margin_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_right_measurement', 'style_margin_right_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'border_style_top', 'style_border_style_top', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_right', 'style_border_style_right', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_bottom', 'style_border_style_bottom', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_left', 'style_border_style_left', defaultBorderStyle, ';', true);
+
+	fillSelect(0, 'border_width_top', 'style_border_width_top', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_right', 'style_border_width_right', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_bottom', 'style_border_width_bottom', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_left', 'style_border_width_left', defaultBorderWidth, ';', true);
+
+	fillSelect(0, 'border_width_top_measurement', 'style_border_width_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_right_measurement', 'style_border_width_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_bottom_measurement', 'style_border_width_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_left_measurement', 'style_border_width_left_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'list_type', 'style_list_type', defaultListType, ';', true);
+	fillSelect(0, 'list_position', 'style_list_position', "inside;outside", ';', true);
+
+	fillSelect(0, 'positioning_type', 'style_positioning_type', "absolute;relative;static", ';', true);
+	fillSelect(0, 'positioning_visibility', 'style_positioning_visibility', "inherit;visible;hidden", ';', true);
+
+	fillSelect(0, 'positioning_width_measurement', 'style_positioning_width_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_height_measurement', 'style_positioning_height_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_overflow', 'style_positioning_overflow', "visible;hidden;scroll;auto", ';', true);
+
+	fillSelect(0, 'positioning_placement_top_measurement', 'style_positioning_placement_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_right_measurement', 'style_positioning_placement_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_bottom_measurement', 'style_positioning_placement_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_left_measurement', 'style_positioning_placement_left_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'positioning_clip_top_measurement', 'style_positioning_clip_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_right_measurement', 'style_positioning_clip_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_bottom_measurement', 'style_positioning_clip_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_left_measurement', 'style_positioning_clip_left_measurement', defaultMeasurement, ';', true);
+
+	TinyMCE_EditableSelects.init();
+	setupFormData();
+	showDisabledControls();
+}
+
+function setupFormData() {
+	var ce = document.getElementById('container'), f = document.forms[0], s, b, i;
+
+	// Setup text fields
+
+	selectByValue(f, 'text_font', ce.style.fontFamily, true, true);
+	selectByValue(f, 'text_size', getNum(ce.style.fontSize), true, true);
+	selectByValue(f, 'text_size_measurement', getMeasurement(ce.style.fontSize));
+	selectByValue(f, 'text_weight', ce.style.fontWeight, true, true);
+	selectByValue(f, 'text_style', ce.style.fontStyle, true, true);
+	selectByValue(f, 'text_lineheight', getNum(ce.style.lineHeight), true, true);
+	selectByValue(f, 'text_lineheight_measurement', getMeasurement(ce.style.lineHeight));
+	selectByValue(f, 'text_case', ce.style.textTransform, true, true);
+	selectByValue(f, 'text_variant', ce.style.fontVariant, true, true);
+	f.text_color.value = tinyMCEPopup.editor.dom.toHex(ce.style.color);
+	updateColor('text_color_pick', 'text_color');
+	f.text_underline.checked = inStr(ce.style.textDecoration, 'underline');
+	f.text_overline.checked = inStr(ce.style.textDecoration, 'overline');
+	f.text_linethrough.checked = inStr(ce.style.textDecoration, 'line-through');
+	f.text_blink.checked = inStr(ce.style.textDecoration, 'blink');
+
+	// Setup background fields
+
+	f.background_color.value = tinyMCEPopup.editor.dom.toHex(ce.style.backgroundColor);
+	updateColor('background_color_pick', 'background_color');
+	f.background_image.value = ce.style.backgroundImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	selectByValue(f, 'background_repeat', ce.style.backgroundRepeat, true, true);
+	selectByValue(f, 'background_attachment', ce.style.backgroundAttachment, true, true);
+	selectByValue(f, 'background_hpos', getNum(getVal(ce.style.backgroundPosition, 0)), true, true);
+	selectByValue(f, 'background_hpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 0)));
+	selectByValue(f, 'background_vpos', getNum(getVal(ce.style.backgroundPosition, 1)), true, true);
+	selectByValue(f, 'background_vpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 1)));
+
+	// Setup block fields
+
+	selectByValue(f, 'block_wordspacing', getNum(ce.style.wordSpacing), true, true);
+	selectByValue(f, 'block_wordspacing_measurement', getMeasurement(ce.style.wordSpacing));
+	selectByValue(f, 'block_letterspacing', getNum(ce.style.letterSpacing), true, true);
+	selectByValue(f, 'block_letterspacing_measurement', getMeasurement(ce.style.letterSpacing));
+	selectByValue(f, 'block_vertical_alignment', ce.style.verticalAlign, true, true);
+	selectByValue(f, 'block_text_align', ce.style.textAlign, true, true);
+	f.block_text_indent.value = getNum(ce.style.textIndent);
+	selectByValue(f, 'block_text_indent_measurement', getMeasurement(ce.style.textIndent));
+	selectByValue(f, 'block_whitespace', ce.style.whiteSpace, true, true);
+	selectByValue(f, 'block_display', ce.style.display, true, true);
+
+	// Setup box fields
+
+	f.box_width.value = getNum(ce.style.width);
+	selectByValue(f, 'box_width_measurement', getMeasurement(ce.style.width));
+
+	f.box_height.value = getNum(ce.style.height);
+	selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height));
+	selectByValue(f, 'box_float', ce.style.cssFloat || ce.style.styleFloat, true, true);
+
+	selectByValue(f, 'box_clear', ce.style.clear, true, true);
+
+	setupBox(f, ce, 'box_padding', 'padding', '');
+	setupBox(f, ce, 'box_margin', 'margin', '');
+
+	// Setup border fields
+
+	setupBox(f, ce, 'border_style', 'border', 'Style');
+	setupBox(f, ce, 'border_width', 'border', 'Width');
+	setupBox(f, ce, 'border_color', 'border', 'Color');
+
+	updateColor('border_color_top_pick', 'border_color_top');
+	updateColor('border_color_right_pick', 'border_color_right');
+	updateColor('border_color_bottom_pick', 'border_color_bottom');
+	updateColor('border_color_left_pick', 'border_color_left');
+
+	f.elements.border_color_top.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_top.value);
+	f.elements.border_color_right.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_right.value);
+	f.elements.border_color_bottom.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_bottom.value);
+	f.elements.border_color_left.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_left.value);
+
+	// Setup list fields
+
+	selectByValue(f, 'list_type', ce.style.listStyleType, true, true);
+	selectByValue(f, 'list_position', ce.style.listStylePosition, true, true);
+	f.list_bullet_image.value = ce.style.listStyleImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+
+	// Setup box fields
+
+	selectByValue(f, 'positioning_type', ce.style.position, true, true);
+	selectByValue(f, 'positioning_visibility', ce.style.visibility, true, true);
+	selectByValue(f, 'positioning_overflow', ce.style.overflow, true, true);
+	f.positioning_zindex.value = ce.style.zIndex ? ce.style.zIndex : "";
+
+	f.positioning_width.value = getNum(ce.style.width);
+	selectByValue(f, 'positioning_width_measurement', getMeasurement(ce.style.width));
+
+	f.positioning_height.value = getNum(ce.style.height);
+	selectByValue(f, 'positioning_height_measurement', getMeasurement(ce.style.height));
+
+	setupBox(f, ce, 'positioning_placement', '', '', ['top', 'right', 'bottom', 'left']);
+
+	s = ce.style.clip.replace(new RegExp("rect\\('?([^']*)'?\\)", 'gi'), "$1");
+	s = s.replace(/,/g, ' ');
+
+	if (!hasEqualValues([getVal(s, 0), getVal(s, 1), getVal(s, 2), getVal(s, 3)])) {
+		f.positioning_clip_top.value = getNum(getVal(s, 0));
+		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));
+		f.positioning_clip_right.value = getNum(getVal(s, 1));
+		selectByValue(f, 'positioning_clip_right_measurement', getMeasurement(getVal(s, 1)));
+		f.positioning_clip_bottom.value = getNum(getVal(s, 2));
+		selectByValue(f, 'positioning_clip_bottom_measurement', getMeasurement(getVal(s, 2)));
+		f.positioning_clip_left.value = getNum(getVal(s, 3));
+		selectByValue(f, 'positioning_clip_left_measurement', getMeasurement(getVal(s, 3)));
+	} else {
+		f.positioning_clip_top.value = getNum(getVal(s, 0));
+		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));
+		f.positioning_clip_right.value = f.positioning_clip_bottom.value = f.positioning_clip_left.value;
+	}
+
+//	setupBox(f, ce, '', 'border', 'Color');
+}
+
+function getMeasurement(s) {
+	return s.replace(/^([0-9.]+)(.*)$/, "$2");
+}
+
+function getNum(s) {
+	if (new RegExp('^(?:[0-9.]+)(?:[a-z%]+)$', 'gi').test(s))
+		return s.replace(/[^0-9.]/g, '');
+
+	return s;
+}
+
+function inStr(s, n) {
+	return new RegExp(n, 'gi').test(s);
+}
+
+function getVal(s, i) {
+	var a = s.split(' ');
+
+	if (a.length > 1)
+		return a[i];
+
+	return "";
+}
+
+function setValue(f, n, v) {
+	if (f.elements[n].type == "text")
+		f.elements[n].value = v;
+	else
+		selectByValue(f, n, v, true, true);
+}
+
+function setupBox(f, ce, fp, pr, sf, b) {
+	if (typeof(b) == "undefined")
+		b = ['Top', 'Right', 'Bottom', 'Left'];
+
+	if (isSame(ce, pr, sf, b)) {
+		f.elements[fp + "_same"].checked = true;
+
+		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));
+		f.elements[fp + "_top"].disabled = false;
+
+		f.elements[fp + "_right"].value = "";
+		f.elements[fp + "_right"].disabled = true;
+		f.elements[fp + "_bottom"].value = "";
+		f.elements[fp + "_bottom"].disabled = true;
+		f.elements[fp + "_left"].value = "";
+		f.elements[fp + "_left"].disabled = true;
+
+		if (f.elements[fp + "_top_measurement"]) {
+			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));
+			f.elements[fp + "_left_measurement"].disabled = true;
+			f.elements[fp + "_bottom_measurement"].disabled = true;
+			f.elements[fp + "_right_measurement"].disabled = true;
+		}
+	} else {
+		f.elements[fp + "_same"].checked = false;
+
+		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));
+		f.elements[fp + "_top"].disabled = false;
+
+		setValue(f, fp + "_right", getNum(ce.style[pr + b[1] + sf]));
+		f.elements[fp + "_right"].disabled = false;
+
+		setValue(f, fp + "_bottom", getNum(ce.style[pr + b[2] + sf]));
+		f.elements[fp + "_bottom"].disabled = false;
+
+		setValue(f, fp + "_left", getNum(ce.style[pr + b[3] + sf]));
+		f.elements[fp + "_left"].disabled = false;
+
+		if (f.elements[fp + "_top_measurement"]) {
+			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));
+			selectByValue(f, fp + '_right_measurement', getMeasurement(ce.style[pr + b[1] + sf]));
+			selectByValue(f, fp + '_bottom_measurement', getMeasurement(ce.style[pr + b[2] + sf]));
+			selectByValue(f, fp + '_left_measurement', getMeasurement(ce.style[pr + b[3] + sf]));
+			f.elements[fp + "_left_measurement"].disabled = false;
+			f.elements[fp + "_bottom_measurement"].disabled = false;
+			f.elements[fp + "_right_measurement"].disabled = false;
+		}
+	}
+}
+
+function isSame(e, pr, sf, b) {
+	var a = [], i, x;
+
+	if (typeof(b) == "undefined")
+		b = ['Top', 'Right', 'Bottom', 'Left'];
+
+	if (typeof(sf) == "undefined" || sf == null)
+		sf = "";
+
+	a[0] = e.style[pr + b[0] + sf];
+	a[1] = e.style[pr + b[1] + sf];
+	a[2] = e.style[pr + b[2] + sf];
+	a[3] = e.style[pr + b[3] + sf];
+
+	for (i=0; i<a.length; i++) {
+		if (a[i] == null)
+			return false;
+
+		for (x=0; x<a.length; x++) {
+			if (a[x] != a[i])
+				return false;
+		}
+	}
+
+	return true;
+};
+
+function hasEqualValues(a) {
+	var i, x;
+
+	for (i=0; i<a.length; i++) {
+		if (a[i] == null)
+			return false;
+
+		for (x=0; x<a.length; x++) {
+			if (a[x] != a[i])
+				return false;
+		}
+	}
+
+	return true;
+}
+
+function applyAction() {
+	var ce = document.getElementById('container'), ed = tinyMCEPopup.editor;
+
+	generateCSS();
+
+	tinyMCEPopup.restoreSelection();
+	ed.dom.setAttrib(ed.selection.getNode(), 'style', tinyMCEPopup.editor.dom.serializeStyle(tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText)));
+}
+
+function updateAction() {
+	applyAction();
+	tinyMCEPopup.close();
+}
+
+function generateCSS() {
+	var ce = document.getElementById('container'), f = document.forms[0], num = new RegExp('[0-9]+', 'g'), s, t;
+
+	ce.style.cssText = "";
+
+	// Build text styles
+	ce.style.fontFamily = f.text_font.value;
+	ce.style.fontSize = f.text_size.value + (isNum(f.text_size.value) ? (f.text_size_measurement.value || 'px') : "");
+	ce.style.fontStyle = f.text_style.value;
+	ce.style.lineHeight = f.text_lineheight.value + (isNum(f.text_lineheight.value) ? f.text_lineheight_measurement.value : "");
+	ce.style.textTransform = f.text_case.value;
+	ce.style.fontWeight = f.text_weight.value;
+	ce.style.fontVariant = f.text_variant.value;
+	ce.style.color = f.text_color.value;
+
+	s = "";
+	s += f.text_underline.checked ? " underline" : "";
+	s += f.text_overline.checked ? " overline" : "";
+	s += f.text_linethrough.checked ? " line-through" : "";
+	s += f.text_blink.checked ? " blink" : "";
+	s = s.length > 0 ? s.substring(1) : s;
+
+	if (f.text_none.checked)
+		s = "none";
+
+	ce.style.textDecoration = s;
+
+	// Build background styles
+
+	ce.style.backgroundColor = f.background_color.value;
+	ce.style.backgroundImage = f.background_image.value != "" ? "url(" + f.background_image.value + ")" : "";
+	ce.style.backgroundRepeat = f.background_repeat.value;
+	ce.style.backgroundAttachment = f.background_attachment.value;
+
+	if (f.background_hpos.value != "") {
+		s = "";
+		s += f.background_hpos.value + (isNum(f.background_hpos.value) ? f.background_hpos_measurement.value : "") + " ";
+		s += f.background_vpos.value + (isNum(f.background_vpos.value) ? f.background_vpos_measurement.value : "");
+		ce.style.backgroundPosition = s;
+	}
+
+	// Build block styles
+
+	ce.style.wordSpacing = f.block_wordspacing.value + (isNum(f.block_wordspacing.value) ? f.block_wordspacing_measurement.value : "");
+	ce.style.letterSpacing = f.block_letterspacing.value + (isNum(f.block_letterspacing.value) ? f.block_letterspacing_measurement.value : "");
+	ce.style.verticalAlign = f.block_vertical_alignment.value;
+	ce.style.textAlign = f.block_text_align.value;
+	ce.style.textIndent = f.block_text_indent.value + (isNum(f.block_text_indent.value) ? f.block_text_indent_measurement.value : "");
+	ce.style.whiteSpace = f.block_whitespace.value;
+	ce.style.display = f.block_display.value;
+
+	// Build box styles
+
+	ce.style.width = f.box_width.value + (isNum(f.box_width.value) ? f.box_width_measurement.value : "");
+	ce.style.height = f.box_height.value + (isNum(f.box_height.value) ? f.box_height_measurement.value : "");
+	ce.style.styleFloat = f.box_float.value;
+	ce.style.cssFloat = f.box_float.value;
+
+	ce.style.clear = f.box_clear.value;
+
+	if (!f.box_padding_same.checked) {
+		ce.style.paddingTop = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");
+		ce.style.paddingRight = f.box_padding_right.value + (isNum(f.box_padding_right.value) ? f.box_padding_right_measurement.value : "");
+		ce.style.paddingBottom = f.box_padding_bottom.value + (isNum(f.box_padding_bottom.value) ? f.box_padding_bottom_measurement.value : "");
+		ce.style.paddingLeft = f.box_padding_left.value + (isNum(f.box_padding_left.value) ? f.box_padding_left_measurement.value : "");
+	} else
+		ce.style.padding = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");		
+
+	if (!f.box_margin_same.checked) {
+		ce.style.marginTop = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");
+		ce.style.marginRight = f.box_margin_right.value + (isNum(f.box_margin_right.value) ? f.box_margin_right_measurement.value : "");
+		ce.style.marginBottom = f.box_margin_bottom.value + (isNum(f.box_margin_bottom.value) ? f.box_margin_bottom_measurement.value : "");
+		ce.style.marginLeft = f.box_margin_left.value + (isNum(f.box_margin_left.value) ? f.box_margin_left_measurement.value : "");
+	} else
+		ce.style.margin = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");		
+
+	// Build border styles
+
+	if (!f.border_style_same.checked) {
+		ce.style.borderTopStyle = f.border_style_top.value;
+		ce.style.borderRightStyle = f.border_style_right.value;
+		ce.style.borderBottomStyle = f.border_style_bottom.value;
+		ce.style.borderLeftStyle = f.border_style_left.value;
+	} else
+		ce.style.borderStyle = f.border_style_top.value;
+
+	if (!f.border_width_same.checked) {
+		ce.style.borderTopWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : "");
+		ce.style.borderRightWidth = f.border_width_right.value + (isNum(f.border_width_right.value) ? f.border_width_right_measurement.value : "");
+		ce.style.borderBottomWidth = f.border_width_bottom.value + (isNum(f.border_width_bottom.value) ? f.border_width_bottom_measurement.value : "");
+		ce.style.borderLeftWidth = f.border_width_left.value + (isNum(f.border_width_left.value) ? f.border_width_left_measurement.value : "");
+	} else
+		ce.style.borderWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : "");
+
+	if (!f.border_color_same.checked) {
+		ce.style.borderTopColor = f.border_color_top.value;
+		ce.style.borderRightColor = f.border_color_right.value;
+		ce.style.borderBottomColor = f.border_color_bottom.value;
+		ce.style.borderLeftColor = f.border_color_left.value;
+	} else
+		ce.style.borderColor = f.border_color_top.value;
+
+	// Build list styles
+
+	ce.style.listStyleType = f.list_type.value;
+	ce.style.listStylePosition = f.list_position.value;
+	ce.style.listStyleImage = f.list_bullet_image.value != "" ? "url(" + f.list_bullet_image.value + ")" : "";
+
+	// Build positioning styles
+
+	ce.style.position = f.positioning_type.value;
+	ce.style.visibility = f.positioning_visibility.value;
+
+	if (ce.style.width == "")
+		ce.style.width = f.positioning_width.value + (isNum(f.positioning_width.value) ? f.positioning_width_measurement.value : "");
+
+	if (ce.style.height == "")
+		ce.style.height = f.positioning_height.value + (isNum(f.positioning_height.value) ? f.positioning_height_measurement.value : "");
+
+	ce.style.zIndex = f.positioning_zindex.value;
+	ce.style.overflow = f.positioning_overflow.value;
+
+	if (!f.positioning_placement_same.checked) {
+		ce.style.top = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");
+		ce.style.right = f.positioning_placement_right.value + (isNum(f.positioning_placement_right.value) ? f.positioning_placement_right_measurement.value : "");
+		ce.style.bottom = f.positioning_placement_bottom.value + (isNum(f.positioning_placement_bottom.value) ? f.positioning_placement_bottom_measurement.value : "");
+		ce.style.left = f.positioning_placement_left.value + (isNum(f.positioning_placement_left.value) ? f.positioning_placement_left_measurement.value : "");
+	} else {
+		s = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");
+		ce.style.top = s;
+		ce.style.right = s;
+		ce.style.bottom = s;
+		ce.style.left = s;
+	}
+
+	if (!f.positioning_clip_same.checked) {
+		s = "rect(";
+		s += (isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_right.value) ? f.positioning_clip_right.value + f.positioning_clip_right_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_bottom.value) ? f.positioning_clip_bottom.value + f.positioning_clip_bottom_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_left.value) ? f.positioning_clip_left.value + f.positioning_clip_left_measurement.value : "auto");
+		s += ")";
+
+		if (s != "rect(auto auto auto auto)")
+			ce.style.clip = s;
+	} else {
+		s = "rect(";
+		t = isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto";
+		s += t + " ";
+		s += t + " ";
+		s += t + " ";
+		s += t + ")";
+
+		if (s != "rect(auto auto auto auto)")
+			ce.style.clip = s;
+	}
+
+	ce.style.cssText = ce.style.cssText;
+}
+
+function isNum(s) {
+	return new RegExp('[0-9]+', 'g').test(s);
+}
+
+function showDisabledControls() {
+	var f = document.forms, i, a;
+
+	for (i=0; i<f.length; i++) {
+		for (a=0; a<f[i].elements.length; a++) {
+			if (f[i].elements[a].disabled)
+				tinyMCEPopup.editor.dom.addClass(f[i].elements[a], "disabled");
+			else
+				tinyMCEPopup.editor.dom.removeClass(f[i].elements[a], "disabled");
+		}
+	}
+}
+
+function fillSelect(f, s, param, dval, sep, em) {
+	var i, ar, p, se;
+
+	f = document.forms[f];
+	sep = typeof(sep) == "undefined" ? ";" : sep;
+
+	if (em)
+		addSelectValue(f, s, "", "");
+
+	ar = tinyMCEPopup.getParam(param, dval).split(sep);
+	for (i=0; i<ar.length; i++) {
+		se = false;
+
+		if (ar[i].charAt(0) == '+') {
+			ar[i] = ar[i].substring(1);
+			se = true;
+		}
+
+		p = ar[i].split('=');
+
+		if (p.length > 1) {
+			addSelectValue(f, s, p[0], p[1]);
+
+			if (se)
+				selectByValue(f, s, p[1]);
+		} else {
+			addSelectValue(f, s, p[0], p[0]);
+
+			if (se)
+				selectByValue(f, s, p[0]);
+		}
+	}
+}
+
+function toggleSame(ce, pre) {
+	var el = document.forms[0].elements, i;
+
+	if (ce.checked) {
+		el[pre + "_top"].disabled = false;
+		el[pre + "_right"].disabled = true;
+		el[pre + "_bottom"].disabled = true;
+		el[pre + "_left"].disabled = true;
+
+		if (el[pre + "_top_measurement"]) {
+			el[pre + "_top_measurement"].disabled = false;
+			el[pre + "_right_measurement"].disabled = true;
+			el[pre + "_bottom_measurement"].disabled = true;
+			el[pre + "_left_measurement"].disabled = true;
+		}
+	} else {
+		el[pre + "_top"].disabled = false;
+		el[pre + "_right"].disabled = false;
+		el[pre + "_bottom"].disabled = false;
+		el[pre + "_left"].disabled = false;
+
+		if (el[pre + "_top_measurement"]) {
+			el[pre + "_top_measurement"].disabled = false;
+			el[pre + "_right_measurement"].disabled = false;
+			el[pre + "_bottom_measurement"].disabled = false;
+			el[pre + "_left_measurement"].disabled = false;
+		}
+	}
+
+	showDisabledControls();
+}
+
+function synch(fr, to) {
+	var f = document.forms[0];
+
+	f.elements[to].value = f.elements[fr].value;
+
+	if (f.elements[fr + "_measurement"])
+		selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value);
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/da_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/da_dlg.js
new file mode 100644
index 0000000000..210a87a526
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/da_dlg.js
@@ -0,0 +1,63 @@
+tinyMCE.addI18n('da.style_dlg',{
+title:"Rediger CSS stil",
+apply:"Anvend",
+text_tab:"Tekst",
+background_tab:"Baggrund",
+block_tab:"Blok",
+box_tab:"Boks",
+border_tab:"Kant",
+list_tab:"Liste",
+positioning_tab:"Positionering",
+text_props:"Tekst",
+text_font:"Skrifttype",
+text_size:"St\u00F8rrelse",
+text_weight:"V\u00E6gt",
+text_style:"Stil",
+text_variant:"Variant",
+text_lineheight:"Linieh\u00F8jde",
+text_case:"Vesaltilstand",
+text_color:"Farve",
+text_decoration:"Dekoration",
+text_overline:"overstreget",
+text_underline:"understreget",
+text_striketrough:"gennemstreget",
+text_blink:"blink",
+text_none:"ingen",
+background_color:"Baggrundsfarve",
+background_image:"Baggrundsbillede",
+background_repeat:"Gentag",
+background_attachment:"Vedh\u00E6ftede fil",
+background_hpos:"Horisontal position",
+background_vpos:"Vertikal position",
+block_wordspacing:"Afstand mellem ord",
+block_letterspacing:"Afstand mellem bogstaver",
+block_vertical_alignment:"Vertikal justering",
+block_text_align:"Tekstjustering",
+block_text_indent:"Tekstindrykning",
+block_whitespace:"Mellemrum",
+block_display:"Vis",
+box_width:"Bredde",
+box_height:"H\u00F8jde",
+box_float:"Flydende",
+box_clear:"Ryd",
+padding:"Afstand til indhold",
+same:"Ens for alle",
+top:"Top",
+right:"H\u00F8jre",
+bottom:"Bund",
+left:"Venstre",
+margin:"Margin",
+style:"Style",
+width:"Bredde",
+height:"H\u00F8jde",
+color:"Farve",
+list_type:"Type",
+bullet_image:"Punktopstillings-billede",
+position:"Position",
+positioning_type:"Type",
+visibility:"Synlighed",
+zindex:"Z-index",
+overflow:"Overl\u00F8b",
+placement:"Placering",
+clip:"Klip"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/de_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/de_dlg.js
new file mode 100644
index 0000000000..57a62ff939
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/de_dlg.js
@@ -0,0 +1,63 @@
+tinyMCE.addI18n('de.style_dlg',{
+title:"CSS-Styles bearbeiten",
+apply:"\u00DCbernehmen",
+text_tab:"Text",
+background_tab:"Hintergrund",
+block_tab:"Block",
+box_tab:"Box",
+border_tab:"Rahmen",
+list_tab:"Liste",
+positioning_tab:"Positionierung",
+text_props:"Text",
+text_font:"Schriftart",
+text_size:"Gr\u00F6\u00DFe",
+text_weight:"Dicke",
+text_style:"Stil",
+text_variant:"Variante",
+text_lineheight:"Zeilenh\u00F6he",
+text_case:"Schreibung",
+text_color:"Farbe",
+text_decoration:"Gestaltung",
+text_overline:"\u00FCberstrichen",
+text_underline:"unterstrichen",
+text_striketrough:"durchgestrichen",
+text_blink:"blinkend",
+text_none:"keine",
+background_color:"Hintergrundfarbe",
+background_image:"Hintergrundbild",
+background_repeat:"Wiederholung",
+background_attachment:"Wasserzeicheneffekt",
+background_hpos:"Position X",
+background_vpos:"Position Y",
+block_wordspacing:"Wortabstand",
+block_letterspacing:"Buchstabenabstand",
+block_vertical_alignment:"Vertikale Ausrichtung",
+block_text_align:"Ausrichtung",
+block_text_indent:"Einr\u00FCckung",
+block_whitespace:"Automatischer Umbruch",
+block_display:"Umbruchverhalten",
+box_width:"Breite",
+box_height:"H\u00F6he",
+box_float:"Umflie\u00DFung",
+box_clear:"Umflie\u00DFung verhindern",
+padding:"Innerer Abstand",
+same:"Alle gleich",
+top:"Oben",
+right:"Rechts",
+bottom:"Unten",
+left:"Links",
+margin:"\u00C4u\u00DFerer Abstand",
+style:"Format",
+width:"Breite",
+height:"H\u00F6he",
+color:"Textfarbe",
+list_type:"Listenpunkt-Art",
+bullet_image:"Listenpunkt-Grafik",
+position:"Positionierung",
+positioning_type:"Art der Positionierung",
+visibility:"Sichtbar",
+zindex:"Z-Wert",
+overflow:"Verhalten bei \u00DCbergr\u00F6\u00DFe",
+placement:"Platzierung",
+clip:"Ausschnitt"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/en_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/en_dlg.js
new file mode 100644
index 0000000000..df0a173c77
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/en_dlg.js
@@ -0,0 +1,70 @@
+tinyMCE.addI18n('en.style_dlg',{
+title:"Edit CSS Style",
+apply:"Apply",
+text_tab:"Text",
+background_tab:"Background",
+block_tab:"Block",
+box_tab:"Box",
+border_tab:"Border",
+list_tab:"List",
+positioning_tab:"Positioning",
+text_props:"Text",
+text_font:"Font",
+text_size:"Size",
+text_weight:"Weight",
+text_style:"Style",
+text_variant:"Variant",
+text_lineheight:"Line height",
+text_case:"Case",
+text_color:"Color",
+text_decoration:"Decoration",
+text_overline:"overline",
+text_underline:"underline",
+text_striketrough:"strikethrough",
+text_blink:"blink",
+text_none:"none",
+background_color:"Background color",
+background_image:"Background image",
+background_repeat:"Repeat",
+background_attachment:"Attachment",
+background_hpos:"Horizontal position",
+background_vpos:"Vertical position",
+block_wordspacing:"Word spacing",
+block_letterspacing:"Letter spacing",
+block_vertical_alignment:"Vertical alignment",
+block_text_align:"Text align",
+block_text_indent:"Text indent",
+block_whitespace:"Whitespace",
+block_display:"Display",
+box_width:"Width",
+box_height:"Height",
+box_float:"Float",
+box_clear:"Clear",
+padding:"Padding",
+same:"Same for all",
+top:"Top",
+right:"Right",
+bottom:"Bottom",
+left:"Left",
+margin:"Margin",
+style:"Style",
+width:"Width",
+height:"Height",
+color:"Color",
+list_type:"Type",
+bullet_image:"Bullet image",
+position:"Position",
+positioning_type:"Type",
+visibility:"Visibility",
+zindex:"Z-index",
+overflow:"Overflow",
+placement:"Placement",
+clip:"Clip",
+text:"Text",
+background:"Background",
+block:"Block",
+box:"Box",
+border:"Border",
+list:"List",
+position:"Position"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/es_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/es_dlg.js
new file mode 100644
index 0000000000..abf4b1db3b
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/es_dlg.js
@@ -0,0 +1,63 @@
+tinyMCE.addI18n('es.style_dlg',{
+title:"Editar Estilo CSS",
+apply:"Aplicar",
+text_tab:"Texto",
+background_tab:"Fondo",
+block_tab:"Bloque",
+box_tab:"Caja",
+border_tab:"Borde",
+list_tab:"Lista",
+positioning_tab:"Posici\u00F3n",
+text_props:"Texto",
+text_font:"Fuente",
+text_size:"Tama\u00F1o",
+text_weight:"Peso",
+text_style:"Estilo",
+text_variant:"Variante",
+text_lineheight:"Ancho de la fila",
+text_case:"Min\u00FAs./May\u00FAs.",
+text_color:"Color",
+text_decoration:"Decorativos",
+text_overline:"Subrayado superior",
+text_underline:"Subrayado",
+text_striketrough:"Tachado",
+text_blink:"Parpadeo",
+text_none:"Ninguno",
+background_color:"Color de fondo",
+background_image:"Imagen de fondo",
+background_repeat:"Repetici\u00F3n",
+background_attachment:"Adjunto",
+background_hpos:"Posici\u00F3n horizontal",
+background_vpos:"Posici\u00F3n vertical",
+block_wordspacing:"Espacio entre palabra",
+block_letterspacing:"Espacio entre letra",
+block_vertical_alignment:"Alineaci\u00F3n vertical",
+block_text_align:"Alineaci\u00F3n del texto",
+block_text_indent:"Sangr\u00EDa",
+block_whitespace:"Espacio en blanco",
+block_display:"Display",
+box_width:"Ancho",
+box_height:"Alto",
+box_float:"Float",
+box_clear:"Clear",
+padding:"Padding",
+same:"Lo mismo en todos",
+top:"Arriba",
+right:"Derecha",
+bottom:"Debajo",
+left:"Izquierda",
+margin:"Margen",
+style:"Estilo",
+width:"Ancho",
+height:"Alto",
+color:"Color",
+list_type:"Tipo",
+bullet_image:"Imagen de la vi\u00F1eta",
+position:"Posici\u00F3n",
+positioning_type:"Tipo",
+visibility:"Visibilidad",
+zindex:"Z-index",
+overflow:"Overflow",
+placement:"Placement",
+clip:"Clip"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/fr_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/fr_dlg.js
new file mode 100644
index 0000000000..d4ddea7b32
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/fr_dlg.js
@@ -0,0 +1,63 @@
+tinyMCE.addI18n('fr.style_dlg',{
+title:"\u00C9diter la feuille de style CSS",
+apply:"Appliquer",
+text_tab:"Texte",
+background_tab:"Fond",
+block_tab:"Bloc",
+box_tab:"Bo\u00EEte",
+border_tab:"Bordure",
+list_tab:"Liste",
+positioning_tab:"Positionement",
+text_props:"Texte",
+text_font:"Police",
+text_size:"Taille",
+text_weight:"Poids",
+text_style:"Style",
+text_variant:"Variante",
+text_lineheight:"Hauteur de ligne",
+text_case:"Casse",
+text_color:"Couleur",
+text_decoration:"D\u00E9coration",
+text_overline:"surlign\u00E9",
+text_underline:"soulign\u00E9",
+text_striketrough:"barr\u00E9",
+text_blink:"clignotant",
+text_none:"aucun",
+background_color:"Couleur de fond",
+background_image:"Image de fond",
+background_repeat:"R\u00E9p\u00E9ter",
+background_attachment:"Attachement",
+background_hpos:"Position horizontale",
+background_vpos:"Position verticale",
+block_wordspacing:"Espacement des mots ",
+block_letterspacing:"Espacement des lettres",
+block_vertical_alignment:"Alignement vertical",
+block_text_align:"Alignement du texte",
+block_text_indent:"Indentation du texte",
+block_whitespace:"Fin de ligne",
+block_display:"Affichage",
+box_width:"Largeur",
+box_height:"Hauteur",
+box_float:"Flottant",
+box_clear:"Vider",
+padding:"Espacement",
+same:"Identique pour tous",
+top:"Haut",
+right:"Droit",
+bottom:"Bas",
+left:"Gauche",
+margin:"Marge",
+style:"Style",
+width:"Largeur",
+height:"Hauter",
+color:"Couleur",
+list_type:"Type",
+bullet_image:"Image de puce",
+position:"Position",
+positioning_type:"Type",
+visibility:"Visibilit\u00E9",
+zindex:"Z-index",
+overflow:"D\u00E9bordement",
+placement:"Placement",
+clip:"Clip"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/it_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/it_dlg.js
new file mode 100644
index 0000000000..ad983ed854
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/it_dlg.js
@@ -0,0 +1,63 @@
+tinyMCE.addI18n('it.style_dlg',{
+title:"Modifica stile CSS",
+apply:"Applica",
+text_tab:"Testo",
+background_tab:"Sfondo",
+block_tab:"Blocco",
+box_tab:"Contenitore",
+border_tab:"Bordi",
+list_tab:"Liste",
+positioning_tab:"Posizionamento",
+text_props:"Testo",
+text_font:"Carattere",
+text_size:"Dimensione",
+text_weight:"Spessore",
+text_style:"Stile",
+text_variant:"Variante",
+text_lineheight:"Altezza linea",
+text_case:"Tipo",
+text_color:"Colore",
+text_decoration:"Decorazione",
+text_overline:"sopralineato",
+text_underline:"sottolineato",
+text_striketrough:"barrato",
+text_blink:"lampeggiante",
+text_none:"nessuna",
+background_color:"Colore sfondo",
+background_image:"Immagine sfondo",
+background_repeat:"Repetizione",
+background_attachment:"Allegato",
+background_hpos:"Posizione orizzontale",
+background_vpos:"Posizione verticale",
+block_wordspacing:"Spaziatura parole",
+block_letterspacing:"Spaziatura caratteri",
+block_vertical_alignment:"Allineamento verticale",
+block_text_align:"Allineamento testo",
+block_text_indent:"Indentazione testo",
+block_whitespace:"Whitespace",
+block_display:"Visualizzazione",
+box_width:"Larghezza",
+box_height:"Altezza",
+box_float:"Float",
+box_clear:"Clear",
+padding:"Spazio dal bordo",
+same:"Uguale per tutti",
+top:"Superiore",
+right:"Destro",
+bottom:"Inferiore",
+left:"Sinistro",
+margin:"Margine",
+style:"Stile",
+width:"Larghezza",
+height:"Altezza",
+color:"Colore",
+list_type:"Tipo",
+bullet_image:"Immagine bullet",
+position:"Posizione",
+positioning_type:"Tipo",
+visibility:"Visibilit\u00E0",
+zindex:"Z-index",
+overflow:"Overflow",
+placement:"Piazzamento",
+clip:"Clip"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/nl_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/nl_dlg.js
new file mode 100644
index 0000000000..854a0be082
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/nl_dlg.js
@@ -0,0 +1,63 @@
+tinyMCE.addI18n('nl.style_dlg',{
+title:"CSS Stijl bewerken",
+apply:"Toepassen",
+text_tab:"Tekst",
+background_tab:"Achtergrond",
+block_tab:"Blok",
+box_tab:"Box",
+border_tab:"Rand",
+list_tab:"Lijst",
+positioning_tab:"Positionering",
+text_props:"Tekst",
+text_font:"Lettertype",
+text_size:"Tekengrootte",
+text_weight:"Gewicht",
+text_style:"Stijl",
+text_variant:"Variant",
+text_lineheight:"Lijnhoogte",
+text_case:"Hoofdlettergebruik",
+text_color:"Kleur",
+text_decoration:"Decoratie",
+text_overline:"Overhalen",
+text_underline:"Onderstrepen",
+text_striketrough:"Doorhalen",
+text_blink:"Knipperen",
+text_none:"Niets",
+background_color:"Achtergrondkleur",
+background_image:"Achtergrondafbeelding",
+background_repeat:"Herhalen",
+background_attachment:"Bijlage",
+background_hpos:"Horizontale positie",
+background_vpos:"Verticale positie",
+block_wordspacing:"Woordruimte",
+block_letterspacing:"Letterruimte",
+block_vertical_alignment:"Verticale uitlijning",
+block_text_align:"Tekstuitlijning",
+block_text_indent:"Inspringen",
+block_whitespace:"Witruimte",
+block_display:"Weergave",
+box_width:"Breedte",
+box_height:"Hoogte",
+box_float:"Zweven",
+box_clear:"Vrijhouden",
+padding:"Opening",
+same:"Alles hetzelfde",
+top:"Boven",
+right:"Rechts",
+bottom:"Onder",
+left:"Links",
+margin:"Marge",
+style:"Stijl",
+width:"Breedte",
+height:"Hoogte",
+color:"Kleur",
+list_type:"Type",
+bullet_image:"Opsommingsteken",
+position:"Positie",
+positioning_type:"Type",
+visibility:"Zichtbaarheid",
+zindex:"Z-index",
+overflow:"Overvloeien",
+placement:"Plaatsing",
+clip:"Clip"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/no_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/no_dlg.js
new file mode 100644
index 0000000000..6733f7b393
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/no_dlg.js
@@ -0,0 +1,63 @@
+tinyMCE.addI18n('no.style_dlg',{
+title:"Rediger CSS-stil",
+apply:"Legg til",
+text_tab:"Tekst",
+background_tab:"Bakgrunn",
+block_tab:"Blokk",
+box_tab:"Boks",
+border_tab:"Ramme",
+list_tab:"Liste",
+positioning_tab:"Posisjon",
+text_props:"Egenskaper for skrift",
+text_font:"Skrifttype",
+text_size:"Skriftst\u00F8rrelse",
+text_weight:"Skriftvekt",
+text_style:"Skriftstil",
+text_variant:"Variant",
+text_lineheight:"Linjeh\u00F8yde",
+text_case:"Kapiteler/minuskaler",
+text_color:"Farge",
+text_decoration:"Dekorasjon",
+text_overline:"Hev skrift",
+text_underline:"Senk skrift",
+text_striketrough:"Gjennomstrek",
+text_blink:"Blink",
+text_none:"Ingen",
+background_color:"Bakgrunnsfarge",
+background_image:"Bakgrunnsbilde",
+background_repeat:"Gjenta",
+background_attachment:"Vedlegg",
+background_hpos:"Horisontal posisjon",
+background_vpos:"Vertikal posisjon",
+block_wordspacing:"Ordmellomrom",
+block_letterspacing:"Bokstavmellomrom",
+block_vertical_alignment:"Vertikal justering",
+block_text_align:"Justering",
+block_text_indent:"Innrykk",
+block_whitespace:"Mellomrom",
+block_display:"Framskyvning",
+box_width:"Bredde",
+box_height:"H\u00F8yde",
+box_float:"Flyt",
+box_clear:"Slett",
+padding:"Utfylling",
+same:"Likt i alle",
+top:"Topp",
+right:"H\u00F8yre",
+bottom:"Bunn",
+left:"Venstre",
+margin:"Marg",
+style:"Stil",
+width:"Bredde",
+height:"H\u00F8yd",
+color:"Farge",
+list_type:"Type",
+bullet_image:"Kulepunktbilde",
+position:"Posisjon",
+positioning_type:"Type",
+visibility:"Synlighet",
+zindex:"Z-indeks",
+overflow:"Overfylt",
+placement:"Plassering",
+clip:"Klipp"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/sv_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/sv_dlg.js
new file mode 100644
index 0000000000..3e7f4ed867
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/langs/sv_dlg.js
@@ -0,0 +1,63 @@
+tinyMCE.addI18n('sv.style_dlg',{
+title:"Redigera inline CSS",
+apply:"Applicera",
+text_tab:"Text",
+background_tab:"Bakgrund",
+block_tab:"Block",
+box_tab:"Box",
+border_tab:"Ramar",
+list_tab:"Listor",
+positioning_tab:"Positionering",
+text_props:"Text",
+text_font:"Typsnitt",
+text_size:"Storlek",
+text_weight:"Tjocklek",
+text_style:"Stil",
+text_variant:"Variant",
+text_lineheight:"Radh\u00F6jd",
+text_case:"Sm\u00E5/stora",
+text_color:"F\u00E4rg",
+text_decoration:"Dekoration",
+text_overline:"\u00D6verstruken",
+text_underline:"Understruken",
+text_striketrough:"Genomstruken",
+text_blink:"Blinka",
+text_none:"Inget",
+background_color:"Bakgrundsf\u00E4rg",
+background_image:"Bakgrundsbild",
+background_repeat:"Upprepning",
+background_attachment:"F\u00E4stpunkt",
+background_hpos:"Horisontell position",
+background_vpos:"Vertikal position",
+block_wordspacing:"Ordavbrytning",
+block_letterspacing:"Teckenmellanrum",
+block_vertical_alignment:"Vertikal justering",
+block_text_align:"Textjustering",
+block_text_indent:"Textindrag",
+block_whitespace:"Whitespace",
+block_display:"Display",
+box_width:"Bredd",
+box_height:"H\u00F6jd",
+box_float:"Float",
+box_clear:"Clear",
+padding:"Padding",
+same:"Samma f\u00F6r alla",
+top:"Toppen",
+right:"H\u00F6ger",
+bottom:"Botten",
+left:"V\u00E4nster",
+margin:"Marginal",
+style:"Stil",
+width:"Bredd",
+height:"H\u00F6jd",
+color:"F\u00E4rg",
+list_type:"Listtyp",
+bullet_image:"Punktbild",
+position:"Position",
+positioning_type:"Positionstyp",
+visibility:"Synlighet",
+zindex:"Z-index",
+overflow:"\u00D6\u0096verfl\u00F6de",
+placement:"Placering",
+clip:"Besk\u00E4rning"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/style/props.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/props.htm
new file mode 100644
index 0000000000..b5a3d15d9e
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/style/props.htm
@@ -0,0 +1,838 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#style_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="js/props.js"></script>
+	<link href="css/props.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body id="styleprops" style="display: none" role="application" aria-labelledby="app_title">
+<span id="app_title" style="display:none">{#style_dlg.title}</span>
+<form onsubmit="updateAction();return false;" action="#">
+<div class="tabs">
+	<ul>
+		<li id="text_tab" class="current" aria-controls="text_panel"><span><a href="javascript:mcTabs.displayTab('text_tab','text_panel');" onMouseDown="return false;">{#style_dlg.text_tab}</a></span></li>
+		<li id="background_tab" aria-controls="background_panel"><span><a href="javascript:mcTabs.displayTab('background_tab','background_panel');" onMouseDown="return false;">{#style_dlg.background_tab}</a></span></li>
+		<li id="block_tab" aria-controls="block_panel"><span><a href="javascript:mcTabs.displayTab('block_tab','block_panel');" onMouseDown="return false;">{#style_dlg.block_tab}</a></span></li>
+		<li id="box_tab" aria-controls="box_panel"><span><a href="javascript:mcTabs.displayTab('box_tab','box_panel');" onMouseDown="return false;">{#style_dlg.box_tab}</a></span></li>
+		<li id="border_tab" aria-controls="border_panel"><span><a href="javascript:mcTabs.displayTab('border_tab','border_panel');" onMouseDown="return false;">{#style_dlg.border_tab}</a></span></li>
+		<li id="list_tab" aria-controls="list_panel"><span><a href="javascript:mcTabs.displayTab('list_tab','list_panel');" onMouseDown="return false;">{#style_dlg.list_tab}</a></span></li>
+		<li id="positioning_tab" aria-controls="positioning_panel"><span><a href="javascript:mcTabs.displayTab('positioning_tab','positioning_panel');" onMouseDown="return false;">{#style_dlg.positioning_tab}</a></span></li>
+	</ul>
+</div>
+
+<div class="panel_wrapper">
+<div id="text_panel" class="panel current">
+	<fieldset>
+		<legend>{#style_dlg.text}</legend>
+		<table role="presentation" border="0" width="100%">
+			<tr>
+				<td><label for="text_font">{#style_dlg.text_font}</label></td>
+				<td colspan="3">
+					<select id="text_font" name="text_font" class="mceEditableSelect mceFocus"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_size">{#style_dlg.text_size}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="text_size_measurement_label" for="text_size_measurement" style="display: none; visibility: hidden;">Text Size Measurement Unit</label>
+								<select id="text_size_measurement" name="text_size_measurement" aria-labelledby="text_size_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td><label for="text_weight">{#style_dlg.text_weight}</label></td>
+				<td>
+					<select id="text_weight" name="text_weight"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_style">{#style_dlg.text_style}</label></td>
+				<td>
+					<select id="text_style" name="text_style" class="mceEditableSelect"></select>
+				</td>
+				<td><label for="text_variant">{#style_dlg.text_variant}</label></td>
+				<td>
+					<select id="text_variant" name="text_variant"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_lineheight">{#style_dlg.text_lineheight}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td>
+								<select id="text_lineheight" name="text_lineheight" class="mceEditableSelect"></select>
+							</td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="text_lineheight_measurement_label" for="text_lineheight_measurement" style="display: none; visibility: hidden;">Line Height Measurement Unit</label>
+								<select id="text_lineheight_measurement" name="text_lineheight_measurement" aria-labelledby="text_lineheight_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td><label for="text_case">{#style_dlg.text_case}</label></td>
+				<td>
+					<select id="text_case" name="text_case"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_color">{#style_dlg.text_color}</label></td>
+				<td colspan="2">
+					<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<td><input id="text_color" name="text_color" type="text" value="" size="9" onChange="updateColor('text_color_pick','text_color');" /></td>
+							<td id="text_color_pickcontainer">&nbsp;</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td valign="top" style="vertical-align: top; padding-top: 3px;">{#style_dlg.text_decoration}</td>
+				<td colspan="2">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input id="text_underline" name="text_underline" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_underline">{#style_dlg.text_underline}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_overline" name="text_overline" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_overline">{#style_dlg.text_overline}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_linethrough" name="text_linethrough" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_linethrough">{#style_dlg.text_striketrough}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_blink" name="text_blink" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_blink">{#style_dlg.text_blink}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_none" name="text_none" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_none">{#style_dlg.text_none}</label></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div id="background_panel" class="panel">
+	<fieldset>
+		<legend>{#style_dlg.background}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="background_color">{#style_dlg.background_color}</label></td>
+				<td>
+					<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<td><input id="background_color" name="background_color" type="text" value="" size="9" onChange="updateColor('background_color_pick','background_color');" /></td>
+							<td id="background_color_pickcontainer">&nbsp;</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+
+			<tr>
+				<td><label for="background_image">{#style_dlg.background_image}</label></td>
+				<td><table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr> 
+						<td><input id="background_image" name="background_image" type="text" /></td> 
+						<td id="background_image_browser">&nbsp;</td>
+					</tr>
+					</table>
+				</td>
+			</tr>
+
+			<tr>
+				<td><label for="background_repeat">{#style_dlg.background_repeat}</label></td>
+				<td><select id="background_repeat" name="background_repeat" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="background_attachment">{#style_dlg.background_attachment}</label></td>
+				<td><select id="background_attachment" name="background_attachment" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="background_hpos">{#style_dlg.background_hpos}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="background_hpos" name="background_hpos" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="background_hpos_measurement_label" for="background_hpos_measurement" style="display: none; visibility: hidden;">Horizontal position measurement unit</label>
+								<select id="background_hpos_measurement" name="background_hpos_measurement" aria-labelledby="background_hpos_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+
+			<tr>
+				<td><label for="background_vpos">{#style_dlg.background_vpos}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="background_vpos" name="background_vpos" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+
+								<label id="background_vpos_measurement_label" for="background_vpos_measurement" style="display: none; visibility: hidden;">Vertical position measurement unit</label>
+								<select id="background_vpos_measurement" name="background_vpos_measurement" aria-labelledby="background_vpos_measurement_label">></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div id="block_panel" class="panel">
+	<fieldset>
+		<legend>{#style_dlg.block}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="block_wordspacing">{#style_dlg.block_wordspacing}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="block_wordspacing" name="block_wordspacing" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_wordspacing_measurement_label" for="block_wordspacing_measurement" style="display: none; visibility: hidden;">Word spacing measurement unit</label>
+								<select id="block_wordspacing_measurement" name="block_wordspacing_measurement" aria-labelledby="block_wordspacing_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+
+			<tr>
+				<td><label for="block_letterspacing">{#style_dlg.block_letterspacing}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="block_letterspacing" name="block_letterspacing" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_letterspacing_measurement_label" for="block_letterspacing_measurement" style="display: none; visibility: hidden;">Letter spacing measurement unit</label>
+								<select id="block_letterspacing_measurement" name="block_letterspacing_measurement" aria-labelledby="block_letterspacing_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+
+			<tr>
+				<td><label for="block_vertical_alignment">{#style_dlg.block_vertical_alignment}</label></td>
+				<td><select id="block_vertical_alignment" name="block_vertical_alignment" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="block_text_align">{#style_dlg.block_text_align}</label></td>
+				<td><select id="block_text_align" name="block_text_align" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="block_text_indent">{#style_dlg.block_text_indent}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="block_text_indent" name="block_text_indent" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_text_indent_measurement_label" for="block_text_indent_measurement" style="display: none; visibility: hidden;">Text Indent Measurement Unit</label>
+
+								<select id="block_text_indent_measurement" name="block_text_indent_measurement" aria-labelledby="block_text_indent_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+
+			<tr>
+				<td><label for="block_whitespace">{#style_dlg.block_whitespace}</label></td>
+				<td><select id="block_whitespace" name="block_whitespace" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="block_display">{#style_dlg.block_display}</label></td>
+				<td><select id="block_display" name="block_display" class="mceEditableSelect"></select></td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div id="box_panel" class="panel">
+	<fieldset>
+		<legend>{#style_dlg.box}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="box_width">{#style_dlg.box_width}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_width" name="box_width" class="mceEditableSelect" onChange="synch('box_width','positioning_width');" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_width_measurement_label" for="box_width_measurement" style="display: none; visibility: hidden;">Box Width Measurement Unit</label>
+								<select id="box_width_measurement" name="box_width_measurement" aria-labelledby="box_width_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td>&nbsp;&nbsp;&nbsp;<label for="box_float">{#style_dlg.box_float}</label></td>
+				<td><select id="box_float" name="box_float" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="box_height">{#style_dlg.box_height}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_height" name="box_height" class="mceEditableSelect" onChange="synch('box_height','positioning_height');" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_height_measurement_label" for="box_height_measurement" style="display: none; visibility: hidden;">Box Height Measurement Unit</label>
+								<select id="box_height_measurement" name="box_height_measurement" aria-labelledby="box_height_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td>&nbsp;&nbsp;&nbsp;<label for="box_clear">{#style_dlg.box_clear}</label></td>
+				<td><select id="box_clear" name="box_clear" class="mceEditableSelect"></select></td>
+			</tr>
+		</table>
+<div style="float: left; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.padding}</legend>
+
+		<table role="presentation" border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="box_padding_same" name="box_padding_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_padding');" /> <label for="box_padding_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_top">{#style_dlg.top}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_top" name="box_padding_top" class="mceEditableSelect" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_padding_top_measurement_label" for="box_padding_top_measurement" style="display: none; visibility: hidden;">Padding Top Measurement Unit</label>
+								<select id="box_padding_top_measurement" name="box_padding_top_measurement" aria-labelledby="box_padding_top_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_right">{#style_dlg.right}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_right" name="box_padding_right" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_padding_right_measurement_label" for="box_padding_right_measurement" style="display: none; visibility: hidden;">Padding Right Measurement Unit</label>
+								<select id="box_padding_right_measurement" name="box_padding_right_measurement" disabled="disabled" aria-labelledby="box_padding_right_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_bottom">{#style_dlg.bottom}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_bottom" name="box_padding_bottom" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_padding_bottom_measurement_label" for="box_padding_bottom_measurement" style="display: none; visibility: hidden;">Padding Bottom Measurement Unit</label>
+								<select id="box_padding_bottom_measurement" name="box_padding_bottom_measurement" disabled="disabled" aria-labelledby="box_padding_bottom_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_left">{#style_dlg.left}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_left" name="box_padding_left" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_padding_left_measurement_label" for="box_padding_left_measurement" style="display: none; visibility: hidden;">Padding Left Measurement Unit</label>
+								<select id="box_padding_left_measurement" name="box_padding_left_measurement" disabled="disabled" aria-labelledby="box_padding_left_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div style="float: right; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.margin}</legend>
+
+		<table role="presentation" border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="box_margin_same" name="box_margin_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_margin');" /> <label for="box_margin_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_top">{#style_dlg.top}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_top" name="box_margin_top" class="mceEditableSelect" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_margin_top_measurement_label" for="box_margin_top_measurement" style="display: none; visibility: hidden;">Margin Top Measurement Unit</label>
+								<select id="box_margin_top_measurement" name="box_margin_top_measurement" aria-labelledby="box_margin_top_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_right">{#style_dlg.right}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_right" name="box_margin_right" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_margin_right_measurement_label" for="box_margin_right_measurement" style="display: none; visibility: hidden;">Margin Right Measurement Unit</label>
+								<select id="box_margin_right_measurement" name="box_margin_right_measurement" disabled="disabled" aria-labelledby="box_margin_right_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_bottom">{#style_dlg.bottom}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_bottom" name="box_margin_bottom" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_margin_bottom_measurement_label" for="box_margin_bottom_measurement" style="display: none; visibility: hidden;">Margin Bottom Measurement Unit</label>
+								<select id="box_margin_bottom_measurement" name="box_margin_bottom_measurement" disabled="disabled" aria-labelledby="box_margin_bottom_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_left">{#style_dlg.left}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_left" name="box_margin_left" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_margin_left_measurement_label" for="box_margin_left_measurement" style="display: none; visibility: hidden;">Margin Left Measurement Unit</label>
+								<select id="box_margin_left_measurement" name="box_margin_left_measurement" disabled="disabled" aria-labelledby="box_margin_left_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+<br style="clear: both" />
+</div>
+
+<div id="border_panel" class="panel">
+	<fieldset>
+		<legend>{#style_dlg.border}</legend>	
+		<table role="presentation" border="0" cellspacing="0" cellpadding="0" width="100%">
+		<tr>
+			<td class="tdelim">&nbsp;</td>
+			<td class="tdelim delim">&nbsp;</td>
+			<td class="tdelim">{#style_dlg.style}</td>
+			<td class="tdelim delim">&nbsp;</td>
+			<td class="tdelim">{#style_dlg.width}</td>
+			<td class="tdelim delim">&nbsp;</td>
+			<td class="tdelim">{#style_dlg.color}</td>
+		</tr>
+
+		<tr>
+			<td>&nbsp;</td>
+			<td class="delim">&nbsp;</td>
+			<td><input type="checkbox" id="border_style_same" name="border_style_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_style');" /> <label for="border_style_same">{#style_dlg.same}</label></td>
+			<td class="delim">&nbsp;</td>
+			<td><input type="checkbox" id="border_width_same" name="border_width_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_width');" /> <label for="border_width_same">{#style_dlg.same}</label></td>
+			<td class="delim">&nbsp;</td>
+			<td><input type="checkbox" id="border_color_same" name="border_color_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_color');" /> <label for="border_color_same">{#style_dlg.same}</label></td>
+		</tr>
+
+		<tr>
+			<td>{#style_dlg.top}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_top" name="border_style_top" class="mceEditableSelect"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_top" name="border_width_top" class="mceEditableSelect"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_top_measurement_label" for="border_width_top_measurement" style="display: none; visibility: hidden;">Width top Measurement Unit</label>
+							<select id="border_width_top_measurement" name="border_width_top_measurement" aria-labelledby="border_width_top_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_top" name="border_color_top" type="text" value="" size="9" onChange="updateColor('border_color_top_pick','border_color_top');" /></td>
+						<td id="border_color_top_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td>{#style_dlg.right}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_right" name="border_style_right" class="mceEditableSelect" disabled="disabled"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_right" name="border_width_right" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_right_measurement_label" for="border_width_right_measurement" style="display: none; visibility: hidden;">Width Right Measurement Unit</label>
+							<select id="border_width_right_measurement" name="border_width_right_measurement" disabled="disabled" aria-labelledby="border_width_right_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_right" name="border_color_right" type="text" value="" size="9" onChange="updateColor('border_color_right_pick','border_color_right');" disabled="disabled" /></td>
+						<td id="border_color_right_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td>{#style_dlg.bottom}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_bottom" name="border_style_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_bottom" name="border_width_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_bottom_measurement_label" for="border_width_bottom_measurement" style="display: none; visibility: hidden;">Width Bottom Measurement Unit</label>
+							<select id="border_width_bottom_measurement" name="border_width_bottom_measurement" disabled="disabled" aria-labelledby="border_width_bottom_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_bottom" name="border_color_bottom" type="text" value="" size="9" onChange="updateColor('border_color_bottom_pick','border_color_bottom');" disabled="disabled" /></td>
+						<td id="border_color_bottom_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td>{#style_dlg.left}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_left" name="border_style_left" class="mceEditableSelect" disabled="disabled"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_left" name="border_width_left" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_left_measurement_label" for="border_width_left_measurement" style="display: none; visibility: hidden;">Width Left Measurement Unit</label>
+							<select id="border_width_left_measurement" name="border_width_left_measurement" disabled="disabled" aria-labelledby="border_width_left_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_left" name="border_color_left" type="text" value="" size="9" onChange="updateColor('border_color_left_pick','border_color_left');" disabled="disabled" /></td>
+						<td id="border_color_left_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div id="list_panel" class="panel">
+<fieldset>
+	<legend>{#style_dlg.list}</legend>
+	<table role="presentation" border="0">
+		<tr>
+			<td><label for="list_type">{#style_dlg.list_type}</label></td>
+			<td><select id="list_type" name="list_type" class="mceEditableSelect"></select></td>
+		</tr>
+
+		<tr>
+			<td><label for="list_bullet_image">{#style_dlg.bullet_image}</label></td>
+			<td><input id="list_bullet_image" name="list_bullet_image" type="text" /></td>
+		</tr>
+
+		<tr>
+			<td><label for="list_position">{#style_dlg.position}</label></td>
+			<td><select id="list_position" name="list_position" class="mceEditableSelect"></select></td>
+		</tr>
+	</table>
+</fieldset>
+</div>
+
+<div id="positioning_panel" class="panel">
+<fieldset>
+	<legend>{#style_dlg.position}</legend>
+<table role="presentation" border="0">
+	<tr>
+		<td><label for="positioning_type">{#style_dlg.positioning_type}</label></td>
+		<td><select id="positioning_type" name="positioning_type" class="mceEditableSelect"></select></td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_visibility">{#style_dlg.visibility}</label></td>
+		<td><select id="positioning_visibility" name="positioning_visibility" class="mceEditableSelect"></select></td>
+	</tr>
+
+	<tr>
+		<td><label for="positioning_width">{#style_dlg.width}</label></td>
+		<td>
+			<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td><input type="text" id="positioning_width" name="positioning_width" onChange="synch('positioning_width','box_width');" /></td>
+					<td>&nbsp;</td>
+					<td>
+						<label id="positioning_width_measurement_label" for="positioning_width_measurement" style="display: none; visibility: hidden;">Positioning width Measurement Unit</label>
+						<select id="positioning_width_measurement" name="positioning_width_measurement" aria-labelledby="positioning_width_measurement_label"></select>
+					</td>
+				</tr>
+			</table>
+		</td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_zindex">{#style_dlg.zindex}</label></td>
+		<td><input type="text" id="positioning_zindex" name="positioning_zindex" /></td>
+	</tr>
+
+	<tr>
+		<td><label for="positioning_height">{#style_dlg.height}</label></td>
+		<td>
+			<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td><input type="text" id="positioning_height" name="positioning_height" onChange="synch('positioning_height','box_height');" /></td>
+					<td>&nbsp;</td>
+					<td>
+						<label id="positioning_height_measurement_label" for="positioning_height_measurement" style="display: none; visibility: hidden;">Positioning Height Measurement Unit</label>
+						<select id="positioning_height_measurement" name="positioning_height_measurement" aria-labelledby="positioning_height_measurement_label"></select>
+					</td>
+				</tr>
+			</table>
+		</td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_overflow">{#style_dlg.overflow}</label></td>
+		<td><select id="positioning_overflow" name="positioning_overflow" class="mceEditableSelect"></select></td>
+	</tr>
+</table>
+
+<div style="float: left; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.placement}</legend>
+
+		<table role="presentation" border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="positioning_placement_same" name="positioning_placement_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_placement');" /> <label for="positioning_placement_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.top}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_top" name="positioning_placement_top" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_placement_top_measurement_label" for="positioning_placement_top_measurement" style="display: none; visibility: hidden;">Placement Top Measurement Unit</label>
+								<select id="positioning_placement_top_measurement" name="positioning_placement_top_measurement" aria-labelledby="positioning_placement_top_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.right}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_right" name="positioning_placement_right" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_placement_right_measurement_label" for="positioning_placement_right_measurement" style="display: none; visibility: hidden;">Placement Right Measurement Unit</label>
+								<select id="positioning_placement_right_measurement" name="positioning_placement_right_measurement" disabled="disabled" aria-labelledby="positioning_placement_right_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.bottom}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_bottom" name="positioning_placement_bottom" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_placement_bottom_measurement_label" for="positioning_placement_bottom_measurement" style="display: none; visibility: hidden;">Placement Bottom Measurement Unit</label>
+								<select id="positioning_placement_bottom_measurement" name="positioning_placement_bottom_measurement" disabled="disabled" aria-labelledby="positioning_placement_bottom_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.left}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_left" name="positioning_placement_left" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_placement_left_measurement_label" for="positioning_placement_left_measurement" style="display: none; visibility: hidden;">Placement Left Measurement Unit</label>
+								<select id="positioning_placement_left_measurement" name="positioning_placement_left_measurement" disabled="disabled" aria-labelledby="positioning_placement_left_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div style="float: right; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.clip}</legend>
+
+		<table role="presentation" border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="positioning_clip_same" name="positioning_clip_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_clip');" /> <label for="positioning_clip_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.top}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_top" name="positioning_clip_top" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_clip_top_measurement_label" for="positioning_clip_top_measurement" style="display: none; visibility: hidden;">Clip Top Measurement Unit</label>
+								<select id="positioning_clip_top_measurement" name="positioning_clip_top_measurement" aria-labelledby="positioning_clip_top_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.right}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_right" name="positioning_clip_right" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_clip_right_measurement_label" for="positioning_clip_right_measurement" style="display: none; visibility: hidden;">Clip Right Measurement Unit</label>
+								<select id="positioning_clip_right_measurement" name="positioning_clip_right_measurement" disabled="disabled" aria-labelledby="positioning_clip_right_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.bottom}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_bottom" name="positioning_clip_bottom" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_clip_bottom_measurement_label" for="positioning_clip_bottom_measurement" style="display: none; visibility: hidden;">Clip Bottom Measurement Unit</label>
+								<select id="positioning_clip_bottom_measurement" name="positioning_clip_bottom_measurement" disabled="disabled" aria-labelledby="positioning_clip_bottom_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.left}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_left" name="positioning_clip_left" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_clip_left_measurement_label" for="positioning_clip_left_measurement" style="display: none; visibility: hidden;">Clip Left Measurement Unit</label>
+								<select id="positioning_clip_left_measurement" name="positioning_clip_left_measurement" disabled="disabled" aria-labelledby="positioning_clip_left_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+<br style="clear: both" />
+</div>
+</fieldset>
+</div>
+
+<div class="mceActionPanel">
+	<input type="submit" id="insert" name="insert" value="{#update}" />
+	<input type="button" class="button" id="apply" name="apply" value="{#style_dlg.apply}" onClick="applyAction();" />
+	<input type="button" id="cancel" name="cancel" value="{#cancel}" onClick="tinyMCEPopup.close();" />
+</div>
+</form>
+
+<div style="display: none">
+	<div id="container"></div>
+</div>
+
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/tabfocus/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/tabfocus/editor_plugin.js
new file mode 100644
index 0000000000..d18689ddb9
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/tabfocus/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(r){n=c.select(":input:enabled,*[tabindex]");function i(s){return s.type!="hidden"&&s.tabIndex!="-1"&&!(n[m].style.display=="none")&&!(n[m].style.visibility=="hidden")}d(n,function(t,s){if(t.id==l.id){j=s;return false}});if(r>0){for(m=j+1;m<n.length;m++){if(i(n[m])){return n[m]}}}else{for(m=j-1;m>=0;m--){if(i(n[m])){return n[m]}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(n.id&&(l=tinymce.get(n.id||n.name))){l.focus()}else{window.setTimeout(function(){if(!tinymce.isWebKit){window.focus()}n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/tabfocus/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/tabfocus/editor_plugin_src.js
new file mode 100644
index 0000000000..f4545e1670
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/tabfocus/editor_plugin_src.js
@@ -0,0 +1,114 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, explode = tinymce.explode;
+
+	tinymce.create('tinymce.plugins.TabFocusPlugin', {
+		init : function(ed, url) {
+			function tabCancel(ed, e) {
+				if (e.keyCode === 9)
+					return Event.cancel(e);
+			};
+
+			function tabHandler(ed, e) {
+				var x, i, f, el, v;
+
+				function find(d) {
+					el = DOM.select(':input:enabled,*[tabindex]');
+					function canSelect(e) {
+						return e.type != 'hidden' && 
+						e.tabIndex != '-1' && 
+							!(el[i].style.display == "none") && 
+							!(el[i].style.visibility == "hidden");
+				    }
+
+					each(el, function(e, i) {
+						if (e.id == ed.id) {
+							x = i;
+							return false;
+						}
+					});
+
+					if (d > 0) {
+						for (i = x + 1; i < el.length; i++) {
+							if (canSelect(el[i]))
+								return el[i];
+						}
+					} else {
+						for (i = x - 1; i >= 0; i--) {
+							if (canSelect(el[i]))
+								return el[i];
+						}
+					}
+
+					return null;
+				};
+
+				if (e.keyCode === 9) {
+					v = explode(ed.getParam('tab_focus', ed.getParam('tabfocus_elements', ':prev,:next')));
+
+					if (v.length == 1) {
+						v[1] = v[0];
+						v[0] = ':prev';
+					}
+
+					// Find element to focus
+					if (e.shiftKey) {
+						if (v[0] == ':prev')
+							el = find(-1);
+						else
+							el = DOM.get(v[0]);
+					} else {
+						if (v[1] == ':next')
+							el = find(1);
+						else
+							el = DOM.get(v[1]);
+					}
+
+					if (el) {
+						if (el.id && (ed = tinymce.get(el.id || el.name)))
+							ed.focus();
+						else
+							window.setTimeout(function() {
+								if (!tinymce.isWebKit)
+									window.focus();
+								el.focus();
+							}, 10);
+
+						return Event.cancel(e);
+					}
+				}
+			};
+
+			ed.onKeyUp.add(tabCancel);
+
+			if (tinymce.isGecko) {
+				ed.onKeyPress.add(tabHandler);
+				ed.onKeyDown.add(tabCancel);
+			} else
+				ed.onKeyDown.add(tabHandler);
+
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Tabfocus',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('tabfocus', tinymce.plugins.TabFocusPlugin);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/cell.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/cell.htm
new file mode 100644
index 0000000000..4afb6afa3a
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/cell.htm
@@ -0,0 +1,178 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#table_dlg.cell_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/cell.js"></script>
+	<link href="css/cell.css" rel="stylesheet" type="text/css" />
+</head>
+<body id="tablecell" style="display: none" role="application">
+	<form onsubmit="updateAction();return false;" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+					<legend>{#table_dlg.general_props}</legend>
+
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td><label for="align">{#table_dlg.align}</label></td>
+							<td>
+								<select id="align" name="align" class="mceFocus">
+									<option value="">{#not_set}</option>
+									<option value="center">{#table_dlg.align_middle}</option>
+									<option value="left">{#table_dlg.align_left}</option>
+									<option value="right">{#table_dlg.align_right}</option>
+								</select>
+							</td>
+		
+							<td><label for="celltype">{#table_dlg.cell_type}</label></td>
+							<td>
+								<select id="celltype" name="celltype">
+									<option value="td">{#table_dlg.td}</option>
+									<option value="th">{#table_dlg.th}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="valign">{#table_dlg.valign}</label></td>
+							<td>
+								<select id="valign" name="valign">
+									<option value="">{#not_set}</option>
+									<option value="top">{#table_dlg.align_top}</option>
+									<option value="middle">{#table_dlg.align_middle}</option>
+									<option value="bottom">{#table_dlg.align_bottom}</option>
+								</select>
+							</td>
+
+							<td><label for="scope">{#table_dlg.scope}</label></td>
+							<td>
+								<select id="scope" name="scope">
+									<option value="">{#not_set}</option>
+									<option value="col">{#table.col}</option>
+									<option value="row">{#table.row}</option>
+									<option value="rowgroup">{#table_dlg.rowgroup}</option>
+									<option value="colgroup">{#table_dlg.colgroup}</option>
+								</select>
+							</td>
+
+						</tr>
+
+						<tr>
+							<td><label for="width">{#table_dlg.width}</label></td>
+							<td><input id="width" name="width" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
+
+							<td><label for="height">{#table_dlg.height}</label></td>
+							<td><input id="height" name="height" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
+						</tr>
+
+						<tr id="styleSelectRow">
+							<td><label for="class">{#class_name}</label></td>
+							<td colspan="3">
+								<select id="class" name="class" class="mceEditableSelect">
+									<option value="" selected="selected">{#not_set}</option>
+								</select>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<fieldset>
+					<legend>{#table_dlg.advanced_props}</legend>
+
+					<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+						<tr>
+							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 
+							<td><input id="id" name="id" type="text" value="" style="width: 200px" /></td> 
+						</tr>
+
+						<tr>
+							<td><label for="style">{#table_dlg.style}</label></td>
+							<td><input type="text" id="style" name="style" value="" style="width: 200px;" onchange="changedStyle();" /></td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="dir">{#table_dlg.langdir}</label></td> 
+							<td>
+								<select id="dir" name="dir" style="width: 200px"> 
+										<option value="">{#not_set}</option> 
+										<option value="ltr">{#table_dlg.ltr}</option> 
+										<option value="rtl">{#table_dlg.rtl}</option> 
+								</select>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="lang">{#table_dlg.langcode}</label></td> 
+							<td>
+								<input id="lang" name="lang" type="text" value="" style="width: 200px" />
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>
+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr role="group" aria-labelledby="bordercolor_label">
+							<td class="column1"><label id="bordercolor_label" for="bordercolor">{#table_dlg.bordercolor}</label></td> 
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>
+										<td id="bordercolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr role="group" aria-labelledby="bgcolor_label">
+							<td class="column1"><label id="bgcolor_label" for="bgcolor">{#table_dlg.bgcolor}</label></td> 
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
+										<td id="bgcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div>
+				<select id="action" name="action">
+					<option value="cell">{#table_dlg.cell_cell}</option>
+					<option value="row">{#table_dlg.cell_row}</option>
+					<option value="all">{#table_dlg.cell_all}</option>
+				</select>
+			</div>
+
+			<input type="submit" id="insert" name="insert" value="{#update}" />
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/css/cell.css b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/css/cell.css
new file mode 100644
index 0000000000..a067ecdfed
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/css/cell.css
@@ -0,0 +1,17 @@
+/* CSS file for cell dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 200px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#action {
+	margin-bottom: 3px;
+}
+
+#class {
+	width: 150px;
+}
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/css/row.css b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/css/row.css
new file mode 100644
index 0000000000..1f7755dafa
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/css/row.css
@@ -0,0 +1,25 @@
+/* CSS file for row dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 200px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#action {
+	margin-bottom: 3px;
+}
+
+#rowtype,#align,#valign,#class,#height {
+	width: 150px;
+}
+
+#height {
+	width: 50px;	
+}
+
+.col2 {
+	padding-left: 20px;
+}
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/css/table.css b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/css/table.css
new file mode 100644
index 0000000000..d11c3f69cb
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/css/table.css
@@ -0,0 +1,13 @@
+/* CSS file for table dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 245px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#class {
+	width: 150px;
+}
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/editor_plugin.js
new file mode 100644
index 0000000000..5f10811a1e
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/editor_plugin.js
@@ -0,0 +1 @@
+(function(c){var d=c.each;function b(f,g){var h=g.ownerDocument,e=h.createRange(),j;e.setStartBefore(g);e.setEnd(f.endContainer,f.endOffset);j=h.createElement("body");j.appendChild(e.cloneContents());return j.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length==0}function a(H,G,K){var f,L,D,o;t();o=G.getParent(K.getStart(),"th,td");if(o){L=F(o);D=I();o=z(L.x,L.y)}function A(N,M){N=N.cloneNode(M);N.removeAttribute("id");return N}function t(){var M=0;f=[];d(["thead","tbody","tfoot"],function(N){var O=G.select("> "+N+" tr",H);d(O,function(P,Q){Q+=M;d(G.select("> td, > th",P),function(W,R){var S,T,U,V;if(f[Q]){while(f[Q][R]){R++}}U=h(W,"rowspan");V=h(W,"colspan");for(T=Q;T<Q+U;T++){if(!f[T]){f[T]=[]}for(S=R;S<R+V;S++){f[T][S]={part:N,real:T==Q&&S==R,elm:W,rowspan:U,colspan:V}}}})});M+=O.length})}function z(M,O){var N;N=f[O];if(N){return N[M]}}function h(N,M){return parseInt(N.getAttribute(M)||1)}function s(O,M,N){if(O){N=parseInt(N);if(N===1){O.removeAttribute(M,1)}else{O.setAttribute(M,N,1)}}}function j(M){return G.hasClass(M.elm,"mceSelected")||M==o}function k(){var M=[];d(H.rows,function(N){d(N.cells,function(O){if(G.hasClass(O,"mceSelected")||O==o.elm){M.push(N);return false}})});return M}function r(){var M=G.createRng();M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H)}function e(M){var N;c.walk(M,function(P){var O;if(P.nodeType==3){d(G.getParents(P.parentNode,null,M).reverse(),function(Q){Q=A(Q,false);if(!N){N=O=Q}else{if(O){O.appendChild(Q)}}O=Q});if(O){O.innerHTML=c.isIE?"&nbsp;":'<br data-mce-bogus="1" />'}return false}},"childNodes");M=A(M,false);s(M,"rowspan",1);s(M,"colspan",1);if(N){M.appendChild(N)}else{if(!c.isIE){M.innerHTML='<br data-mce-bogus="1" />'}}return M}function q(){var M=G.createRng();d(G.select("tr",H),function(N){if(N.cells.length==0){G.remove(N)}});if(G.select("tr",H).length==0){M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H);return}d(G.select("thead,tbody,tfoot",H),function(N){if(N.rows.length==0){G.remove(N)}});t();row=f[Math.min(f.length-1,L.y)];if(row){K.select(row[Math.min(row.length-1,L.x)].elm,true);K.collapse(true)}}function u(S,Q,U,R){var P,N,M,O,T;P=f[Q][S].elm.parentNode;for(M=1;M<=U;M++){P=G.getNext(P,"tr");if(P){for(N=S;N>=0;N--){T=f[Q+M][N].elm;if(T.parentNode==P){for(O=1;O<=R;O++){G.insertAfter(e(T),T)}break}}if(N==-1){for(O=1;O<=R;O++){P.insertBefore(e(P.cells[0]),P.cells[0])}}}}}function C(){d(f,function(M,N){d(M,function(P,O){var S,R,T,Q;if(j(P)){P=P.elm;S=h(P,"colspan");R=h(P,"rowspan");if(S>1||R>1){s(P,"rowspan",1);s(P,"colspan",1);for(Q=0;Q<S-1;Q++){G.insertAfter(e(P),P)}u(O,N,R-1,S)}}})})}function p(V,S,Y){var P,O,X,W,U,R,T,M,V,N,Q;if(V){pos=F(V);P=pos.x;O=pos.y;X=P+(S-1);W=O+(Y-1)}else{P=L.x;O=L.y;X=D.x;W=D.y}T=z(P,O);M=z(X,W);if(T&&M&&T.part==M.part){C();t();T=z(P,O).elm;s(T,"colspan",(X-P)+1);s(T,"rowspan",(W-O)+1);for(R=O;R<=W;R++){for(U=P;U<=X;U++){V=f[R][U].elm;if(V!=T){N=c.grep(V.childNodes);d(N,function(Z){T.appendChild(Z)});if(N.length){N=c.grep(T.childNodes);Q=0;d(N,function(Z){if(Z.nodeName=="BR"&&G.getAttrib(Z,"data-mce-bogus")&&Q++<N.length-1){T.removeChild(Z)}})}G.remove(V)}}}q()}}function l(P){var M,R,O,Q,S,T,N,U;d(f,function(V,W){d(V,function(Y,X){if(j(Y)){Y=Y.elm;S=Y.parentNode;T=A(S,false);M=W;if(P){return false}}});if(P){return !M}});for(Q=0;Q<f[0].length;Q++){R=f[M][Q].elm;if(R!=O){if(!P){rowSpan=h(R,"rowspan");if(rowSpan>1){s(R,"rowspan",rowSpan+1);continue}}else{if(M>0&&f[M-1][Q]){U=f[M-1][Q].elm;rowSpan=h(U,"rowspan");if(rowSpan>1){s(U,"rowspan",rowSpan+1);continue}}}N=e(R);s(N,"colspan",R.colSpan);T.appendChild(N);O=R}}if(T.hasChildNodes()){if(!P){G.insertAfter(T,S)}else{S.parentNode.insertBefore(T,S)}}}function g(N){var O,M;d(f,function(P,Q){d(P,function(S,R){if(j(S)){O=R;if(N){return false}}});if(N){return !O}});d(f,function(S,T){var P=S[O].elm,Q,R;if(P!=M){R=h(P,"colspan");Q=h(P,"rowspan");if(R==1){if(!N){G.insertAfter(e(P),P);u(O,T,Q-1,R)}else{P.parentNode.insertBefore(e(P),P);u(O,T,Q-1,R)}}else{s(P,"colspan",P.colSpan+1)}M=P}})}function n(){var M=[];d(f,function(N,O){d(N,function(Q,P){if(j(Q)&&c.inArray(M,P)===-1){d(f,function(T){var R=T[P].elm,S;S=h(R,"colspan");if(S>1){s(R,"colspan",S-1)}else{G.remove(R)}});M.push(P)}})});q()}function m(){var N;function M(Q){var P,R,O;P=G.getNext(Q,"tr");d(Q.cells,function(S){var T=h(S,"rowspan");if(T>1){s(S,"rowspan",T-1);R=F(S);u(R.x,R.y,1,1)}});R=F(Q.cells[0]);d(f[R.y],function(S){var T;S=S.elm;if(S!=O){T=h(S,"rowspan");if(T<=1){G.remove(S)}else{s(S,"rowspan",T-1)}O=S}})}N=k();d(N.reverse(),function(O){M(O)});q()}function E(){var M=k();G.remove(M);q();return M}function J(){var M=k();d(M,function(O,N){M[N]=A(O,true)});return M}function B(O,N){var P=k(),M=P[N?0:P.length-1],Q=M.cells.length;d(f,function(S){var R;Q=0;d(S,function(U,T){if(U.real){Q+=U.colspan}if(U.elm.parentNode==M){R=1}});if(R){return false}});if(!N){O.reverse()}d(O,function(T){var S=T.cells.length,R;for(i=0;i<S;i++){R=T.cells[i];s(R,"colspan",1);s(R,"rowspan",1)}for(i=S;i<Q;i++){T.appendChild(e(T.cells[S-1]))}for(i=Q;i<S;i++){G.remove(T.cells[i])}if(N){M.parentNode.insertBefore(T,M)}else{G.insertAfter(T,M)}})}function F(M){var N;d(f,function(O,P){d(O,function(R,Q){if(R.elm==M){N={x:Q,y:P};return false}});return !N});return N}function w(M){L=F(M)}function I(){var O,N,M;N=M=0;d(f,function(P,Q){d(P,function(S,R){var U,T;if(j(S)){S=f[Q][R];if(R>N){N=R}if(Q>M){M=Q}if(S.real){U=S.colspan-1;T=S.rowspan-1;if(U){if(R+U>N){N=R+U}}if(T){if(Q+T>M){M=Q+T}}}}})});return{x:N,y:M}}function v(S){var P,O,U,T,N,M,Q,R;D=F(S);if(L&&D){P=Math.min(L.x,D.x);O=Math.min(L.y,D.y);U=Math.max(L.x,D.x);T=Math.max(L.y,D.y);N=U;M=T;for(y=O;y<=M;y++){S=f[y][P];if(!S.real){if(P-(S.colspan-1)<P){P-=S.colspan-1}}}for(x=P;x<=N;x++){S=f[O][x];if(!S.real){if(O-(S.rowspan-1)<O){O-=S.rowspan-1}}}for(y=O;y<=T;y++){for(x=P;x<=U;x++){S=f[y][x];if(S.real){Q=S.colspan-1;R=S.rowspan-1;if(Q){if(x+Q>N){N=x+Q}}if(R){if(y+R>M){M=y+R}}}}}G.removeClass(G.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=O;y<=M;y++){for(x=P;x<=N;x++){G.addClass(f[y][x].elm,"mceSelected")}}}}c.extend(this,{deleteTable:r,split:C,merge:p,insertRow:l,insertCol:g,deleteCols:n,deleteRows:m,cutRows:E,copyRows:J,pasteRows:B,getPos:F,setStartCell:w,setEndCell:v})}c.create("tinymce.plugins.TablePlugin",{init:function(f,g){var e,k;function j(n){var m=f.selection,l=f.dom.getParent(n||m.getNode(),"table");if(l){return new a(l,f.dom,m)}}function h(){f.getBody().style.webkitUserSelect="";f.dom.removeClass(f.dom.select("td.mceSelected,th.mceSelected"),"mceSelected")}d([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(l){f.addButton(l[0],{title:l[1],cmd:l[2],ui:l[3]})});if(!c.isIE){f.onClick.add(function(l,m){m=m.target;if(m.nodeName==="TABLE"){l.selection.select(m)}})}f.onPreProcess.add(function(m,n){var l,o,p,r=m.dom,q;l=r.select("table",n.node);o=l.length;while(o--){p=l[o];r.setAttrib(p,"data-mce-style","");if((q=r.getAttrib(p,"width"))){r.setStyle(p,"width",q);r.setAttrib(p,"width","")}if((q=r.getAttrib(p,"height"))){r.setStyle(p,"height",q);r.setAttrib(p,"height","")}}});f.onNodeChange.add(function(m,l,q){var o;q=m.selection.getStart();o=m.dom.getParent(q,"td,th,caption");l.setActive("table",q.nodeName==="TABLE"||!!o);if(o&&o.nodeName==="CAPTION"){o=0}l.setDisabled("delete_table",!o);l.setDisabled("delete_col",!o);l.setDisabled("delete_table",!o);l.setDisabled("delete_row",!o);l.setDisabled("col_after",!o);l.setDisabled("col_before",!o);l.setDisabled("row_after",!o);l.setDisabled("row_before",!o);l.setDisabled("row_props",!o);l.setDisabled("cell_props",!o);l.setDisabled("split_cells",!o);l.setDisabled("merge_cells",!o)});f.onInit.add(function(m){var l,p,q=m.dom,n;e=m.windowManager;m.onMouseDown.add(function(r,s){if(s.button!=2){h();p=q.getParent(s.target,"td,th");l=q.getParent(p,"table")}});q.bind(m.getDoc(),"mouseover",function(u){var s,r,t=u.target;if(p&&(n||t!=p)&&(t.nodeName=="TD"||t.nodeName=="TH")){r=q.getParent(t,"table");if(r==l){if(!n){n=j(r);n.setStartCell(p);m.getBody().style.webkitUserSelect="none"}n.setEndCell(t)}s=m.selection.getSel();if(s.removeAllRanges){s.removeAllRanges()}else{s.empty()}u.preventDefault()}});m.onMouseUp.add(function(A,B){var s,u=A.selection,C,D=u.getSel(),r,v,t,z;if(p){if(n){A.getBody().style.webkitUserSelect=""}function w(E,G){var F=new c.dom.TreeWalker(E,E);do{if(E.nodeType==3&&c.trim(E.nodeValue).length!=0){if(G){s.setStart(E,0)}else{s.setEnd(E,E.nodeValue.length)}return}if(E.nodeName=="BR"){if(G){s.setStartBefore(E)}else{s.setEndBefore(E)}return}}while(E=(G?F.next():F.prev()))}C=q.select("td.mceSelected,th.mceSelected");if(C.length>0){s=q.createRng();v=C[0];z=C[C.length-1];w(v,1);r=new c.dom.TreeWalker(v,q.getParent(C[0],"table"));do{if(v.nodeName=="TD"||v.nodeName=="TH"){if(!q.hasClass(v,"mceSelected")){break}t=v}}while(v=r.next());w(t);u.setRng(s)}A.nodeChanged();p=n=l=null}});m.onKeyUp.add(function(r,s){h()});if(m&&m.plugins.contextmenu){m.plugins.contextmenu.onContextMenu.add(function(t,r,v){var w,u=m.selection,s=u.getNode()||m.getBody();if(m.dom.getParent(v,"td")||m.dom.getParent(v,"th")||m.dom.select("td.mceSelected,th.mceSelected").length){r.removeAll();if(s.nodeName=="A"&&!m.dom.getAttrib(s,"name")){r.add({title:"advanced.link_desc",icon:"link",cmd:m.plugins.advlink?"mceAdvLink":"mceLink",ui:true});r.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});r.addSeparator()}if(s.nodeName=="IMG"&&s.className.indexOf("mceItem")==-1){r.add({title:"advanced.image_desc",icon:"image",cmd:m.plugins.advimage?"mceAdvImage":"mceImage",ui:true});r.addSeparator()}r.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});r.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});r.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});r.addSeparator();w=r.addMenu({title:"table.cell"});w.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});w.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});w.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});w=r.addMenu({title:"table.row"});w.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});w.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});w.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});w.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});w.addSeparator();w.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});w.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});w.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!k);w.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!k);w=r.addMenu({title:"table.col"});w.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});w.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});w.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{r.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(!c.isIE){function o(){var r;for(r=m.getBody().lastChild;r&&r.nodeType==3&&!r.nodeValue.length;r=r.previousSibling){}if(r&&r.nodeName=="TABLE"){m.dom.add(m.getBody(),"p",null,'<br mce_bogus="1" />')}}if(c.isGecko){m.onKeyDown.add(function(s,u){var r,t,v=s.dom;if(u.keyCode==37||u.keyCode==38){r=s.selection.getRng();t=v.getParent(r.startContainer,"table");if(t&&s.getBody().firstChild==t){if(b(r,t)){r=v.createRng();r.setStartBefore(t);r.setEndBefore(t);s.selection.setRng(r);u.preventDefault()}}}})}m.onKeyUp.add(o);m.onSetContent.add(o);m.onVisualAid.add(o);m.onPreProcess.add(function(r,t){var s=t.node.lastChild;if(s&&s.childNodes.length==1&&s.firstChild.nodeName=="BR"){r.dom.remove(s)}});o()}});d({mceTableSplitCells:function(l){l.split()},mceTableMergeCells:function(m){var n,o,l;l=f.dom.getParent(f.selection.getNode(),"th,td");if(l){n=l.rowSpan;o=l.colSpan}if(!f.dom.select("td.mceSelected,th.mceSelected").length){e.open({url:g+"/merge_cells.htm",width:240+parseInt(f.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(f.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:n,cols:o,onaction:function(p){m.merge(l,p.cols,p.rows)},plugin_url:g})}else{m.merge()}},mceTableInsertRowBefore:function(l){l.insertRow(true)},mceTableInsertRowAfter:function(l){l.insertRow()},mceTableInsertColBefore:function(l){l.insertCol(true)},mceTableInsertColAfter:function(l){l.insertCol()},mceTableDeleteCol:function(l){l.deleteCols()},mceTableDeleteRow:function(l){l.deleteRows()},mceTableCutRow:function(l){k=l.cutRows()},mceTableCopyRow:function(l){k=l.copyRows()},mceTablePasteRowBefore:function(l){l.pasteRows(k,true)},mceTablePasteRowAfter:function(l){l.pasteRows(k)},mceTableDelete:function(l){l.deleteTable()}},function(m,l){f.addCommand(l,function(){var n=j();if(n){m(n);f.execCommand("mceRepaint");h()}})});d({mceInsertTable:function(l){e.open({url:g+"/table.htm",width:400+parseInt(f.getLang("table.table_delta_width",0)),height:320+parseInt(f.getLang("table.table_delta_height",0)),inline:1},{plugin_url:g,action:l?l.action:0})},mceTableRowProps:function(){e.open({url:g+"/row.htm",width:400+parseInt(f.getLang("table.rowprops_delta_width",0)),height:295+parseInt(f.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:g})},mceTableCellProps:function(){e.open({url:g+"/cell.htm",width:400+parseInt(f.getLang("table.cellprops_delta_width",0)),height:295+parseInt(f.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:g})}},function(m,l){f.addCommand(l,function(n,o){m(o)})})}});c.PluginManager.add("table",c.plugins.TablePlugin)})(tinymce);
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/editor_plugin_src.js
new file mode 100644
index 0000000000..b60f241c0b
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/editor_plugin_src.js
@@ -0,0 +1,1183 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function(tinymce) {
+	var each = tinymce.each;
+
+	// Checks if the selection/caret is at the start of the specified block element
+	function isAtStart(rng, par) {
+		var doc = par.ownerDocument, rng2 = doc.createRange(), elm;
+
+		rng2.setStartBefore(par);
+		rng2.setEnd(rng.endContainer, rng.endOffset);
+
+		elm = doc.createElement('body');
+		elm.appendChild(rng2.cloneContents());
+
+		// Check for text characters of other elements that should be treated as content
+		return elm.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi, '-').replace(/<[^>]+>/g, '').length == 0;
+	};
+
+	/**
+	 * Table Grid class.
+	 */
+	function TableGrid(table, dom, selection) {
+		var grid, startPos, endPos, selectedCell;
+
+		buildGrid();
+		selectedCell = dom.getParent(selection.getStart(), 'th,td');
+		if (selectedCell) {
+			startPos = getPos(selectedCell);
+			endPos = findEndPos();
+			selectedCell = getCell(startPos.x, startPos.y);
+		}
+
+		function cloneNode(node, children) {
+			node = node.cloneNode(children);
+			node.removeAttribute('id');
+
+			return node;
+		}
+
+		function buildGrid() {
+			var startY = 0;
+
+			grid = [];
+
+			each(['thead', 'tbody', 'tfoot'], function(part) {
+				var rows = dom.select('> ' + part + ' tr', table);
+
+				each(rows, function(tr, y) {
+					y += startY;
+
+					each(dom.select('> td, > th', tr), function(td, x) {
+						var x2, y2, rowspan, colspan;
+
+						// Skip over existing cells produced by rowspan
+						if (grid[y]) {
+							while (grid[y][x])
+								x++;
+						}
+
+						// Get col/rowspan from cell
+						rowspan = getSpanVal(td, 'rowspan');
+						colspan = getSpanVal(td, 'colspan');
+
+						// Fill out rowspan/colspan right and down
+						for (y2 = y; y2 < y + rowspan; y2++) {
+							if (!grid[y2])
+								grid[y2] = [];
+
+							for (x2 = x; x2 < x + colspan; x2++) {
+								grid[y2][x2] = {
+									part : part,
+									real : y2 == y && x2 == x,
+									elm : td,
+									rowspan : rowspan,
+									colspan : colspan
+								};
+							}
+						}
+					});
+				});
+
+				startY += rows.length;
+			});
+		};
+
+		function getCell(x, y) {
+			var row;
+
+			row = grid[y];
+			if (row)
+				return row[x];
+		};
+
+		function getSpanVal(td, name) {
+			return parseInt(td.getAttribute(name) || 1);
+		};
+
+		function setSpanVal(td, name, val) {
+			if (td) {
+				val = parseInt(val);
+
+				if (val === 1)
+					td.removeAttribute(name, 1);
+				else
+					td.setAttribute(name, val, 1);
+			}
+		}
+
+		function isCellSelected(cell) {
+			return dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell;
+		};
+
+		function getSelectedRows() {
+			var rows = [];
+
+			each(table.rows, function(row) {
+				each(row.cells, function(cell) {
+					if (dom.hasClass(cell, 'mceSelected') || cell == selectedCell.elm) {
+						rows.push(row);
+						return false;
+					}
+				});
+			});
+
+			return rows;
+		};
+
+		function deleteTable() {
+			var rng = dom.createRng();
+
+			rng.setStartAfter(table);
+			rng.setEndAfter(table);
+
+			selection.setRng(rng);
+
+			dom.remove(table);
+		};
+
+		function cloneCell(cell) {
+			var formatNode;
+
+			// Clone formats
+			tinymce.walk(cell, function(node) {
+				var curNode;
+
+				if (node.nodeType == 3) {
+					each(dom.getParents(node.parentNode, null, cell).reverse(), function(node) {
+						node = cloneNode(node, false);
+
+						if (!formatNode)
+							formatNode = curNode = node;
+						else if (curNode)
+							curNode.appendChild(node);
+
+						curNode = node;
+					});
+
+					// Add something to the inner node
+					if (curNode)
+						curNode.innerHTML = tinymce.isIE ? '&nbsp;' : '<br data-mce-bogus="1" />';
+
+					return false;
+				}
+			}, 'childNodes');
+
+			cell = cloneNode(cell, false);
+			setSpanVal(cell, 'rowspan', 1);
+			setSpanVal(cell, 'colspan', 1);
+
+			if (formatNode) {
+				cell.appendChild(formatNode);
+			} else {
+				if (!tinymce.isIE)
+					cell.innerHTML = '<br data-mce-bogus="1" />';
+			}
+
+			return cell;
+		};
+
+		function cleanup() {
+			var rng = dom.createRng();
+
+			// Empty rows
+			each(dom.select('tr', table), function(tr) {
+				if (tr.cells.length == 0)
+					dom.remove(tr);
+			});
+
+			// Empty table
+			if (dom.select('tr', table).length == 0) {
+				rng.setStartAfter(table);
+				rng.setEndAfter(table);
+				selection.setRng(rng);
+				dom.remove(table);
+				return;
+			}
+
+			// Empty header/body/footer
+			each(dom.select('thead,tbody,tfoot', table), function(part) {
+				if (part.rows.length == 0)
+					dom.remove(part);
+			});
+
+			// Restore selection to start position if it still exists
+			buildGrid();
+
+			// Restore the selection to the closest table position
+			row = grid[Math.min(grid.length - 1, startPos.y)];
+			if (row) {
+				selection.select(row[Math.min(row.length - 1, startPos.x)].elm, true);
+				selection.collapse(true);
+			}
+		};
+
+		function fillLeftDown(x, y, rows, cols) {
+			var tr, x2, r, c, cell;
+
+			tr = grid[y][x].elm.parentNode;
+			for (r = 1; r <= rows; r++) {
+				tr = dom.getNext(tr, 'tr');
+
+				if (tr) {
+					// Loop left to find real cell
+					for (x2 = x; x2 >= 0; x2--) {
+						cell = grid[y + r][x2].elm;
+
+						if (cell.parentNode == tr) {
+							// Append clones after
+							for (c = 1; c <= cols; c++)
+								dom.insertAfter(cloneCell(cell), cell);
+
+							break;
+						}
+					}
+
+					if (x2 == -1) {
+						// Insert nodes before first cell
+						for (c = 1; c <= cols; c++)
+							tr.insertBefore(cloneCell(tr.cells[0]), tr.cells[0]);
+					}
+				}
+			}
+		};
+
+		function split() {
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					var colSpan, rowSpan, newCell, i;
+
+					if (isCellSelected(cell)) {
+						cell = cell.elm;
+						colSpan = getSpanVal(cell, 'colspan');
+						rowSpan = getSpanVal(cell, 'rowspan');
+
+						if (colSpan > 1 || rowSpan > 1) {
+							setSpanVal(cell, 'rowspan', 1);
+							setSpanVal(cell, 'colspan', 1);
+
+							// Insert cells right
+							for (i = 0; i < colSpan - 1; i++)
+								dom.insertAfter(cloneCell(cell), cell);
+
+							fillLeftDown(x, y, rowSpan - 1, colSpan);
+						}
+					}
+				});
+			});
+		};
+
+		function merge(cell, cols, rows) {
+			var startX, startY, endX, endY, x, y, startCell, endCell, cell, children, count;
+
+			// Use specified cell and cols/rows
+			if (cell) {
+				pos = getPos(cell);
+				startX = pos.x;
+				startY = pos.y;
+				endX = startX + (cols - 1);
+				endY = startY + (rows - 1);
+			} else {
+				// Use selection
+				startX = startPos.x;
+				startY = startPos.y;
+				endX = endPos.x;
+				endY = endPos.y;
+			}
+
+			// Find start/end cells
+			startCell = getCell(startX, startY);
+			endCell = getCell(endX, endY);
+
+			// Check if the cells exists and if they are of the same part for example tbody = tbody
+			if (startCell && endCell && startCell.part == endCell.part) {
+				// Split and rebuild grid
+				split();
+				buildGrid();
+
+				// Set row/col span to start cell
+				startCell = getCell(startX, startY).elm;
+				setSpanVal(startCell, 'colspan', (endX - startX) + 1);
+				setSpanVal(startCell, 'rowspan', (endY - startY) + 1);
+
+				// Remove other cells and add it's contents to the start cell
+				for (y = startY; y <= endY; y++) {
+					for (x = startX; x <= endX; x++) {
+						cell = grid[y][x].elm;
+
+						if (cell != startCell) {
+							// Move children to startCell
+							children = tinymce.grep(cell.childNodes);
+							each(children, function(node) {
+								startCell.appendChild(node);
+							});
+
+							// Remove bogus nodes if there is children in the target cell
+							if (children.length) {
+								children = tinymce.grep(startCell.childNodes);
+								count = 0;
+								each(children, function(node) {
+									if (node.nodeName == 'BR' && dom.getAttrib(node, 'data-mce-bogus') && count++ < children.length - 1)
+										startCell.removeChild(node);
+								});
+							}
+							
+							// Remove cell
+							dom.remove(cell);
+						}
+					}
+				}
+
+				// Remove empty rows etc and restore caret location
+				cleanup();
+			}
+		};
+
+		function insertRow(before) {
+			var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell;
+
+			// Find first/last row
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell)) {
+						cell = cell.elm;
+						rowElm = cell.parentNode;
+						newRow = cloneNode(rowElm, false);
+						posY = y;
+
+						if (before)
+							return false;
+					}
+				});
+
+				if (before)
+					return !posY;
+			});
+
+			for (x = 0; x < grid[0].length; x++) {
+				cell = grid[posY][x].elm;
+
+				if (cell != lastCell) {
+					if (!before) {
+						rowSpan = getSpanVal(cell, 'rowspan');
+						if (rowSpan > 1) {
+							setSpanVal(cell, 'rowspan', rowSpan + 1);
+							continue;
+						}
+					} else {
+						// Check if cell above can be expanded
+						if (posY > 0 && grid[posY - 1][x]) {
+							otherCell = grid[posY - 1][x].elm;
+							rowSpan = getSpanVal(otherCell, 'rowspan');
+							if (rowSpan > 1) {
+								setSpanVal(otherCell, 'rowspan', rowSpan + 1);
+								continue;
+							}
+						}
+					}
+
+					// Insert new cell into new row
+					newCell = cloneCell(cell);
+					setSpanVal(newCell, 'colspan', cell.colSpan);
+
+					newRow.appendChild(newCell);
+
+					lastCell = cell;
+				}
+			}
+
+			if (newRow.hasChildNodes()) {
+				if (!before)
+					dom.insertAfter(newRow, rowElm);
+				else
+					rowElm.parentNode.insertBefore(newRow, rowElm);
+			}
+		};
+
+		function insertCol(before) {
+			var posX, lastCell;
+
+			// Find first/last column
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell)) {
+						posX = x;
+
+						if (before)
+							return false;
+					}
+				});
+
+				if (before)
+					return !posX;
+			});
+
+			each(grid, function(row, y) {
+				var cell = row[posX].elm, rowSpan, colSpan;
+
+				if (cell != lastCell) {
+					colSpan = getSpanVal(cell, 'colspan');
+					rowSpan = getSpanVal(cell, 'rowspan');
+
+					if (colSpan == 1) {
+						if (!before) {
+							dom.insertAfter(cloneCell(cell), cell);
+							fillLeftDown(posX, y, rowSpan - 1, colSpan);
+						} else {
+							cell.parentNode.insertBefore(cloneCell(cell), cell);
+							fillLeftDown(posX, y, rowSpan - 1, colSpan);
+						}
+					} else
+						setSpanVal(cell, 'colspan', cell.colSpan + 1);
+
+					lastCell = cell;
+				}
+			});
+		};
+
+		function deleteCols() {
+			var cols = [];
+
+			// Get selected column indexes
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell) && tinymce.inArray(cols, x) === -1) {
+						each(grid, function(row) {
+							var cell = row[x].elm, colSpan;
+
+							colSpan = getSpanVal(cell, 'colspan');
+
+							if (colSpan > 1)
+								setSpanVal(cell, 'colspan', colSpan - 1);
+							else
+								dom.remove(cell);
+						});
+
+						cols.push(x);
+					}
+				});
+			});
+
+			cleanup();
+		};
+
+		function deleteRows() {
+			var rows;
+
+			function deleteRow(tr) {
+				var nextTr, pos, lastCell;
+
+				nextTr = dom.getNext(tr, 'tr');
+
+				// Move down row spanned cells
+				each(tr.cells, function(cell) {
+					var rowSpan = getSpanVal(cell, 'rowspan');
+
+					if (rowSpan > 1) {
+						setSpanVal(cell, 'rowspan', rowSpan - 1);
+						pos = getPos(cell);
+						fillLeftDown(pos.x, pos.y, 1, 1);
+					}
+				});
+
+				// Delete cells
+				pos = getPos(tr.cells[0]);
+				each(grid[pos.y], function(cell) {
+					var rowSpan;
+
+					cell = cell.elm;
+
+					if (cell != lastCell) {
+						rowSpan = getSpanVal(cell, 'rowspan');
+
+						if (rowSpan <= 1)
+							dom.remove(cell);
+						else
+							setSpanVal(cell, 'rowspan', rowSpan - 1);
+
+						lastCell = cell;
+					}
+				});
+			};
+
+			// Get selected rows and move selection out of scope
+			rows = getSelectedRows();
+
+			// Delete all selected rows
+			each(rows.reverse(), function(tr) {
+				deleteRow(tr);
+			});
+
+			cleanup();
+		};
+
+		function cutRows() {
+			var rows = getSelectedRows();
+
+			dom.remove(rows);
+			cleanup();
+
+			return rows;
+		};
+
+		function copyRows() {
+			var rows = getSelectedRows();
+
+			each(rows, function(row, i) {
+				rows[i] = cloneNode(row, true);
+			});
+
+			return rows;
+		};
+
+		function pasteRows(rows, before) {
+			var selectedRows = getSelectedRows(),
+				targetRow = selectedRows[before ? 0 : selectedRows.length - 1],
+				targetCellCount = targetRow.cells.length;
+
+			// Calc target cell count
+			each(grid, function(row) {
+				var match;
+
+				targetCellCount = 0;
+				each(row, function(cell, x) {
+					if (cell.real)
+						targetCellCount += cell.colspan;
+
+					if (cell.elm.parentNode == targetRow)
+						match = 1;
+				});
+
+				if (match)
+					return false;
+			});
+
+			if (!before)
+				rows.reverse();
+
+			each(rows, function(row) {
+				var cellCount = row.cells.length, cell;
+
+				// Remove col/rowspans
+				for (i = 0; i < cellCount; i++) {
+					cell = row.cells[i];
+					setSpanVal(cell, 'colspan', 1);
+					setSpanVal(cell, 'rowspan', 1);
+				}
+
+				// Needs more cells
+				for (i = cellCount; i < targetCellCount; i++)
+					row.appendChild(cloneCell(row.cells[cellCount - 1]));
+
+				// Needs less cells
+				for (i = targetCellCount; i < cellCount; i++)
+					dom.remove(row.cells[i]);
+
+				// Add before/after
+				if (before)
+					targetRow.parentNode.insertBefore(row, targetRow);
+				else
+					dom.insertAfter(row, targetRow);
+			});
+		};
+
+		function getPos(target) {
+			var pos;
+
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (cell.elm == target) {
+						pos = {x : x, y : y};
+						return false;
+					}
+				});
+
+				return !pos;
+			});
+
+			return pos;
+		};
+
+		function setStartCell(cell) {
+			startPos = getPos(cell);
+		};
+
+		function findEndPos() {
+			var pos, maxX, maxY;
+
+			maxX = maxY = 0;
+
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					var colSpan, rowSpan;
+
+					if (isCellSelected(cell)) {
+						cell = grid[y][x];
+
+						if (x > maxX)
+							maxX = x;
+
+						if (y > maxY)
+							maxY = y;
+
+						if (cell.real) {
+							colSpan = cell.colspan - 1;
+							rowSpan = cell.rowspan - 1;
+
+							if (colSpan) {
+								if (x + colSpan > maxX)
+									maxX = x + colSpan;
+							}
+
+							if (rowSpan) {
+								if (y + rowSpan > maxY)
+									maxY = y + rowSpan;
+							}
+						}
+					}
+				});
+			});
+
+			return {x : maxX, y : maxY};
+		};
+
+		function setEndCell(cell) {
+			var startX, startY, endX, endY, maxX, maxY, colSpan, rowSpan;
+
+			endPos = getPos(cell);
+
+			if (startPos && endPos) {
+				// Get start/end positions
+				startX = Math.min(startPos.x, endPos.x);
+				startY = Math.min(startPos.y, endPos.y);
+				endX = Math.max(startPos.x, endPos.x);
+				endY = Math.max(startPos.y, endPos.y);
+
+				// Expand end positon to include spans
+				maxX = endX;
+				maxY = endY;
+
+				// Expand startX
+				for (y = startY; y <= maxY; y++) {
+					cell = grid[y][startX];
+
+					if (!cell.real) {
+						if (startX - (cell.colspan - 1) < startX)
+							startX -= cell.colspan - 1;
+					}
+				}
+
+				// Expand startY
+				for (x = startX; x <= maxX; x++) {
+					cell = grid[startY][x];
+
+					if (!cell.real) {
+						if (startY - (cell.rowspan - 1) < startY)
+							startY -= cell.rowspan - 1;
+					}
+				}
+
+				// Find max X, Y
+				for (y = startY; y <= endY; y++) {
+					for (x = startX; x <= endX; x++) {
+						cell = grid[y][x];
+
+						if (cell.real) {
+							colSpan = cell.colspan - 1;
+							rowSpan = cell.rowspan - 1;
+
+							if (colSpan) {
+								if (x + colSpan > maxX)
+									maxX = x + colSpan;
+							}
+
+							if (rowSpan) {
+								if (y + rowSpan > maxY)
+									maxY = y + rowSpan;
+							}
+						}
+					}
+				}
+
+				// Remove current selection
+				dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
+
+				// Add new selection
+				for (y = startY; y <= maxY; y++) {
+					for (x = startX; x <= maxX; x++)
+						dom.addClass(grid[y][x].elm, 'mceSelected');
+				}
+			}
+		};
+
+		// Expose to public
+		tinymce.extend(this, {
+			deleteTable : deleteTable,
+			split : split,
+			merge : merge,
+			insertRow : insertRow,
+			insertCol : insertCol,
+			deleteCols : deleteCols,
+			deleteRows : deleteRows,
+			cutRows : cutRows,
+			copyRows : copyRows,
+			pasteRows : pasteRows,
+			getPos : getPos,
+			setStartCell : setStartCell,
+			setEndCell : setEndCell
+		});
+	};
+
+	tinymce.create('tinymce.plugins.TablePlugin', {
+		init : function(ed, url) {
+			var winMan, clipboardRows;
+
+			function createTableGrid(node) {
+				var selection = ed.selection, tblElm = ed.dom.getParent(node || selection.getNode(), 'table');
+
+				if (tblElm)
+					return new TableGrid(tblElm, ed.dom, selection);
+			};
+
+			function cleanup() {
+				// Restore selection possibilities
+				ed.getBody().style.webkitUserSelect = '';
+				ed.dom.removeClass(ed.dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
+			};
+
+			// Register buttons
+			each([
+				['table', 'table.desc', 'mceInsertTable', true],
+				['delete_table', 'table.del', 'mceTableDelete'],
+				['delete_col', 'table.delete_col_desc', 'mceTableDeleteCol'],
+				['delete_row', 'table.delete_row_desc', 'mceTableDeleteRow'],
+				['col_after', 'table.col_after_desc', 'mceTableInsertColAfter'],
+				['col_before', 'table.col_before_desc', 'mceTableInsertColBefore'],
+				['row_after', 'table.row_after_desc', 'mceTableInsertRowAfter'],
+				['row_before', 'table.row_before_desc', 'mceTableInsertRowBefore'],
+				['row_props', 'table.row_desc', 'mceTableRowProps', true],
+				['cell_props', 'table.cell_desc', 'mceTableCellProps', true],
+				['split_cells', 'table.split_cells_desc', 'mceTableSplitCells', true],
+				['merge_cells', 'table.merge_cells_desc', 'mceTableMergeCells', true]
+			], function(c) {
+				ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});
+			});
+
+			// Select whole table is a table border is clicked
+			if (!tinymce.isIE) {
+				ed.onClick.add(function(ed, e) {
+					e = e.target;
+
+					if (e.nodeName === 'TABLE')
+						ed.selection.select(e);
+				});
+			}
+
+			ed.onPreProcess.add(function(ed, args) {
+				var nodes, i, node, dom = ed.dom, value;
+
+				nodes = dom.select('table', args.node);
+				i = nodes.length;
+				while (i--) {
+					node = nodes[i];
+					dom.setAttrib(node, 'data-mce-style', '');
+
+					if ((value = dom.getAttrib(node, 'width'))) {
+						dom.setStyle(node, 'width', value);
+						dom.setAttrib(node, 'width', '');
+					}
+
+					if ((value = dom.getAttrib(node, 'height'))) {
+						dom.setStyle(node, 'height', value);
+						dom.setAttrib(node, 'height', '');
+					}
+				}
+			});
+
+			// Handle node change updates
+			ed.onNodeChange.add(function(ed, cm, n) {
+				var p;
+
+				n = ed.selection.getStart();
+				p = ed.dom.getParent(n, 'td,th,caption');
+				cm.setActive('table', n.nodeName === 'TABLE' || !!p);
+
+				// Disable table tools if we are in caption
+				if (p && p.nodeName === 'CAPTION')
+					p = 0;
+
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_col', !p);
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_row', !p);
+				cm.setDisabled('col_after', !p);
+				cm.setDisabled('col_before', !p);
+				cm.setDisabled('row_after', !p);
+				cm.setDisabled('row_before', !p);
+				cm.setDisabled('row_props', !p);
+				cm.setDisabled('cell_props', !p);
+				cm.setDisabled('split_cells', !p);
+				cm.setDisabled('merge_cells', !p);
+			});
+
+			ed.onInit.add(function(ed) {
+				var startTable, startCell, dom = ed.dom, tableGrid;
+
+				winMan = ed.windowManager;
+
+				// Add cell selection logic
+				ed.onMouseDown.add(function(ed, e) {
+					if (e.button != 2) {
+						cleanup();
+
+						startCell = dom.getParent(e.target, 'td,th');
+						startTable = dom.getParent(startCell, 'table');
+					}
+				});
+
+				dom.bind(ed.getDoc(), 'mouseover', function(e) {
+					var sel, table, target = e.target;
+
+					if (startCell && (tableGrid || target != startCell) && (target.nodeName == 'TD' || target.nodeName == 'TH')) {
+						table = dom.getParent(target, 'table');
+						if (table == startTable) {
+							if (!tableGrid) {
+								tableGrid = createTableGrid(table);
+								tableGrid.setStartCell(startCell);
+
+								ed.getBody().style.webkitUserSelect = 'none';
+							}
+
+							tableGrid.setEndCell(target);
+						}
+
+						// Remove current selection
+						sel = ed.selection.getSel();
+
+						if (sel.removeAllRanges)
+							sel.removeAllRanges();
+						else
+							sel.empty();
+
+						e.preventDefault();
+					}
+				});
+
+				ed.onMouseUp.add(function(ed, e) {
+					var rng, sel = ed.selection, selectedCells, nativeSel = sel.getSel(), walker, node, lastNode, endNode;
+
+					// Move selection to startCell
+					if (startCell) {
+						if (tableGrid)
+							ed.getBody().style.webkitUserSelect = '';
+
+						function setPoint(node, start) {
+							var walker = new tinymce.dom.TreeWalker(node, node);
+
+							do {
+								// Text node
+								if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {
+									if (start)
+										rng.setStart(node, 0);
+									else
+										rng.setEnd(node, node.nodeValue.length);
+
+									return;
+								}
+
+								// BR element
+								if (node.nodeName == 'BR') {
+									if (start)
+										rng.setStartBefore(node);
+									else
+										rng.setEndBefore(node);
+
+									return;
+								}
+							} while (node = (start ? walker.next() : walker.prev()));
+						};
+
+						// Try to expand text selection as much as we can only Gecko supports cell selection
+						selectedCells = dom.select('td.mceSelected,th.mceSelected');
+						if (selectedCells.length > 0) {
+							rng = dom.createRng();
+							node = selectedCells[0];
+							endNode = selectedCells[selectedCells.length - 1];
+
+							setPoint(node, 1);
+							walker = new tinymce.dom.TreeWalker(node, dom.getParent(selectedCells[0], 'table'));
+
+							do {
+								if (node.nodeName == 'TD' || node.nodeName == 'TH') {
+									if (!dom.hasClass(node, 'mceSelected'))
+										break;
+
+									lastNode = node;
+								}
+							} while (node = walker.next());
+
+							setPoint(lastNode);
+
+							sel.setRng(rng);
+						}
+
+						ed.nodeChanged();
+						startCell = tableGrid = startTable = null;
+					}
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					cleanup();
+				});
+
+				// Add context menu
+				if (ed && ed.plugins.contextmenu) {
+					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
+						var sm, se = ed.selection, el = se.getNode() || ed.getBody();
+
+						if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th') || ed.dom.select('td.mceSelected,th.mceSelected').length) {
+							m.removeAll();
+
+							if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {
+								m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});
+								m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});
+								m.addSeparator();
+							}
+
+							if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {
+								m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});
+								m.addSeparator();
+							}
+
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', value : {action : 'insert'}});
+							m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable'});
+							m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete'});
+							m.addSeparator();
+
+							// Cell menu
+							sm = m.addMenu({title : 'table.cell'});
+							sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps'});
+							sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells'});
+							sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells'});
+
+							// Row menu
+							sm = m.addMenu({title : 'table.row'});
+							sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps'});
+							sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});
+							sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});
+							sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});
+							sm.addSeparator();
+							sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});
+							sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});
+							sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'}).setDisabled(!clipboardRows);
+							sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'}).setDisabled(!clipboardRows);
+
+							// Column menu
+							sm = m.addMenu({title : 'table.col'});
+							sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});
+							sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});
+							sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});
+						} else
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable'});
+					});
+				}
+
+				// Fixes an issue on Gecko where it's impossible to place the caret behind a table
+				// This fix will force a paragraph element after the table but only when the forced_root_block setting is enabled
+				if (!tinymce.isIE) {
+					function fixTableCaretPos() {
+						var last;
+
+						// Skip empty text nodes form the end
+						for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling) ;
+
+						if (last && last.nodeName == 'TABLE')
+							ed.dom.add(ed.getBody(), 'p', null, '<br mce_bogus="1" />');
+					};
+
+					// Fixes an bug where it's impossible to place the caret before a table in Gecko
+					// this fix solves it by detecting when the caret is at the beginning of such a table
+					// and then manually moves the caret infront of the table
+					if (tinymce.isGecko) {
+						ed.onKeyDown.add(function(ed, e) {
+							var rng, table, dom = ed.dom;
+
+							// On gecko it's not possible to place the caret before a table
+							if (e.keyCode == 37 || e.keyCode == 38) {
+								rng = ed.selection.getRng();
+								table = dom.getParent(rng.startContainer, 'table');
+
+								if (table && ed.getBody().firstChild == table) {
+									if (isAtStart(rng, table)) {
+										rng = dom.createRng();
+
+										rng.setStartBefore(table);
+										rng.setEndBefore(table);
+
+										ed.selection.setRng(rng);
+
+										e.preventDefault();
+									}
+								}
+							}
+						});
+					}
+
+					ed.onKeyUp.add(fixTableCaretPos);
+					ed.onSetContent.add(fixTableCaretPos);
+					ed.onVisualAid.add(fixTableCaretPos);
+
+					ed.onPreProcess.add(function(ed, o) {
+						var last = o.node.lastChild;
+
+						if (last && last.childNodes.length == 1 && last.firstChild.nodeName == 'BR')
+							ed.dom.remove(last);
+					});
+
+					fixTableCaretPos();
+				}
+			});
+
+			// Register action commands
+			each({
+				mceTableSplitCells : function(grid) {
+					grid.split();
+				},
+
+				mceTableMergeCells : function(grid) {
+					var rowSpan, colSpan, cell;
+
+					cell = ed.dom.getParent(ed.selection.getNode(), 'th,td');
+					if (cell) {
+						rowSpan = cell.rowSpan;
+						colSpan = cell.colSpan;
+					}
+
+					if (!ed.dom.select('td.mceSelected,th.mceSelected').length) {
+						winMan.open({
+							url : url + '/merge_cells.htm',
+							width : 240 + parseInt(ed.getLang('table.merge_cells_delta_width', 0)),
+							height : 110 + parseInt(ed.getLang('table.merge_cells_delta_height', 0)),
+							inline : 1
+						}, {
+							rows : rowSpan,
+							cols : colSpan,
+							onaction : function(data) {
+								grid.merge(cell, data.cols, data.rows);
+							},
+							plugin_url : url
+						});
+					} else
+						grid.merge();
+				},
+
+				mceTableInsertRowBefore : function(grid) {
+					grid.insertRow(true);
+				},
+
+				mceTableInsertRowAfter : function(grid) {
+					grid.insertRow();
+				},
+
+				mceTableInsertColBefore : function(grid) {
+					grid.insertCol(true);
+				},
+
+				mceTableInsertColAfter : function(grid) {
+					grid.insertCol();
+				},
+
+				mceTableDeleteCol : function(grid) {
+					grid.deleteCols();
+				},
+
+				mceTableDeleteRow : function(grid) {
+					grid.deleteRows();
+				},
+
+				mceTableCutRow : function(grid) {
+					clipboardRows = grid.cutRows();
+				},
+
+				mceTableCopyRow : function(grid) {
+					clipboardRows = grid.copyRows();
+				},
+
+				mceTablePasteRowBefore : function(grid) {
+					grid.pasteRows(clipboardRows, true);
+				},
+
+				mceTablePasteRowAfter : function(grid) {
+					grid.pasteRows(clipboardRows);
+				},
+
+				mceTableDelete : function(grid) {
+					grid.deleteTable();
+				}
+			}, function(func, name) {
+				ed.addCommand(name, function() {
+					var grid = createTableGrid();
+
+					if (grid) {
+						func(grid);
+						ed.execCommand('mceRepaint');
+						cleanup();
+					}
+				});
+			});
+
+			// Register dialog commands
+			each({
+				mceInsertTable : function(val) {
+					winMan.open({
+						url : url + '/table.htm',
+						width : 400 + parseInt(ed.getLang('table.table_delta_width', 0)),
+						height : 320 + parseInt(ed.getLang('table.table_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url,
+						action : val ? val.action : 0
+					});
+				},
+
+				mceTableRowProps : function() {
+					winMan.open({
+						url : url + '/row.htm',
+						width : 400 + parseInt(ed.getLang('table.rowprops_delta_width', 0)),
+						height : 295 + parseInt(ed.getLang('table.rowprops_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url
+					});
+				},
+
+				mceTableCellProps : function() {
+					winMan.open({
+						url : url + '/cell.htm',
+						width : 400 + parseInt(ed.getLang('table.cellprops_delta_width', 0)),
+						height : 295 + parseInt(ed.getLang('table.cellprops_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url
+					});
+				}
+			}, function(func, name) {
+				ed.addCommand(name, function(ui, val) {
+					func(val);
+				});
+			});
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('table', tinymce.plugins.TablePlugin);
+})(tinymce);
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/cell.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/cell.js
new file mode 100644
index 0000000000..45e6061fd0
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/cell.js
@@ -0,0 +1,284 @@
+tinyMCEPopup.requireLangPack();
+
+var ed;
+
+function init() {
+	ed = tinyMCEPopup.editor;
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor')
+
+	var inst = ed;
+	var tdElm = ed.dom.getParent(ed.selection.getStart(), "td,th");
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(ed.dom.getAttrib(tdElm, "style"));
+
+	// Get table cell data
+	var celltype = tdElm.nodeName.toLowerCase();
+	var align = ed.dom.getAttrib(tdElm, 'align');
+	var valign = ed.dom.getAttrib(tdElm, 'valign');
+	var width = trimSize(getStyle(tdElm, 'width', 'width'));
+	var height = trimSize(getStyle(tdElm, 'height', 'height'));
+	var bordercolor = convertRGBToHex(getStyle(tdElm, 'bordercolor', 'borderLeftColor'));
+	var bgcolor = convertRGBToHex(getStyle(tdElm, 'bgcolor', 'backgroundColor'));
+	var className = ed.dom.getAttrib(tdElm, 'class');
+	var backgroundimage = getStyle(tdElm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
+	var id = ed.dom.getAttrib(tdElm, 'id');
+	var lang = ed.dom.getAttrib(tdElm, 'lang');
+	var dir = ed.dom.getAttrib(tdElm, 'dir');
+	var scope = ed.dom.getAttrib(tdElm, 'scope');
+
+	// Setup form
+	addClassesToList('class', 'table_cell_styles');
+	TinyMCE_EditableSelects.init();
+
+	if (!ed.dom.hasClass(tdElm, 'mceSelected')) {
+		formObj.bordercolor.value = bordercolor;
+		formObj.bgcolor.value = bgcolor;
+		formObj.backgroundimage.value = backgroundimage;
+		formObj.width.value = width;
+		formObj.height.value = height;
+		formObj.id.value = id;
+		formObj.lang.value = lang;
+		formObj.style.value = ed.dom.serializeStyle(st);
+		selectByValue(formObj, 'align', align);
+		selectByValue(formObj, 'valign', valign);
+		selectByValue(formObj, 'class', className, true, true);
+		selectByValue(formObj, 'celltype', celltype);
+		selectByValue(formObj, 'dir', dir);
+		selectByValue(formObj, 'scope', scope);
+
+		// Resize some elements
+		if (isVisible('backgroundimagebrowser'))
+			document.getElementById('backgroundimage').style.width = '180px';
+
+		updateColor('bordercolor_pick', 'bordercolor');
+		updateColor('bgcolor_pick', 'bgcolor');
+	} else
+		tinyMCEPopup.dom.hide('action');
+}
+
+function updateAction() {
+	var el, inst = ed, tdElm, trElm, tableElm, formObj = document.forms[0];
+
+	tinyMCEPopup.restoreSelection();
+	el = ed.selection.getStart();
+	tdElm = ed.dom.getParent(el, "td,th");
+	trElm = ed.dom.getParent(el, "tr");
+	tableElm = ed.dom.getParent(el, "table");
+
+	// Cell is selected
+	if (ed.dom.hasClass(tdElm, 'mceSelected')) {
+		// Update all selected sells
+		tinymce.each(ed.dom.select('td.mceSelected,th.mceSelected'), function(td) {
+			updateCell(td);
+		});
+
+		ed.addVisual();
+		ed.nodeChanged();
+		inst.execCommand('mceEndUndoLevel');
+		tinyMCEPopup.close();
+		return;
+	}
+
+	switch (getSelectValue(formObj, 'action')) {
+		case "cell":
+			var celltype = getSelectValue(formObj, 'celltype');
+			var scope = getSelectValue(formObj, 'scope');
+
+			function doUpdate(s) {
+				if (s) {
+					updateCell(tdElm);
+
+					ed.addVisual();
+					ed.nodeChanged();
+					inst.execCommand('mceEndUndoLevel');
+					tinyMCEPopup.close();
+				}
+			};
+
+			if (ed.getParam("accessibility_warnings", 1)) {
+				if (celltype == "th" && scope == "")
+					tinyMCEPopup.confirm(ed.getLang('table_dlg.missing_scope', '', true), doUpdate);
+				else
+					doUpdate(1);
+
+				return;
+			}
+
+			updateCell(tdElm);
+			break;
+
+		case "row":
+			var cell = trElm.firstChild;
+
+			if (cell.nodeName != "TD" && cell.nodeName != "TH")
+				cell = nextCell(cell);
+
+			do {
+				cell = updateCell(cell, true);
+			} while ((cell = nextCell(cell)) != null);
+
+			break;
+
+		case "all":
+			var rows = tableElm.getElementsByTagName("tr");
+
+			for (var i=0; i<rows.length; i++) {
+				var cell = rows[i].firstChild;
+
+				if (cell.nodeName != "TD" && cell.nodeName != "TH")
+					cell = nextCell(cell);
+
+				do {
+					cell = updateCell(cell, true);
+				} while ((cell = nextCell(cell)) != null);
+			}
+
+			break;
+	}
+
+	ed.addVisual();
+	ed.nodeChanged();
+	inst.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function nextCell(elm) {
+	while ((elm = elm.nextSibling) != null) {
+		if (elm.nodeName == "TD" || elm.nodeName == "TH")
+			return elm;
+	}
+
+	return null;
+}
+
+function updateCell(td, skip_id) {
+	var inst = ed;
+	var formObj = document.forms[0];
+	var curCellType = td.nodeName.toLowerCase();
+	var celltype = getSelectValue(formObj, 'celltype');
+	var doc = inst.getDoc();
+	var dom = ed.dom;
+
+	if (!skip_id)
+		dom.setAttrib(td, 'id', formObj.id.value);
+
+	dom.setAttrib(td, 'align', formObj.align.value);
+	dom.setAttrib(td, 'vAlign', formObj.valign.value);
+	dom.setAttrib(td, 'lang', formObj.lang.value);
+	dom.setAttrib(td, 'dir', getSelectValue(formObj, 'dir'));
+	dom.setAttrib(td, 'style', ed.dom.serializeStyle(ed.dom.parseStyle(formObj.style.value)));
+	dom.setAttrib(td, 'scope', formObj.scope.value);
+	dom.setAttrib(td, 'class', getSelectValue(formObj, 'class'));
+
+	// Clear deprecated attributes
+	ed.dom.setAttrib(td, 'width', '');
+	ed.dom.setAttrib(td, 'height', '');
+	ed.dom.setAttrib(td, 'bgColor', '');
+	ed.dom.setAttrib(td, 'borderColor', '');
+	ed.dom.setAttrib(td, 'background', '');
+
+	// Set styles
+	td.style.width = getCSSSize(formObj.width.value);
+	td.style.height = getCSSSize(formObj.height.value);
+	if (formObj.bordercolor.value != "") {
+		td.style.borderColor = formObj.bordercolor.value;
+		td.style.borderStyle = td.style.borderStyle == "" ? "solid" : td.style.borderStyle;
+		td.style.borderWidth = td.style.borderWidth == "" ? "1px" : td.style.borderWidth;
+	} else
+		td.style.borderColor = '';
+
+	td.style.backgroundColor = formObj.bgcolor.value;
+
+	if (formObj.backgroundimage.value != "")
+		td.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";
+	else
+		td.style.backgroundImage = '';
+
+	if (curCellType != celltype) {
+		// changing to a different node type
+		var newCell = doc.createElement(celltype);
+
+		for (var c=0; c<td.childNodes.length; c++)
+			newCell.appendChild(td.childNodes[c].cloneNode(1));
+
+		for (var a=0; a<td.attributes.length; a++)
+			ed.dom.setAttrib(newCell, td.attributes[a].name, ed.dom.getAttrib(td, td.attributes[a].name));
+
+		td.parentNode.replaceChild(newCell, td);
+		td = newCell;
+	}
+
+	dom.setAttrib(td, 'style', dom.serializeStyle(dom.parseStyle(td.style.cssText)));
+
+	return td;
+}
+
+function changedBackgroundImage() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+
+	formObj.style.value = ed.dom.serializeStyle(st);
+}
+
+function changedSize() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	var width = formObj.width.value;
+	if (width != "")
+		st['width'] = getCSSSize(width);
+	else
+		st['width'] = "";
+
+	var height = formObj.height.value;
+	if (height != "")
+		st['height'] = getCSSSize(height);
+	else
+		st['height'] = "";
+
+	formObj.style.value = ed.dom.serializeStyle(st);
+}
+
+function changedColor() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	st['background-color'] = formObj.bgcolor.value;
+	st['border-color'] = formObj.bordercolor.value;
+
+	formObj.style.value = ed.dom.serializeStyle(st);
+}
+
+function changedStyle() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	if (st['background-image'])
+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	else
+		formObj.backgroundimage.value = '';
+
+	if (st['width'])
+		formObj.width.value = trimSize(st['width']);
+
+	if (st['height'])
+		formObj.height.value = trimSize(st['height']);
+
+	if (st['background-color']) {
+		formObj.bgcolor.value = st['background-color'];
+		updateColor('bgcolor_pick','bgcolor');
+	}
+
+	if (st['border-color']) {
+		formObj.bordercolor.value = st['border-color'];
+		updateColor('bordercolor_pick','bordercolor');
+	}
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/merge_cells.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/merge_cells.js
new file mode 100644
index 0000000000..7ee4bf0401
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/merge_cells.js
@@ -0,0 +1,27 @@
+tinyMCEPopup.requireLangPack();
+
+var MergeCellsDialog = {
+	init : function() {
+		var f = document.forms[0];
+
+		f.numcols.value = tinyMCEPopup.getWindowArg('cols', 1);
+		f.numrows.value = tinyMCEPopup.getWindowArg('rows', 1);
+	},
+
+	merge : function() {
+		var func, f = document.forms[0];
+
+		tinyMCEPopup.restoreSelection();
+
+		func = tinyMCEPopup.getWindowArg('onaction');
+
+		func({
+			cols : f.numcols.value,
+			rows : f.numrows.value
+		});
+
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.onInit.add(MergeCellsDialog.init, MergeCellsDialog);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/row.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/row.js
new file mode 100644
index 0000000000..b275e6ea98
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/row.js
@@ -0,0 +1,232 @@
+tinyMCEPopup.requireLangPack();
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+
+	var inst = tinyMCEPopup.editor;
+	var dom = inst.dom;
+	var trElm = dom.getParent(inst.selection.getStart(), "tr");
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(dom.getAttrib(trElm, "style"));
+
+	// Get table row data
+	var rowtype = trElm.parentNode.nodeName.toLowerCase();
+	var align = dom.getAttrib(trElm, 'align');
+	var valign = dom.getAttrib(trElm, 'valign');
+	var height = trimSize(getStyle(trElm, 'height', 'height'));
+	var className = dom.getAttrib(trElm, 'class');
+	var bgcolor = convertRGBToHex(getStyle(trElm, 'bgcolor', 'backgroundColor'));
+	var backgroundimage = getStyle(trElm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
+	var id = dom.getAttrib(trElm, 'id');
+	var lang = dom.getAttrib(trElm, 'lang');
+	var dir = dom.getAttrib(trElm, 'dir');
+
+	selectByValue(formObj, 'rowtype', rowtype);
+
+	// Any cells selected
+	if (dom.select('td.mceSelected,th.mceSelected', trElm).length == 0) {
+		// Setup form
+		addClassesToList('class', 'table_row_styles');
+		TinyMCE_EditableSelects.init();
+
+		formObj.bgcolor.value = bgcolor;
+		formObj.backgroundimage.value = backgroundimage;
+		formObj.height.value = height;
+		formObj.id.value = id;
+		formObj.lang.value = lang;
+		formObj.style.value = dom.serializeStyle(st);
+		selectByValue(formObj, 'align', align);
+		selectByValue(formObj, 'valign', valign);
+		selectByValue(formObj, 'class', className, true, true);
+		selectByValue(formObj, 'dir', dir);
+
+		// Resize some elements
+		if (isVisible('backgroundimagebrowser'))
+			document.getElementById('backgroundimage').style.width = '180px';
+
+		updateColor('bgcolor_pick', 'bgcolor');
+	} else
+		tinyMCEPopup.dom.hide('action');
+}
+
+function updateAction() {
+	var inst = tinyMCEPopup.editor, dom = inst.dom, trElm, tableElm, formObj = document.forms[0];
+	var action = getSelectValue(formObj, 'action');
+
+	tinyMCEPopup.restoreSelection();
+	trElm = dom.getParent(inst.selection.getStart(), "tr");
+	tableElm = dom.getParent(inst.selection.getStart(), "table");
+
+	// Update all selected rows
+	if (dom.select('td.mceSelected,th.mceSelected', trElm).length > 0) {
+		tinymce.each(tableElm.rows, function(tr) {
+			var i;
+
+			for (i = 0; i < tr.cells.length; i++) {
+				if (dom.hasClass(tr.cells[i], 'mceSelected')) {
+					updateRow(tr, true);
+					return;
+				}
+			}
+		});
+
+		inst.addVisual();
+		inst.nodeChanged();
+		inst.execCommand('mceEndUndoLevel');
+		tinyMCEPopup.close();
+		return;
+	}
+
+	switch (action) {
+		case "row":
+			updateRow(trElm);
+			break;
+
+		case "all":
+			var rows = tableElm.getElementsByTagName("tr");
+
+			for (var i=0; i<rows.length; i++)
+				updateRow(rows[i], true);
+
+			break;
+
+		case "odd":
+		case "even":
+			var rows = tableElm.getElementsByTagName("tr");
+
+			for (var i=0; i<rows.length; i++) {
+				if ((i % 2 == 0 && action == "odd") || (i % 2 != 0 && action == "even"))
+					updateRow(rows[i], true, true);
+			}
+
+			break;
+	}
+
+	inst.addVisual();
+	inst.nodeChanged();
+	inst.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function updateRow(tr_elm, skip_id, skip_parent) {
+	var inst = tinyMCEPopup.editor;
+	var formObj = document.forms[0];
+	var dom = inst.dom;
+	var curRowType = tr_elm.parentNode.nodeName.toLowerCase();
+	var rowtype = getSelectValue(formObj, 'rowtype');
+	var doc = inst.getDoc();
+
+	// Update row element
+	if (!skip_id)
+		dom.setAttrib(tr_elm, 'id', formObj.id.value);
+
+	dom.setAttrib(tr_elm, 'align', getSelectValue(formObj, 'align'));
+	dom.setAttrib(tr_elm, 'vAlign', getSelectValue(formObj, 'valign'));
+	dom.setAttrib(tr_elm, 'lang', formObj.lang.value);
+	dom.setAttrib(tr_elm, 'dir', getSelectValue(formObj, 'dir'));
+	dom.setAttrib(tr_elm, 'style', dom.serializeStyle(dom.parseStyle(formObj.style.value)));
+	dom.setAttrib(tr_elm, 'class', getSelectValue(formObj, 'class'));
+
+	// Clear deprecated attributes
+	dom.setAttrib(tr_elm, 'background', '');
+	dom.setAttrib(tr_elm, 'bgColor', '');
+	dom.setAttrib(tr_elm, 'height', '');
+
+	// Set styles
+	tr_elm.style.height = getCSSSize(formObj.height.value);
+	tr_elm.style.backgroundColor = formObj.bgcolor.value;
+
+	if (formObj.backgroundimage.value != "")
+		tr_elm.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";
+	else
+		tr_elm.style.backgroundImage = '';
+
+	// Setup new rowtype
+	if (curRowType != rowtype && !skip_parent) {
+		// first, clone the node we are working on
+		var newRow = tr_elm.cloneNode(1);
+
+		// next, find the parent of its new destination (creating it if necessary)
+		var theTable = dom.getParent(tr_elm, "table");
+		var dest = rowtype;
+		var newParent = null;
+		for (var i = 0; i < theTable.childNodes.length; i++) {
+			if (theTable.childNodes[i].nodeName.toLowerCase() == dest)
+				newParent = theTable.childNodes[i];
+		}
+
+		if (newParent == null) {
+			newParent = doc.createElement(dest);
+
+			if (theTable.firstChild.nodeName == 'CAPTION')
+				inst.dom.insertAfter(newParent, theTable.firstChild);
+			else
+				theTable.insertBefore(newParent, theTable.firstChild);
+		}
+
+		// append the row to the new parent
+		newParent.appendChild(newRow);
+
+		// remove the original
+		tr_elm.parentNode.removeChild(tr_elm);
+
+		// set tr_elm to the new node
+		tr_elm = newRow;
+	}
+
+	dom.setAttrib(tr_elm, 'style', dom.serializeStyle(dom.parseStyle(tr_elm.style.cssText)));
+}
+
+function changedBackgroundImage() {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+	var st = dom.parseStyle(formObj.style.value);
+
+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedStyle() {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+	var st = dom.parseStyle(formObj.style.value);
+
+	if (st['background-image'])
+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	else
+		formObj.backgroundimage.value = '';
+
+	if (st['height'])
+		formObj.height.value = trimSize(st['height']);
+
+	if (st['background-color']) {
+		formObj.bgcolor.value = st['background-color'];
+		updateColor('bgcolor_pick','bgcolor');
+	}
+}
+
+function changedSize() {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+	var st = dom.parseStyle(formObj.style.value);
+
+	var height = formObj.height.value;
+	if (height != "")
+		st['height'] = getCSSSize(height);
+	else
+		st['height'] = "";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedColor() {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+	var st = dom.parseStyle(formObj.style.value);
+
+	st['background-color'] = formObj.bgcolor.value;
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/table.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/table.js
new file mode 100644
index 0000000000..520d857fce
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/js/table.js
@@ -0,0 +1,450 @@
+tinyMCEPopup.requireLangPack();
+
+var action, orgTableWidth, orgTableHeight, dom = tinyMCEPopup.editor.dom;
+
+function insertTable() {
+	var formObj = document.forms[0];
+	var inst = tinyMCEPopup.editor, dom = inst.dom;
+	var cols = 2, rows = 2, border = 0, cellpadding = -1, cellspacing = -1, align, width, height, className, caption, frame, rules;
+	var html = '', capEl, elm;
+	var cellLimit, rowLimit, colLimit;
+
+	tinyMCEPopup.restoreSelection();
+
+	if (!AutoValidator.validate(formObj)) {
+		tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');
+		return false;
+	}
+
+	elm = dom.getParent(inst.selection.getNode(), 'table');
+
+	// Get form data
+	cols = formObj.elements['cols'].value;
+	rows = formObj.elements['rows'].value;
+	border = formObj.elements['border'].value != "" ? formObj.elements['border'].value : 0;
+	cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : "";
+	cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : "";
+	align = getSelectValue(formObj, "align");
+	frame = getSelectValue(formObj, "tframe");
+	rules = getSelectValue(formObj, "rules");
+	width = formObj.elements['width'].value;
+	height = formObj.elements['height'].value;
+	bordercolor = formObj.elements['bordercolor'].value;
+	bgcolor = formObj.elements['bgcolor'].value;
+	className = getSelectValue(formObj, "class");
+	id = formObj.elements['id'].value;
+	summary = formObj.elements['summary'].value;
+	style = formObj.elements['style'].value;
+	dir = formObj.elements['dir'].value;
+	lang = formObj.elements['lang'].value;
+	background = formObj.elements['backgroundimage'].value;
+	caption = formObj.elements['caption'].checked;
+
+	cellLimit = tinyMCEPopup.getParam('table_cell_limit', false);
+	rowLimit = tinyMCEPopup.getParam('table_row_limit', false);
+	colLimit = tinyMCEPopup.getParam('table_col_limit', false);
+
+	// Validate table size
+	if (colLimit && cols > colLimit) {
+		tinyMCEPopup.alert(inst.getLang('table_dlg.col_limit').replace(/\{\$cols\}/g, colLimit));
+		return false;
+	} else if (rowLimit && rows > rowLimit) {
+		tinyMCEPopup.alert(inst.getLang('table_dlg.row_limit').replace(/\{\$rows\}/g, rowLimit));
+		return false;
+	} else if (cellLimit && cols * rows > cellLimit) {
+		tinyMCEPopup.alert(inst.getLang('table_dlg.cell_limit').replace(/\{\$cells\}/g, cellLimit));
+		return false;
+	}
+
+	// Update table
+	if (action == "update") {
+		dom.setAttrib(elm, 'cellPadding', cellpadding, true);
+		dom.setAttrib(elm, 'cellSpacing', cellspacing, true);
+		dom.setAttrib(elm, 'border', border);
+		dom.setAttrib(elm, 'align', align);
+		dom.setAttrib(elm, 'frame', frame);
+		dom.setAttrib(elm, 'rules', rules);
+		dom.setAttrib(elm, 'class', className);
+		dom.setAttrib(elm, 'style', style);
+		dom.setAttrib(elm, 'id', id);
+		dom.setAttrib(elm, 'summary', summary);
+		dom.setAttrib(elm, 'dir', dir);
+		dom.setAttrib(elm, 'lang', lang);
+
+		capEl = inst.dom.select('caption', elm)[0];
+
+		if (capEl && !caption)
+			capEl.parentNode.removeChild(capEl);
+
+		if (!capEl && caption) {
+			capEl = elm.ownerDocument.createElement('caption');
+
+			if (!tinymce.isIE)
+				capEl.innerHTML = '<br data-mce-bogus="1"/>';
+
+			elm.insertBefore(capEl, elm.firstChild);
+		}
+
+		if (width && inst.settings.inline_styles) {
+			dom.setStyle(elm, 'width', width);
+			dom.setAttrib(elm, 'width', '');
+		} else {
+			dom.setAttrib(elm, 'width', width, true);
+			dom.setStyle(elm, 'width', '');
+		}
+
+		// Remove these since they are not valid XHTML
+		dom.setAttrib(elm, 'borderColor', '');
+		dom.setAttrib(elm, 'bgColor', '');
+		dom.setAttrib(elm, 'background', '');
+
+		if (height && inst.settings.inline_styles) {
+			dom.setStyle(elm, 'height', height);
+			dom.setAttrib(elm, 'height', '');
+		} else {
+			dom.setAttrib(elm, 'height', height, true);
+			dom.setStyle(elm, 'height', '');
+ 		}
+
+		if (background != '')
+			elm.style.backgroundImage = "url('" + background + "')";
+		else
+			elm.style.backgroundImage = '';
+
+/*		if (tinyMCEPopup.getParam("inline_styles")) {
+			if (width != '')
+				elm.style.width = getCSSSize(width);
+		}*/
+
+		if (bordercolor != "") {
+			elm.style.borderColor = bordercolor;
+			elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle;
+			elm.style.borderWidth = border == "" ? "1px" : border;
+		} else
+			elm.style.borderColor = '';
+
+		elm.style.backgroundColor = bgcolor;
+		elm.style.height = getCSSSize(height);
+
+		inst.addVisual();
+
+		// Fix for stange MSIE align bug
+		//elm.outerHTML = elm.outerHTML;
+
+		inst.nodeChanged();
+		inst.execCommand('mceEndUndoLevel');
+
+		// Repaint if dimensions changed
+		if (formObj.width.value != orgTableWidth || formObj.height.value != orgTableHeight)
+			inst.execCommand('mceRepaint');
+
+		tinyMCEPopup.close();
+		return true;
+	}
+
+	// Create new table
+	html += '<table';
+
+	html += makeAttrib('id', id);
+	html += makeAttrib('border', border);
+	html += makeAttrib('cellpadding', cellpadding);
+	html += makeAttrib('cellspacing', cellspacing);
+	html += makeAttrib('data-mce-new', '1');
+
+	if (width && inst.settings.inline_styles) {
+		if (style)
+			style += '; ';
+
+		// Force px
+		if (/^[0-9\.]+$/.test(width))
+			width += 'px';
+
+		style += 'width: ' + width;
+	} else
+		html += makeAttrib('width', width);
+
+/*	if (height) {
+		if (style)
+			style += '; ';
+
+		style += 'height: ' + height;
+	}*/
+
+	//html += makeAttrib('height', height);
+	//html += makeAttrib('bordercolor', bordercolor);
+	//html += makeAttrib('bgcolor', bgcolor);
+	html += makeAttrib('align', align);
+	html += makeAttrib('frame', frame);
+	html += makeAttrib('rules', rules);
+	html += makeAttrib('class', className);
+	html += makeAttrib('style', style);
+	html += makeAttrib('summary', summary);
+	html += makeAttrib('dir', dir);
+	html += makeAttrib('lang', lang);
+	html += '>';
+
+	if (caption) {
+		if (!tinymce.isIE)
+			html += '<caption><br data-mce-bogus="1"/></caption>';
+		else
+			html += '<caption></caption>';
+	}
+
+	for (var y=0; y<rows; y++) {
+		html += "<tr>";
+
+		for (var x=0; x<cols; x++) {
+			if (!tinymce.isIE)
+				html += '<td><br data-mce-bogus="1"/></td>';
+			else
+				html += '<td></td>';
+		}
+
+		html += "</tr>";
+	}
+
+	html += "</table>";
+
+	// Move table
+	if (inst.settings.fix_table_elements) {
+		var patt = '';
+
+		inst.focus();
+		inst.selection.setContent('<br class="_mce_marker" />');
+
+		tinymce.each('h1,h2,h3,h4,h5,h6,p'.split(','), function(n) {
+			if (patt)
+				patt += ',';
+
+			patt += n + ' ._mce_marker';
+		});
+
+		tinymce.each(inst.dom.select(patt), function(n) {
+			inst.dom.split(inst.dom.getParent(n, 'h1,h2,h3,h4,h5,h6,p'), n);
+		});
+
+		dom.setOuterHTML(dom.select('br._mce_marker')[0], html);
+	} else
+		inst.execCommand('mceInsertContent', false, html);
+
+	tinymce.each(dom.select('table[data-mce-new]'), function(node) {
+		var td = dom.select('td', node);
+
+		try {
+			// IE9 might fail to do this selection
+			inst.selection.select(td[0], true);
+			inst.selection.collapse();
+		} catch (ex) {
+			// Ignore
+		}
+
+		dom.setAttrib(node, 'data-mce-new', '');
+	});
+
+	inst.addVisual();
+	inst.execCommand('mceEndUndoLevel');
+
+	tinyMCEPopup.close();
+}
+
+function makeAttrib(attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib];
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	if (value == "")
+		return "";
+
+	// XML encode it
+	value = value.replace(/&/g, '&amp;');
+	value = value.replace(/\"/g, '&quot;');
+	value = value.replace(/</g, '&lt;');
+	value = value.replace(/>/g, '&gt;');
+
+	return ' ' + attrib + '="' + value + '"';
+}
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+
+	var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', '0'), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', '');
+	var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";
+	var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules = "", frame = "";
+	var inst = tinyMCEPopup.editor, dom = inst.dom;
+	var formObj = document.forms[0];
+	var elm = dom.getParent(inst.selection.getNode(), "table");
+
+	action = tinyMCEPopup.getWindowArg('action');
+
+	if (!action)
+		action = elm ? "update" : "insert";
+
+	if (elm && action != "insert") {
+		var rowsAr = elm.rows;
+		var cols = 0;
+		for (var i=0; i<rowsAr.length; i++)
+			if (rowsAr[i].cells.length > cols)
+				cols = rowsAr[i].cells.length;
+
+		cols = cols;
+		rows = rowsAr.length;
+
+		st = dom.parseStyle(dom.getAttrib(elm, "style"));
+		border = trimSize(getStyle(elm, 'border', 'borderWidth'));
+		cellpadding = dom.getAttrib(elm, 'cellpadding', "");
+		cellspacing = dom.getAttrib(elm, 'cellspacing', "");
+		width = trimSize(getStyle(elm, 'width', 'width'));
+		height = trimSize(getStyle(elm, 'height', 'height'));
+		bordercolor = convertRGBToHex(getStyle(elm, 'bordercolor', 'borderLeftColor'));
+		bgcolor = convertRGBToHex(getStyle(elm, 'bgcolor', 'backgroundColor'));
+		align = dom.getAttrib(elm, 'align', align);
+		frame = dom.getAttrib(elm, 'frame');
+		rules = dom.getAttrib(elm, 'rules');
+		className = tinymce.trim(dom.getAttrib(elm, 'class').replace(/mceItem.+/g, ''));
+		id = dom.getAttrib(elm, 'id');
+		summary = dom.getAttrib(elm, 'summary');
+		style = dom.serializeStyle(st);
+		dir = dom.getAttrib(elm, 'dir');
+		lang = dom.getAttrib(elm, 'lang');
+		background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
+		formObj.caption.checked = elm.getElementsByTagName('caption').length > 0;
+
+		orgTableWidth = width;
+		orgTableHeight = height;
+
+		action = "update";
+		formObj.insert.value = inst.getLang('update');
+	}
+
+	addClassesToList('class', "table_styles");
+	TinyMCE_EditableSelects.init();
+
+	// Update form
+	selectByValue(formObj, 'align', align);
+	selectByValue(formObj, 'tframe', frame);
+	selectByValue(formObj, 'rules', rules);
+	selectByValue(formObj, 'class', className, true, true);
+	formObj.cols.value = cols;
+	formObj.rows.value = rows;
+	formObj.border.value = border;
+	formObj.cellpadding.value = cellpadding;
+	formObj.cellspacing.value = cellspacing;
+	formObj.width.value = width;
+	formObj.height.value = height;
+	formObj.bordercolor.value = bordercolor;
+	formObj.bgcolor.value = bgcolor;
+	formObj.id.value = id;
+	formObj.summary.value = summary;
+	formObj.style.value = style;
+	formObj.dir.value = dir;
+	formObj.lang.value = lang;
+	formObj.backgroundimage.value = background;
+
+	updateColor('bordercolor_pick', 'bordercolor');
+	updateColor('bgcolor_pick', 'bgcolor');
+
+	// Resize some elements
+	if (isVisible('backgroundimagebrowser'))
+		document.getElementById('backgroundimage').style.width = '180px';
+
+	// Disable some fields in update mode
+	if (action == "update") {
+		formObj.cols.disabled = true;
+		formObj.rows.disabled = true;
+	}
+}
+
+function changedSize() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+/*	var width = formObj.width.value;
+	if (width != "")
+		st['width'] = tinyMCEPopup.getParam("inline_styles") ? getCSSSize(width) : "";
+	else
+		st['width'] = "";*/
+
+	var height = formObj.height.value;
+	if (height != "")
+		st['height'] = getCSSSize(height);
+	else
+		st['height'] = "";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedBackgroundImage() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedBorder() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	// Update border width if the element has a color
+	if (formObj.border.value != "" && formObj.bordercolor.value != "")
+		st['border-width'] = formObj.border.value + "px";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedColor() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	st['background-color'] = formObj.bgcolor.value;
+
+	if (formObj.bordercolor.value != "") {
+		st['border-color'] = formObj.bordercolor.value;
+
+		// Add border-width if it's missing
+		if (!st['border-width'])
+			st['border-width'] = formObj.border.value == "" ? "1px" : formObj.border.value + "px";
+	}
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedStyle() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	if (st['background-image'])
+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
+	else
+		formObj.backgroundimage.value = '';
+
+	if (st['width'])
+		formObj.width.value = trimSize(st['width']);
+
+	if (st['height'])
+		formObj.height.value = trimSize(st['height']);
+
+	if (st['background-color']) {
+		formObj.bgcolor.value = st['background-color'];
+		updateColor('bgcolor_pick','bgcolor');
+	}
+
+	if (st['border-color']) {
+		formObj.bordercolor.value = st['border-color'];
+		updateColor('bordercolor_pick','bordercolor');
+	}
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/da_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/da_dlg.js
new file mode 100644
index 0000000000..6deb56868f
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/da_dlg.js
@@ -0,0 +1,74 @@
+tinyMCE.addI18n('da.table_dlg',{
+general_tab:"Generelt",
+advanced_tab:"Avanceret",
+general_props:"Generelle egenskaber",
+advanced_props:"Avancerede egenskaber",
+rowtype:"Row in table part",
+title:"Inds\u00E6t/rediger tabel",
+width:"Bredde",
+height:"H\u00F8jde",
+cols:"Kolonner",
+rows:"R\u00E6kker",
+cellspacing:"Afstand mellem celler",
+cellpadding:"Afstand til celleindhold",
+border:"Kant",
+align:"Justering",
+align_default:"Standard",
+align_left:"Venstre",
+align_right:"H\u00F8jre",
+align_middle:"Centreret",
+row_title:"R\u00E6kkeegenskaber",
+cell_title:"Celleegenskaber",
+cell_type:"Celletype",
+valign:"Vertikal justering",
+align_top:"Top",
+align_bottom:"Bund",
+bordercolor:"Kantfarve",
+bgcolor:"Baggrundsfarve",
+merge_cells_title:"Flet celler",
+id:"Id",
+style:"Style",
+langdir:"Sprogretning",
+langcode:"Sprogkode",
+mime:"Destinations-MIME-type",
+ltr:"Venstre mod h\u00F8jre",
+rtl:"H\u00F8jre mod venstre",
+bgimage:"Baggrundsbillede",
+summary:"Beskrivelse",
+td:"Data",
+th:"Hoved",
+cell_cell:"Opdater aktuelle celle",
+cell_row:"Opdater alle celler i r\u00E6kken",
+cell_all:"Opdater alle celler i tabellen",
+row_row:"Opdater aktuelle celle",
+row_odd:"Opdater ulige r\u00E6kker",
+row_even:"Opdater lige r\u00E6kker",
+row_all:"Opdater alle r\u00E6kker",
+thead:"Tabelhoved",
+tbody:"Tabelkrop",
+tfoot:"Tabelfod",
+scope:"Forklaring",
+rowgroup:"R\u00E6kkegruppe",
+colgroup:"Kolonnegruppe",
+col_limit:"Du har overskredet antallet af tilladte kolonner p\u00E5 {$cols}.",
+row_limit:"Du har overskredet antallet af tilladte r\u00E6kker p\u00E5 {$rows}.",
+cell_limit:"Du har overskredet antallet af tilladte celler p\u00E5 {$cells}.",
+missing_scope:"Er du sikker p\u00E5, du vil forts\u00E6tte uden at angive forklaring for denne overskriftscelle? Uden forklaring vil v\u00E6re sv\u00E6rt for f.ek.s blinde at l\u00E6se og forst\u00E5 indholdet i tabellen.",
+caption:"Tabeloverskrift",
+frame:"Ramme",
+frame_none:"ingen",
+frame_groups:"grupper",
+frame_rows:"r\u00E6kker",
+frame_cols:"kolonner",
+frame_all:"alle",
+rules:"Regler",
+rules_void:"void",
+rules_above:"over",
+rules_below:"under",
+rules_hsides:"hsides",
+rules_lhs:"lhs",
+rules_rhs:"rhs",
+rules_vsides:"vsides",
+rules_box:"boks",
+rules_border:"kant"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/de_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/de_dlg.js
new file mode 100644
index 0000000000..850ffc9064
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/de_dlg.js
@@ -0,0 +1,74 @@
+tinyMCE.addI18n('de.table_dlg',{
+general_tab:"Allgemein",
+advanced_tab:"Erweitert",
+general_props:"Allgemeine Einstellungen",
+advanced_props:"Erweiterte Einstellungen",
+rowtype:"Gruppierung",
+title:"Tabelle einf\u00FCgen/bearbeiten",
+width:"Breite",
+height:"H\u00F6he",
+cols:"Spalten",
+rows:"Zeilen",
+cellspacing:"Zellenabstand",
+cellpadding:"Abstand innerhalb der Zellen",
+border:"Rahmen",
+align:"Ausrichtung",
+align_default:"Standard",
+align_left:"Links",
+align_right:"Rechts",
+align_middle:"Mittig",
+row_title:"Eigenschaften der Zeile",
+cell_title:"Eigenschaften der Zelle",
+cell_type:"Zellentyp",
+valign:"Vertikale Ausrichtung",
+align_top:"Oben",
+align_bottom:"Unten",
+bordercolor:"Rahmenfarbe",
+bgcolor:"Hintergrundfarbe",
+merge_cells_title:"Zellen vereinen",
+id:"ID",
+style:"Format",
+langdir:"Schriftrichtung",
+langcode:"Sprachcode",
+mime:"MIME-Type des Inhalts",
+ltr:"Links nach rechts",
+rtl:"Rechts nach links",
+bgimage:"Hintergrundbild",
+summary:"Zusammenfassung",
+td:"Textzelle",
+th:"\u00DCberschrift",
+cell_cell:"Diese Zelle ver\u00E4ndern",
+cell_row:"Alle Zellen in dieser Zeile ver\u00E4ndern",
+cell_all:"Alle Zellen der Tabelle ver\u00E4ndern",
+row_row:"Diese Zeile ver\u00E4ndern",
+row_odd:"Ungerade Zeilen ver\u00E4ndern",
+row_even:"Gerade Zeilen ver\u00E4ndern",
+row_all:"Alle Zeilen ver\u00E4ndern",
+thead:"Tabellenkopf",
+tbody:"Tabelleninhalt",
+tfoot:"Tabellenfu\u00DF",
+scope:"Bezug",
+rowgroup:"Vertikal gruppieren",
+colgroup:"Horizontal gruppieren",
+col_limit:"Sie haben die maximale Spaltenzahl von {$cols} \u00FCberschritten.",
+row_limit:"Sie haben die maximale Zeilenzahl von {$rows} \u00FCberschritten.",
+cell_limit:"Sie haben die maximale Zellenzahl von {$cells} \u00FCberschritten.",
+missing_scope:"Wollen Sie wirklich keine Beziehung f\u00FCr diese \u00DCberschrift angeben? Benutzer mit k\u00F6rperlichen Einschr\u00E4nkungen k\u00F6nnten Schwierigkeiten haben, den Inhalt der Tabelle zu verstehen.",
+caption:"Beschriftung der Tabelle",
+frame:"Rahmen",
+frame_none:"keine",
+frame_groups:"zwischen Gruppen",
+frame_rows:"zwischen Zeilen",
+frame_cols:"zwischen Spalten",
+frame_all:"zwischen allen Zellen",
+rules:"Gitter",
+rules_void:"keins",
+rules_above:"nur oben",
+rules_below:"nur unten",
+rules_hsides:"oben und unten",
+rules_lhs:"nur links",
+rules_rhs:"nur rechts",
+rules_vsides:"links und rechts",
+rules_box:"alle 4 Seiten (Box)",
+rules_border:"alle 4 Seiten (Border)"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/en_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/en_dlg.js
new file mode 100644
index 0000000000..8352d9ffa1
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/en_dlg.js
@@ -0,0 +1,74 @@
+tinyMCE.addI18n('en.table_dlg',{
+general_tab:"General",
+advanced_tab:"Advanced",
+general_props:"General properties",
+advanced_props:"Advanced properties",
+rowtype:"Row in table part",
+title:"Insert/Modify table",
+width:"Width",
+height:"Height",
+cols:"Columns",
+rows:"Rows",
+cellspacing:"Cellspacing",
+cellpadding:"Cellpadding",
+border:"Border",
+align:"Alignment",
+align_default:"Default",
+align_left:"Left",
+align_right:"Right",
+align_middle:"Center",
+row_title:"Table row properties",
+cell_title:"Table cell properties",
+cell_type:"Cell type",
+valign:"Vertical alignment",
+align_top:"Top",
+align_bottom:"Bottom",
+bordercolor:"Border color",
+bgcolor:"Background color",
+merge_cells_title:"Merge table cells",
+id:"Id",
+style:"Style",
+langdir:"Language direction",
+langcode:"Language code",
+mime:"Target MIME type",
+ltr:"Left to right",
+rtl:"Right to left",
+bgimage:"Background image",
+summary:"Summary",
+td:"Data",
+th:"Header",
+cell_cell:"Update current cell",
+cell_row:"Update all cells in row",
+cell_all:"Update all cells in table",
+row_row:"Update current row",
+row_odd:"Update odd rows in table",
+row_even:"Update even rows in table",
+row_all:"Update all rows in table",
+thead:"Table Head",
+tbody:"Table Body",
+tfoot:"Table Foot",
+scope:"Scope",
+rowgroup:"Row Group",
+colgroup:"Col Group",
+col_limit:"You've exceeded the maximum number of columns of {$cols}.",
+row_limit:"You've exceeded the maximum number of rows of {$rows}.",
+cell_limit:"You've exceeded the maximum number of cells of {$cells}.",
+missing_scope:"Are you sure you want to continue without specifying a scope for this table header cell. Without it, it may be difficult for some users with disabilities to understand the content or data displayed of the table.",
+caption:"Table caption",
+frame:"Frame",
+frame_none:"none",
+frame_groups:"groups",
+frame_rows:"rows",
+frame_cols:"cols",
+frame_all:"all",
+rules:"Rules",
+rules_void:"void",
+rules_above:"above",
+rules_below:"below",
+rules_hsides:"hsides",
+rules_lhs:"lhs",
+rules_rhs:"rhs",
+rules_vsides:"vsides",
+rules_box:"box",
+rules_border:"border"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/es_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/es_dlg.js
new file mode 100644
index 0000000000..53786c4864
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/es_dlg.js
@@ -0,0 +1,74 @@
+tinyMCE.addI18n('es.table_dlg',{
+general_tab:"General",
+advanced_tab:"Avanzado",
+general_props:"Propiedades generales",
+advanced_props:"Propiedades avanzadas",
+rowtype:"Tipo de fila",
+title:"Insertar/Modificar tabla",
+width:"Ancho",
+height:"Alto",
+cols:"Cols",
+rows:"Filas",
+cellspacing:"Espaciado de celda",
+cellpadding:"Relleno de celda",
+border:"Borde",
+align:"Alineaci\u00F3n",
+align_default:"Predet.",
+align_left:"Izquierda",
+align_right:"Derecha",
+align_middle:"Centrado",
+row_title:"Propiedades de la fila",
+cell_title:"Propiedades de la celda",
+cell_type:"Tipo de celda",
+valign:"Alineaci\u00F3n vertical",
+align_top:"Arriba",
+align_bottom:"Debajo",
+bordercolor:"Color del borde",
+bgcolor:"Color de fondo",
+merge_cells_title:"Vincular celdas",
+id:"Id",
+style:"Estilo",
+langdir:"Direcci\u00F3n del lenguaje",
+langcode:"C\u00F3digo del lenguaje",
+mime:"Tipo MIME",
+ltr:"Izquierda a derecha",
+rtl:"Derecha a izquierda",
+bgimage:"Imagen de fondo",
+summary:"Resumen",
+td:"Datos",
+th:"Encabezado",
+cell_cell:"Actualizar celda actual",
+cell_row:"Actualizar todas las celdas en la fila",
+cell_all:"Actualizar todas las celdas en la tabla",
+row_row:"Actualizar fila actual",
+row_odd:"Actualizar filas impares",
+row_even:"Actualizar filas pares",
+row_all:"Actualizar todas las filas",
+thead:"Encabezado de la tabla",
+tbody:"Cuerpo de la tabla",
+tfoot:"Pie de la tabla",
+scope:"Alcance",
+rowgroup:"Grupo de filas",
+colgroup:"Grupo de columnas",
+col_limit:"Ha superado el n\u00FAmero m\u00E1ximo de columnas: {$cols}.",
+row_limit:"Ha superado el n\u00FAmero m\u00E1ximo de filas: {$rows}.",
+cell_limit:"Ha superado el n\u00FAmero m\u00E1ximo de celdas: {$cells}.",
+missing_scope:" \u00BFEst\u00E1 seguro que desea continuar sin especificar el alcance del encabezado de celda? Sin \u00E9l podr\u00EDa ser dificultoso para algunos usuarios entender el contenido o los datos mostrados en la tabla.",
+caption:"Subt\u00EDtulo de la tabla",
+frame:"Recuadro",
+frame_none:"ninguno",
+frame_groups:"grupos",
+frame_rows:"filas",
+frame_cols:"cols",
+frame_all:"todos",
+rules:"Reglas",
+rules_void:"vac\u00EDo",
+rules_above:"encima",
+rules_below:"debajo",
+rules_hsides:"hsides",
+rules_lhs:"lhs",
+rules_rhs:"rhs",
+rules_vsides:"vsides",
+rules_box:"box",
+rules_border:"border"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/fr_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/fr_dlg.js
new file mode 100644
index 0000000000..d49267ed32
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/fr_dlg.js
@@ -0,0 +1,74 @@
+tinyMCE.addI18n('fr.table_dlg',{
+general_tab:"G\u00E9n\u00E9ral",
+advanced_tab:"Avanc\u00E9",
+general_props:"Propri\u00E9t\u00E9s g\u00E9n\u00E9rales",
+advanced_props:"Propri\u00E9t\u00E9s avanc\u00E9es",
+rowtype:"Type de ligne",
+title:"Ins\u00E9rer/Modifier tableau",
+width:"Largeur",
+height:"Hauteur",
+cols:"Colonnes",
+rows:"Lignes",
+cellspacing:"Espacement des cellules",
+cellpadding:"Espacement dans les cellules",
+border:"Bordure",
+align:"Alignement",
+align_default:"Par defaut",
+align_left:"Gauche",
+align_right:"Droit",
+align_middle:"Centr\u00E9",
+row_title:"Propri\u00E9t\u00E9s de la ligne",
+cell_title:"Propri\u00E9t\u00E9s de la cellule",
+cell_type:"Type de cellule",
+valign:"Alignement vertical",
+align_top:"Haut",
+align_bottom:"Bas",
+bordercolor:"Couleur de la bordure",
+bgcolor:"Couleur du fond",
+merge_cells_title:"Fusioner les cellules",
+id:"Id",
+style:"Style",
+langdir:"Sens de lecture",
+langcode:"Code de la langue",
+mime:"Type MIME de la cible",
+ltr:"De gauche \u00E0 droite",
+rtl:"de droite \u00E0 gauche",
+bgimage:"Image de fond",
+summary:"R\u00E9sum\u00E9",
+td:"Donn\u00E9es",
+th:"Titre",
+cell_cell:"Mettre \u00E0 jour la cellule courante",
+cell_row:"Mettre \u00E0 jour toutes les cellules de la ligne",
+cell_all:"Mettre \u00E0 jour toutes les celluls du tableau",
+row_row:"Mettre \u00E0 jour la ligne courante",
+row_odd:"Mettre \u00E0 jour les lignes impaires",
+row_even:"Mettre \u00E0 jour les lignes paires",
+row_all:"Mettre \u00E0 jout toutes les lignes du tableau",
+thead:"T\u00EAte de tableau",
+tbody:"Corps de tableau",
+tfoot:"Pied de tableau",
+scope:"Port\u00E9e",
+rowgroup:"Groupe de lignes",
+colgroup:"Groupe de colonnes",
+col_limit:"Vous avez d\u00E9pass\u00E9 le nombre maximum de colonnes ({$cols}).",
+row_limit:"Vous avez d\u00E9pass\u00E9 le nombre maximum de lignes ({$rows}).",
+cell_limit:"Vous avez d\u00E9pass\u00E9 le nombre maximum de cellules ({$cells}).",
+missing_scope:"\u00CAtes-vous s\u00FBr de vouloir continuer sans sp\u00E9ficier de port\u00E9e pour cette cellule de titre\u00A0? Sans port\u00E9e, cela peut \u00EAtre difficile pour certains usagers \u00E0 probl\u00E8mes de comprendre le contenu ou les donn\u00E9es affich\u00E9es dans le tableau.",
+caption:"Afficher la l\u00E9gende du tableau",
+frame:"Cadre",
+frame_none:"aucun",
+frame_groups:"groupe",
+frame_rows:"lignes",
+frame_cols:"colonnes",
+frame_all:"tous",
+rules:"R\u00E8gles",
+rules_void:"nul",
+rules_above:"au dessus",
+rules_below:"au dessous",
+rules_hsides:"hsides",
+rules_lhs:"lhs",
+rules_rhs:"rhs",
+rules_vsides:"vsides",
+rules_box:"box",
+rules_border:"border"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/it_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/it_dlg.js
new file mode 100644
index 0000000000..4f67340704
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/it_dlg.js
@@ -0,0 +1,74 @@
+tinyMCE.addI18n('it.table_dlg',{
+general_tab:"Generale",
+advanced_tab:"Avanzate",
+general_props:"Propriet\u00E0 generali",
+advanced_props:"Propriet\u00E0 avanzate",
+rowtype:"Riga in una parte di tabella",
+title:"Inserisci/Modifica tabella",
+width:"Larghezza",
+height:"Altezza",
+cols:"Colonne",
+rows:"Righe",
+cellspacing:"Spaziatura celle",
+cellpadding:"Padding celle",
+border:"Bordo",
+align:"Allineamento",
+align_default:"Predefinito",
+align_left:"A sinistra",
+align_right:"A destra",
+align_middle:"Centra",
+row_title:"Propriet\u00E0 riga",
+cell_title:"Propriet\u00E0 cella",
+cell_type:"Tipo cella",
+valign:"Allineamento verticale",
+align_top:"In alto",
+align_bottom:"In basso",
+bordercolor:"Colore bordo",
+bgcolor:"Colore sfondo",
+merge_cells_title:"Unisci celle",
+id:"Id",
+style:"Stile",
+langdir:"Direzione testo",
+langcode:"Lingua",
+mime:"Tipo MIME del target",
+ltr:"Sinistra verso destra",
+rtl:"Destra verso sinistra",
+bgimage:"Immagine sfondo",
+summary:"Sommario",
+td:"Data",
+th:"Intestazione",
+cell_cell:"Aggiorna cella corrente",
+cell_row:"Aggiorna tutte le celle della riga",
+cell_all:"Aggiorna tutte le celle della tabella",
+row_row:"Aggiorna riga corrente",
+row_odd:"Aggiorna righe dispari della tabella",
+row_even:"Aggiorna righe pari della tabella",
+row_all:"Update tutte le righe della tabella",
+thead:"Intestazione tabella",
+tbody:"Corpo tabella",
+tfoot:"Pedice tabella",
+scope:"Scope",
+rowgroup:"Gruppo riga",
+colgroup:"Gruppo colonna",
+col_limit:"Superato il numero massimo di colonne di {$cols}.",
+row_limit:"Superato il numero massimo di righe di {$rows}.",
+cell_limit:"Superato il numero massimo di celle di {$cells}.",
+missing_scope:"Sicuro di proseguire senza aver specificato uno scope per l'intestazione di questa tabella? Senza di esso, potrebbe essere difficoltoso per alcuni utenti con disabilit\u00E0 capire il contenuto o i dati mostrati nella tabella.",
+caption:"Table caption",
+frame:"Cornice",
+frame_none:"nessuna",
+frame_groups:"gruppi",
+frame_rows:"righe",
+frame_cols:"colonne",
+frame_all:"tutte",
+rules:"Regole",
+rules_void:"void",
+rules_above:"above",
+rules_below:"below",
+rules_hsides:"hsides",
+rules_lhs:"lhs",
+rules_rhs:"rhs",
+rules_vsides:"vsides",
+rules_box:"box",
+rules_border:"border"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/nl_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/nl_dlg.js
new file mode 100644
index 0000000000..9aa03fdae1
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/nl_dlg.js
@@ -0,0 +1,74 @@
+tinyMCE.addI18n('nl.table_dlg',{
+general_tab:"Algemeen",
+advanced_tab:"Geavanceerd",
+general_props:"Algemene eigenschappen",
+advanced_props:"Geavanceerde eigenschappen",
+rowtype:"Rijtype",
+title:"Tabel invoegen/bewerken",
+width:"Breedte",
+height:"Hoogte",
+cols:"Kolommen",
+rows:"Rijen",
+cellspacing:"Ruimte om cel",
+cellpadding:"Ruimte in cel",
+border:"Rand",
+align:"Uitlijning",
+align_default:"Standaard",
+align_left:"Links",
+align_right:"Rechts",
+align_middle:"Centreren",
+row_title:"Rij-eigenschappen",
+cell_title:"Celeigenschappen",
+cell_type:"Celtype",
+valign:"Verticale uitlijning",
+align_top:"Boven",
+align_bottom:"Onder",
+bordercolor:"Randkleur",
+bgcolor:"Achtergrondkleur",
+merge_cells_title:"Cellen samenvoegen",
+id:"Id",
+style:"Stijl",
+langdir:"Taalrichting",
+langcode:"Taalcode",
+mime:"Doel MIME type",
+ltr:"Van links naar rechts",
+rtl:"Van rechts naar links",
+bgimage:"Achtergrondafbeelding",
+summary:"Samenvatting",
+td:"Gegevens",
+th:"Kop",
+cell_cell:"Huidige cel bijwerken",
+cell_row:"Alle cellen in rij bijwerken",
+cell_all:"Alle cellen in tabel bijwerken",
+row_row:"Huidige rij bijwerken",
+row_odd:"Oneven rijen bijwerken",
+row_even:"Even rijen bijwerken",
+row_all:"Alle rijen bijweken",
+thead:"Tabelkop",
+tbody:"Tabellichaam",
+tfoot:"Tabelvoet",
+scope:"Bereik",
+rowgroup:"Rijgroep",
+colgroup:"Kolomgroep",
+col_limit:"U heeft het maximale aantal kolommen van {$cols} overschreden.",
+row_limit:"U heeft hebt het maximale aantal rijen van {$rows} overschreden.",
+cell_limit:"U heeft het maximale aantal cellen van {$cells} overschreden.",
+missing_scope:"Weet u zeker dat u door wilt gaan met het toewijzen van een kop zonder een bereik op te geven? Mensen met een visuele handicap kunnen hierdoor waarschijnlijk slecht bij de gegevens.",
+caption:"Tabelbeschrijving",
+frame:"Frame",
+frame_none:"Geen",
+frame_groups:"Groepen",
+frame_rows:"Rijen",
+frame_cols:"Kolommen",
+frame_all:"Alles",
+rules:"Hulplijnen",
+rules_void:"Geen",
+rules_above:"Boven",
+rules_below:"Onder",
+rules_hsides:"Horizontale zijdes",
+rules_lhs:"Linkerzijkant",
+rules_rhs:"Rechterzijkant",
+rules_vsides:"Verticale zijdes",
+rules_box:"Box",
+rules_border:"Rand"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/no_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/no_dlg.js
new file mode 100644
index 0000000000..66b1880124
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/no_dlg.js
@@ -0,0 +1,74 @@
+tinyMCE.addI18n('no.table_dlg',{
+general_tab:"Generelt",
+advanced_tab:"Avansert",
+general_props:"Generelt",
+advanced_props:"Generelle egenskaper",
+rowtype:"Rad i tabell",
+title:"Sett inn / rediger tabell",
+width:"Bredde",
+height:"H\u00F8yde",
+cols:"Kolonner",
+rows:"Rader",
+cellspacing:"Celleavstand",
+cellpadding:"Cellefylling",
+border:"Ramme",
+align:"Justering",
+align_default:"Standard",
+align_left:"Venstre",
+align_right:"H\u00F8yre",
+align_middle:"Midtstilt",
+row_title:"Radegenskaper",
+cell_title:"Celleegenskaper",
+cell_type:"Celletype",
+valign:"Vertikal justering",
+align_top:"Topp",
+align_bottom:"Bunn",
+bordercolor:"Rammefarge",
+bgcolor:"Bakgrunn",
+merge_cells_title:"Sl\u00E5 sammen celler",
+id:"Id",
+style:"Stil",
+langdir:"Skriftretning",
+langcode:"Spr\u00E5kkode",
+mime:"M\u00E5let sin MIME-type",
+ltr:"Venstre mot h\u00F8yre",
+rtl:"H\u00F8yre mot venstre",
+bgimage:"Bakgrunnsbilde",
+summary:"Sammendrag",
+td:"Data",
+th:"Overskrift",
+cell_cell:"Oppdater aktuell celle",
+cell_row:"Oppdater alle celler i raden",
+cell_all:"Oppdater alle celler i tabellen",
+row_row:"Oppdater aktuell rad",
+row_odd:"Oppdater oddetallrader",
+row_even:"Oppdater partallrader",
+row_all:"Oppdater alle rader",
+thead:"Tabellhode",
+tbody:"Tabellkropp",
+tfoot:"Tabellfot",
+scope:"Omr\u00E5de",
+rowgroup:"Radgruppe",
+colgroup:"Kolonnegruppe",
+col_limit:"Du har flere enn maksimalt tillatt kolonner p\u00E5 {$cols}.",
+row_limit:"Du har flere enn maksimalt tillatt rader p\u00E5 {$rows}.",
+cell_limit:"Du har flere enn maksimalt tillatt celler p\u00E5 {$cells}.",
+missing_scope:"Er du sikker p\u00E5 at du vil fortsette uten \u00E5 angi et omr\u00E5de for denne overskrifscella? Uten dette kan det bli vanskelig for enkelte funksjonshemmede brukere \u00E5 forst\u00E5 innholdet eller dataene som blir presenterte i tabellen.",
+caption:"Tabelloverskrift",
+frame:"Ramme",
+frame_none:"ingen",
+frame_groups:"grupper",
+frame_rows:"rader",
+frame_cols:"kolonner",
+frame_all:"alle",
+rules:"Streker",
+rules_void:"ingen",
+rules_above:"over",
+rules_below:"under",
+rules_hsides:"hside",
+rules_lhs:"lhs",
+rules_rhs:"rhs",
+rules_vsides:"vside",
+rules_box:"boks",
+rules_border:"ramme"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/sv_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/sv_dlg.js
new file mode 100644
index 0000000000..bcf81c7155
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/langs/sv_dlg.js
@@ -0,0 +1,73 @@
+tinyMCE.addI18n('sv.table_dlg',{
+general_tab:"Generellt",
+advanced_tab:"Avancerat",
+general_props:"Generella inst\u00E4llningar",
+advanced_props:"Avancerade inst\u00E4llningar",
+rowtype:"Radtyp",
+title:"Infoga/redigera ny tabell",
+width:"Bredd",
+height:"H\u00F6jd",
+cols:"Kolumner",
+rows:"Rader",
+cellspacing:"Cellspacing",
+cellpadding:"Cellpadding",
+border:"Ram",
+align:"Justering",
+align_default:"Ingen",
+align_left:"V\u00E4nster",
+align_right:"H\u00F6ger",
+align_middle:"Mitten",
+row_title:"Tabellradsinst\u00E4llningar",
+cell_title:"Tabellcellsinst\u00E4llningar",
+cell_type:"Celltyp",
+valign:"Vertikal justering",
+align_top:"Toppen",
+align_bottom:"Botten",
+bordercolor:"Ramf\u00E4rg",
+bgcolor:"Bakgrundsf\u00E4rg",
+merge_cells_title:"Sammanfoga celler",
+id:"Id",
+style:"Stil",
+langdir:"Skriftriktning",
+langcode:"Spr\u00E5kkod",
+ltr:"V\u00E4nster till h\u00F6ger",
+rtl:"H\u00F6ger till v\u00E4nster",
+bgimage:"Bakgrundsbild",
+summary:"Sammanfattning",
+td:"Data",
+th:"Huvud",
+cell_cell:"Uppdatera nuvarande cell",
+cell_row:"Uppdatera alla celler i raden",
+cell_all:"Uppdatera alla celler i tabellen",
+row_row:"Uppdatera nuvarande rad",
+row_odd:"Uppdatera udda rader i tabellen",
+row_even:"Uppdatera j\u00E4mna rader i tabellen",
+row_all:"Uppdatera alla rader i tabellen",
+thead:"tabellhuvud",
+tbody:"tabellkropp",
+tfoot:"tabellfot",
+scope:"Omfattning",
+rowgroup:"Radgrupp",
+colgroup:"Kolumngrupp",
+col_limit:"Du kan inte ange fler \u00E4n {$cols} kolumner.",
+row_limit:"Du kan inte ange fler \u00E4n {$rows} rader.",
+cell_limit:"Du kan inte skapa en tabell med fler \u00E4n {$cells} celler.",
+missing_scope:"\u00D6\u0084r du s\u00E4ker p\u00E5 att du vill forts\u00E4tta utan att ange en omfattning, denna underl\u00E4ttar f\u00F6r icke-grafiska webbl\u00E4sare.",
+caption:"\u00D6verskrift",
+frame:"Ram",
+frame_none:"none",
+frame_groups:"groups",
+frame_rows:"rows",
+frame_cols:"cols",
+frame_all:"all",
+rules:"Regler",
+rules_void:"void",
+rules_above:"above",
+rules_below:"below",
+rules_hsides:"hsides",
+rules_lhs:"lhs",
+rules_rhs:"rhs",
+rules_vsides:"vsides",
+rules_box:"box",
+rules_border:"border"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/merge_cells.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/merge_cells.htm
new file mode 100644
index 0000000000..d231090e79
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/merge_cells.htm
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#table_dlg.merge_cells_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/validate.js"></script>
+	<script type="text/javascript" src="js/merge_cells.js"></script>
+</head>
+<body style="margin: 8px" role="application">
+<form onsubmit="MergeCellsDialog.merge();return false;" action="#">
+	<fieldset>
+		<legend>{#table_dlg.merge_cells_title}</legend>
+		<table role="presentation" border="0" cellpadding="0" cellspacing="3" width="100%">
+			<tr>
+				<td><label for="numcols">{#table_dlg.cols}</label>:</td>
+				<td align="right"><input type="text" id="numcols" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" aria-required="true" /></td>
+			</tr>
+			<tr>
+				<td><label for="numrows">{#table_dlg.rows}</label>:</td>
+				<td align="right"><input type="text" id="numrows" name="numrows" value="" class="number min1" style="width: 30px" aria-required="true" /></td>
+			</tr>
+		</table>
+	</fieldset>
+
+	<div class="mceActionPanel">
+		<input type="submit" id="insert" name="insert" value="{#update}" />
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+	</div>
+</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/row.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/row.htm
new file mode 100644
index 0000000000..c197ff6c70
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/row.htm
@@ -0,0 +1,157 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#table_dlg.row_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/row.js"></script>
+	<link href="css/row.css" rel="stylesheet" type="text/css" />
+</head>
+<body id="tablerow" style="display: none" role="application">
+	<form onsubmit="updateAction();return false;" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+					<legend>{#table_dlg.general_props}</legend>
+
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td><label for="rowtype">{#table_dlg.rowtype}</label></td>
+							<td class="col2">
+								<select id="rowtype" name="rowtype" class="mceFocus">
+									<option value="thead">{#table_dlg.thead}</option>
+									<option value="tbody">{#table_dlg.tbody}</option>
+									<option value="tfoot">{#table_dlg.tfoot}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="align">{#table_dlg.align}</label></td>
+							<td class="col2">
+								<select id="align" name="align">
+									<option value="">{#not_set}</option>
+									<option value="center">{#table_dlg.align_middle}</option>
+									<option value="left">{#table_dlg.align_left}</option>
+									<option value="right">{#table_dlg.align_right}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="valign">{#table_dlg.valign}</label></td>
+							<td class="col2">
+								<select id="valign" name="valign">
+									<option value="">{#not_set}</option>
+									<option value="top">{#table_dlg.align_top}</option>
+									<option value="middle">{#table_dlg.align_middle}</option>
+									<option value="bottom">{#table_dlg.align_bottom}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr id="styleSelectRow">
+							<td><label for="class">{#class_name}</label></td>
+							<td class="col2">
+								<select id="class" name="class" class="mceEditableSelect">
+									<option value="" selected="selected">{#not_set}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="height">{#table_dlg.height}</label></td>
+							<td class="col2"><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<fieldset>
+					<legend>{#table_dlg.advanced_props}</legend>
+
+					<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+						<tr>
+							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 
+							<td><input id="id" name="id" type="text" value="" style="width: 200px" /></td> 
+						</tr>
+
+						<tr>
+							<td><label for="style">{#table_dlg.style}</label></td>
+							<td><input type="text" id="style" name="style" value="" style="width: 200px;" onchange="changedStyle();" /></td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="dir">{#table_dlg.langdir}</label></td> 
+							<td>
+								<select id="dir" name="dir" style="width: 200px"> 
+										<option value="">{#not_set}</option> 
+										<option value="ltr">{#table_dlg.ltr}</option> 
+										<option value="rtl">{#table_dlg.rtl}</option> 
+								</select>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="lang">{#table_dlg.langcode}</label></td> 
+							<td>
+								<input id="lang" name="lang" type="text" value="" style="width: 200px" />
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>
+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="bgcolor" id="bgcolor_label">{#table_dlg.bgcolor}</label></td> 
+							<td>
+								<span role="group" aria-labelledby="bgcolor_label">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
+										<td id="bgcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+								</span>
+							</td> 
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div>
+				<select id="action" name="action">
+					<option value="row">{#table_dlg.row_row}</option>
+					<option value="odd">{#table_dlg.row_odd}</option>
+					<option value="even">{#table_dlg.row_even}</option>
+					<option value="all">{#table_dlg.row_all}</option>
+				</select>
+			</div>
+
+			<input type="submit" id="insert" name="insert" value="{#update}" />
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/table/table.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/table.htm
new file mode 100644
index 0000000000..4a873b0a6f
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/table/table.htm
@@ -0,0 +1,188 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#table_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/validate.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/table.js"></script>
+	<link href="css/table.css" rel="stylesheet" type="text/css" />
+</head>
+<body id="table" style="display: none" role="application" aria-labelledby="app_title">
+	<span style="display:none;" id="app_title">{#table_dlg.title}</span>
+	<form onsubmit="insertTable();return false;" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" aria-controls="general_panel" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+					<legend>{#table_dlg.general_props}</legend>
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0" width="100%">
+						<tr>
+							<td><label id="colslabel" for="cols">{#table_dlg.cols}</label></td>
+							<td><input id="cols" name="cols" type="text" value="" size="3" maxlength="3" class="required number min1 mceFocus" aria-required="true" /></td>
+							<td><label id="rowslabel" for="rows">{#table_dlg.rows}</label></td>
+							<td><input id="rows" name="rows" type="text" value="" size="3" maxlength="3" class="required number min1" aria-required="true" /></td>
+						</tr>
+						<tr>
+							<td><label id="cellpaddinglabel" for="cellpadding">{#table_dlg.cellpadding}</label></td>
+							<td><input id="cellpadding" name="cellpadding" type="text" value="" size="3" maxlength="3" class="number" /></td>
+							<td><label id="cellspacinglabel" for="cellspacing">{#table_dlg.cellspacing}</label></td>
+							<td><input id="cellspacing" name="cellspacing" type="text" value="" size="3" maxlength="3" class="number" /></td>
+						</tr>
+						<tr>
+							<td><label id="alignlabel" for="align">{#table_dlg.align}</label></td>
+							<td><select id="align" name="align">
+								<option value="">{#not_set}</option>
+								<option value="center">{#table_dlg.align_middle}</option>
+								<option value="left">{#table_dlg.align_left}</option>
+								<option value="right">{#table_dlg.align_right}</option>
+							</select></td>
+							<td><label id="borderlabel" for="border">{#table_dlg.border}</label></td>
+							<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="changedBorder();" class="number" /></td>
+						</tr>
+						<tr id="width_row">
+							<td><label id="widthlabel" for="width">{#table_dlg.width}</label></td>
+							<td><input name="width" type="text" id="width" value="" size="4" maxlength="4" onchange="changedSize();" class="size" /></td>
+							<td><label id="heightlabel" for="height">{#table_dlg.height}</label></td>
+							<td><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" class="size" /></td>
+						</tr>
+						<tr id="styleSelectRow" >
+							<td><label id="classlabel" for="class">{#class_name}</label></td>
+							<td colspan="3" >
+							 <select id="class" name="class" class="mceEditableSelect">
+								<option value="" selected="selected">{#not_set}</option>
+							 </select></td>
+						</tr>
+						<tr>
+							<td class="column1" ><label for="caption">{#table_dlg.caption}</label></td> 
+							<td><input id="caption" name="caption" type="checkbox" class="checkbox" value="true" /></td> 
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<fieldset>
+					<legend>{#table_dlg.advanced_props}</legend>
+
+					<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+						<tr>
+							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 
+							<td><input id="id" name="id" type="text" value="" class="advfield" /></td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="summary">{#table_dlg.summary}</label></td> 
+							<td><input id="summary" name="summary" type="text" value="" class="advfield" /></td> 
+						</tr>
+
+						<tr>
+							<td><label for="style">{#table_dlg.style}</label></td>
+							<td><input type="text" id="style" name="style" value="" class="advfield" onchange="changedStyle();" /></td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="langlabel" for="lang">{#table_dlg.langcode}</label></td> 
+							<td>
+								<input id="lang" name="lang" type="text" value="" class="advfield" />
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 
+							<td>
+								<table role="presentation" aria-labelledby="backgroundimage_label" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" class="advfield" onchange="changedBackgroundImage();" /></td>
+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="tframe">{#table_dlg.frame}</label></td> 
+							<td>
+								<select id="tframe" name="tframe" class="advfield"> 
+										<option value="">{#not_set}</option>
+										<option value="void">{#table_dlg.rules_void}</option>
+										<option value="above">{#table_dlg.rules_above}</option> 
+										<option value="below">{#table_dlg.rules_below}</option> 
+										<option value="hsides">{#table_dlg.rules_hsides}</option> 
+										<option value="lhs">{#table_dlg.rules_lhs}</option> 
+										<option value="rhs">{#table_dlg.rules_rhs}</option> 
+										<option value="vsides">{#table_dlg.rules_vsides}</option> 
+										<option value="box">{#table_dlg.rules_box}</option> 
+										<option value="border">{#table_dlg.rules_border}</option> 
+								</select>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="rules">{#table_dlg.rules}</label></td> 
+							<td>
+								<select id="rules" name="rules" class="advfield"> 
+										<option value="">{#not_set}</option> 
+										<option value="none">{#table_dlg.frame_none}</option>
+										<option value="groups">{#table_dlg.frame_groups}</option>
+										<option value="rows">{#table_dlg.frame_rows}</option>
+										<option value="cols">{#table_dlg.frame_cols}</option>
+										<option value="all">{#table_dlg.frame_all}</option>
+									</select>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="dir">{#table_dlg.langdir}</label></td> 
+							<td>
+								<select id="dir" name="dir" class="advfield"> 
+										<option value="">{#not_set}</option> 
+										<option value="ltr">{#table_dlg.ltr}</option> 
+										<option value="rtl">{#table_dlg.rtl}</option> 
+								</select>
+							</td> 
+						</tr>
+
+						<tr role="group" aria-labelledby="bordercolor_label">
+							<td class="column1"><label id="bordercolor_label" for="bordercolor">{#table_dlg.bordercolor}</label></td> 
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>
+										<td id="bordercolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr role="group" aria-labelledby="bgcolor_label">
+							<td class="column1"><label id="bgcolor_label" for="bgcolor">{#table_dlg.bgcolor}</label></td> 
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
+										<td id="bgcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<input type="submit" id="insert" name="insert" value="{#insert}" />
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/blank.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/blank.htm
new file mode 100644
index 0000000000..ecde53fae7
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/blank.htm
@@ -0,0 +1,12 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>blank_page</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<script type="text/javascript">
+		parent.TemplateDialog.loadCSSFiles(document);
+	</script>
+</head>
+<body id="mceTemplatePreview" class="mceContentBody">
+
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/css/template.css b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/css/template.css
new file mode 100644
index 0000000000..2d23a4938c
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/css/template.css
@@ -0,0 +1,23 @@
+#frmbody {
+	padding: 10px;
+	background-color: #FFF;
+	border: 1px solid #CCC;
+}
+
+.frmRow {
+	margin-bottom: 10px;
+}
+
+#templatesrc {
+	border: none;
+	width: 320px;
+	height: 240px;
+}
+
+.title {
+	padding-bottom: 5px;
+}
+
+.mceActionPanel {
+	padding-top: 5px;
+}
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/editor_plugin.js
new file mode 100644
index 0000000000..ebe3c27d78
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.TemplatePlugin",{init:function(b,c){var d=this;d.editor=b;b.addCommand("mceTemplate",function(e){b.windowManager.open({file:c+"/template.htm",width:b.getParam("template_popup_width",750),height:b.getParam("template_popup_height",600),inline:1},{plugin_url:c})});b.addCommand("mceInsertTemplate",d._insertTemplate,d);b.addButton("template",{title:"template.desc",cmd:"mceTemplate"});b.onPreProcess.add(function(e,g){var f=e.dom;a(f.select("div",g.node),function(h){if(f.hasClass(h,"mceTmpl")){a(f.select("*",h),function(i){if(f.hasClass(i,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))){i.innerHTML=d._getDateTime(new Date(),e.getParam("template_mdate_format",e.getLang("template.mdate_format")))}});d._replaceVals(h)}})})},getInfo:function(){return{longname:"Template plugin",author:"Moxiecode Systems AB",authorurl:"http://www.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/template",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_insertTemplate:function(i,j){var k=this,g=k.editor,f,c,d=g.dom,b=g.selection.getContent();f=j.content;a(k.editor.getParam("template_replace_values"),function(l,h){if(typeof(l)!="function"){f=f.replace(new RegExp("\\{\\$"+h+"\\}","g"),l)}});c=d.create("div",null,f);n=d.select(".mceTmpl",c);if(n&&n.length>0){c=d.create("div",null);c.appendChild(n[0].cloneNode(true))}function e(l,h){return new RegExp("\\b"+h+"\\b","g").test(l.className)}a(d.select("*",c),function(h){if(e(h,g.getParam("template_cdate_classes","cdate").replace(/\s+/g,"|"))){h.innerHTML=k._getDateTime(new Date(),g.getParam("template_cdate_format",g.getLang("template.cdate_format")))}if(e(h,g.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))){h.innerHTML=k._getDateTime(new Date(),g.getParam("template_mdate_format",g.getLang("template.mdate_format")))}if(e(h,g.getParam("template_selected_content_classes","selcontent").replace(/\s+/g,"|"))){h.innerHTML=b}});k._replaceVals(c);g.execCommand("mceInsertContent",false,c.innerHTML);g.addVisual()},_replaceVals:function(c){var d=this.editor.dom,b=this.editor.getParam("template_replace_values");a(d.select("*",c),function(f){a(b,function(g,e){if(d.hasClass(f,e)){if(typeof(b[e])=="function"){b[e](f)}}})})},_getDateTime:function(e,b){if(!b){return""}function c(g,d){var f;g=""+g;if(g.length<d){for(f=0;f<(d-g.length);f++){g="0"+g}}return g}b=b.replace("%D","%m/%d/%y");b=b.replace("%r","%I:%M:%S %p");b=b.replace("%Y",""+e.getFullYear());b=b.replace("%y",""+e.getYear());b=b.replace("%m",c(e.getMonth()+1,2));b=b.replace("%d",c(e.getDate(),2));b=b.replace("%H",""+c(e.getHours(),2));b=b.replace("%M",""+c(e.getMinutes(),2));b=b.replace("%S",""+c(e.getSeconds(),2));b=b.replace("%I",""+((e.getHours()+11)%12+1));b=b.replace("%p",""+(e.getHours()<12?"AM":"PM"));b=b.replace("%B",""+this.editor.getLang("template_months_long").split(",")[e.getMonth()]);b=b.replace("%b",""+this.editor.getLang("template_months_short").split(",")[e.getMonth()]);b=b.replace("%A",""+this.editor.getLang("template_day_long").split(",")[e.getDay()]);b=b.replace("%a",""+this.editor.getLang("template_day_short").split(",")[e.getDay()]);b=b.replace("%%","%");return b}});tinymce.PluginManager.add("template",tinymce.plugins.TemplatePlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/editor_plugin_src.js
new file mode 100644
index 0000000000..9cac269919
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/editor_plugin_src.js
@@ -0,0 +1,159 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.plugins.TemplatePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceTemplate', function(ui) {
+				ed.windowManager.open({
+					file : url + '/template.htm',
+					width : ed.getParam('template_popup_width', 750),
+					height : ed.getParam('template_popup_height', 600),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceInsertTemplate', t._insertTemplate, t);
+
+			// Register buttons
+			ed.addButton('template', {title : 'template.desc', cmd : 'mceTemplate'});
+
+			ed.onPreProcess.add(function(ed, o) {
+				var dom = ed.dom;
+
+				each(dom.select('div', o.node), function(e) {
+					if (dom.hasClass(e, 'mceTmpl')) {
+						each(dom.select('*', e), function(e) {
+							if (dom.hasClass(e, ed.getParam('template_mdate_classes', 'mdate').replace(/\s+/g, '|')))
+								e.innerHTML = t._getDateTime(new Date(), ed.getParam("template_mdate_format", ed.getLang("template.mdate_format")));
+						});
+
+						t._replaceVals(e);
+					}
+				});
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Template plugin',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://www.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/template',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		_insertTemplate : function(ui, v) {
+			var t = this, ed = t.editor, h, el, dom = ed.dom, sel = ed.selection.getContent();
+
+			h = v.content;
+
+			each(t.editor.getParam('template_replace_values'), function(v, k) {
+				if (typeof(v) != 'function')
+					h = h.replace(new RegExp('\\{\\$' + k + '\\}', 'g'), v);
+			});
+
+			el = dom.create('div', null, h);
+
+			// Find template element within div
+			n = dom.select('.mceTmpl', el);
+			if (n && n.length > 0) {
+				el = dom.create('div', null);
+				el.appendChild(n[0].cloneNode(true));
+			}
+
+			function hasClass(n, c) {
+				return new RegExp('\\b' + c + '\\b', 'g').test(n.className);
+			};
+
+			each(dom.select('*', el), function(n) {
+				// Replace cdate
+				if (hasClass(n, ed.getParam('template_cdate_classes', 'cdate').replace(/\s+/g, '|')))
+					n.innerHTML = t._getDateTime(new Date(), ed.getParam("template_cdate_format", ed.getLang("template.cdate_format")));
+
+				// Replace mdate
+				if (hasClass(n, ed.getParam('template_mdate_classes', 'mdate').replace(/\s+/g, '|')))
+					n.innerHTML = t._getDateTime(new Date(), ed.getParam("template_mdate_format", ed.getLang("template.mdate_format")));
+
+				// Replace selection
+				if (hasClass(n, ed.getParam('template_selected_content_classes', 'selcontent').replace(/\s+/g, '|')))
+					n.innerHTML = sel;
+			});
+
+			t._replaceVals(el);
+
+			ed.execCommand('mceInsertContent', false, el.innerHTML);
+			ed.addVisual();
+		},
+
+		_replaceVals : function(e) {
+			var dom = this.editor.dom, vl = this.editor.getParam('template_replace_values');
+
+			each(dom.select('*', e), function(e) {
+				each(vl, function(v, k) {
+					if (dom.hasClass(e, k)) {
+						if (typeof(vl[k]) == 'function')
+							vl[k](e);
+					}
+				});
+			});
+		},
+
+		_getDateTime : function(d, fmt) {
+				if (!fmt)
+					return "";
+
+				function addZeros(value, len) {
+					var i;
+
+					value = "" + value;
+
+					if (value.length < len) {
+						for (i=0; i<(len-value.length); i++)
+							value = "0" + value;
+					}
+
+					return value;
+				}
+
+				fmt = fmt.replace("%D", "%m/%d/%y");
+				fmt = fmt.replace("%r", "%I:%M:%S %p");
+				fmt = fmt.replace("%Y", "" + d.getFullYear());
+				fmt = fmt.replace("%y", "" + d.getYear());
+				fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));
+				fmt = fmt.replace("%d", addZeros(d.getDate(), 2));
+				fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));
+				fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));
+				fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));
+				fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));
+				fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));
+				fmt = fmt.replace("%B", "" + this.editor.getLang("template_months_long").split(',')[d.getMonth()]);
+				fmt = fmt.replace("%b", "" + this.editor.getLang("template_months_short").split(',')[d.getMonth()]);
+				fmt = fmt.replace("%A", "" + this.editor.getLang("template_day_long").split(',')[d.getDay()]);
+				fmt = fmt.replace("%a", "" + this.editor.getLang("template_day_short").split(',')[d.getDay()]);
+				fmt = fmt.replace("%%", "%");
+
+				return fmt;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('template', tinymce.plugins.TemplatePlugin);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/js/template.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/js/template.js
new file mode 100644
index 0000000000..bc3045d244
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/js/template.js
@@ -0,0 +1,106 @@
+tinyMCEPopup.requireLangPack();
+
+var TemplateDialog = {
+	preInit : function() {
+		var url = tinyMCEPopup.getParam("template_external_list_url");
+
+		if (url != null)
+			document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></sc'+'ript>');
+	},
+
+	init : function() {
+		var ed = tinyMCEPopup.editor, tsrc, sel, x, u;
+
+ 		tsrc = ed.getParam("template_templates", false);
+ 		sel = document.getElementById('tpath');
+
+		// Setup external template list
+		if (!tsrc && typeof(tinyMCETemplateList) != 'undefined') {
+			for (x=0, tsrc = []; x<tinyMCETemplateList.length; x++)
+				tsrc.push({title : tinyMCETemplateList[x][0], src : tinyMCETemplateList[x][1], description : tinyMCETemplateList[x][2]});
+		}
+
+		for (x=0; x<tsrc.length; x++)
+			sel.options[sel.options.length] = new Option(tsrc[x].title, tinyMCEPopup.editor.documentBaseURI.toAbsolute(tsrc[x].src));
+
+		this.resize();
+		this.tsrc = tsrc;
+	},
+
+	resize : function() {
+		var w, h, e;
+
+		if (!self.innerWidth) {
+			w = document.body.clientWidth - 50;
+			h = document.body.clientHeight - 160;
+		} else {
+			w = self.innerWidth - 50;
+			h = self.innerHeight - 170;
+		}
+
+		e = document.getElementById('templatesrc');
+
+		if (e) {
+			e.style.height = Math.abs(h) + 'px';
+			e.style.width = Math.abs(w - 5) + 'px';
+		}
+	},
+
+	loadCSSFiles : function(d) {
+		var ed = tinyMCEPopup.editor;
+
+		tinymce.each(ed.getParam("content_css", '').split(','), function(u) {
+			d.write('<link href="' + ed.documentBaseURI.toAbsolute(u) + '" rel="stylesheet" type="text/css" />');
+		});
+	},
+
+	selectTemplate : function(u, ti) {
+		var d = window.frames['templatesrc'].document, x, tsrc = this.tsrc;
+
+		if (!u)
+			return;
+
+		d.body.innerHTML = this.templateHTML = this.getFileContents(u);
+
+		for (x=0; x<tsrc.length; x++) {
+			if (tsrc[x].title == ti)
+				document.getElementById('tmpldesc').innerHTML = tsrc[x].description || '';
+		}
+	},
+
+ 	insert : function() {
+		tinyMCEPopup.execCommand('mceInsertTemplate', false, {
+			content : this.templateHTML,
+			selection : tinyMCEPopup.editor.selection.getContent()
+		});
+
+		tinyMCEPopup.close();
+	},
+
+	getFileContents : function(u) {
+		var x, d, t = 'text/plain';
+
+		function g(s) {
+			x = 0;
+
+			try {
+				x = new ActiveXObject(s);
+			} catch (s) {
+			}
+
+			return x;
+		};
+
+		x = window.ActiveXObject ? g('Msxml2.XMLHTTP') || g('Microsoft.XMLHTTP') : new XMLHttpRequest();
+
+		// Synchronous AJAX load file
+		x.overrideMimeType && x.overrideMimeType(t);
+		x.open("GET", u, false);
+		x.send(null);
+
+		return x.responseText;
+	}
+};
+
+TemplateDialog.preInit();
+tinyMCEPopup.onInit.add(TemplateDialog.init, TemplateDialog);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/da_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/da_dlg.js
new file mode 100644
index 0000000000..e9fc0c9569
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/da_dlg.js
@@ -0,0 +1,15 @@
+tinyMCE.addI18n('da.template_dlg',{
+title:"Skabeloner",
+label:"Skabelon",
+desc_label:"Beskrivelse",
+desc:"Inds\u00E6t pr\u00E6defineret skabelonindhold",
+select:"V\u00E6lg en skabelon",
+preview:"Vis udskrift",
+warning:"Advarsel: Opdatering af en skabelon med en anden kan betyde datatab.",
+mdate_format:"%Y-%m-%d %H:%M:%S",
+cdate_format:"%Y-%m-%d %H:%M:%S",
+months_long:"Januar,Februar,Marts,April,Maj,Juni,Juli,August,September,Oktober,November,December",
+months_short:"Jan,Feb,Mar,Apr,Maj,Jun,Jul,Aug,Sep,Okt,Nov,Dec",
+day_long:"S\u00F8ndag,Mandag,Tirsdag,Onsdag,Torsdag,Fredag,L\u00F8rdag,S\u00F8ndag",
+day_short:"S\u00F8n,Man,Tirs,Ons,Tors,Fre,L\u00F8r,S\u00F8n"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/de_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/de_dlg.js
new file mode 100644
index 0000000000..8a5b1ba879
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/de_dlg.js
@@ -0,0 +1,15 @@
+tinyMCE.addI18n('de.template_dlg',{
+title:"Vorlagen",
+label:"Vorlage",
+desc_label:"Beschreibung",
+desc:"Vorgefertigten Vorlageninhalt einf\u00FCgen",
+select:"Vorlage ausw\u00E4hlen",
+preview:"Vorschau",
+warning:"Warnung: Eine Vorlage mit einer anderen zu aktualisieren kann einen Datenverlust herbeif\u00FChren!",
+mdate_format:"%Y-%m-%d %H:%M:%S",
+cdate_format:"%Y-%m-%d %H:%M:%S",
+months_long:"Januar,Februar,M\u00E4rz,April,Mai,Juni,Juli,August,September,Oktober,November,Dezember",
+months_short:"Jan,Feb,M\u00E4rz,Apr,Mai,Juni,Juli,Aug,Sept,Okt,Nov,Dez",
+day_long:"Sonntag,Montag,Dienstag,Mittwoch,Donnerstag,Freitag,Samstag,Sonntag",
+day_short:"So,Mo,Di,Mi,Do,Fr,Sa,So"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/en_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/en_dlg.js
new file mode 100644
index 0000000000..2471c3fa04
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/en_dlg.js
@@ -0,0 +1,15 @@
+tinyMCE.addI18n('en.template_dlg',{
+title:"Templates",
+label:"Template",
+desc_label:"Description",
+desc:"Insert predefined template content",
+select:"Select a template",
+preview:"Preview",
+warning:"Warning: Updating a template with a different one may cause data loss.",
+mdate_format:"%Y-%m-%d %H:%M:%S",
+cdate_format:"%Y-%m-%d %H:%M:%S",
+months_long:"January,February,March,April,May,June,July,August,September,October,November,December",
+months_short:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec",
+day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday",
+day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/es_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/es_dlg.js
new file mode 100644
index 0000000000..81f15887cf
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/es_dlg.js
@@ -0,0 +1,15 @@
+tinyMCE.addI18n('es.template_dlg',{
+title:"Plantillas",
+label:"Plantilla",
+desc_label:"Descripci\u00F3n",
+desc:"Insertar contenido de plantilla predefinida",
+select:"Seleccionar plantilla",
+preview:"Vista previa",
+warning:"Cuidado: Actualizar una plantilla con otra puede causar p\u00E9rdida de datos.",
+mdate_format:"%d-%m-%Y %H:%M:%S",
+cdate_format:"%d-%m-%Y %H:%M:%S",
+months_long:"Enero,Febrero,Marzo,Abril,Mayo,Junio,Julio,Agosto,Septiembre,Octubre,Noviembre,Diciembre",
+months_short:"Ene,Feb,Mar,Abr,May,Jun,Jul,Ago,Sep,Oct,Nov,Dic",
+day_long:"Domingo,Lunes,Martes,Mi\u00E9rcoles,Jueves,Viernes,S\u00E1bado,Domingo",
+day_short:"Dom,Lun,Mar,Mie,Jue,Vie,Sab,Dom"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/fr_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/fr_dlg.js
new file mode 100644
index 0000000000..46e5e27328
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/fr_dlg.js
@@ -0,0 +1,15 @@
+tinyMCE.addI18n('fr.template_dlg',{
+title:"Mod\u00E8les",
+label:"Mod\u00E8le",
+desc_label:"Description",
+desc:"Ins\u00E9rer un mod\u00E8le pr\u00E9d\u00E9fini",
+select:"Choisir un mod\u00E8le",
+preview:"Pr\u00E9visualiser",
+warning:"Attention : Changer un mod\u00E8le pour un autre peut entra\u00EEner une perte de donn\u00E9es !",
+mdate_format:"%d-%m-%Y %H:%M:%S",
+cdate_format:"%d-%m-%Y %H:%M:%S",
+months_long:"Janvier,F\u00E9vrier,Mars,Avril,Mai,Juin,Juillet,Ao\u00FBt,Septembre,Octobre,Novembre,D\u00E9cembre",
+months_short:"Jan,F\u00E9v,Mar,Avr,Mai,Juin,Juil,Ao\u00FBt,Sep,Oct,Nov,D\u00E9c",
+day_long:"Dimanche,Lundi,Mardi,Mercredi,Jeudi,Vendredi,Samedi,Dimanche",
+day_short:"Dim,Lun,Mar,Mer,Jeu,Ven,Sam,Dim"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/it_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/it_dlg.js
new file mode 100644
index 0000000000..96cd2b39a3
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/it_dlg.js
@@ -0,0 +1,15 @@
+tinyMCE.addI18n('it.template_dlg',{
+title:"Modelli",
+label:"Modello",
+desc_label:"Descrizione",
+desc:"Inserisci contenuto da modello predefinito",
+select:"Seleziona un modello",
+preview:"Anteprima",
+warning:"Attenzione: Aggiornare un modello con un altro differente pu\u00F2 causare perdite di dati.",
+mdate_format:"%Y-%m-%d %H:%M:%S",
+cdate_format:"%Y-%m-%d %H:%M:%S",
+months_long:"Gennaio,Febbraio,Marzo,Aprile,Maggio,Giugno,Luglio,Agosto,Settembre,Ottobre,Novembre,Dicembre",
+months_short:"Gen,Feb,Mar,Apr,Mag,Giu,Lug,Ago,Set,Ott,Nov,Dic",
+day_long:"Domenica,Luned\u00EC,Marted\u00EC,Mercoled\u00EC,Gioved\u00EC,Venerd\u00EC,Sabato,Domenica",
+day_short:"Dom,Lun,Mar,Mer,Gio,Ven,Sab,Dom"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/nl_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/nl_dlg.js
new file mode 100644
index 0000000000..ffd6a21c2c
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/nl_dlg.js
@@ -0,0 +1,15 @@
+tinyMCE.addI18n('nl.template_dlg',{
+title:"Sjablonen",
+label:"Sjabloon",
+desc_label:"Beschrijving",
+desc:"Voorgedefineerd sjabloon invoegen",
+select:"Selecteer een sjabloon",
+preview:"Voorbeeld",
+warning:"Waarschuwing: het bijwerken van een sjabloon met een andere kan informatie verwijderen.",
+mdate_format:"%d-%m-%Y %H:%M:%S",
+cdate_format:"%d-%m-%Y %H:%M:%S",
+months_long:"Januari,Februari,Maart,April,Mei,Juni,Juli,Augustus,September,Oktober,November,December",
+months_short:"Jan,Feb,Mar,Apr,Mei,Jun,Jul,Aug,Sep,Okt,Nov,Dec",
+day_long:"Zondag,Maandag,Dinsdag,Woensdag,Donderdag,Vrijdag,Zaterdag,Zonday",
+day_short:"Zon,Ma,Di,Woe,Do,Vrij,Zat,Zon"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/no_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/no_dlg.js
new file mode 100644
index 0000000000..01914eebda
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/no_dlg.js
@@ -0,0 +1,15 @@
+tinyMCE.addI18n('no.template_dlg',{
+title:"Maler",
+label:"Mal",
+desc_label:"Omtale",
+desc:"Sett inn forh\u00E5ndsdefinert malinnhold",
+select:"Velg en mal",
+preview:"Forh\u00E5ndsvis",
+warning:"Advarsel: Utskifting av en mal med en annen kan f\u00F8re til at data g\u00E5r tapt.",
+mdate_format:"%d-%m-%Y %H:%M:%S",
+cdate_format:"%d-%m-%Y %H:%M:%S",
+months_long:"januar,februar,mars,april,mai,juni,juli,august,september,oktober,november,desember",
+months_short:"jan,feb,mar,apr,mai,jun,jul,aug,sep,okt,nov,des",
+day_long:"s\u00F8ndag,mandag,tirsdag,onsdag,torsdag,fredag,l\u00F8rdag,s\u00F8ndag",
+day_short:"s\u00F8n,man,tir,ons,tor,fre,l\u00F8r,s\u00F8n"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/sv_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/sv_dlg.js
new file mode 100644
index 0000000000..fe00df8e64
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/langs/sv_dlg.js
@@ -0,0 +1,15 @@
+tinyMCE.addI18n('sv.template_dlg',{
+title:"Mallar",
+label:"Mall",
+desc_label:"Beskrivning",
+desc:"Infoga en f\u00E4rdig mall",
+select:"V\u00E4lj en mall",
+preview:"F\u00F6rhandsgranska",
+warning:"Varning: Uppdaterar en mall med en ny kan inneb\u00E4ra att data f\u00F6rsvinner.",
+mdate_format:"%Y-%m-%d %H:%M:%S",
+cdate_format:"%Y-%m-%d %H:%M:%S",
+months_long:"Januari,Februari,Mars,April,Maj,Juni,Juli,Augusti,September,Oktober,November,December",
+months_short:"Jan,Feb,Mar,Apr,Maj,Jun,Jul,Aug,Sep,Okt,Nov,Dec",
+day_long:"S\u00F6ndag,M\u00E5ndag,Tisdag,Onsdag,Torsdag,Fredag,L\u00F6rdag,S\u00F6ndag",
+day_short:"S\u00F6n,M\u00E5n,Tis,Ons,Tors,Fre,L\u00F6r,S\u00F6n"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/template/template.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/template.htm
new file mode 100644
index 0000000000..b2182e6322
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/template/template.htm
@@ -0,0 +1,31 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#template_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/template.js"></script>
+	<link href="css/template.css" rel="stylesheet" type="text/css" />
+</head>
+<body onresize="TemplateDialog.resize();"> 
+	<form onsubmit="TemplateDialog.insert();return false;">
+		<div id="frmbody">
+			<div class="title">{#template_dlg.desc}</div>
+			<div class="frmRow"><label for="tpath" title="{#template_dlg.select}">{#template_dlg.label}:</label>
+			<select id="tpath" name="tpath" onchange="TemplateDialog.selectTemplate(this.options[this.selectedIndex].value, this.options[this.selectedIndex].text);" class="mceFocus">
+				<option value="">{#template_dlg.select}...</option>
+			</select>
+			<span id="warning"></span></div>
+			<div class="frmRow"><label for="tdesc">{#template_dlg.desc_label}:</label>
+			<span id="tmpldesc"></span></div>
+			<fieldset>
+				<legend>{#template_dlg.preview}</legend>
+				<iframe id="templatesrc" name="templatesrc" src="blank.htm" width="690" height="400" frameborder="0"></iframe>
+			</fieldset>
+		</div>
+		
+		<div class="mceActionPanel">
+			<input type="submit" id="insert" name="insert" value="{#insert}" />
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</form>
+</body> 
+</html> 
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/visualchars/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/visualchars/editor_plugin.js
new file mode 100644
index 0000000000..1a148e8b4f
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/visualchars/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.VisualChars",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceVisualChars",c._toggleVisualChars,c);a.addButton("visualchars",{title:"visualchars.desc",cmd:"mceVisualChars"});a.onBeforeGetContent.add(function(d,e){if(c.state&&e.format!="raw"&&!e.draft){c.state=true;c._toggleVisualChars(false)}})},getInfo:function(){return{longname:"Visual characters",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_toggleVisualChars:function(m){var p=this,k=p.editor,a,g,j,n=k.getDoc(),o=k.getBody(),l,q=k.selection,e,c,f;p.state=!p.state;k.controlManager.setActive("visualchars",p.state);if(m){f=q.getBookmark()}if(p.state){a=[];tinymce.walk(o,function(b){if(b.nodeType==3&&b.nodeValue&&b.nodeValue.indexOf("\u00a0")!=-1){a.push(b)}},"childNodes");for(g=0;g<a.length;g++){l=a[g].nodeValue;l=l.replace(/(\u00a0)/g,'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');c=k.dom.create("div",null,l);while(node=c.lastChild){k.dom.insertAfter(node,a[g])}k.dom.remove(a[g])}}else{a=k.dom.select("span.mceItemNbsp",o);for(g=a.length-1;g>=0;g--){k.dom.remove(a[g],1)}}q.moveToBookmark(f)}});tinymce.PluginManager.add("visualchars",tinymce.plugins.VisualChars)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/visualchars/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/visualchars/editor_plugin_src.js
new file mode 100644
index 0000000000..df985905b6
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/visualchars/editor_plugin_src.js
@@ -0,0 +1,83 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.VisualChars', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceVisualChars', t._toggleVisualChars, t);
+
+			// Register buttons
+			ed.addButton('visualchars', {title : 'visualchars.desc', cmd : 'mceVisualChars'});
+
+			ed.onBeforeGetContent.add(function(ed, o) {
+				if (t.state && o.format != 'raw' && !o.draft) {
+					t.state = true;
+					t._toggleVisualChars(false);
+				}
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Visual characters',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private methods
+
+		_toggleVisualChars : function(bookmark) {
+			var t = this, ed = t.editor, nl, i, h, d = ed.getDoc(), b = ed.getBody(), nv, s = ed.selection, bo, div, bm;
+
+			t.state = !t.state;
+			ed.controlManager.setActive('visualchars', t.state);
+
+			if (bookmark)
+				bm = s.getBookmark();
+
+			if (t.state) {
+				nl = [];
+				tinymce.walk(b, function(n) {
+					if (n.nodeType == 3 && n.nodeValue && n.nodeValue.indexOf('\u00a0') != -1)
+						nl.push(n);
+				}, 'childNodes');
+
+				for (i = 0; i < nl.length; i++) {
+					nv = nl[i].nodeValue;
+					nv = nv.replace(/(\u00a0)/g, '<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');
+
+					div = ed.dom.create('div', null, nv);
+					while (node = div.lastChild)
+						ed.dom.insertAfter(node, nl[i]);
+
+					ed.dom.remove(nl[i]);
+				}
+			} else {
+				nl = ed.dom.select('span.mceItemNbsp', b);
+
+				for (i = nl.length - 1; i >= 0; i--)
+					ed.dom.remove(nl[i], 1);
+			}
+
+			s.moveToBookmark(bm);
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('visualchars', tinymce.plugins.VisualChars);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/wordcount/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/wordcount/editor_plugin.js
new file mode 100644
index 0000000000..e769d09f6d
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/wordcount/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(a,b){var c=this,d=0;c.countre=a.getParam("wordcount_countregex",/[\w\u2019\'-]+/g);c.cleanre=a.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);c.id=a.id+"-word-count";a.onPostRender.add(function(f,e){var g,h;h=f.getParam("wordcount_target_id");if(!h){g=tinymce.DOM.get(f.id+"_path_row");if(g){tinymce.DOM.add(g.parentNode,"div",{style:"float: right"},f.getLang("wordcount.words","Words: ")+'<span id="'+c.id+'">0</span>')}}else{tinymce.DOM.add(h,"span",{},'<span id="'+c.id+'">0</span>')}});a.onInit.add(function(e){e.selection.onSetContent.add(function(){c._count(e)});c._count(e)});a.onSetContent.add(function(e){c._count(e)});a.onKeyUp.add(function(f,g){if(g.keyCode==d){return}if(13==g.keyCode||8==d||46==d){c._count(f)}d=g.keyCode})},_getCount:function(c){var a=0;var b=c.getContent({format:"raw"});if(b){b=b.replace(/\.\.\./g," ");b=b.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");b=b.replace(/(\w+)(&.+?;)+(\w+)/,"$1$3").replace(/&.+?;/g," ");b=b.replace(this.cleanre,"");var d=b.match(this.countre);if(d){a=d.length}}return a},_count:function(a){var b=this;if(b.block){return}b.block=1;setTimeout(function(){var c=b._getCount(a);tinymce.DOM.setHTML(b.id,c.toString());setTimeout(function(){b.block=0},2000)},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/wordcount/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/wordcount/editor_plugin_src.js
new file mode 100644
index 0000000000..6c9a3ead27
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/wordcount/editor_plugin_src.js
@@ -0,0 +1,114 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.WordCount', {
+		block : 0,
+		id : null,
+		countre : null,
+		cleanre : null,
+
+		init : function(ed, url) {
+			var t = this, last = 0;
+
+			t.countre = ed.getParam('wordcount_countregex', /[\w\u2019\'-]+/g); // u2019 == &rsquo;
+			t.cleanre = ed.getParam('wordcount_cleanregex', /[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);
+			t.id = ed.id + '-word-count';
+
+			ed.onPostRender.add(function(ed, cm) {
+				var row, id;
+
+				// Add it to the specified id or the theme advanced path
+				id = ed.getParam('wordcount_target_id');
+				if (!id) {
+					row = tinymce.DOM.get(ed.id + '_path_row');
+
+					if (row)
+						tinymce.DOM.add(row.parentNode, 'div', {'style': 'float: right'}, ed.getLang('wordcount.words', 'Words: ') + '<span id="' + t.id + '">0</span>');
+				} else {
+					tinymce.DOM.add(id, 'span', {}, '<span id="' + t.id + '">0</span>');
+				}
+			});
+
+			ed.onInit.add(function(ed) {
+				ed.selection.onSetContent.add(function() {
+					t._count(ed);
+				});
+
+				t._count(ed);
+			});
+
+			ed.onSetContent.add(function(ed) {
+				t._count(ed);
+			});
+
+			ed.onKeyUp.add(function(ed, e) {
+				if (e.keyCode == last)
+					return;
+
+				if (13 == e.keyCode || 8 == last || 46 == last)
+					t._count(ed);
+
+				last = e.keyCode;
+			});
+		},
+
+		_getCount : function(ed) {
+			var tc = 0;
+			var tx = ed.getContent({ format: 'raw' });
+
+			if (tx) {
+					tx = tx.replace(/\.\.\./g, ' '); // convert ellipses to spaces
+					tx = tx.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' '); // remove html tags and space chars
+
+					// deal with html entities
+					tx = tx.replace(/(\w+)(&.+?;)+(\w+)/, "$1$3").replace(/&.+?;/g, ' ');
+					tx = tx.replace(this.cleanre, ''); // remove numbers and punctuation
+
+					var wordArray = tx.match(this.countre);
+					if (wordArray) {
+							tc = wordArray.length;
+					}
+			}
+
+			return tc;
+		},
+
+		_count : function(ed) {
+			var t = this;
+
+			// Keep multiple calls from happening at the same time
+			if (t.block)
+				return;
+
+			t.block = 1;
+
+			setTimeout(function() {
+					var tc = t._getCount(ed);
+
+					tinymce.DOM.setHTML(t.id, tc.toString());
+
+					setTimeout(function() {t.block = 0;}, 2000);
+			}, 1);
+		},
+
+		getInfo: function() {
+			return {
+				longname : 'Word Count plugin',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	tinymce.PluginManager.add('wordcount', tinymce.plugins.WordCount);
+})();
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/abbr.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/abbr.htm
new file mode 100644
index 0000000000..30a894f7c3
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/abbr.htm
@@ -0,0 +1,142 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#xhtmlxtras_dlg.title_abbr_element}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/element_common.js"></script>
+	<script type="text/javascript" src="js/abbr.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/popup.css" />
+</head>
+<body style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_abbr_element}</span>
+<form onsubmit="insertAbbr();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
+						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 
+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 
+						<td>
+							<select id="class" name="class" class="field mceEditableSelect">
+								<option value="">{#not_set}</option> 
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 
+						<td>
+							<select id="dir" name="dir" class="field"> 
+								<option value="">{#not_set}</option> 
+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 
+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 
+							</select>
+						</td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 
+						<td>
+							<input id="lang" name="lang" type="text" value="" class="field" />
+						</td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+		<div id="events_panel" class="panel">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
+
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label for="onfocus">onfocus</label>:</td> 
+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onblur">onblur</label>:</td> 
+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onclick">onclick</label>:</td> 
+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 
+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 
+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 
+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 
+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 
+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 
+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 
+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 
+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<input type="submit" id="insert" name="insert" value="{#update}" />
+		<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeAbbr();" style="display: none;" />
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+	</div>
+</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/acronym.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/acronym.htm
new file mode 100644
index 0000000000..c109345928
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/acronym.htm
@@ -0,0 +1,142 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#xhtmlxtras_dlg.title_acronym_element}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/element_common.js"></script>
+	<script type="text/javascript" src="js/acronym.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/popup.css" />
+</head>
+<body style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_acronym_element}</span>
+<form onsubmit="insertAcronym();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
+						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 
+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 
+						<td>
+							<select id="class" name="class" class="field mceEditableSelect">
+								<option value="">{#not_set}</option> 
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 
+						<td>
+							<select id="dir" name="dir" class="field"> 
+								<option value="">{#not_set}</option> 
+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 
+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 
+							</select>
+						</td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 
+						<td>
+							<input id="lang" name="lang" type="text" value="" class="field" />
+						</td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+		<div id="events_panel" class="panel">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
+
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label for="onfocus">onfocus</label>:</td> 
+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onblur">onblur</label>:</td> 
+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onclick">onclick</label>:</td> 
+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 
+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 
+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 
+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 
+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 
+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 
+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 
+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 
+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<input type="submit" id="insert" name="insert" value="{#update}" />
+		<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeAcronym();" style="display: none;" />
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+	</div>
+</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/attributes.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/attributes.htm
new file mode 100644
index 0000000000..e8d606a340
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/attributes.htm
@@ -0,0 +1,149 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#xhtmlxtras_dlg.attribs_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="js/attributes.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/attributes.css" />
+</head>
+<body style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.attribs_title}</span>
+<form onsubmit="insertAction();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_attrib_tab}</a></span></li>
+			<li id="events_tab" aria-controls="events_panel"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_events_tab}</a></span></li>
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.attribute_attrib_tab}</legend>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
+						<td><input id="title" name="title" type="text" value="" class="mceFocus" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 
+						<td><input id="id" name="id" type="text" value="" /></td> 
+					</tr>
+					<tr>
+						<td><label id="classlabel" for="classlist">{#class_name}</label></td>
+						<td>
+							<select id="classlist" name="classlist" class="mceEditableSelect">
+								<option value="" selected="selected">{#not_set}</option>
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
+						<td><input id="style" name="style" type="text" value="" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 
+						<td>
+							<select id="dir" name="dir"> 
+								<option value="">{#not_set}</option> 
+								<option value="ltr">{#xhtmlxtras_dlg.option_ltr}</option> 
+								<option value="rtl">{#xhtmlxtras_dlg.option_rtl}</option> 
+							</select>
+						</td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 
+						<td>
+							<input id="lang" name="lang" type="text" value="" />
+						</td> 
+					</tr>
+					<tr>
+							<td><label id="tabindexlabel" for="tabindex">{#xhtmlxtras_dlg.attribute_label_tabindex}</label></td>
+							<td><input type="text" id="tabindex" name="tabindex" value="" /></td>
+						</tr>
+
+						<tr>
+							<td><label id="accesskeylabel" for="accesskey">{#xhtmlxtras_dlg.attribute_label_accesskey}</label></td>
+							<td><input type="text" id="accesskey" name="accesskey" value="" /></td>
+						</tr>
+				</table>
+			</fieldset>
+		</div>
+		<div id="events_panel" class="panel">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.attribute_events_tab}</legend>
+
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label for="onfocus">onfocus</label>:</td> 
+						<td><input id="onfocus" name="onfocus" type="text" value="" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onblur">onblur</label>:</td> 
+						<td><input id="onblur" name="onblur" type="text" value="" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onclick">onclick</label>:</td> 
+						<td><input id="onclick" name="onclick" type="text" value="" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 
+						<td><input id="ondblclick" name="ondblclick" type="text" value="" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 
+						<td><input id="onmousedown" name="onmousedown" type="text" value="" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 
+						<td><input id="onmouseup" name="onmouseup" type="text" value="" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 
+						<td><input id="onmouseover" name="onmouseover" type="text" value="" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 
+						<td><input id="onmousemove" name="onmousemove" type="text" value="" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 
+						<td><input id="onmouseout" name="onmouseout" type="text" value="" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 
+						<td><input id="onkeypress" name="onkeypress" type="text" value="" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 
+						<td><input id="onkeydown" name="onkeydown" type="text" value="" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" /></td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<input type="submit" id="insert" name="insert" value="{#insert}" />
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+	</div>
+</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/cite.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/cite.htm
new file mode 100644
index 0000000000..0ac6bdb667
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/cite.htm
@@ -0,0 +1,142 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#xhtmlxtras_dlg.title_cite_element}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/element_common.js"></script>
+	<script type="text/javascript" src="js/cite.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/popup.css" />
+</head>
+<body style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_cite_element}</span>
+<form onsubmit="insertCite();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
+						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 
+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 
+						<td>
+							<select id="class" name="class" class="field mceEditableSelect">
+								<option value="">{#not_set}</option> 
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 
+						<td>
+							<select id="dir" name="dir" class="field"> 
+								<option value="">{#not_set}</option> 
+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 
+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 
+							</select>
+						</td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 
+						<td>
+							<input id="lang" name="lang" type="text" value="" class="field" />
+						</td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+		<div id="events_panel" class="panel">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
+
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label for="onfocus">onfocus</label>:</td> 
+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onblur">onblur</label>:</td> 
+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onclick">onclick</label>:</td> 
+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 
+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 
+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 
+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 
+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 
+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 
+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 
+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 
+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<input type="submit" id="insert" name="insert" value="{#update}" />
+		<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeCite();" style="display: none;" />
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+	</div>
+</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/css/attributes.css b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/css/attributes.css
new file mode 100644
index 0000000000..9a6a235c35
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/css/attributes.css
@@ -0,0 +1,11 @@
+.panel_wrapper div.current {
+	height: 290px;
+}
+
+#id, #style, #title, #dir, #hreflang, #lang, #classlist, #tabindex, #accesskey {
+	width: 200px;
+}
+
+#events_panel input {
+	width: 200px;
+}
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/css/popup.css b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/css/popup.css
new file mode 100644
index 0000000000..e67114dbaa
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/css/popup.css
@@ -0,0 +1,9 @@
+input.field, select.field {width:200px;}
+input.picker {width:179px; margin-left: 5px;}
+input.disabled {border-color:#F2F2F2;}
+img.picker {vertical-align:text-bottom; cursor:pointer;}
+h1 {padding: 0 0 5px 0;}
+.panel_wrapper div.current {height:160px;}
+#xhtmlxtrasdel .panel_wrapper div.current, #xhtmlxtrasins .panel_wrapper div.current {height: 230px;}
+a.browse span {display:block; width:20px; height:20px; background:url('../../../themes/advanced/img/icons.gif') -140px -20px;}
+#datetime {width:180px;}
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/del.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/del.htm
new file mode 100644
index 0000000000..5f667510f5
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/del.htm
@@ -0,0 +1,162 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#xhtmlxtras_dlg.title_del_element}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/element_common.js"></script>
+	<script type="text/javascript" src="js/del.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/popup.css" />
+</head>
+<body id="xhtmlxtrasins" style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_del_element}</span>
+<form onsubmit="insertDel();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td>
+						<td>
+							<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+								<tr> 
+									<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td> 
+									<td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse" role="button" aria-labelledby="datetimelabel"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+					<tr>
+						<td class="label"><label id="citelabel" for="cite">{#xhtmlxtras_dlg.attribute_label_cite}</label>:</td>
+						<td><input id="cite" name="cite" type="text" value="" class="field" /></td> 
+					</tr>
+				</table>
+			</fieldset>
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
+						<td><input id="title" name="title" type="text" value="" class="field" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 
+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 
+						<td>
+							<select id="class" name="class" class="field mceEditableSelect">
+								<option value="">{#not_set}</option> 
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 
+						<td>
+							<select id="dir" name="dir" class="field"> 
+								<option value="">{#not_set}</option> 
+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 
+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 
+							</select>
+						</td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 
+						<td>
+							<input id="lang" name="lang" type="text" value="" class="field" />
+						</td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+		<div id="events_panel" class="panel">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
+
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label for="onfocus">onfocus</label>:</td> 
+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onblur">onblur</label>:</td> 
+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onclick">onclick</label>:</td> 
+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 
+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 
+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 
+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 
+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 
+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 
+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 
+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 
+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<input type="submit" id="insert" name="insert" value="{#update}" />
+		<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeDel();" style="display: none;" />
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+	</div>
+</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/editor_plugin.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/editor_plugin.js
new file mode 100644
index 0000000000..a9393ad6db
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(a,b){a.addCommand("mceCite",function(){a.windowManager.open({file:b+"/cite.htm",width:350+parseInt(a.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAcronym",function(){a.windowManager.open({file:b+"/acronym.htm",width:350+parseInt(a.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.acronym_delta_width",0)),inline:1},{plugin_url:b})});a.addCommand("mceAbbr",function(){a.windowManager.open({file:b+"/abbr.htm",width:350+parseInt(a.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.abbr_delta_width",0)),inline:1},{plugin_url:b})});a.addCommand("mceDel",function(){a.windowManager.open({file:b+"/del.htm",width:340+parseInt(a.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.del_delta_width",0)),inline:1},{plugin_url:b})});a.addCommand("mceIns",function(){a.windowManager.open({file:b+"/ins.htm",width:340+parseInt(a.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.ins_delta_width",0)),inline:1},{plugin_url:b})});a.addCommand("mceAttributes",function(){a.windowManager.open({file:b+"/attributes.htm",width:380,height:370,inline:1},{plugin_url:b})});a.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});a.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});a.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});a.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});a.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});a.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});a.onNodeChange.add(function(d,c,f,e){f=d.dom.getParent(f,"CITE,ACRONYM,ABBR,DEL,INS");c.setDisabled("cite",e);c.setDisabled("acronym",e);c.setDisabled("abbr",e);c.setDisabled("del",e);c.setDisabled("ins",e);c.setDisabled("attribs",f&&f.nodeName=="BODY");c.setActive("cite",0);c.setActive("acronym",0);c.setActive("abbr",0);c.setActive("del",0);c.setActive("ins",0);if(f){do{c.setDisabled(f.nodeName.toLowerCase(),0);c.setActive(f.nodeName.toLowerCase(),1)}while(f=f.parentNode)}});a.onPreInit.add(function(){a.dom.create("abbr")})},getInfo:function(){return{longname:"XHTML Xtras Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("xhtmlxtras",tinymce.plugins.XHTMLXtrasPlugin)})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/editor_plugin_src.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/editor_plugin_src.js
new file mode 100644
index 0000000000..5f9d9bd50b
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/editor_plugin_src.js
@@ -0,0 +1,132 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.XHTMLXtrasPlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceCite', function() {
+				ed.windowManager.open({
+					file : url + '/cite.htm',
+					width : 350 + parseInt(ed.getLang('xhtmlxtras.cite_delta_width', 0)),
+					height : 250 + parseInt(ed.getLang('xhtmlxtras.cite_delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceAcronym', function() {
+				ed.windowManager.open({
+					file : url + '/acronym.htm',
+					width : 350 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),
+					height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceAbbr', function() {
+				ed.windowManager.open({
+					file : url + '/abbr.htm',
+					width : 350 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),
+					height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceDel', function() {
+				ed.windowManager.open({
+					file : url + '/del.htm',
+					width : 340 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),
+					height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceIns', function() {
+				ed.windowManager.open({
+					file : url + '/ins.htm',
+					width : 340 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),
+					height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceAttributes', function() {
+				ed.windowManager.open({
+					file : url + '/attributes.htm',
+					width : 380,
+					height : 370,
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.addButton('cite', {title : 'xhtmlxtras.cite_desc', cmd : 'mceCite'});
+			ed.addButton('acronym', {title : 'xhtmlxtras.acronym_desc', cmd : 'mceAcronym'});
+			ed.addButton('abbr', {title : 'xhtmlxtras.abbr_desc', cmd : 'mceAbbr'});
+			ed.addButton('del', {title : 'xhtmlxtras.del_desc', cmd : 'mceDel'});
+			ed.addButton('ins', {title : 'xhtmlxtras.ins_desc', cmd : 'mceIns'});
+			ed.addButton('attribs', {title : 'xhtmlxtras.attribs_desc', cmd : 'mceAttributes'});
+
+			ed.onNodeChange.add(function(ed, cm, n, co) {
+				n = ed.dom.getParent(n, 'CITE,ACRONYM,ABBR,DEL,INS');
+
+				cm.setDisabled('cite', co);
+				cm.setDisabled('acronym', co);
+				cm.setDisabled('abbr', co);
+				cm.setDisabled('del', co);
+				cm.setDisabled('ins', co);
+				cm.setDisabled('attribs', n && n.nodeName == 'BODY');
+				cm.setActive('cite', 0);
+				cm.setActive('acronym', 0);
+				cm.setActive('abbr', 0);
+				cm.setActive('del', 0);
+				cm.setActive('ins', 0);
+
+				// Activate all
+				if (n) {
+					do {
+						cm.setDisabled(n.nodeName.toLowerCase(), 0);
+						cm.setActive(n.nodeName.toLowerCase(), 1);
+					} while (n = n.parentNode);
+				}
+			});
+
+			ed.onPreInit.add(function() {
+				// Fixed IE issue where it can't handle these elements correctly
+				ed.dom.create('abbr');
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'XHTML Xtras Plugin',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('xhtmlxtras', tinymce.plugins.XHTMLXtrasPlugin);
+})();
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/ins.htm b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/ins.htm
new file mode 100644
index 0000000000..d001ac7c4d
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/ins.htm
@@ -0,0 +1,162 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#xhtmlxtras_dlg.title_ins_element}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/element_common.js"></script>
+	<script type="text/javascript" src="js/ins.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/popup.css" />
+</head>
+<body id="xhtmlxtrasins" style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_ins_element}</span>
+<form onsubmit="insertIns();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td> 
+						<td>
+							<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+								<tr> 
+									<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td> 
+									<td ><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse" role="button" aria-labelledby="datetimelabel"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+					<tr >
+						<td class="label"><label id="citelabel" for="cite">{#xhtmlxtras_dlg.attribute_label_cite}</label>:</td> 
+						<td><input id="cite" name="cite" type="text" value="" class="field" /></td> 
+					</tr>
+				</table>
+			</fieldset>
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td  class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
+						<td><input id="title" name="title" type="text" value="" class="field" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 
+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 
+						<td>
+							<select id="class" name="class" class="field mceEditableSelect">
+								<option value="">{#not_set}</option> 
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 
+						<td>
+							<select id="dir" name="dir" class="field"> 
+								<option value="">{#not_set}</option> 
+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 
+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 
+							</select>
+						</td> 
+					</tr>
+					<tr>
+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 
+						<td>
+							<input id="lang" name="lang" type="text" value="" class="field" />
+						</td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+		<div id="events_panel" class="panel">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
+
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label for="onfocus">onfocus</label>:</td> 
+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onblur">onblur</label>:</td> 
+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onclick">onclick</label>:</td> 
+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 
+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 
+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 
+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 
+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 
+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 
+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 
+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 
+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<input type="submit" id="insert" name="insert" value="{#update}" />
+		<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeIns();" style="display: none;" />
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+	</div>
+</form>
+</body>
+</html>
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/abbr.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/abbr.js
new file mode 100644
index 0000000000..4b51a25721
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/abbr.js
@@ -0,0 +1,28 @@
+/**
+ * abbr.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+function init() {
+	SXE.initElementDialog('abbr');
+	if (SXE.currentAction == "update") {
+		SXE.showRemoveButton();
+	}
+}
+
+function insertAbbr() {
+	SXE.insertElement('abbr');
+	tinyMCEPopup.close();
+}
+
+function removeAbbr() {
+	SXE.removeElement('abbr');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/acronym.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/acronym.js
new file mode 100644
index 0000000000..6ec2f88716
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/acronym.js
@@ -0,0 +1,28 @@
+/**
+ * acronym.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+function init() {
+	SXE.initElementDialog('acronym');
+	if (SXE.currentAction == "update") {
+		SXE.showRemoveButton();
+	}
+}
+
+function insertAcronym() {
+	SXE.insertElement('acronym');
+	tinyMCEPopup.close();
+}
+
+function removeAcronym() {
+	SXE.removeElement('acronym');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/attributes.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/attributes.js
new file mode 100644
index 0000000000..9de9c29c97
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/attributes.js
@@ -0,0 +1,125 @@
+/**
+ * attributes.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+	var inst = tinyMCEPopup.editor;
+	var dom = inst.dom;
+	var elm = inst.selection.getNode();
+	var f = document.forms[0];
+	var onclick = dom.getAttrib(elm, 'onclick');
+
+	setFormValue('title', dom.getAttrib(elm, 'title'));
+	setFormValue('id', dom.getAttrib(elm, 'id'));
+	setFormValue('style', dom.getAttrib(elm, "style"));
+	setFormValue('dir', dom.getAttrib(elm, 'dir'));
+	setFormValue('lang', dom.getAttrib(elm, 'lang'));
+	setFormValue('tabindex', dom.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : ""));
+	setFormValue('accesskey', dom.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : ""));
+	setFormValue('onfocus', dom.getAttrib(elm, 'onfocus'));
+	setFormValue('onblur', dom.getAttrib(elm, 'onblur'));
+	setFormValue('onclick', onclick);
+	setFormValue('ondblclick', dom.getAttrib(elm, 'ondblclick'));
+	setFormValue('onmousedown', dom.getAttrib(elm, 'onmousedown'));
+	setFormValue('onmouseup', dom.getAttrib(elm, 'onmouseup'));
+	setFormValue('onmouseover', dom.getAttrib(elm, 'onmouseover'));
+	setFormValue('onmousemove', dom.getAttrib(elm, 'onmousemove'));
+	setFormValue('onmouseout', dom.getAttrib(elm, 'onmouseout'));
+	setFormValue('onkeypress', dom.getAttrib(elm, 'onkeypress'));
+	setFormValue('onkeydown', dom.getAttrib(elm, 'onkeydown'));
+	setFormValue('onkeyup', dom.getAttrib(elm, 'onkeyup'));
+	className = dom.getAttrib(elm, 'class');
+
+	addClassesToList('classlist', 'advlink_styles');
+	selectByValue(f, 'classlist', className, true);
+
+	TinyMCE_EditableSelects.init();
+}
+
+function setFormValue(name, value) {
+	if(value && document.forms[0].elements[name]){
+		document.forms[0].elements[name].value = value;
+	}
+}
+
+function insertAction() {
+	var inst = tinyMCEPopup.editor;
+	var elm = inst.selection.getNode();
+
+	setAllAttribs(elm);
+	tinyMCEPopup.execCommand("mceEndUndoLevel");
+	tinyMCEPopup.close();
+}
+
+function setAttrib(elm, attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib.toLowerCase()];
+	var inst = tinyMCEPopup.editor;
+	var dom = inst.dom;
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	if (value != "") {
+		dom.setAttrib(elm, attrib.toLowerCase(), value);
+
+		if (attrib == "style")
+			attrib = "style.cssText";
+
+		if (attrib.substring(0, 2) == 'on')
+			value = 'return true;' + value;
+
+		if (attrib == "class")
+			attrib = "className";
+
+		elm[attrib]=value;
+	} else
+		elm.removeAttribute(attrib);
+}
+
+function setAllAttribs(elm) {
+	var f = document.forms[0];
+
+	setAttrib(elm, 'title');
+	setAttrib(elm, 'id');
+	setAttrib(elm, 'style');
+	setAttrib(elm, 'class', getSelectValue(f, 'classlist'));
+	setAttrib(elm, 'dir');
+	setAttrib(elm, 'lang');
+	setAttrib(elm, 'tabindex');
+	setAttrib(elm, 'accesskey');
+	setAttrib(elm, 'onfocus');
+	setAttrib(elm, 'onblur');
+	setAttrib(elm, 'onclick');
+	setAttrib(elm, 'ondblclick');
+	setAttrib(elm, 'onmousedown');
+	setAttrib(elm, 'onmouseup');
+	setAttrib(elm, 'onmouseover');
+	setAttrib(elm, 'onmousemove');
+	setAttrib(elm, 'onmouseout');
+	setAttrib(elm, 'onkeypress');
+	setAttrib(elm, 'onkeydown');
+	setAttrib(elm, 'onkeyup');
+
+	// Refresh in old MSIE
+//	if (tinyMCE.isMSIE5)
+//		elm.outerHTML = elm.outerHTML;
+}
+
+function insertAttribute() {
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
+tinyMCEPopup.requireLangPack();
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/cite.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/cite.js
new file mode 100644
index 0000000000..009b71546a
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/cite.js
@@ -0,0 +1,28 @@
+/**
+ * cite.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+function init() {
+	SXE.initElementDialog('cite');
+	if (SXE.currentAction == "update") {
+		SXE.showRemoveButton();
+	}
+}
+
+function insertCite() {
+	SXE.insertElement('cite');
+	tinyMCEPopup.close();
+}
+
+function removeCite() {
+	SXE.removeElement('cite');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/del.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/del.js
new file mode 100644
index 0000000000..1f957dc786
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/del.js
@@ -0,0 +1,53 @@
+/**
+ * del.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+function init() {
+	SXE.initElementDialog('del');
+	if (SXE.currentAction == "update") {
+		setFormValue('datetime', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'datetime'));
+		setFormValue('cite', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'cite'));
+		SXE.showRemoveButton();
+	}
+}
+
+function setElementAttribs(elm) {
+	setAllCommonAttribs(elm);
+	setAttrib(elm, 'datetime');
+	setAttrib(elm, 'cite');
+	elm.removeAttribute('data-mce-new');
+}
+
+function insertDel() {
+	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'DEL');
+
+	if (elm == null) {
+		var s = SXE.inst.selection.getContent();
+		if(s.length > 0) {
+			insertInlineElement('del');
+			var elementArray = SXE.inst.dom.select('del[data-mce-new]');
+			for (var i=0; i<elementArray.length; i++) {
+				var elm = elementArray[i];
+				setElementAttribs(elm);
+			}
+		}
+	} else {
+		setElementAttribs(elm);
+	}
+	tinyMCEPopup.editor.nodeChanged();
+	tinyMCEPopup.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function removeDel() {
+	SXE.removeElement('del');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/element_common.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/element_common.js
new file mode 100644
index 0000000000..4e5d9c3bbd
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/element_common.js
@@ -0,0 +1,229 @@
+/**
+ * element_common.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+tinyMCEPopup.requireLangPack();
+
+function initCommonAttributes(elm) {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+
+	// Setup form data for common element attributes
+	setFormValue('title', dom.getAttrib(elm, 'title'));
+	setFormValue('id', dom.getAttrib(elm, 'id'));
+	selectByValue(formObj, 'class', dom.getAttrib(elm, 'class'), true);
+	setFormValue('style', dom.getAttrib(elm, 'style'));
+	selectByValue(formObj, 'dir', dom.getAttrib(elm, 'dir'));
+	setFormValue('lang', dom.getAttrib(elm, 'lang'));
+	setFormValue('onfocus', dom.getAttrib(elm, 'onfocus'));
+	setFormValue('onblur', dom.getAttrib(elm, 'onblur'));
+	setFormValue('onclick', dom.getAttrib(elm, 'onclick'));
+	setFormValue('ondblclick', dom.getAttrib(elm, 'ondblclick'));
+	setFormValue('onmousedown', dom.getAttrib(elm, 'onmousedown'));
+	setFormValue('onmouseup', dom.getAttrib(elm, 'onmouseup'));
+	setFormValue('onmouseover', dom.getAttrib(elm, 'onmouseover'));
+	setFormValue('onmousemove', dom.getAttrib(elm, 'onmousemove'));
+	setFormValue('onmouseout', dom.getAttrib(elm, 'onmouseout'));
+	setFormValue('onkeypress', dom.getAttrib(elm, 'onkeypress'));
+	setFormValue('onkeydown', dom.getAttrib(elm, 'onkeydown'));
+	setFormValue('onkeyup', dom.getAttrib(elm, 'onkeyup'));
+}
+
+function setFormValue(name, value) {
+	if(document.forms[0].elements[name]) document.forms[0].elements[name].value = value;
+}
+
+function insertDateTime(id) {
+	document.getElementById(id).value = getDateTime(new Date(), "%Y-%m-%dT%H:%M:%S");
+}
+
+function getDateTime(d, fmt) {
+	fmt = fmt.replace("%D", "%m/%d/%y");
+	fmt = fmt.replace("%r", "%I:%M:%S %p");
+	fmt = fmt.replace("%Y", "" + d.getFullYear());
+	fmt = fmt.replace("%y", "" + d.getYear());
+	fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));
+	fmt = fmt.replace("%d", addZeros(d.getDate(), 2));
+	fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));
+	fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));
+	fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));
+	fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));
+	fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));
+	fmt = fmt.replace("%%", "%");
+
+	return fmt;
+}
+
+function addZeros(value, len) {
+	var i;
+
+	value = "" + value;
+
+	if (value.length < len) {
+		for (i=0; i<(len-value.length); i++)
+			value = "0" + value;
+	}
+
+	return value;
+}
+
+function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
+	if (!form_obj || !form_obj.elements[field_name])
+		return;
+
+	var sel = form_obj.elements[field_name];
+
+	var found = false;
+	for (var i=0; i<sel.options.length; i++) {
+		var option = sel.options[i];
+
+		if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {
+			option.selected = true;
+			found = true;
+		} else
+			option.selected = false;
+	}
+
+	if (!found && add_custom && value != '') {
+		var option = new Option('Value: ' + value, value);
+		option.selected = true;
+		sel.options[sel.options.length] = option;
+	}
+
+	return found;
+}
+
+function setAttrib(elm, attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib.toLowerCase()];
+	tinyMCEPopup.editor.dom.setAttrib(elm, attrib, value || valueElm.value);
+}
+
+function setAllCommonAttribs(elm) {
+	setAttrib(elm, 'title');
+	setAttrib(elm, 'id');
+	setAttrib(elm, 'class');
+	setAttrib(elm, 'style');
+	setAttrib(elm, 'dir');
+	setAttrib(elm, 'lang');
+	/*setAttrib(elm, 'onfocus');
+	setAttrib(elm, 'onblur');
+	setAttrib(elm, 'onclick');
+	setAttrib(elm, 'ondblclick');
+	setAttrib(elm, 'onmousedown');
+	setAttrib(elm, 'onmouseup');
+	setAttrib(elm, 'onmouseover');
+	setAttrib(elm, 'onmousemove');
+	setAttrib(elm, 'onmouseout');
+	setAttrib(elm, 'onkeypress');
+	setAttrib(elm, 'onkeydown');
+	setAttrib(elm, 'onkeyup');*/
+}
+
+SXE = {
+	currentAction : "insert",
+	inst : tinyMCEPopup.editor,
+	updateElement : null
+}
+
+SXE.focusElement = SXE.inst.selection.getNode();
+
+SXE.initElementDialog = function(element_name) {
+	addClassesToList('class', 'xhtmlxtras_styles');
+	TinyMCE_EditableSelects.init();
+
+	element_name = element_name.toLowerCase();
+	var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());
+	if (elm != null && elm.nodeName.toUpperCase() == element_name.toUpperCase()) {
+		SXE.currentAction = "update";
+	}
+
+	if (SXE.currentAction == "update") {
+		initCommonAttributes(elm);
+		SXE.updateElement = elm;
+	}
+
+	document.forms[0].insert.value = tinyMCEPopup.getLang(SXE.currentAction, 'Insert', true); 
+}
+
+SXE.insertElement = function(element_name) {
+	var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase()), h, tagName;
+
+	if (elm == null) {
+		var s = SXE.inst.selection.getContent();
+		if(s.length > 0) {
+			tagName = element_name;
+
+			insertInlineElement(element_name);
+			var elementArray = tinymce.grep(SXE.inst.dom.select(element_name));
+			for (var i=0; i<elementArray.length; i++) {
+				var elm = elementArray[i];
+
+				if (SXE.inst.dom.getAttrib(elm, 'data-mce-new')) {
+					elm.id = '';
+					elm.setAttribute('id', '');
+					elm.removeAttribute('id');
+					elm.removeAttribute('data-mce-new');
+
+					setAllCommonAttribs(elm);
+				}
+			}
+		}
+	} else {
+		setAllCommonAttribs(elm);
+	}
+	SXE.inst.nodeChanged();
+	tinyMCEPopup.execCommand('mceEndUndoLevel');
+}
+
+SXE.removeElement = function(element_name){
+	element_name = element_name.toLowerCase();
+	elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());
+	if(elm && elm.nodeName.toUpperCase() == element_name.toUpperCase()){
+		tinyMCE.execCommand('mceRemoveNode', false, elm);
+		SXE.inst.nodeChanged();
+		tinyMCEPopup.execCommand('mceEndUndoLevel');
+	}
+}
+
+SXE.showRemoveButton = function() {
+		document.getElementById("remove").style.display = '';
+}
+
+SXE.containsClass = function(elm,cl) {
+	return (elm.className.indexOf(cl) > -1) ? true : false;
+}
+
+SXE.removeClass = function(elm,cl) {
+	if(elm.className == null || elm.className == "" || !SXE.containsClass(elm,cl)) {
+		return true;
+	}
+	var classNames = elm.className.split(" ");
+	var newClassNames = "";
+	for (var x = 0, cnl = classNames.length; x < cnl; x++) {
+		if (classNames[x] != cl) {
+			newClassNames += (classNames[x] + " ");
+		}
+	}
+	elm.className = newClassNames.substring(0,newClassNames.length-1); //removes extra space at the end
+}
+
+SXE.addClass = function(elm,cl) {
+	if(!SXE.containsClass(elm,cl)) elm.className ? elm.className += " " + cl : elm.className = cl;
+	return true;
+}
+
+function insertInlineElement(en) {
+	var ed = tinyMCEPopup.editor, dom = ed.dom;
+
+	ed.getDoc().execCommand('FontName', false, 'mceinline');
+	tinymce.each(dom.select('span,font'), function(n) {
+		if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')
+			dom.replace(dom.create(en, {'data-mce-new' : 1}), n, 1);
+	});
+}
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/ins.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/ins.js
new file mode 100644
index 0000000000..c4addfb01d
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/js/ins.js
@@ -0,0 +1,53 @@
+/**
+ * ins.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+function init() {
+	SXE.initElementDialog('ins');
+	if (SXE.currentAction == "update") {
+		setFormValue('datetime', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'datetime'));
+		setFormValue('cite', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'cite'));
+		SXE.showRemoveButton();
+	}
+}
+
+function setElementAttribs(elm) {
+	setAllCommonAttribs(elm);
+	setAttrib(elm, 'datetime');
+	setAttrib(elm, 'cite');
+	elm.removeAttribute('data-mce-new');
+}
+
+function insertIns() {
+	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'INS');
+
+	if (elm == null) {
+		var s = SXE.inst.selection.getContent();
+		if(s.length > 0) {
+			insertInlineElement('ins');
+			var elementArray = SXE.inst.dom.select('ins[data-mce-new]');
+			for (var i=0; i<elementArray.length; i++) {
+				var elm = elementArray[i];
+				setElementAttribs(elm);
+			}
+		}
+	} else {
+		setElementAttribs(elm);
+	}
+	tinyMCEPopup.editor.nodeChanged();
+	tinyMCEPopup.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function removeIns() {
+	SXE.removeElement('ins');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/da_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/da_dlg.js
new file mode 100644
index 0000000000..2d66e48577
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/da_dlg.js
@@ -0,0 +1,32 @@
+tinyMCE.addI18n('da.xhtmlxtras_dlg',{
+attribute_label_title:"Titel",
+attribute_label_id:"ID",
+attribute_label_class:"Klasse",
+attribute_label_style:"Stil",
+attribute_label_cite:"Citat",
+attribute_label_datetime:"Dato/tid",
+attribute_label_langdir:"Tekstretning",
+attribute_option_ltr:"Venstre mod h\u00F8jre",
+attribute_option_rtl:"H\u00F8jre mod venstre",
+attribute_label_langcode:"Sprog",
+attribute_label_tabindex:"Tab-indeks",
+attribute_label_accesskey:"Adgangsn\u00F8gle",
+attribute_events_tab:"H\u00E6ndelser",
+attribute_attrib_tab:"Attributter",
+general_tab:"Generelt",
+attrib_tab:"Attributter",
+events_tab:"H\u00E6ndelser",
+fieldset_general_tab:"Genererelle indstillinger",
+fieldset_attrib_tab:"Element-attributter",
+fieldset_events_tab:"Element-h\u00E6ndelser",
+title_ins_element:"Inds\u00E6tbart element",
+title_del_element:"Sletteklart element",
+title_acronym_element:"Akronym element",
+title_abbr_element:"Forkortet element",
+title_cite_element:"Citationselement",
+remove:"Slet",
+insert_date:"Inds\u00E6t nuv\u00E6rende dato/tid",
+option_ltr:"Venstre mod h\u00F8jre",
+option_rtl:"H\u00F8jre mod venstre",
+attribs_title:"Inds\u00E6t/rediger attributter"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/de_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/de_dlg.js
new file mode 100644
index 0000000000..cc0b1e5dcd
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/de_dlg.js
@@ -0,0 +1,32 @@
+tinyMCE.addI18n('de.xhtmlxtras_dlg',{
+attribute_label_title:"Titel",
+attribute_label_id:"ID",
+attribute_label_class:"Klasse",
+attribute_label_style:"Format",
+attribute_label_cite:"Quellenangabe",
+attribute_label_datetime:"Zeit/Datum",
+attribute_label_langdir:"Schriftrichtung",
+attribute_option_ltr:"Links nach rechts",
+attribute_option_rtl:"Rechts nach links",
+attribute_label_langcode:"Sprache",
+attribute_label_tabindex:"Tabindex",
+attribute_label_accesskey:"Tastenk\u00FCrzel",
+attribute_events_tab:"Ereignisse",
+attribute_attrib_tab:"Attribute",
+general_tab:"Allgemein",
+attrib_tab:"Attribute",
+events_tab:"Ereignisse",
+fieldset_general_tab:"Allgemeine Einstellungen",
+fieldset_attrib_tab:"Attribute",
+fieldset_events_tab:"Ereignisse",
+title_ins_element:"Eingef\u00FCgter Text",
+title_del_element:"Entfernter Text",
+title_acronym_element:"Akronym",
+title_abbr_element:"Abk\u00FCrzung",
+title_cite_element:"Quellenangabe",
+remove:"Entfernen",
+insert_date:"Aktuelle Zeit/Datum einf\u00FCgen",
+option_ltr:"Links nach rechts",
+option_rtl:"Rechts nach links",
+attribs_title:"Attribute einf\u00FCgen/bearbeiten"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/en_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/en_dlg.js
new file mode 100644
index 0000000000..45b6b267ba
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/en_dlg.js
@@ -0,0 +1,32 @@
+tinyMCE.addI18n('en.xhtmlxtras_dlg',{
+attribute_label_title:"Title",
+attribute_label_id:"ID",
+attribute_label_class:"Class",
+attribute_label_style:"Style",
+attribute_label_cite:"Cite",
+attribute_label_datetime:"Date/Time",
+attribute_label_langdir:"Text Direction",
+attribute_option_ltr:"Left to right",
+attribute_option_rtl:"Right to left",
+attribute_label_langcode:"Language",
+attribute_label_tabindex:"TabIndex",
+attribute_label_accesskey:"AccessKey",
+attribute_events_tab:"Events",
+attribute_attrib_tab:"Attributes",
+general_tab:"General",
+attrib_tab:"Attributes",
+events_tab:"Events",
+fieldset_general_tab:"General Settings",
+fieldset_attrib_tab:"Element Attributes",
+fieldset_events_tab:"Element Events",
+title_ins_element:"Insertion Element",
+title_del_element:"Deletion Element",
+title_acronym_element:"Acronym Element",
+title_abbr_element:"Abbreviation Element",
+title_cite_element:"Citation Element",
+remove:"Remove",
+insert_date:"Insert current date/time",
+option_ltr:"Left to right",
+option_rtl:"Right to left",
+attribs_title:"Insert/Edit Attributes"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/es_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/es_dlg.js
new file mode 100644
index 0000000000..3025857d28
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/es_dlg.js
@@ -0,0 +1,32 @@
+tinyMCE.addI18n('es.xhtmlxtras_dlg',{
+attribute_label_title:"T\u00EDtulo",
+attribute_label_id:"ID",
+attribute_label_class:"Clase",
+attribute_label_style:"Estilo",
+attribute_label_cite:"Cita",
+attribute_label_datetime:"Fecha/Hora",
+attribute_label_langdir:"Direcci\u00F3n de texto",
+attribute_option_ltr:"Izquierda a derecha",
+attribute_option_rtl:"Derecha a izquierda",
+attribute_label_langcode:"Lenguaje",
+attribute_label_tabindex:"Orden de tabulaci\u00F3n",
+attribute_label_accesskey:"Tecla de acceso",
+attribute_events_tab:"Eventos",
+attribute_attrib_tab:"Atributos",
+general_tab:"General",
+attrib_tab:"Atributos",
+events_tab:"Eventos",
+fieldset_general_tab:"Configuraci\u00F3n general",
+fieldset_attrib_tab:"Atributos",
+fieldset_events_tab:"Evento",
+title_ins_element:"Insertar",
+title_del_element:"Borrar",
+title_acronym_element:"Acr\u00F3nimo",
+title_abbr_element:"Abreviatura",
+title_cite_element:"Cita",
+remove:"Suprimir",
+insert_date:"Insertar fecha/hora actuales",
+option_ltr:"Izquierda a derecha",
+option_rtl:"Derecha a izquierda",
+attribs_title:"Insertar/Editar atributos"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/fr_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/fr_dlg.js
new file mode 100644
index 0000000000..0359be42ba
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/fr_dlg.js
@@ -0,0 +1,32 @@
+tinyMCE.addI18n('fr.xhtmlxtras_dlg',{
+attribute_label_title:"Titre",
+attribute_label_id:"ID",
+attribute_label_class:"Classe",
+attribute_label_style:"Style",
+attribute_label_cite:"Citation",
+attribute_label_datetime:"Date/Heure",
+attribute_label_langdir:"Sens de lecture",
+attribute_option_ltr:"De gauche \u00E0 droite",
+attribute_option_rtl:"De droite \u00E0 gauche",
+attribute_label_langcode:"Langue",
+attribute_label_tabindex:"TabIndex",
+attribute_label_accesskey:"Touche d'acc\u00E8s",
+attribute_events_tab:"\u00C9v\u00E9nements",
+attribute_attrib_tab:"Attributs",
+general_tab:"G\u00E9n\u00E9ral",
+attrib_tab:"Attributs",
+events_tab:"\u00C9v\u00E9nements",
+fieldset_general_tab:"Param\u00E8tres g\u00E9n\u00E9raux",
+fieldset_attrib_tab:"Attributs",
+fieldset_events_tab:"\u00C9v\u00E9nements",
+title_ins_element:"Ajout",
+title_del_element:"Suppression",
+title_acronym_element:"Acronyme",
+title_abbr_element:"Abbr\u00E9viation",
+title_cite_element:"Citation",
+remove:"Enlever",
+insert_date:"Ins\u00E9rer la date et l'heure actuels",
+option_ltr:"De gauche \u00E0 droite",
+option_rtl:"De droite \u00E0 gauche",
+attribs_title:"Ins\u00E9rer/\u00C9diter attributs"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/it_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/it_dlg.js
new file mode 100644
index 0000000000..beb58a6f35
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/it_dlg.js
@@ -0,0 +1,32 @@
+tinyMCE.addI18n('it.xhtmlxtras_dlg',{
+attribute_label_title:"Titolo",
+attribute_label_id:"ID",
+attribute_label_class:"Classe",
+attribute_label_style:"Style",
+attribute_label_cite:"Citazione",
+attribute_label_datetime:"Date/Time",
+attribute_label_langdir:"Direzione del testo",
+attribute_option_ltr:"Sinistra verso destra",
+attribute_option_rtl:"Destra verso sinistra",
+attribute_label_langcode:"Lingua",
+attribute_label_tabindex:"Indice tabulazione",
+attribute_label_accesskey:"Tasto di accesso",
+attribute_events_tab:"Eventi",
+attribute_attrib_tab:"Attributi",
+general_tab:"Generale",
+attrib_tab:"Attributi",
+events_tab:"Eventi",
+fieldset_general_tab:"Impostazioni Generali",
+fieldset_attrib_tab:"Attributi elemento",
+fieldset_events_tab:"Eventi elemento",
+title_ins_element:"Inserimento elemento",
+title_del_element:"Cancellazione elemento",
+title_acronym_element:"Acronimo elemento",
+title_abbr_element:"Abbreviazione elemento",
+title_cite_element:"Citazione elemento",
+remove:"Rimuovi",
+insert_date:"Inserisci data/ora corrente",
+option_ltr:"Sinistra verso destra",
+option_rtl:"Destra verso sinistra",
+attribs_title:"Inserisci/modifica attributi"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/nl_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/nl_dlg.js
new file mode 100644
index 0000000000..e4db8e9659
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/nl_dlg.js
@@ -0,0 +1,32 @@
+tinyMCE.addI18n('nl.xhtmlxtras_dlg',{
+attribute_label_title:"Titel",
+attribute_label_id:"ID",
+attribute_label_class:"Klasse",
+attribute_label_style:"Stijl",
+attribute_label_cite:"Citaat",
+attribute_label_datetime:"Datum/Tijd",
+attribute_label_langdir:"Tekstrichting",
+attribute_option_ltr:"Van links naar rechts",
+attribute_option_rtl:"Van rechts naar links",
+attribute_label_langcode:"Taal",
+attribute_label_tabindex:"Tabvolgorde",
+attribute_label_accesskey:"Toegangstoets",
+attribute_events_tab:"Gebeurtenissen",
+attribute_attrib_tab:"Attributen",
+general_tab:"Algemeen",
+attrib_tab:"Attributen",
+events_tab:"Gebeurtenissen",
+fieldset_general_tab:"Algemene instellingen",
+fieldset_attrib_tab:"Elementattributen",
+fieldset_events_tab:"Element Gebeurtenissen",
+title_ins_element:"Invoegingselement",
+title_del_element:"Verwijderingselement",
+title_acronym_element:"Synoniem",
+title_abbr_element:"Afkoring",
+title_cite_element:"Citaat",
+remove:"Verwijderen",
+insert_date:"Huidige datum/tijd invoegen",
+option_ltr:"Van links naar rechts",
+option_rtl:"Van rechts naar links",
+attribs_title:"Attributen Invoegen/bewerken"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/no_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/no_dlg.js
new file mode 100644
index 0000000000..6be8a3aa01
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/no_dlg.js
@@ -0,0 +1,32 @@
+tinyMCE.addI18n('no.xhtmlxtras_dlg',{
+attribute_label_title:"Tittel",
+attribute_label_id:"ID",
+attribute_label_class:"Klasse",
+attribute_label_style:"Stil",
+attribute_label_cite:"Sted",
+attribute_label_datetime:"Dato/tid",
+attribute_label_langdir:"Tekstretning",
+attribute_option_ltr:"Venstre mot h\u00F8yre",
+attribute_option_rtl:"H\u00F8yre mot venstre",
+attribute_label_langcode:"Spr\u00E5k",
+attribute_label_tabindex:"Tabuleringsindeks",
+attribute_label_accesskey:"Tilgangsn\u00F8kkel",
+attribute_events_tab:"Hendelser",
+attribute_attrib_tab:"Attributt",
+general_tab:"Generelt",
+attrib_tab:"Attributter",
+events_tab:"Hendelser",
+fieldset_general_tab:"Generelle innstillinger",
+fieldset_attrib_tab:"Elementattributter",
+fieldset_events_tab:"Elementhendelser",
+title_ins_element:"Innsettingselement",
+title_del_element:"Sletteelement",
+title_acronym_element:"Akronymelement",
+title_abbr_element:"Forkortingselement",
+title_cite_element:"Sitatelement",
+remove:"Fjern",
+insert_date:"Sett inn dato/tid",
+option_ltr:"Venstre mot h\u00F8yre",
+option_rtl:"H\u00F8yre mot venstre",
+attribs_title:"Sett inn / endre attributt"
+});
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/sv_dlg.js b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/sv_dlg.js
new file mode 100644
index 0000000000..2c97687ce7
--- /dev/null
+++ b/umbraco/presentation/umbraco_client/tinymce3/plugins/xhtmlxtras/langs/sv_dlg.js
@@ -0,0 +1,32 @@
+tinyMCE.addI18n('sv.xhtmlxtras_dlg',{
+attribute_label_title:"Titel",
+attribute_label_id:"ID",
+attribute_label_class:"Klass",
+attribute_label_style:"Stil",
+attribute_label_cite:"Citat",
+attribute_label_datetime:"Datum/Tid",
+attribute_label_langdir:"Skriftriktning",
+attribute_option_ltr:"V\u00E4nster till h\u00F6ger",
+attribute_option_rtl:"H\u00F6ger till v\u00E4nster",
+attribute_label_langcode:"Spr\u00E5k",
+attribute_label_tabindex:"Tabbindex",
+attribute_label_accesskey:"Snabbtangent",
+attribute_events_tab:"H\u00E4ndelser",
+attribute_attrib_tab:"Attribut",
+general_tab:"Generellt",
+attrib_tab:"Attribut",
+events_tab:"H\u00E4ndelser",
+fieldset_general_tab:"Generella inst\u00E4llningar",
+fieldset_attrib_tab:"Attribut",
+fieldset_events_tab:"H\u00E4ndelser",
+title_ins_element:"Markera som tillagt",
+title_del_element:"Markera som struket",
+title_acronym_element:"Akronym",
+title_abbr_element:"F\u00F6rkortning",
+title_cite_element:"Citat",
+remove:"Radera",
+insert_date:"Infoga nuvarande datum och tid",
+option_ltr:"V\u00E4nster till h\u00F6ger",
+option_rtl:"H\u00F6ger till v\u00E4nster",
+attribs_title:"Redigera attribut"
+});
\ No newline at end of file