diff --git a/common/content/io.js b/common/content/io.js
index 79f20f28..fcf48181 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -66,8 +66,8 @@ function IO() //{{{
     const WINDOWS = liberator.has("Win32");
     const EXTENSION_NAME = config.name.toLowerCase(); // "vimperator" or "muttator"
 
-    const downloadManager    = Cc["@mozilla.org/download-manager;1"].createInstance(Ci.nsIDownloadManager);
-    const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+    const downloadManager = Cc["@mozilla.org/download-manager;1"].createInstance(Ci.nsIDownloadManager);
+    const ioService = services.get("io");
 
     var processDir = services.get("directory").get("CurWorkD", Ci.nsIFile);
     var cwd = processDir;
diff --git a/common/content/services.js b/common/content/services.js
index 57d8a0c9..79bc3e73 100644
--- a/common/content/services.js
+++ b/common/content/services.js
@@ -45,6 +45,7 @@ function Services()
         get: function (name) services[name],
         create: function (name) classes[name]()
     };
+
     self.add("appStartup",          "@mozilla.org/toolkit/app-startup;1",       Ci.nsIAppStartup);
     self.add("autoCompleteSearch",  "@mozilla.org/browser/global-history;2",    Ci.nsIAutoCompleteSearch);
     self.add("browserSearch",       "@mozilla.org/browser/search-service;1",    Ci.nsIBrowserSearchService);
@@ -55,7 +56,8 @@ function Services()
     self.add("extensionManager",    "@mozilla.org/extensions/manager;1",        Ci.nsIExtensionManager);
     self.add("json",                "@mozilla.org/dom/json;1",                  Ci.nsIJSON, "createInstance");
     self.add("observer",            "@mozilla.org/observer-service;1",          Ci.nsIObserverService);
-    self.add("pref",		    "@mozilla.org/preferences-service;1",       [Ci.nsIPrefService, Ci.nsIPrefBranch, Ci.nsIPrefBranch2]);
+    self.add("io",                  "@mozilla.org/network/io-service;1",        Ci.nsIIOService);
+    self.add("pref",                "@mozilla.org/preferences-service;1",       [Ci.nsIPrefService, Ci.nsIPrefBranch, Ci.nsIPrefBranch2]);
     self.add("profile",             "@mozilla.org/toolkit/profile-service;1",   Ci.nsIToolkitProfileService);
     self.add("sessionStore",        "@mozilla.org/browser/sessionstore;1",      Ci.nsISessionStore);
     self.add("subscriptLoader",     "@mozilla.org/moz/jssubscript-loader;1",    Ci.mozIJSSubScriptLoader);
@@ -63,11 +65,13 @@ function Services()
     self.add("windowMediator",      "@mozilla.org/appshell/window-mediator;1",  Ci.nsIWindowMediator);
     self.add("windowWatcher",       "@mozilla.org/embedcomp/window-watcher;1",  Ci.nsIWindowWatcher);
 
-    self.addClass("file",	"@mozilla.org/file/local;1",            Ci.nsILocalFile);
-    self.addClass("find",   	"@mozilla.org/embedcomp/rangefind;1",   Ci.nsIFind);
-    self.addClass("process",    "@mozilla.org/process/util;1",		Ci.nsIProcess);
+    self.addClass("file",       "@mozilla.org/file/local;1",            Ci.nsILocalFile);
+    self.addClass("find",       "@mozilla.org/embedcomp/rangefind;1",   Ci.nsIFind);
+    self.addClass("process",    "@mozilla.org/process/util;1",          Ci.nsIProcess);
+
     return self;
 };
 
 var services = Services();
 
+// vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/style.js b/common/content/style.js
index 8433ea58..d99ee8eb 100644
--- a/common/content/style.js
+++ b/common/content/style.js
@@ -253,7 +253,7 @@ function Styles(name, store, serial)
     const sleep = liberator.sleep;
     const storage = modules.storage;
     const consoleService = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
-    const ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+    const ios = services.get("io");
     const sss = Cc["@mozilla.org/content/style-sheet-service;1"].getService(Ci.nsIStyleSheetService);
     const namespace = '@namespace html "' + XHTML + '";\n' +
                       '@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";\n' +
diff --git a/common/content/util.js b/common/content/util.js
index fa6d5df3..53c8c31a 100644
--- a/common/content/util.js
+++ b/common/content/util.js
@@ -434,8 +434,7 @@ const util = { //{{{
     // FIXME: createURI needed too?
     newURI: function (uri)
     {
-        const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
-        return ioService.newURI(uri, null, null);
+        return services.get("io").newURI(uri, null, null);
     },
 
     /**
diff --git a/vimperator/content/config.js b/vimperator/content/config.js
index 6a3a3ab1..cc203755 100644
--- a/vimperator/content/config.js
+++ b/vimperator/content/config.js
@@ -430,16 +430,12 @@ const config = { //{{{
             {
                 setter: function (value)
                 {
-                    const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService2);
+                    const ioService = services.get("io");
                     ioService.offline = !value;
                     gPrefService.setBoolPref("browser.offline", ioService.offline);
                     return value;
                 },
-                getter: function ()
-                {
-                    const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService2);
-                    return !ioService.offline;
-                }
+                getter: function () !services.get("io").offline
             });
 
         options.add(["titlestring"],