diff --git a/templates/2k11/admin/media_choose.tpl b/templates/2k11/admin/media_choose.tpl
index e1b2ca8f..03dbdb09 100644
--- a/templates/2k11/admin/media_choose.tpl
+++ b/templates/2k11/admin/media_choose.tpl
@@ -51,76 +51,19 @@
 {/if}
     <script src="{serendipity_getFile file='YahooUI/treeview/YAHOO.js'}"></script>
     <script src="{serendipity_getFile file='YahooUI/treeview/treeview.js'}"></script>
+    <script src="{serendipity_getFile file='admin/header_spawn.js'}"></script>
+    <script type="text/javascript" src="{$serendipityHTTPPath}serendipity_define.js.php"></script>
+    <script src="{$serendipityHTTPPath}serendipity_editor.js"></script>
+    {serendipity_hookPlugin hook="backend_header" hookAll="true"}
 </head>
-    <script>
-        function addLoadEvent(func) {ldelim}
-          var oldonload = window.onload;
-          if (typeof window.onload != 'function') {ldelim}
-            window.onload = func;
-          {rdelim} else {ldelim}
-            window.onload = function() {ldelim}
-              oldonload();
-              func();
-            {rdelim}
-          {rdelim}
-        {rdelim}
-
-        function SetCookie(name, value) {ldelim}
-            var today  = new Date();
-            var expire = new Date();
-            expire.setTime(today.getTime() + (60*60*24*30*1000));
-            document.cookie = 'serendipity[' + name + ']='+escape(value) + ';expires=' + expire.toGMTString();
-        {rdelim}
-
-        function rememberOptions() {ldelim}
-            el = document.getElementById('imageForm');
-            for (i = 0; i < el.elements.length; i++) {ldelim}
-                elname = new String(el.elements[i].name);
-                elname = elname.replace(/\[/g, '_');
-                elname = elname.replace(/\]/g, '');
-
-                if (el.elements[i].type == 'radio') {ldelim}
-                    if (el.elements[i].checked) {ldelim}
-                        SetCookie(elname, el.elements[i].value);
-                    {rdelim}
-                {rdelim} else if (typeof(el.elements[i].options) == 'object') {ldelim}
-                    SetCookie(elname, el.elements[i].options[el.elements[i].selectedIndex].value);
-                {rdelim}
-            {rdelim}
-        {rdelim}
-
 {if $media.only_path}
-        if (parent.frames && parent.frames['tree']) {ldelim}
-            parent.frames['tree'].document.getElementById('newdirlink').href =
-                parent.frames['tree'].basenewdirurl +
-                "{$media.only_path|@escape}"
-        {rdelim}
+<script>
+if (parent.frames && parent.frames['tree']) {ldelim}
+    parent.frames['tree'].document.getElementById('newdirlink').href = parent.frames['tree'].basenewdirurl + "{$media.only_path|@escape}";
+{rdelim}
+</script>
 {/if}
 
-{if $media.case == 'default'}
-        function rename(id, fname) {ldelim}
-            if (newname = prompt('{$CONST.ENTER_NEW_NAME}' + fname, fname)) {ldelim}
-                newloc = '?{$media.token_url}&serendipity[adminModule]=images&serendipity[adminAction]=rename&serendipity[fid]='+ escape(id) + '&serendipity[newname]='+ escape(newname);
-                location.href=newloc;
-            {rdelim}
-        {rdelim}
-{/if}
-
-{if $media.case == 'tree'}
-    var toggle_state = 'expand';
-    function treeToggleAll() {ldelim}
-        if (toggle_state == 'expand') {ldelim}
-            toggle_state = 'collapse';
-            tree.expandAll();
-        {rdelim} else {ldelim}
-            toggle_state = 'expand';
-            tree.collapseAll();
-            coreNode.expand();
-        {rdelim}
-    {rdelim}
-{/if}
-    </script>
-
 {if $media.frameset}
 <frameset id="media_frame" cols="20%,*">
     <frame id="media_frame_tree" frameborder="0" name="tree" scrolling="auto" src="{$serendipityHTTPPath}serendipity_admin_image_selector.php?{$media.GET_STRING}&amp;serendipity[step]=tree">
@@ -162,8 +105,6 @@
     {else}
     <!-- MEDIA SELECTION START -->
     {$media.external}
-    <script src="{$serendipityHTTPPath}serendipity_define.js.php"></script>
-    <script src="{$serendipityHTTPPath}serendipity_editor.js"></script>
 
     <div class="clearfix">
     {if $media.file.is_image}
@@ -293,7 +234,7 @@
             {serendipity_hookPlugin hookAll=true hook='frontend_image_selector_more' eventData=$media.file}
             <div class="form_buttons">
                 <input type="button" value="{$CONST.BACK}" onclick="history.go(-1);">
-                <input type="button" value="{$CONST.DONE}" onclick="rememberOptions(); {$media.file.origfinishJSFunction}">
+                <input type="button" value="{$CONST.DONE}" onclick="rememberMediaOptions(); {$media.file.origfinishJSFunction}">
                 {serendipity_hookPlugin hookAll=true hook='frontend_image_selector_submit' eventData=$media.file}
             </div>
         {/if}