diff --git a/content/liberator.xul b/content/liberator.xul
new file mode 100644
index 00000000..5b751250
--- /dev/null
+++ b/content/liberator.xul
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+
+<!-- ***** BEGIN LICENSE BLOCK ***** {{{
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+(c) 2006-2008: Martin Stubenschrott <stubenschrott@gmx.net>
+
+Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.
+}}} ***** END LICENSE BLOCK ***** -->
+
+<!DOCTYPE overlay SYSTEM "chrome://vimperator/content/vimperator.dtd">
+
+<overlay id="liberator"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:nc="http://home.netscape.com/NC-rdf#"
+    xmlns:html="http://www.w3.org/1999/xhtml"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <script type="application/x-javascript;version=1.8" src="&liberator.name;.js"/>
+
+    <script type="application/x-javascript;version=1.8" src="buffer.js"/>
+    <script type="application/x-javascript;version=1.8" src="commands.js"/>
+    <script type="application/x-javascript;version=1.8" src="completion.js"/>
+    <script type="application/x-javascript;version=1.8" src="editor.js"/>
+    <script type="application/x-javascript;version=1.8" src="events.js"/>
+    <script type="application/x-javascript;version=1.8" src="find.js"/>
+    <script type="application/x-javascript;version=1.8" src="help.js"/>
+    <script type="application/x-javascript;version=1.8" src="hints.js"/>
+    <script type="application/x-javascript;version=1.8" src="io.js"/>
+    <script type="application/x-javascript;version=1.8" src="mappings.js"/>
+    <script type="application/x-javascript;version=1.8" src="modes.js"/>
+    <script type="application/x-javascript;version=1.8" src="ui.js"/>
+    <script type="application/x-javascript;version=1.8" src="util.js"/>
+    <script type="application/x-javascript;version=1.8" src="options.js"/>
+
+    <window id="&liberator.mainWindow;">
+
+        <keyset id="mainKeyset">
+            <key id="key_open_vimbar" key=":" oncommand="liberator.commandline.open(':', '', liberator.modes.EX);" modifiers=""/>
+            <key id="key_stop" keycode="VK_ESCAPE" oncommand="liberator.events.onEscape();"/>
+            <!-- other keys are handled inside the event loop in events.js -->
+        </keyset>
+
+        <panel id="liberator-visualbell"/>
+
+        <!--this notifies us also of focus events in the XUL
+            from: http://developer.mozilla.org/en/docs/XUL_Tutorial:Updating_Commands !-->
+        <commandset id="onVimperatorFocus"
+            commandupdater="true"
+            events="focus"
+            oncommandupdate="if (typeof liberator.events != 'undefined') liberator.events.onFocusChange(event);"/>
+        <commandset id="onVimperatorSelect"
+            commandupdater="true"
+            events="select"
+            oncommandupdate="if (typeof liberator.events != 'undefined') liberator.events.onSelectionChange(event);"/>
+
+        <!-- As of Firefox 3.1pre, <iframe>.height changes do not seem to have immediate effect,
+             therefore we need to put them into a <vbox> for which that works just fine -->
+        <vbox class="liberator-container" hidden="false" collapsed="true">
+            <iframe id="liberator-multiline-output" src="chrome://&liberator.name;/content/buffer.xhtml"
+                flex="1" hidden="false" collapsed="false"
+                onclick="liberator.commandline.onMultilineOutputEvent(event)"/>
+        </vbox>
+
+        <vbox class="liberator-container" hidden="false" collapsed="true">
+            <iframe id="liberator-completions" src="chrome://&liberator.name;/content/buffer.xhtml"
+                flex="1" hidden="false" collapsed="false"
+                onclick="liberator.commandline.onMultilineOutputEvent(event)"/>
+        </vbox>
+
+        <hbox id="liberator-commandline" hidden="false" class="hl-Normal">
+            <label class="plain" id="liberator-commandline-prompt"  flex="0" crop="end" value="" collapsed="true"/>
+            <textbox class="plain" id="liberator-commandline-command" flex="1" type="timed" timeout="100"
+                oninput="liberator.commandline.onEvent(event);"
+                onfocus="liberator.commandline.onEvent(event);"
+                onblur="liberator.commandline.onEvent(event);"/>
+        </hbox>
+
+        <vbox class="liberator-container" hidden="false" collapsed="false">
+            <textbox id="liberator-multiline-input" class="plain" flex="1" rows="1" hidden="false" collapsed="true" multiline="true"
+                onkeypress="liberator.commandline.onMultilineInputEvent(event);"
+                oninput="liberator.commandline.onMultilineInputEvent(event);"
+                onblur="liberator.commandline.onMultilineInputEvent(event);"/>
+        </vbox>
+
+    </window>
+
+    <statusbar id="status-bar" class="hl-StatusLine">
+        <hbox insertbefore="&liberator.statusBefore;" insertafter="&liberator.statusAfter;"
+              id="liberator-statusline" flex="1" hidden="false" align="center">
+            <textbox class="plain" id="liberator-statusline-field-url" readonly="false" flex="1" crop="end"/>
+            <label class="plain" id="liberator-statusline-field-inputbuffer"    flex="0"/>
+            <label class="plain" id="liberator-statusline-field-progress"       flex="0"/>
+            <label class="plain" id="liberator-statusline-field-tabcount"       flex="0"/>
+            <label class="plain" id="liberator-statusline-field-bufferposition" flex="0"/>
+        </hbox>
+        <!-- just hide them since other elements expect them -->
+        <statusbarpanel id="statusbar-display" hidden="true"/>
+        <statusbarpanel id="statusbar-progresspanel" hidden="true"/>
+    </statusbar>
+
+</overlay>
+
+<!-- vim: set fdm=marker sw=4 ts=4 et: -->
diff --git a/content/muttator.dtd b/content/muttator.dtd
new file mode 100644
index 00000000..6fec80fd
--- /dev/null
+++ b/content/muttator.dtd
@@ -0,0 +1,6 @@
+
+<!ENTITY liberator.mainWindow "messengerWindow">
+<!ENTITY liberator.name "vimperator">
+<!ENTITY liberator.statusBefore "">
+<!ENTITY liberator.statusAfter "statusTextBox">
+
diff --git a/content/muttator.xul b/content/muttator.xul
index 4e1a0412..453bf44a 100644
--- a/content/muttator.xul
+++ b/content/muttator.xul
@@ -30,6 +30,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
 <!--?xml-stylesheet href="chrome://browser/skin/" type="text/css"?-->
 <?xml-stylesheet href="chrome://muttator/skin/vimperator.css" type="text/css"?>
