4 files changed, 16 insertions, 24 deletions
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index d42e5027..576365bd 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -13,14 +13,8 @@ browser.runtime.onInstalled.addListener(async details => {
       if (!(await utils.getOptions())) {
         await servicesHelper.initDefaults()
       }
-      browser.runtime.openOptionsPage()
     } else if (details.reason == "update") {
-      if (details.previousVersion == "2.5.2") {
-        await servicesHelper.upgradeOptions()
-        await servicesHelper.processUpdate()
-      } else {
-        await servicesHelper.processUpdate()
-      }
+      await servicesHelper.processUpdate()
     }
   }
 })
diff --git a/src/pages/options_src/General/SettingsButtons.svelte b/src/pages/options_src/General/SettingsButtons.svelte
index 2f574199..29b756d2 100644
--- a/src/pages/options_src/General/SettingsButtons.svelte
+++ b/src/pages/options_src/General/SettingsButtons.svelte
@@ -20,14 +20,12 @@
     const reader = new FileReader()
     reader.readAsText(importSettingsFiles[0])
     reader.onload = async () => {
-      const data = JSON.parse(reader.result)
-      if ("theme" in data && data.version == browser.runtime.getManifest().version) {
-        browser.storage.local.clear(async () => {
-          options.set(data)
-        })
-      } else {
-        alert("Incompatible settings")
+      let data = JSON.parse(reader.result)
+      if (data.version != browser.runtime.getManifest().version) {
+        alert("Importing from a previous version. Be careful")
       }
+      data = await servicesHelper.processUpdate(data)
+      options.set(data)
     }
     reader.onerror = error => {
       console.log("error", error)
@@ -51,20 +49,20 @@
   }
 
   async function importSettingsSync() {
-    browser.storage.sync.get({ options }, r => {
-      const optionsSync = r.options
-      if (optionsSync.version == browser.runtime.getManifest().version) {
-        options.set(optionsSync)
-      } else {
-        alert("Error")
+    browser.storage.sync.get({ options }, async r => {
+      let data = r.options
+      if (data.version != browser.runtime.getManifest().version) {
+        alert("Importing from a previous version. Be careful")
       }
+      data = await servicesHelper.processUpdate(data)
+      options.set(data)
     })
   }
 
   async function resetSettings() {
     browser.storage.local.clear(async () => {
-      await servicesHelper.initDefaults()
-      options.set(await utils.getOptions())
+      const data = await servicesHelper.initDefaults()
+      options.set(data)
     })
   }
 </script>
diff --git a/src/pages/options_src/Services/Services.svelte b/src/pages/options_src/Services/Services.svelte
index 481afb83..6b16e824 100644
--- a/src/pages/options_src/Services/Services.svelte
+++ b/src/pages/options_src/Services/Services.svelte
@@ -72,7 +72,7 @@
             <ServiceIcon details={selection} />
             {selection.label}
           {:else}
-            {browser.i18n.getMessage("search_service") || "Search Service"}
+            {browser.i18n.getMessage("searchService") || "Search Service"}
           {/if}
         </div>
         <div style="font-size: 10px;" slot="chevron-icon">🮦</div>
diff --git a/src/pages/popup_src/App.svelte b/src/pages/popup_src/App.svelte
index 3409052d..2bd16169 100644
--- a/src/pages/popup_src/App.svelte
+++ b/src/pages/popup_src/App.svelte
@@ -88,7 +88,7 @@
 
 <style>
   :global(html, body) {
-    width: 300px;
+    width: 280px;
     height: min-content;
     min-height: auto;
     margin: 0;