diff --git a/chrome.manifest b/chrome.manifest
index ed4476f9..fe31c25b 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,7 +1,9 @@
 # Firefox
-content	 vimperator content/
-resource vimperator modules/
-locale	 vimperator en-US locale/en-US/
-skin vimperator classic/1.0 skin/
-overlay chrome://browser/content/browser.xul chrome://vimperator/content/vimperator.xul
+content	 liberator content/
+resource liberator modules/
+locale	 liberator en-US locale/en-US/
+skin	 liberator classic/1.0 skin/
+override chrome://liberator/content/liberator.dtd chrome://liberator/content/vimperator.dtd
+overlay  chrome://browser/content/browser.xul chrome://liberator/content/liberator.xul
+overlay  chrome://browser/content/browser.xul chrome://liberator/content/vimperator.xul
 
diff --git a/content/buffer.js b/content/buffer.js
index 3ecee3f0..b6c7b263 100644
--- a/content/buffer.js
+++ b/content/buffer.js
@@ -42,8 +42,7 @@ liberator.Buffer = function () //{{{
             ["Search", ".__liberator-search", "*"],
             ["Bell", "#liberator-visualbell"],
             ];
-    let name = liberator.config.name.toLowerCase();
-    const highlightDocs = "chrome://" + name + "/content/buffer.xhtml,chrome://browser/content/browser.xul";
+    const highlightDocs = "chrome://liberator/content/buffer.xhtml,chrome://browser/content/browser.xul";
 
     var highlight = liberator.storage.newMap("highlight", false);
 
@@ -234,8 +233,8 @@ liberator.Buffer = function () //{{{
     let fontSize = document.defaultView.getComputedStyle(document.getElementById(mainWindowID), null)
                                        .getPropertyValue("font-size");
 
