diff --git a/chrome/content/options.xul b/chrome/content/options.xul
new file mode 100644
index 0000000..f80a9d8
--- /dev/null
+++ b/chrome/content/options.xul
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://zotero-platform/content/preferences.css"?>
+
+<!DOCTYPE window SYSTEM "chrome://zoteroshortdoi/locale/options.dtd">
+
+<!-- onload="updatePreferenceWindow('all');" -->
+<prefwindow id="shortdoi-pref" title="&shortdoi-preferences;" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+	<stringbundleset id="stringbundleset">
+		<stringbundle id="shortdoi-options" src="chrome://zotero-shortdoi/locale/options.properties"/>
+	</stringbundleset>
+  <prefpane label="&shortdoi-preferences;" id="shortdoi-prefpane">
+    <preferences>
+      <preference id="pref-shortdoi-autoretrieve" name="extensions.shortdoi.autoretrieve" type="string"/>
+      <preference id="pref-shortdoi-tag-invalid" name="extensions.shortdoi.tag_invalid" type="string"/>
+      <preference id="pref-shortdoi-tag-multiple" name="extensions.shortdoi.tag_multiple" type="string"/>
+      <preference id="pref-shortdoi-tag-nodoi" name="extensions.shortdoi.tag_nodoi" type="string"/>
+    </preferences>
+      
+    <groupbox>
+      <caption label="&autoretrieve-label;"/>
+      <radiogroup id="id-shortdoi-autoretrieve" preference="pref-shortdoi-autoretrieve">
+        <radio label="&autoretrieve-short-label;" value='short'/>
+        <radio label="&autoretrieve-long-label;" value='long'/>
+        <radio label="&autoretrieve-check-label;" value='check'/>
+        <radio label="&autoretrieve-no-label;" value='none'/>
+      </radiogroup>
+    </groupbox>
+    <separator class="thin"/>
+
+    <groupbox>
+      <caption label="&notfound-tag-label;"/>
+      <description style="width: 420px">&notfound-tag-desc;</description>
+      <separator class="thin"/>
+      <label control="id-shortdoi-tag-invalid" value="&tag-invalid-label;"/>
+      <textbox id="id-shortdoi-tag-invalid" preference="pref-shortdoi-tag-invalid" flex="1"/>
+      <separator class="thin"/>
+      <label control="id-shortdoi-tag-multiple" value="&tag-multiple-label;"/>
+      <textbox id="id-shortdoi-tag-multiple" preference="pref-shortdoi-tag-multiple" flex="1"/>
+      <separator class="thin"/>
+      <label control="id-shortdoi-tag-nodoi" value="&tag-nodoi-label;"/>
+      <textbox id="id-shortdoi-tag-nodoi" preference="pref-shortdoi-tag-nodoi" flex="1"/>
+    </groupbox>
+  </prefpane>
+
+  <script src="options.js"/>
+  <script src="chrome://zotero/content/include.js"/>
+
+</prefwindow>
\ No newline at end of file
diff --git a/chrome/content/overlay.xul b/chrome/content/overlay.xul
index a79338d..8bf4c5f 100644
--- a/chrome/content/overlay.xul
+++ b/chrome/content/overlay.xul
@@ -11,52 +11,53 @@
 
     <stringbundleset id="stringbundleset">
         <stringbundle
-            id="zoteroshortdoi-bundle"
+            id="shortdoi-bundle"
             src="chrome://zoteroshortdoi/locale/zoteroshortdoi.properties"/>
     </stringbundleset>
 
     <popup
         id="zotero-itemmenu">
-        <menu class="menu-iconic" image="chrome://zoteroshortdoi/skin/doi@2x.png" id="zotero-itemmenu-zoteroshortdoi-menu" label="&zotero.zoteroshortdoi.menu.label;">
-            <menupopup id="zotero-itemmenu-zoteroshortdoi-menupopup">
+        <menu class="menu-iconic" image="chrome://zoteroshortdoi/skin/doi@2x.png" id="zotero-itemmenu-shortdoi-menu" label="&shortdoi-menu-label;">
+            <menupopup id="zotero-itemmenu-shortdoi-menupopup">
                 <menuitem
