6 files changed, 11 insertions, 11 deletions
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 241b51de..e9bf691f 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -121,7 +121,7 @@ async function redirectOfflineInstance(url, tabId) {
 let counter = 0
 
 function isAutoRedirect() {
-	return new Promise(resolve => browser.storage.local.get("autoRedirect", r => resolve(r.autoRedirect == true)))
+	return new Promise(resolve => browser.storage.local.get("options", r => resolve(r.options.autoRedirect == true)))
 }
 
 browser.webRequest.onResponseStarted.addListener(
diff --git a/src/pages/options/index.html b/src/pages/options/index.html
index 20592637..6ef33723 100644
--- a/src/pages/options/index.html
+++ b/src/pages/options/index.html
@@ -99,7 +99,7 @@
   <div class="some-block option-block">
     <h4 data-localise="__MSG_theme__">Theme</h4>
     <select id="theme">
-      <option value="DEFAULT" data-localise="__MSG_system__">System</option>
+      <option value="detect" data-localise="__MSG_detect__">Detect</option>
       <option value="light" data-localise="__MSG_light__">Light</option>
       <option value="dark" data-localise="__MSG_dark__">Dark</option>
     </select>
diff --git a/src/pages/options/init.js b/src/pages/options/init.js
index 5b679da4..cac23748 100644
--- a/src/pages/options/init.js
+++ b/src/pages/options/init.js
@@ -4,8 +4,8 @@ import localise from "../../assets/javascripts/localise.js"
 
 function changeTheme() {
 	return new Promise(resolve => {
-		browser.storage.local.get("theme", r => {
-			switch (r.theme) {
+		browser.storage.local.get("options", r => {
+			switch (r.options.theme) {
 				case "dark":
 					document.body.classList.add("dark-theme")
 					document.body.classList.remove("light-theme")
diff --git a/src/pages/options/widgets/general.ejs b/src/pages/options/widgets/general.ejs
index fa85e8bc..8f7ab029 100644
--- a/src/pages/options/widgets/general.ejs
+++ b/src/pages/options/widgets/general.ejs
@@ -6,7 +6,7 @@
   <div class="some-block option-block">
     <h4 data-localise="__MSG_theme__">Theme</h4>
     <select id="theme">
-      <option value="DEFAULT" data-localise="__MSG_system__">System</option>
+      <option value="detect" data-localise="__MSG_detect__">Detect</option>
       <option value="light" data-localise="__MSG_light__">Light</option>
       <option value="dark" data-localise="__MSG_dark__">Dark</option>
     </select>
diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html
index e21a63a0..d52a34b6 100644
--- a/src/pages/popup/popup.html
+++ b/src/pages/popup/popup.html
@@ -241,7 +241,7 @@
         <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
           <path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"></path>
         </svg></a></div>
-    <div class="some-block" id="unify_div" title="Unify cookies across all selected instances"><a class="title button prevent" id="unify">
+    <div class="some-block" id="unify_div" title="Unify preferences across all selected instances"><a class="title button prevent" id="unify">
         <h4 data-localise="__MSG_unifySettings__">Unify Settings</h4>
         <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
           <path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"></path>
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 098ae01a..5a5ccb53 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -78,11 +78,11 @@ browser.storage.local.get("options", r => {
 			return
 		}
 
-		const currentService = serviceHelper.computeService(url)
-		if (currentService != null) {
-			divs[currentService].current.classList.remove("hide")
-			divs[currentService].all.classList.add("hide")
-			if (config.services[currentService].preferences != undefined) {
+		const [service, frontend] = serviceHelper.computeService(url, true)
+		if (service) {
+			divs[service].current.classList.remove("hide")
+			divs[service].all.classList.add("hide")
+			if (config.services[service].frontends[frontend].preferences) {
 				const unify = document.getElementById("unify")
 				const textElement = document.getElementById("unify").getElementsByTagName("h4")[0]
 				unify.addEventListener("click", () => {