-    styles.registerSheet("chrome://" + name + "/skin/vimperator.css");
-    let error = styles.addSheet("chrome://" + name + "/content/buffer.xhtml",
+    styles.registerSheet("chrome://liberator/skin/liberator.css");
+    let error = styles.addSheet("chrome://liberator/content/buffer.xhtml",
         "body { font-size: " + fontSize + "; }", true);
 
     function setZoom(value, fullZoom)
diff --git a/content/completion.js b/content/completion.js
index bc7c17ca..15258dcf 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -876,12 +876,12 @@ liberator.Completion = function () //{{{
                 try
                 {
                     var xmlhttp = new XMLHttpRequest();
-                    xmlhttp.open("GET", "chrome://" + liberator.config.name.toLowerCase() + "/locale/" + files[i], false);
+                    xmlhttp.open("GET", "chrome://liberator/locale/" + files[i], false);
                     xmlhttp.send(null);
                 }
                 catch (e)
                 {
-                    liberator.log("Error opening chrome://" + liberator.config.name.toLowerCase() + "/locale/" + files[i], 1);
+                    liberator.log("Error opening chrome://liberator/locale/" + files[i], 1);
                     continue;
                 }
                 var doc = xmlhttp.responseXML;
diff --git a/content/liberator.js b/content/liberator.js
index 62fe1eda..060564ec 100644
--- a/content/liberator.js
+++ b/content/liberator.js
@@ -638,7 +638,7 @@ const liberator = (function () //{{{
         // with (liberator) means, liberator is the default namespace "inside" eval
         eval: function (str)
         {
-            const fileName = "chrome://" + liberator.config.name.toLowerCase() + "/content/liberator.js";
+            const fileName = "chrome://liberator/content/liberator.js";
             const line = new Error().lineNumber + 3;
             try
             {
@@ -840,7 +840,7 @@ const liberator = (function () //{{{
                 var helpFile = liberator.options["helpfile"];
 
                 if (liberator.config.helpFiles.indexOf(helpFile) != -1)
-                    liberator.open("chrome://" + liberator.config.name.toLowerCase() + "/locale/" + helpFile, where);
+                    liberator.open("chrome://liberator/locale/" + helpFile, where);
                 else
                     liberator.echo("Sorry, help file \"" + helpFile + "\" not found");
 
@@ -849,7 +849,7 @@ const liberator = (function () //{{{
 
             function jumpToTag(file, tag)
             {
-                liberator.open("chrome://" + liberator.config.name.toLowerCase() + "/locale/" + file, where);
+                liberator.open("chrome://liberator/locale/" + file, where);
                 // TODO: it would be better wo wait for pageLoad
                 setTimeout(function () {
                     var elem = liberator.buffer.getElement('@class="tag" and text()="' + tag + '"');
@@ -1053,7 +1053,7 @@ const liberator = (function () //{{{
             liberator.log("Initializing liberator object...", 0);
 
             // components which should be shared across all windows
-            Components.utils.import("resource://" + liberator.config.name.toLowerCase() + "/storage.jsm", liberator);
+            Components.utils.import("resource://liberator/storage.jsm", liberator);
 
             // commands must always be the first module to be initialized
             loadModule("commands",     liberator.Commands); addCommands();
diff --git a/content/liberator.xul b/content/liberator.xul
index ca3a6bd1..f2662221 100644
--- a/content/liberator.xul
+++ b/content/liberator.xul
@@ -28,7 +28,8 @@ 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">
+<?xml-stylesheet href="chrome://liberator/skin/liberator.css" type="text/css"?>
+<!DOCTYPE overlay SYSTEM "chrome://liberator/content/liberator.dtd">
 
 <overlay id="liberator"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -36,6 +37,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
     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.js"/>
     <script type="application/x-javascript;version=1.8" src="&liberator.name;.js"/>
 
     <script type="application/x-javascript;version=1.8" src="buffer.js"/>
@@ -80,13 +82,13 @@ the terms of any one of the MPL, the GPL or the LGPL.
         <!-- 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"
+            <iframe id="liberator-multiline-output" src="chrome://liberator/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"
+            <iframe id="liberator-completions" src="chrome://liberator/content/buffer.xhtml"
                 flex="1" hidden="false" collapsed="false"
                 onclick="liberator.commandline.onMultilineOutputEvent(event)"/>
         </vbox>
diff --git a/content/muttator.xul b/content/muttator.xul
index 453bf44a..2e4f8759 100644
--- a/content/muttator.xul
+++ b/content/muttator.xul
@@ -29,8 +29,6 @@ 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://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,7 +36,6 @@ the terms of any one of the MPL, the GPL or the LGPL.
     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.js"/>
     <script type="application/x-javascript;version=1.8" src="addressbook.js"/>
     <script type="application/x-javascript;version=1.8" src="mail.js"/>
     <script type="application/x-javascript;version=1.8" src="tabs.js"/>
diff --git a/content/muttatorcompose.xul b/content/muttatorcompose.xul
index 9dd5f3ed..51cfb827 100644
--- a/content/muttatorcompose.xul
+++ b/content/muttatorcompose.xul
@@ -29,7 +29,7 @@ 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://muttator/skin/vimperator.css" type="text/css"?>
+<?xml-stylesheet href="chrome://liberator/skin/liberator.css" type="text/css"?>
 
 <overlay id="muttator"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -90,13 +90,13 @@ the terms of any one of the MPL, the GPL or the LGPL.
         </statusbar>
 
         <vbox class="liberator-container" hidden="false" collapsed="true">
-            <iframe id="liberator-multiline-output" src="chrome://muttator/content/buffer.xhtml"
+            <iframe id="liberator-multiline-output" src="chrome://liberator/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"
+            <iframe id="liberator-completions" src="chrome://liberator/content/buffer.xhtml"
                 flex="1" height="250px" hidden="false" collapsed="false"
                 onclick="liberator.commandline.onMultilineOutputEvent(event)"/>
         </vbox>
diff --git a/content/ui.js b/content/ui.js
index 71c6707c..aaec45cc 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -1519,7 +1519,7 @@ liberator.StatusLine = function () //{{{
             }
             else
             {
-                url = url.replace(new RegExp("^chrome://" + liberator.config.name.toLowerCase() + "/locale/(\\S+)\\.html$"), "$1 [Help]");
+                url = url.replace(new RegExp("^chrome://liberator/locale/(\\S+)\\.html$"), "$1 [Help]");
             }
 
             // when session information is available, add [+] when we can go backwards
diff --git a/content/vimperator.xul b/content/vimperator.xul
index 231f033f..66dbd541 100644
--- a/content/vimperator.xul
+++ b/content/vimperator.xul
@@ -29,8 +29,6 @@ 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://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,7 +36,6 @@ the terms of any one of the MPL, the GPL or the LGPL.
     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.js"/>
     <script type="application/x-javascript;version=1.8" src="bookmarks.js"/>
     <script type="application/x-javascript;version=1.8" src="tabs.js"/>
 
diff --git a/skin/vimperator.css b/skin/liberator.css
similarity index 92%
rename from skin/vimperator.css
rename to skin/liberator.css
index 3e084707..663eab80 100644
--- a/skin/vimperator.css
+++ b/skin/liberator.css
@@ -34,7 +34,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 #liberator-frame-indicator {
     background-color: red;
     opacity: 0.5;
-    z-index: 999
+    z-index: 999;
     position: fixed;
     top: 0;
     bottom: 0;
@@ -53,28 +53,22 @@ the terms of any one of the MPL, the GPL or the LGPL.
 }
 
 .liberator-hint {
-    z-index:5000;
-    font-family:monospace;
-    font-size:10px;
-    font-weight: bold;
-    color:white;
-    background-color:red;
-    border-color:ButtonShadow;
-    border-width:0px;
-    border-style:solid;
-    padding:0px 1px 0px 1px;
-    position:absolute;
-}
-
-#liberator-visualbell {
-    border: none;
-    background-color: black;
+    z-index: 5000;
+    font-family: monospace;
+    font-size: 10px;
+    font-weight:  bold;
+    color: white;
+    background-color: red;
+    border-color: ButtonShadow;
+    border-width: 0px;
+    border-style: solid;
+    padding: 0px 1px 0px 1px;
+    position: absolute;
 }
 
 /* Applied only to completion buffer and MOW */
 @-moz-document
-    url-prefix(chrome://vimperator/),
-    url-prefix(chrome://muttator/) {
+    url-prefix(chrome://liberator/) {
 
 *:-moz-loading, *:-moz-broken { display: none !important; }
 
@@ -107,8 +101,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
 /* Applied to completion buffer, MOW, browser window */
 @-moz-document 
-    url-prefix(chrome://),
-    url(chrome://browser/content/browser.xul) {
+    url-prefix(chrome://) {
 
 #liberator-container  {
     font-family: monospace;