-                    id="zotero-itemmenu-zoteroshortdoi-short"
-                    label="&zotero.zoteroshortdoi.short.label;"
+                    id="zotero-itemmenu-shortdoi-short"
+                    label="&shortdoi-menu-short-label;"
                     oncommand="Zotero.ShortDOI.updateSelectedItems('short')"/>
                 <menuitem
-                    id="zotero-itemmenu-zoteroshortdoi-long"
-                    label="&zotero.zoteroshortdoi.long.label;"
+                    id="zotero-itemmenu-shortdoi-long"
+                    label="&shortdoi-menu-long-label;"
                     oncommand="Zotero.ShortDOI.updateSelectedItems('long')"/>
                 <menuitem
-                    id="zotero-itemmenu-zoteroshortdoi-check"
-                    label="&zotero.zoteroshortdoi.check.label;"
+                    id="zotero-itemmenu-shortdoi-check"
+                    label="&shortdoi-menu-check-label;"
                     oncommand="Zotero.ShortDOI.updateSelectedItems('check')"/>
             </menupopup>
         </menu>
     </popup>
     
     <menupopup id="menu_ToolsPopup">
-      <menu id="menu_Tools-zoteroshortdoi-menu" label="&zotero.zoteroshortdoi.toolsmenu.label;">
-        <menupopup id="menu_Tools-zoteroshortdoi-menu-popup" onpopupshowing="Zotero.ShortDOI.setCheck();">
+      <menuitem id="menu_Tools-shortdoi-preferences" label="&shortdoi-preferences-label;" oncommand="Zotero.ShortDOI.openPreferenceWindow();"/>
+      <menu id="menu_Tools-shortdoi-menu" label="&shortdoi-autoretrieve-label;">
+        <menupopup id="menu_Tools-shortdoi-menu-popup" onpopupshowing="Zotero.ShortDOI.setCheck();">
           <menuitem
-              id="menu_Tools-zoteroshortdoi-menu-popup-short"
+              id="menu_Tools-shortdoi-menu-popup-short"
               type="checkbox"
-              label="shortDOIs"
+              label="&shortdoi-autoretrieve-short-label;"
               oncommand="Zotero.ShortDOI.changePref('short');"/>
           <menuitem
-              id="menu_Tools-zoteroshortdoi-menu-popup-long"
+              id="menu_Tools-shortdoi-menu-popup-long"
               type="checkbox"
-              label="Long DOIs"
+              label="&shortdoi-autoretrieve-long-label;"
               oncommand="Zotero.ShortDOI.changePref('long');"/>
           <menuitem
-              id="menu_Tools-zoteroshortdoi-menu-popup-check"
+              id="menu_Tools-shortdoi-menu-popup-check"
               type="checkbox"
-              label="Verify DOIs only"
+              label="&shortdoi-autoretrieve-check-label;"
               oncommand="Zotero.ShortDOI.changePref('check');"/>
           <menuitem
-              id="menu_Tools-zoteroshortdoi-menu-popup-none"
+              id="menu_Tools-shortdoi-menu-popup-none"
               type="checkbox"
-              label="No"
+              label="&shortdoi-autoretrieve-no-label;"
               oncommand="Zotero.ShortDOI.changePref('none');"/>
         </menupopup>
       </menu>
diff --git a/chrome/content/scripts/getPref.js b/chrome/content/scripts/getPref.js
new file mode 100644
index 0000000..e69de29
diff --git a/chrome/content/scripts/zoteroshortdoi.js b/chrome/content/scripts/zoteroshortdoi.js
index b4dbcc7..d939937 100644
--- a/chrome/content/scripts/zoteroshortdoi.js
+++ b/chrome/content/scripts/zoteroshortdoi.js
@@ -1,116 +1,31 @@
-const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-Cu.import("resource://gre/modules/Services.jsm");
-
 // Startup -- load Zotero and constants
 if (typeof Zotero === 'undefined') {
     Zotero = {};
 }
 Zotero.ShortDOI = {};
 
-const PREF_BRANCH = 'extensions.shortdoi.';
-const PREFS = {
-    autoretrieve: "short",
-    tag_invalid: "_Invalid DOI",
-    tag_multiple: "_Multiple DOIs found",
-    tag_nodoi: "_No DOI found"
-};
-
 // Preference managers