+<?xul-overlay href="chrome://muttator/content/liberator.xul"?>
 
 <overlay id="muttator"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -38,89 +39,10 @@ the terms of any one of the MPL, the GPL or the LGPL.
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/x-javascript;version=1.8" src="liberator.js"/>
-    <script type="application/x-javascript;version=1.8" src="muttator.js"/>
-
     <script type="application/x-javascript;version=1.8" src="addressbook.js"/>
-    <script type="application/x-javascript;version=1.8" src="buffer.js"/>
-    <script type="application/x-javascript;version=1.8" src="commands.js"/>
-    <script type="application/x-javascript;version=1.8" src="completion.js"/>
-    <script type="application/x-javascript;version=1.8" src="editor.js"/>
-    <script type="application/x-javascript;version=1.8" src="events.js"/>
-    <script type="application/x-javascript;version=1.8" src="find.js"/>
-    <script type="application/x-javascript;version=1.8" src="help.js"/>
-    <script type="application/x-javascript;version=1.8" src="hints.js"/>
-    <script type="application/x-javascript;version=1.8" src="io.js"/>
     <script type="application/x-javascript;version=1.8" src="mail.js"/>
-    <script type="application/x-javascript;version=1.8" src="mappings.js"/>
-    <script type="application/x-javascript;version=1.8" src="modes.js"/>
-    <script type="application/x-javascript;version=1.8" src="options.js"/>
-    <script type="application/x-javascript;version=1.8" src="ui.js"/>
-    <script type="application/x-javascript;version=1.8" src="util.js"/>
     <script type="application/x-javascript;version=1.8" src="tabs.js"/>
 
