diff --git a/content/compose/liberator.xul b/content/compose/liberator.xul
index 948271bb..fe7c63a7 100644
--- a/content/compose/liberator.xul
+++ b/content/compose/liberator.xul
@@ -34,6 +34,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 ]>
 
 <overlay id="liberator"
+    xmlns:liberator="http://vimperator.org/namespaces/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"
@@ -50,7 +51,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
         </keyset> 
 
         <popupset>
-            <panel id="liberator-visualbell"/>
+            <panel id="liberator-visualbell" liberator:highlight="Bell"/>
         </popupset>
 
         <!--this notifies us also of focus events in the XUL
@@ -78,7 +79,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
                 onclick="liberator.modules.commandline.onMultilineOutputEvent(event)"/>
         </vbox>
 
-        <hbox id="liberator-commandline" hidden="false" class="hl-Normal">
+        <hbox id="liberator-commandline" hidden="false" liberator:highlight="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.modules.commandline.onEvent(event);"
@@ -95,7 +96,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
     </window>
 
-    <statusbar id="status-bar" class="hl-StatusLine">
+    <statusbar id="status-bar" liberator:highlight="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"/>
diff --git a/content/io.js b/content/io.js
index 77ac628e..33eee7d2 100644
--- a/content/io.js
+++ b/content/io.js
@@ -48,6 +48,8 @@ function IO() //{{{
     const WINDOWS = liberator.has("Win32");
     const EXTENSION_NAME = config.name.toLowerCase(); // "vimperator" or "muttator"
 
+    const ioService          = Components.classes['@mozilla.org/network/io-service;1']
+                                         .getService(Components.interfaces.nsIIOService);
     const environmentService = Components.classes["@mozilla.org/process/environment;1"]
                                          .getService(Components.interfaces.nsIEnvironment);
     const directoryService   = Components.classes["@mozilla.org/file/directory_service;1"]
@@ -817,7 +819,7 @@ lookup:
                 liberator.echomsg("sourcing \"" + filename + "\"", 2);
 
                 let str = ioManager.readFile(file);
-                let uri = makeFileURI(file);
+                let uri = ioService.newFileURI(file);
 
                 // handle pure javascript files specially
                 if (/\.js$/.test(filename))
diff --git a/content/mail.js b/content/mail.js
index 7ea0fcc0..4c82b831 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -601,7 +601,7 @@ function Mail() //{{{
         {
             var value = gPrefBranch.getIntPref("mail.show_headers", 2);
             gPrefBranch.setIntPref("mail.show_headers", value == 2 ? 1 : 2);
-            MsgReload();
+            ReloadMessage();
         });
 
     mappings.add(myModes, ["x"],
@@ -1034,7 +1034,7 @@ function Mail() //{{{
             gPrefBranch.setBoolPref("mailnews.display.prefer_plaintext", values[value][0]);
             gPrefBranch.setIntPref("mailnews.display.html_as", values[value][1]);
             gPrefBranch.setIntPref("mailnews.display.disallow_mime_handlers", values[value][2]);
-            MsgReload();
+            ReloadMessage();
         }
     };
     //}}}