-function getPref(key) {
-  // Cache the prefbranch after first use
-  if (getPref.branch == null)
-    getPref.branch = Services.prefs.getBranch(PREF_BRANCH);
-
-  // Figure out what type of pref to fetch
-  switch (typeof PREFS[key]) {
-    case "boolean":
-      return getPref.branch.getBoolPref(key);
-    case "number":
-      return getPref.branch.getIntPref(key);
-    case "string":
-      return getPref.branch.getComplexValue(key, Components.interfaces.nsISupportsString).data;
-  }
-}
 
-function setPref(key, value) {
-  // Cache the prefbranch after first use
-  if (setPref.branch == null)
-    setPref.branch = Services.prefs.getBranch(PREF_BRANCH);
-
-  // Figure out what type of pref to fetch
-  switch (typeof PREFS[key]) {
-    case "boolean":
-      return setPref.branch.setBoolPref(key, value);
-    case "number":
-      return setPref.branch.setIntPref(key, value);
-    case "string":
-      var str = Components.classes["@mozilla.org/supports-string;1"]
-                .createInstance(Components.interfaces.nsISupportsString);
-      str.data = value;
-      setPref.branch.setComplexValue(key, 
-                             Components.interfaces.nsISupportsString, str);
-      break;
-  }
-}
+function getPref(pref) {
+    return Zotero.Prefs.get('extensions.shortdoi.' + pref, true);
+};
 