-    <window id="messengerWindow">
-
-       <keyset id="mainKeyset">
-           <key id="key_open_vimbar" key=":" oncommand="liberator.commandline.open(':', '', liberator.modes.EX);" modifiers=""/>
-           <key id="key_stop" keycode="VK_ESCAPE" oncommand="liberator.events.onEscape();"/>
-           <!-- other keys are handled inside the event loop in events.js -->
-       </keyset>
-
-       <panel id="liberator-visualbell"/>
-
-        <!--this notifies us also of focus events in the XUL
-            from: http://developer.mozilla.org/en/docs/XUL_Tutorial:Updating_Commands !-->
-        <commandset id="onVimperatorFocus"
-            commandupdater="true"
-            events="focus"
-            oncommandupdate="if (typeof liberator.events != 'undefined') liberator.events.onFocusChange(event);"/>
-        <commandset id="onVimperatorSelect"
-            commandupdater="true"
-            events="select"
-            oncommandupdate="if (typeof liberator.events != 'undefined') liberator.events.onSelectionChange(event);"/>
-
-        <vbox class="liberator-container" hidden="false" collapsed="true">
-            <iframe id="liberator-multiline-output" src="chrome://muttator/content/buffer.xhtml"
-                flex="1" height="10px" hidden="false" collapsed="false"
-                onclick="liberator.commandline.onMultilineOutputEvent(event)"/>
-        </vbox>
-
-        <vbox class="liberator-container" hidden="false" collapsed="true">
-            <iframe id="liberator-completions" src="chrome://muttator/content/buffer.xhtml"
-                flex="1" height="250px" hidden="false" collapsed="false"
-                onclick="liberator.commandline.onMultilineOutputEvent(event)"/>
-        </vbox>
-
-        <hbox id="liberator-commandline" hidden="false" class="hl-Normal">
-            <label class="plain" id="liberator-commandline-prompt"  flex="0" crop="end" value="" collapsed="true"/>
-            <textbox class="plain" id="liberator-commandline-command" flex="1" type="timed" timeout="100"
-                oninput="liberator.commandline.onEvent(event);"
-                onfocus="liberator.commandline.onEvent(event);"
-                onblur="liberator.commandline.onEvent(event);"/>
-        </hbox>
-
-        <vbox class="liberator-container" hidden="false" collapsed="false">
-            <textbox id="liberator-multiline-input" class="plain" flex="1" rows="1" hidden="false" collapsed="true" multiline="true"
-                onkeypress="liberator.commandline.onMultilineInputEvent(event);"
-                oninput="liberator.commandline.onMultilineInputEvent(event);"
-                onblur="liberator.commandline.onMultilineInputEvent(event);"/>
-        </vbox>
-
-    </window>
-
-    <statusbar id="status-bar" class="hl-StatusLine">
-        <hbox insertafter="statusTextBox" id="liberator-statusline" flex="1" height="10" hidden="false" align="center">
-            <statusbarpanel class="plain" id="liberator-statusline-field-url" readonly="false" flex="1" crop="end"/>
-            <statusbarpanel class="plain" id="liberator-statusline-field-inputbuffer"    flex="0"/>
-            <statusbarpanel class="plain" id="liberator-statusline-field-progress"       flex="0"/>
-            <statusbarpanel class="plain" id="liberator-statusline-field-tabcount"       flex="0"/>
-            <statusbarpanel class="plain" id="liberator-statusline-field-bufferposition" flex="0"/>
-        </hbox>
-        <!-- just hide them since other elements expect them -->
-        <statusbarpanel id="statusText" hidden="true"/>
-        <statusbarpanel id="statusbarpanel-progress" hidden="true"/>
-    </statusbar>
-
 </overlay>
 
 <!-- vim: set fdm=marker sw=4 ts=4 et: -->
diff --git a/content/vimperator.dtd b/content/vimperator.dtd
new file mode 100644
index 00000000..3dfe25c3
--- /dev/null
+++ b/content/vimperator.dtd
@@ -0,0 +1,6 @@
+
+<!ENTITY liberator.mainWindow "main-window">
+<!ENTITY liberator.name "vimperator">
+<!ENTITY liberator.statusBefore "statusbar-display">
+<!ENTITY liberator.statusAfter "">
+
diff --git a/content/vimperator.xul b/content/vimperator.xul
index c840a71b..231f033f 100644
--- a/content/vimperator.xul
+++ b/content/vimperator.xul
@@ -30,6 +30,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://vimperator/skin/vimperator.css" type="text/css"?>
+<?xul-overlay href="chrome://vimperator/content/liberator.xul"?>
 
 <overlay id="vimperator"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -38,89 +39,8 @@ the terms of any one of the MPL, the GPL or the LGPL.
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/x-javascript;version=1.8" src="liberator.js"/>
-    <script type="application/x-javascript;version=1.8" src="vimperator.js"/>
-
     <script type="application/x-javascript;version=1.8" src="bookmarks.js"/>
