diff --git a/content/bookmarks.js b/content/bookmarks.js
index 0319e532..23eb7a06 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -781,7 +781,7 @@ function QuickMarks() //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     var qmarks = {};
-    var saved_marks = Options.getPref("quickmarks", "").split("\n");
+    var saved_marks = vimperator.options.getPref("quickmarks", "").split("\n");
 
     // load the saved quickmarks -- TODO: change to sqlite
     for (var i = 0; i < saved_marks.length - 1; i += 2)
@@ -875,7 +875,7 @@ function QuickMarks() //{{{
             saved_qmarks += qmarks[i] + "\n";
         }
 
-        Options.setPref("quickmarks", saved_qmarks);
+        vimperator.options.setPref("quickmarks", saved_qmarks);
     }
     //}}}
 } //}}}
diff --git a/content/options.js b/content/options.js
index e2be66e7..1e76fa63 100644
--- a/content/options.js
+++ b/content/options.js
@@ -75,7 +75,7 @@ function Option(names, type, extra_info) //{{{
         }
     }
 
-    // NOTE: forced defaults need to use Options.getPref
+    // NOTE: forced defaults need to use vimperator.options.getPref
     this.__defineGetter__("value",
         function()
         {
@@ -363,22 +363,22 @@ function Options() //{{{
 
     // TODO: separate Preferences from Options? Would these utility functions
     // be better placed in the 'core' vimperator namespace somewhere?
-    Options.setPref = function(name, value)
+    this.setPref = function(name, value)
     {
         return storePreference(name, value, true);
     }
 
-    Options.getPref = function(name, forced_default)
+    this.getPref = function(name, forced_default)
     {
         return loadPreference(name, forced_default, true);
     }
 
-    Options.setFirefoxPref = function(name, value)
+    this.setFirefoxPref = function(name, value)
     {
         return storePreference(name, value);
     }
 
-    Options.getFirefoxPref = function(name, forced_default)
+    this.getFirefoxPref = function(name, forced_default)
     {
         return loadPreference(name, forced_default);
     }
@@ -664,7 +664,7 @@ function Options() //{{{
     addOption(new Option(["visualbell", "vb"], "boolean",
         {
             short_help: "Use visual bell instead of beeping on errors",
-            setter: function(value) { Options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); },
+            setter: function(value) { vimperator.options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); },
             default_value: false
         }
     ));
@@ -672,7 +672,7 @@ function Options() //{{{
         {
             short_help: "CSS specification of the visual bell",
             help: "To hide the visual bell use a value of \"display: none;\" or unset it with <code class=\"command\">:set t_vb=</code>",
-            setter: function(value) { if (!value) value = "display: none;"; Options.setPref("visualbellstyle", value); },
+            setter: function(value) { if (!value) value = "display: none;"; },
             default_value: "background-color: black; color: black;"
         }
     ));
diff --git a/content/ui.js b/content/ui.js
index 9504be97..346a24f7 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -57,14 +57,14 @@ function CommandLine() //{{{
 
         load: function()
         {
-            this.cmd = Options.getPref("commandline_cmd_history", "").split("\n");
-            this.search = Options.getPref("commandline_search_history", "").split("\n");
+            this.cmd = vimperator.options.getPref("commandline_cmd_history", "").split("\n");
+            this.search = vimperator.options.getPref("commandline_search_history", "").split("\n");
         },
 
         save: function()
         {
-            Options.setPref("commandline_cmd_history", this.cmd.join("\n"));
-            Options.setPref("commandline_search_history", this.search.join("\n"));
+            vimperator.options.setPref("commandline_cmd_history", this.cmd.join("\n"));
+            vimperator.options.setPref("commandline_search_history", this.search.join("\n"));
         },
 
         add: function(str)
diff --git a/content/vimperator.js b/content/vimperator.js
index e13b2b39..282c7135 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -401,7 +401,7 @@ const vimperator = (function() //{{{
         // if msg is an object, it is beautified
         log: function(msg, level)
         {
-            //if (Options.getPref("verbose") >= level) // FIXME: hangs vimperator, probably timing issue --mst
+            //if (vimperator.options.getPref("verbose") >= level) // FIXME: hangs vimperator, probably timing issue --mst
             if (typeof msg == "object")
                 msg = this.objectToString(msg, false);
 
@@ -481,9 +481,9 @@ const vimperator = (function() //{{{
         quit: function(save_session)
         {
             if (save_session)
-                Options.setFirefoxPref("browser.startup.page", 3); // start with saved session
+                vimperator.options.setFirefoxPref("browser.startup.page", 3); // start with saved session
             else
-                Options.setFirefoxPref("browser.startup.page", 1); // start with default homepage session
+                vimperator.options.setFirefoxPref("browser.startup.page", 1); // start with default homepage session
 
             goQuitApplication();
         },
@@ -727,11 +727,11 @@ const vimperator = (function() //{{{
             vimperator.registerCallback("complete", vimperator.modes.EX, function(str) { return vimperator.completion.exTabCompletion(str); } );
 
             // first time intro message
-            if (Options.getPref("firsttime", true))
+            if (vimperator.options.getPref("firsttime", true))
             {
                 setTimeout(function() {
                     vimperator.help(null, null, null, { inTab: true });
-                    Options.setPref("firsttime", false);
+                    vimperator.options.setPref("firsttime", false);
                 }, 1000);
             }