diff --git a/content/compose/liberator.dtd b/content/compose/liberator.dtd
index 4631750f..2fa8c74e 100644
--- a/content/compose/liberator.dtd
+++ b/content/compose/liberator.dtd
@@ -1,6 +1,4 @@
-
 <!ENTITY liberator.mainWindow "msgcomposeWindow">
 <!ENTITY liberator.name "muttator">
 <!ENTITY liberator.statusBefore "">
 <!ENTITY liberator.statusAfter "statusText">
-
diff --git a/content/muttatorcompose.xul b/content/compose/liberator.xul
similarity index 53%
rename from content/muttatorcompose.xul
rename to content/compose/liberator.xul
index 89be0d4c..948271bb 100644
--- a/content/muttatorcompose.xul
+++ b/content/compose/liberator.xul
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!-- ***** BEGIN LICENSE BLOCK ***** {{{
 Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -28,78 +28,87 @@ 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 ***** -->
 
-<!--?xml-stylesheet href="chrome://browser/skin/" type="text/css"?-->
 <?xml-stylesheet href="chrome://liberator/skin/liberator.css" type="text/css"?>
+<!DOCTYPE overlay SYSTEM "liberator.dtd" [
+    <!ENTITY liberator.content "chrome://liberator/content/">
+]>
 
-<overlay id="muttator"
+<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-overlay.js"/>
+    <script type="application/x-javascript;version=1.8" src="&liberator.content;liberator-overlay.js"/>
 
-    <window id="msgcomposeWindow">
+    <window id="&liberator.mainWindow;">
+
+        <keyset id="mainKeyset">
+            <key id="key_open_vimbar" key=":" oncommand="liberator.modules.commandline.open(':', '', liberator.modules.modes.EX);" modifiers=""/>
+            <key id="key_stop" keycode="VK_ESCAPE" oncommand="liberator.modules.events.onEscape();"/>
+            <!-- other keys are handled inside the event loop in events.js -->
+        </keyset> 
+
+        <popupset>
+            <panel id="liberator-visualbell"/>
+        </popupset>
 
         <!--this notifies us also of focus events in the XUL
             from: http://developer.mozilla.org/en/docs/XUL_Tutorial:Updating_Commands !-->
-        <commandset id="onLiberatorFocus"
+        <commandset id="onVimperatorFocus"
             commandupdater="true"
             events="focus"
-            oncommandupdate="if (typeof liberator.events != 'undefined') liberator.events.onFocusChange(event);"/>
-        <commandset id="onLiberatorSelect"
+            oncommandupdate="if (typeof liberator.modules.events != 'undefined') liberator.modules.events.onFocusChange(event);"/>
+        <commandset id="onVimperatorSelect"
             commandupdater="true"
             events="select"
-            oncommandupdate="if (typeof liberator.events != 'undefined') liberator.events.onSelectionChange(event);"/>
-
-        <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>
-
-        <statusbar id="status-bar" class="hl-StatusLine">
-            <hbox insertafter="statusText" 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>
+            oncommandupdate="if (typeof liberator.modules.events != 'undefined') liberator.modules.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/content/buffer.xhtml"
-                flex="1" height="10px" hidden="false" collapsed="false"
-                onclick="liberator.commandline.onMultilineOutputEvent(event)"/>
+                flex="1" hidden="false" collapsed="false"
+                onclick="liberator.modules.commandline.onMultilineOutputEvent(event)"/>
         </vbox>
 
         <vbox class="liberator-container" hidden="false" collapsed="true">
             <iframe id="liberator-completions" src="chrome://liberator/content/buffer.xhtml"
-                flex="1" height="250px" hidden="false" collapsed="false"
-                onclick="liberator.commandline.onMultilineOutputEvent(event)"/>
+                flex="1" hidden="false" collapsed="false"
+                onclick="liberator.modules.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);"/>
+                oninput="liberator.modules.commandline.onEvent(event);"
+                onfocus="liberator.modules.commandline.onEvent(event);"
+                onblur="liberator.modules.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);"/>
+                onkeypress="liberator.modules.commandline.onMultilineInputEvent(event);"
+                oninput="liberator.modules.commandline.onMultilineInputEvent(event);"
+                onblur="liberator.modules.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: -->