-    <script type="application/x-javascript;version=1.8" src="buffer.js"/>
-    <script type="application/x-javascript;version=1.8" src="commands.js"/>
-    <script type="application/x-javascript;version=1.8" src="completion.js"/>
-    <script type="application/x-javascript;version=1.8" src="editor.js"/>
-    <script type="application/x-javascript;version=1.8" src="events.js"/>
-    <script type="application/x-javascript;version=1.8" src="find.js"/>
-    <script type="application/x-javascript;version=1.8" src="help.js"/>
-    <script type="application/x-javascript;version=1.8" src="hints.js"/>
-    <script type="application/x-javascript;version=1.8" src="io.js"/>
-    <script type="application/x-javascript;version=1.8" src="mappings.js"/>
-    <script type="application/x-javascript;version=1.8" src="modes.js"/>
-    <script type="application/x-javascript;version=1.8" src="options.js"/>
     <script type="application/x-javascript;version=1.8" src="tabs.js"/>
-    <script type="application/x-javascript;version=1.8" src="ui.js"/>
-    <script type="application/x-javascript;version=1.8" src="util.js"/>
-
-    <window id="main-window">
-
-        <keyset id="mainKeyset">
-            <key id="key_open_vimbar" key=":" oncommand="liberator.commandline.open(':', '', liberator.modes.EX);" modifiers=""/>
-            <key id="key_stop" keycode="VK_ESCAPE" oncommand="liberator.events.onEscape();"/>
-            <!-- other keys are handled inside the event loop in events.js -->
-        </keyset>
-
-        <panel id="liberator-visualbell"/>
-
-        <!--this notifies us also of focus events in the XUL
-            from: http://developer.mozilla.org/en/docs/XUL_Tutorial:Updating_Commands !-->
-        <commandset id="onVimperatorFocus"
-            commandupdater="true"
-            events="focus"
-            oncommandupdate="if (typeof liberator.events != 'undefined') liberator.events.onFocusChange(event);"/>
-        <commandset id="onVimperatorSelect"
-            commandupdater="true"
-            events="select"
-            oncommandupdate="if (typeof liberator.events != 'undefined') liberator.events.onSelectionChange(event);"/>
-
-        <!-- As of Firefox 3.1pre, <iframe>.height changes do not seem to have immediate effect,
-             therefore we need to put them into a <vbox> for which that works just fine -->
-        <vbox class="liberator-container" hidden="false" collapsed="true">
-            <iframe id="liberator-multiline-output" src="chrome://vimperator/content/buffer.xhtml"
-                flex="1" hidden="false" collapsed="false"
-                onclick="liberator.commandline.onMultilineOutputEvent(event)"/>
-        </vbox>
-
-        <vbox class="liberator-container" hidden="false" collapsed="true">
-            <iframe id="liberator-completions" src="chrome://vimperator/content/buffer.xhtml"
-                flex="1" hidden="false" collapsed="false"
-                onclick="liberator.commandline.onMultilineOutputEvent(event)"/>
-        </vbox>
-
-        <hbox id="liberator-commandline" hidden="false" class="hl-Normal">
-            <label class="plain" id="liberator-commandline-prompt"  flex="0" crop="end" value="" collapsed="true"/>
-            <textbox class="plain" id="liberator-commandline-command" flex="1" type="timed" timeout="100"
-                oninput="liberator.commandline.onEvent(event);"
-                onfocus="liberator.commandline.onEvent(event);"
-                onblur="liberator.commandline.onEvent(event);"/>
-        </hbox>
-
-        <vbox class="liberator-container" hidden="false" collapsed="false">
-            <textbox id="liberator-multiline-input" class="plain" flex="1" rows="1" hidden="false" collapsed="true" multiline="true"
-                onkeypress="liberator.commandline.onMultilineInputEvent(event);"
-                oninput="liberator.commandline.onMultilineInputEvent(event);"
-                onblur="liberator.commandline.onMultilineInputEvent(event);"/>
-        </vbox>
-
-    </window>
-
-    <statusbar id="status-bar" class="hl-StatusLine">
-        <hbox insertbefore="statusbar-display" id="liberator-statusline" flex="1" hidden="false" align="center">
-            <textbox class="plain" id="liberator-statusline-field-url" readonly="false" flex="1" crop="end"/>
-            <label class="plain" id="liberator-statusline-field-inputbuffer"    flex="0"/>
-            <label class="plain" id="liberator-statusline-field-progress"       flex="0"/>
-            <label class="plain" id="liberator-statusline-field-tabcount"       flex="0"/>
-            <label class="plain" id="liberator-statusline-field-bufferposition" flex="0"/>
-        </hbox>
-        <!-- just hide them since other elements expect them -->
-        <statusbarpanel id="statusbar-display" hidden="true"/>
-        <statusbarpanel id="statusbar-progresspanel" hidden="true"/>
-    </statusbar>
 
     <menupopup id="viewSidebarMenu">
         <menuitem observes="vimperator-viewAddonsSidebar" label="Add-ons" accesskey="A"/>