-var prefObserver = {
-  register: function() {
-    var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-                                .getService(Components.interfaces.nsIPrefService);
-
-    this.branch = prefService.getBranch(PREF_BRANCH);
-
-    // Now we queue the interface called nsIPrefBranch2. This interface is described as:
-    // "nsIPrefBranch2 allows clients to observe changes to pref values."
-    // This is only necessary prior to Gecko 13
-    if (!("addObserver" in this.branch))
-        this.branch.QueryInterface(Components.interfaces.nsIPrefBranch2);
-
-    // Finally add the observer.
-    this.branch.addObserver("", this, false);
-  },
-
-  unregister: function() {
-    this.branch.removeObserver("", this);
-  },
-
-  observe: function(aSubject, aTopic, aData) {
-    switch (aData) {
-      case "autoretrieve":
-        Zotero.ShortDOI.autoretrieve = getPref("autoretrieve");
-        break;
-      case "tag_invalid": 
-        Zotero.ShortDOI.tag_invalid = getPref("tag_invalid");
-        break;
-      case "tag_multiple": 
-        Zotero.ShortDOI.tag_multiple = getPref("tag_multiple");
-        break;
-      case "tag_nodoi":
-        Zotero.ShortDOI.tag_nodoi = getPref("tag_nodoi");
-        break; 
-    }
-  }
+function setPref(pref, value) {
+    return Zotero.Prefs.set('extensions.shortdoi.' + pref, value, true);
 };
 
 // Startup - initialize plugin
 
 Zotero.ShortDOI.init = function() {
-    //setDefaultPrefs();
     Zotero.ShortDOI.resetState("initial");
 
     // Register the callback in Zotero as an item observer
     var notifierID = Zotero.Notifier.registerObserver(
         Zotero.ShortDOI.notifierCallback, ['item']);
-    prefObserver.register();
-    Zotero.ShortDOI.autoretrieve = getPref("autoretrieve");
-    Zotero.ShortDOI.tag_invalid = getPref("tag_invalid");
-    Zotero.ShortDOI.tag_multiple = getPref("tag_multiple");
-    Zotero.ShortDOI.tag_nodoi = getPref("tag_nodoi");
 
     // Unregister callback when the window closes (important to avoid a memory leak)
     window.addEventListener('unload', function(e) {
         Zotero.Notifier.unregisterObserver(notifierID);
-        prefObserver.unregister();
     }, false);
 
 };
@@ -139,10 +54,10 @@ Zotero.ShortDOI.notifierCallback = {
 
 // *********** Set the checkbox checks, frompref
 Zotero.ShortDOI.setCheck = function() {
-    var tools_short = document.getElementById("menu_Tools-zoteroshortdoi-menu-popup-short");
-    var tools_long  = document.getElementById("menu_Tools-zoteroshortdoi-menu-popup-long");
-    var tools_check = document.getElementById("menu_Tools-zoteroshortdoi-menu-popup-check");
-    var tools_none  = document.getElementById("menu_Tools-zoteroshortdoi-menu-popup-none");
+    var tools_short = document.getElementById("menu_Tools-shortdoi-menu-popup-short");
+    var tools_long  = document.getElementById("menu_Tools-shortdoi-menu-popup-long");
+    var tools_check = document.getElementById("menu_Tools-shortdoi-menu-popup-check");
+    var tools_none  = document.getElementById("menu_Tools-shortdoi-menu-popup-none");
     var pref = getPref("autoretrieve");
     tools_short.setAttribute("checked", Boolean(pref === "short"));
     tools_long.setAttribute("checked", Boolean(pref === "long"));
@@ -155,6 +70,17 @@ Zotero.ShortDOI.changePref = function changePref(option) {
     setPref("autoretrieve", option);
 };
 
+/**
+ * Open shortdoi preference window
+ */
+Zotero.ShortDOI.openPreferenceWindow = function(paneID, action) {
+    var io = {pane: paneID, action: action};
+    window.openDialog('chrome://zoteroshortdoi/content/options.xul',
+        'shortdoi-pref',
+        'chrome,titlebar,toolbar,centerscreen' + Zotero.Prefs.get('browser.preferences.instantApply', true) ? 'dialog=no' : 'modal', io
+    );
+};
+
 Zotero.ShortDOI.resetState = function(operation) {
 
     if (operation == "initial") {
@@ -181,8 +107,8 @@ Zotero.ShortDOI.resetState = function(operation) {
             if(error_invalid && ! error_invalid_shown) {
               var progressWindowInvalid = new Zotero.ProgressWindow({closeOnClick:true});
               progressWindowInvalid.changeHeadline("Invalid DOI");
-              if(Zotero.ShortDOI.tag_invalid !== "") {
-                progressWindowInvalid.progress = new progressWindowInvalid.ItemProgress(icon, "Invalid DOIs were found. These have been tagged with '" + Zotero.ShortDOI.tag_invalid + "'.");
+              if(getPref("tag_invalid") !== "") {
+                progressWindowInvalid.progress = new progressWindowInvalid.ItemProgress(icon, "Invalid DOIs were found. These have been tagged with '" + getPref("tag_invalid") + "'.");
               } else {
                 progressWindowInvalid.progress = new progressWindowInvalid.ItemProgress(icon, "Invalid DOIs were found.");
               }
@@ -194,8 +120,8 @@ Zotero.ShortDOI.resetState = function(operation) {
             if(error_nodoi && ! error_nodoi_shown) {
               var progressWindowNoDOI = new Zotero.ProgressWindow({closeOnClick:true});
               progressWindowNoDOI.changeHeadline("DOI not found");
-              if(Zotero.ShortDOI.tag_nodoi !== "") {
-                progressWindowNoDOI.progress = new progressWindowNoDOI.ItemProgress(icon, "No DOI was found for some items. These have been tagged with '" + Zotero.ShortDOI.tag_nodoi + "'.");
+              if(getPref("tag_nodoi") !== "") {
+                progressWindowNoDOI.progress = new progressWindowNoDOI.ItemProgress(icon, "No DOI was found for some items. These have been tagged with '" + getPref("tag_nodoi") + "'.");
               } else {
                 progressWindowNoDOI.progress = new progressWindowNoDOI.ItemProgress(icon, "No DOI was found for some items.");
               }
@@ -207,8 +133,8 @@ Zotero.ShortDOI.resetState = function(operation) {
             if(error_multiple && ! error_multiple_shown) {
               var progressWindowMulti = new Zotero.ProgressWindow({closeOnClick:true});
               progressWindowMulti.changeHeadline("Multiple possible DOIs");
-              if(Zotero.ShortDOI.tag_multiple !== "") {
-                progressWindowMulti.progress = new progressWindowMulti.ItemProgress(icon, "Some items had multiple possible DOIs. Links to lists of DOIs have been added and tagged with '" + Zotero.ShortDOI.tag_multiple + "'.");
+              if(getPref("tag_multiple") !== "") {
+                progressWindowMulti.progress = new progressWindowMulti.ItemProgress(icon, "Some items had multiple possible DOIs. Links to lists of DOIs have been added and tagged with '" + getPref("tag_multiple") + "'.");
               } else {
                 progressWindowMulti.progress = new progressWindowMulti.ItemProgress(icon, "Some items had multiple possible DOIs.");
               }
@@ -332,8 +258,8 @@ Zotero.ShortDOI.updateItem = function(item, operation) {
     var url = Zotero.ShortDOI.generateItemUrl(item, operation);
 
     if ( ! url ) {
-        if (item.hasTag(Zotero.ShortDOI.tag_invalid)) {
-            item.removeTag(Zotero.ShortDOI.tag_invalid);
+        if (item.hasTag(getPref("tag_invalid"))) {
+            item.removeTag(getPref("tag_invalid"));
             item.saveTx();
         }
         Zotero.ShortDOI.updateNextItem(operation);
@@ -356,15 +282,15 @@ Zotero.ShortDOI.updateItem = function(item, operation) {
                                     if (req.response.handle != oldDOI) {
                                         var shortDOI = req.response.handle.toLowerCase();
                                         item.setField('DOI', shortDOI);
-                                        item.removeTag(Zotero.ShortDOI.tag_invalid);
-                                        item.removeTag(Zotero.ShortDOI.tag_multiple);
-                                        item.removeTag(Zotero.ShortDOI.tag_nodoi);
+                                        item.removeTag(getPref("tag_invalid"));
+                                        item.removeTag(getPref("tag_multiple"));
+                                        item.removeTag(getPref("tag_nodoi"));
                                         item.saveTx();
                                         Zotero.ShortDOI.counter++;
-                                    } else if (item.hasTag(Zotero.ShortDOI.tag_invalid) || item.hasTag(Zotero.ShortDOI.tag_multiple) || item.hasTag(Zotero.ShortDOI.tag_nodoi)) {
-                                        item.removeTag(Zotero.ShortDOI.tag_invalid);
-                                        item.removeTag(Zotero.ShortDOI.tag_multiple);
-                                        item.removeTag(Zotero.ShortDOI.tag_nodoi);
+                                    } else if (item.hasTag(getPref("tag_invalid")) || item.hasTag(getPref("tag_multiple")) || item.hasTag(getPref("tag_nodoi"))) {
+                                        item.removeTag(getPref("tag_invalid"));
+                                        item.removeTag(getPref("tag_multiple"));
+                                        item.removeTag(getPref("tag_nodoi"));
                                         item.saveTx();
                                     }
                                 } else {
@@ -373,9 +299,9 @@ Zotero.ShortDOI.updateItem = function(item, operation) {
                             } else {
                                 var shortDOI = req.response.ShortDOI.toLowerCase();
                                 item.setField('DOI', shortDOI);
-                                item.removeTag(Zotero.ShortDOI.tag_invalid);
-                                item.removeTag(Zotero.ShortDOI.tag_multiple);
-                                item.removeTag(Zotero.ShortDOI.tag_nodoi);
+                                item.removeTag(getPref("tag_invalid"));
+                                item.removeTag(getPref("tag_multiple"));
+                                item.removeTag(getPref("tag_nodoi"));
                                 item.saveTx();
                                 Zotero.ShortDOI.counter++;
                             }
@@ -403,9 +329,9 @@ Zotero.ShortDOI.updateItem = function(item, operation) {
                                 if (item.isRegularItem() && !item.isCollection()) {
                                     var longDOI = req.response.values["1"].data.value.toLowerCase();
                                     item.setField('DOI', longDOI);
-                                    item.removeTag(Zotero.ShortDOI.tag_invalid);
-                                    item.removeTag(Zotero.ShortDOI.tag_multiple);
-                                    item.removeTag(Zotero.ShortDOI.tag_nodoi);
+                                    item.removeTag(getPref("tag_invalid"));
+                                    item.removeTag(getPref("tag_multiple"));
+                                    item.removeTag(getPref("tag_nodoi"));
                                     item.saveTx();
                                     Zotero.ShortDOI.counter++;
                                 }
@@ -413,15 +339,15 @@ Zotero.ShortDOI.updateItem = function(item, operation) {
                                 if (req.response.handle != oldDOI) {
                                     var longDOI = req.response.handle.toLowerCase();
                                     item.setField('DOI', longDOI);
-                                    item.removeTag(Zotero.ShortDOI.tag_invalid);
-                                    item.removeTag(Zotero.ShortDOI.tag_multiple);
-                                    item.removeTag(Zotero.ShortDOI.tag_nodoi);
+                                    item.removeTag(getPref("tag_invalid"));
+                                    item.removeTag(getPref("tag_multiple"));
+                                    item.removeTag(getPref("tag_nodoi"));
                                     item.saveTx();
                                     Zotero.ShortDOI.counter++;
-                                } else if (item.hasTag(Zotero.ShortDOI.tag_invalid) || item.hasTag(Zotero.ShortDOI.tag_multiple) || item.hasTag(Zotero.ShortDOI.tag_nodoi)) {
-                                    item.removeTag(Zotero.ShortDOI.tag_invalid);
-                                    item.removeTag(Zotero.ShortDOI.tag_multiple);
-                                    item.removeTag(Zotero.ShortDOI.tag_nodoi);
+                                } else if (item.hasTag(getPref("tag_invalid")) || item.hasTag(getPref("tag_multiple")) || item.hasTag(getPref("tag_nodoi"))) {
+                                    item.removeTag(getPref("tag_invalid"));
+                                    item.removeTag(getPref("tag_multiple"));
+                                    item.removeTag(getPref("tag_nodoi"));
                                     item.saveTx();
                                 }
                             }
@@ -455,14 +381,14 @@ Zotero.ShortDOI.updateItem = function(item, operation) {
                             if (req.response.handle != oldDOI) {
                                 var newDOI = req.response.handle.toLowerCase();
                                 item.setField('DOI', newDOI);
-                                item.removeTag(Zotero.ShortDOI.tag_invalid);
-                                item.removeTag(Zotero.ShortDOI.tag_multiple);
-                                item.removeTag(Zotero.ShortDOI.tag_nodoi);
+                                item.removeTag(getPref("tag_invalid"));
+                                item.removeTag(getPref("tag_multiple"));
+                                item.removeTag(getPref("tag_nodoi"));
                                 item.saveTx();
-                            } else if (item.hasTag(Zotero.ShortDOI.tag_invalid) || item.hasTag(Zotero.ShortDOI.tag_multiple) || item.hasTag(Zotero.ShortDOI.tag_nodoi)) {
-                                item.removeTag(Zotero.ShortDOI.tag_invalid);
-                                item.removeTag(Zotero.ShortDOI.tag_multiple);
-                                item.removeTag(Zotero.ShortDOI.tag_nodoi);
+                            } else if (item.hasTag(getPref("tag_invalid")) || item.hasTag(getPref("tag_multiple")) || item.hasTag(getPref("tag_nodoi"))) {
+                                item.removeTag(getPref("tag_invalid"));
+                                item.removeTag(getPref("tag_multiple"));
+                                item.removeTag(getPref("tag_nodoi"));
                                 item.saveTx();
                             }
                             Zotero.ShortDOI.counter++;
@@ -483,7 +409,7 @@ Zotero.ShortDOI.updateItem = function(item, operation) {
 Zotero.ShortDOI.invalidate = function(item, operation) {
     if (item.isRegularItem() && !item.isCollection()) {
         error_invalid = true;
-        if(Zotero.ShortDOI.tag_invalid !== "") item.addTag(Zotero.ShortDOI.tag_invalid);
+        if(getPref("tag_invalid") !== "") item.addTag(getPref("tag_invalid"));
         item.saveTx();
     }
     Zotero.ShortDOI.updateNextItem(operation);
@@ -516,9 +442,9 @@ Zotero.ShortDOI.crossrefLookup = function(item, operation) {
 
                       } else {
                           item.setField('DOI', doi);
-                          item.removeTag(Zotero.ShortDOI.tag_invalid);
-                          item.removeTag(Zotero.ShortDOI.tag_multiple);
-                          item.removeTag(Zotero.ShortDOI.tag_nodoi);
+                          item.removeTag(getPref("tag_invalid"));
+                          item.removeTag(getPref("tag_multiple"));
+                          item.removeTag(getPref("tag_nodoi"));
                           item.saveTx();
                           Zotero.ShortDOI.counter++;
                           Zotero.ShortDOI.updateNextItem(operation);
@@ -527,22 +453,22 @@ Zotero.ShortDOI.crossrefLookup = function(item, operation) {
 
                   } else if (status === "unresolved") {
                       error_nodoi = true;
-                      item.removeTag(Zotero.ShortDOI.tag_invalid);
-                      item.removeTag(Zotero.ShortDOI.tag_multiple);
-                      item.removeTag(Zotero.ShortDOI.tag_nodoi);
-                      if(Zotero.ShortDOI.tag_nodoi !== "") item.addTag(Zotero.ShortDOI.tag_nodoi);
+                      item.removeTag(getPref("tag_invalid"));
+                      item.removeTag(getPref("tag_multiple"));
+                      item.removeTag(getPref("tag_nodoi"));
+                      if(getPref("tag_nodoi") !== "") item.addTag(getPref("tag_nodoi"));
                       item.saveTx();
                       Zotero.ShortDOI.updateNextItem(operation);
 
                   } else if (status === "multiresolved") {
                       error_multiple = true;
                       Zotero.Attachments.linkFromURL({"url":crossrefOpenURL + ctx, "parentItemID":item.id, "contentType":"text/html", "title":"Multiple DOIs found"});
-                      if (item.hasTag(Zotero.ShortDOI.tag_invalid) || item.hasTag(Zotero.ShortDOI.tag_nodoi)) {
-                          item.removeTag(Zotero.ShortDOI.tag_invalid);
-                          item.removeTag(Zotero.ShortDOI.tag_nodoi);
+                      if (item.hasTag(getPref("tag_invalid")) || item.hasTag(getPref("tag_nodoi"))) {
+                          item.removeTag(getPref("tag_invalid"));
+                          item.removeTag(getPref("tag_nodoi"));
                       }
                       // TODO: Move this tag to the attachment link
-                      if(Zotero.ShortDOI.tag_multiple !== "") item.addTag(Zotero.ShortDOI.tag_multiple);
+                      if(getPref("tag_multiple") !== "") item.addTag(getPref("tag_multiple"));
                       item.saveTx();
                       Zotero.ShortDOI.updateNextItem(operation);
 
diff --git a/chrome/locale/en-US/options.dtd b/chrome/locale/en-US/options.dtd
index 9dec607..e8b8a90 100644
--- a/chrome/locale/en-US/options.dtd
+++ b/chrome/locale/en-US/options.dtd
@@ -1,5 +1,12 @@
-<!ENTITY options_window_title "Zotero DOI Manager Preferences">
-<!ENTITY options_extensions.shortdoi.autoretrieve.label "Automatically get DOIs on item import?">
-<!ENTITY options_extensions.shortdoi.tag_invalid.label "Tag to indicate 'Invalid DOI supplied'">
-<!ENTITY options_extensions.shortdoi.tag_multiple.label "Tag to indicate 'Multiple possible DOIs found'">
-<!ENTITY options_extensions.shortdoi.tag_nodoi.label "Tag to indicate 'No DOI found'">
+<!ENTITY shortdoi-name "DOI Manager">
+<!ENTITY shortdoi-preferences "DOI Manager Preferences">
+<!ENTITY autoretrieve-label "Get DOIs for new items">
+<!ENTITY autoretrieve-short-label "shortDOIs">
+<!ENTITY autoretrieve-long-label "Long DOIs">
+<!ENTITY autoretrieve-check-label "Verify DOIs only">
+<!ENTITY autoretrieve-no-label "No">
+<!ENTITY notfound-tag-label "DOI Not Found Tags">
+<!ENTITY notfound-tag-desc "Tags added to items to indicate reasons why unique DOIs are not found">
+<!ENTITY tag-invalid-label "Invalid DOI">
+<!ENTITY tag-multiple-label "Multiple possible DOIs found">
+<!ENTITY tag-nodoi-label "No DOI found">
\ No newline at end of file
diff --git a/chrome/locale/en-US/options.properties b/chrome/locale/en-US/options.properties
new file mode 100644
index 0000000..e69de29
diff --git a/chrome/locale/en-US/overlay.dtd b/chrome/locale/en-US/overlay.dtd
index 4b407b5..4b59ef1 100644
--- a/chrome/locale/en-US/overlay.dtd
+++ b/chrome/locale/en-US/overlay.dtd
@@ -3,3 +3,14 @@
 <!ENTITY zotero.zoteroshortdoi.check.label "Verify and clean DOIs">
 <!ENTITY zotero.zoteroshortdoi.menu.label "Manage DOIs">
 <!ENTITY zotero.zoteroshortdoi.toolsmenu.label "Get DOIs for new items">
+
+<!ENTITY shortdoi-preferences-label "DOI Manager Preferences…">
+<!ENTITY shortdoi-autoretrieve-label "Get DOIs for new items">
+<!ENTITY shortdoi-autoretrieve-short-label "shortDOIs">
+<!ENTITY shortdoi-autoretrieve-long-label "Long DOIs">
+<!ENTITY shortdoi-autoretrieve-check-label "Verify DOIs only">
+<!ENTITY shortdoi-autoretrieve-no-label "No">
+<!ENTITY shortdoi-menu-label "Manage DOIs">
+<!ENTITY shortdoi-menu-short-label "Get shortDOIs">
+<!ENTITY shortdoi-menu-long-label "Get long DOIs">
+<!ENTITY shortdoi-menu-check-label "Verify and clean DOIs">
\ No newline at end of file
diff --git a/install.rdf b/install.rdf
index b0689e3..d57b194 100644
--- a/install.rdf
+++ b/install.rdf
@@ -7,7 +7,7 @@
         RDF:about="urn:mozilla:install-manifest"
         em:id="zoteroshortdoi@wiernik.org"
         em:name="Zotero DOI Manager"
-        em:version="1.3.8"
+        em:version="1.3.9"
         em:type="2"
         em:creator="Brenton M. Wiernik"
         em:description="Zotero plugin for auto-fetching and validating DOI and shortDOI names"
diff --git a/options.xul b/options.xul
deleted file mode 100644
index 86c8717..0000000
--- a/options.xul
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE window SYSTEM "chrome://zoteroshortdoi/locale/options.dtd">
-<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <!--setting pref="extensions.shortdoi.savelong" title="Store long DOI in Extra" type="bool"/ -->
-  <setting pref="extensions.shortdoi.autoretrieve" title="&options_extensions.shortdoi.autoretrieve.label;" type="menulist">
-    <menulist>
-      <menupopup>
-        <menuitem value="short" label="shortDOIs"/>
-        <menuitem value="long" label="Long DOIs"/>
-        <menuitem value="check" label="Verify DOIs only"/>
-        <menuitem value="none" label="No"/>
-      </menupopup>
-    </menulist>
-  </setting>
-  <setting pref="extensions.shortdoi.tag_invalid" title="&options_extensions.shortdoi.tag_invalid.label;" type="string"/>
-  <setting pref="extensions.shortdoi.tag_multiple" title="&options_extensions.shortdoi.tag_multiple.label;" type="string"/>
-  <setting pref="extensions.shortdoi.tag_nodoi" title="&options_extensions.shortdoi.tag_nodoi.label;" type="string"/>
-</vbox>
diff --git a/update.rdf b/update.rdf
index a0a87d0..aa938c6 100644
--- a/update.rdf
+++ b/update.rdf
@@ -5,13 +5,13 @@
       <rdf:Seq>
         <rdf:li>
           <rdf:Description>
-            <em:version>1.3.8</em:version>
+            <em:version>1.3.9</em:version>
             <em:targetApplication>
               <rdf:Description>
                 <em:id>zotero@chnm.gmu.edu</em:id>
                 <em:minVersion>5.0</em:minVersion>
                 <em:maxVersion>5.*</em:maxVersion>
-                <em:updateLink>https://github.com/bwiernik/zotero-shortdoi/releases/download/v1.3.8/zotero-shortdoi-1.3.8.xpi</em:updateLink>
+                <em:updateLink>https://github.com/bwiernik/zotero-shortdoi/releases/download/v1.3.9/zotero-shortdoi-1.3.9.xpi</em:updateLink>
               </rdf:Description>
             </em:targetApplication>
             <em:targetApplication>
@@ -19,7 +19,7 @@
                 <em:id>juris-m@juris-m.github.io</em:id>
                 <em:minVersion>5.0</em:minVersion>
                 <em:maxVersion>5.*</em:maxVersion>
-                <em:updateLink>https://github.com/bwiernik/zotero-shortdoi/releases/download/v1.3.8/zotero-shortdoi-1.3.8.xpi</em:updateLink>
+                <em:updateLink>https://github.com/bwiernik/zotero-shortdoi/releases/download/v1.3.9/zotero-shortdoi-1.3.9.xpi</em:updateLink>
               </rdf:Description>
             </em:targetApplication>
           </rdf:Description>