diff --git a/src/chrome/content/localePicker.xul b/src/chrome/content/localePicker.xhtml
similarity index 100%
rename from src/chrome/content/localePicker.xul
rename to src/chrome/content/localePicker.xhtml
diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xhtml
similarity index 100%
rename from src/chrome/content/network-settings-wizard.xul
rename to src/chrome/content/network-settings-wizard.xhtml
diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xhtml
similarity index 100%
rename from src/chrome/content/network-settings.xul
rename to src/chrome/content/network-settings.xhtml
diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index 1cad103efb3a4d69f0198d8fb46bd7a1b5d8d074..31f6801c530eb6ac6f6b633fab4e5f3b0d7201c8 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -722,7 +722,7 @@ TorProcessService.prototype =
 
   _openLocalePicker: function()
   {
-    const kLocalePickerURL = "chrome://torlauncher/content/localePicker.xul";
+    const kLocalePickerURL = "chrome://torlauncher/content/localePicker.xhtml";
 
     var wwSvc = Cc["@mozilla.org/embedcomp/window-watcher;1"]
                   .getService(Ci.nsIWindowWatcher);
@@ -743,8 +743,8 @@ TorProcessService.prototype =
       return;
     }
 
-    const kSettingsURL = "chrome://torlauncher/content/network-settings.xul";
-    const kWizardURL = "chrome://torlauncher/content/network-settings-wizard.xul";
+    const kSettingsURL = "chrome://torlauncher/content/network-settings.xhtml";
+    const kWizardURL = "chrome://torlauncher/content/network-settings-wizard.xhtml";
 
     var wwSvc = Cc["@mozilla.org/embedcomp/window-watcher;1"]
                   .getService(Ci.nsIWindowWatcher);
diff --git a/src/install.rdf b/src/install.rdf
index 919d5e8fd0f119e9307d926097641e2c583a2e97..571b8c5b7820a15824af2ec2abd539733743a7ce 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -12,9 +12,6 @@
         <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL>
         <em:updateURL>data:text/plain,</em:updateURL>
         <em:updateKey>-</em:updateKey>
-<!--
-        <em:optionsURL>chrome://torlauncher/content/preferences.xul</em:optionsURL>
--->
         <!-- firefox -->
         <em:targetApplication>
             <Description>