diff --git a/js/main.js b/js/main.js
index dd87ef1..4eccdf8 100644
--- a/js/main.js
+++ b/js/main.js
@@ -36,7 +36,7 @@ validWeatherUnit = [
     "fah", "cel"
 ]
 
-async function initBody() {
+function initBody() {
     /**
      * Function called when the body is loaded.
      * 
@@ -44,12 +44,9 @@ async function initBody() {
      * other things.
      */
     // Read the json file
-    storedSettings = await chrome.storage.sync.get(result => {return result})
-    console.log(storedSettings)
-    if (storedSettings == undefined || storedSettings.length == 0)
-        readJSON("config.json")
-    else
-        parseAndCreate(storedSettings)
+    BROWSER.storage.sync.get(result => {
+        Object.keys(result).length == 0 ? readJSON("config.json") : parseAndCreate(result)
+    })
 }
 
 function initSearchBar(jsonData) {
@@ -155,7 +152,6 @@ function updateWeather(weatherConfig) {
         .then(jsonData => {
             temp = Math.floor(jsonData["main"]["temp"])
             weatherType = jsonData["weather"][0]["main"]
-            console.log(temp, weatherType)
 
             temp = !unit.includes("cel") ?
                         getFahrenheit(temp) + "°F" : temp + "°C"
@@ -179,7 +175,7 @@ function readJSON(fileName) {
 }
 
 function saveSettings(settings) {
-    chrome.storage.sync.set(settings)
+    BROWSER.storage.sync.set(settings)
 }
 
 function parseAndCreate(jsonData) {
diff --git a/js/settings.js b/js/settings.js
index d9c3e56..6926384 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -11,35 +11,50 @@ modalId = "settings"
 closeId = "close"
 jsonContainer = "jsoneditor"
 
-async function showSettings() {
+// Detect browser
+BROWSER = detectBrowser()
+
+function showSettings() {
     modalEl = document.getElementById(modalId)
     closeBtn = document.getElementsByClassName(closeId)[0]
     modalEl.style.display = "block"
-    updatedJson = await loadJson()
-    closeBtn.onclick = () => {
-        modalEl.style.display = "none"
-        // Get the updated JSON
-        //updatedJson = editor.get()
-        console.log(updatedJson)
-        chrome.storage.sync.set(updatedJson)
-        document.getElementById(jsonContainer).innerHTML = ""
-        location.reload()
-    }
-}
 
-async function loadJson() {
+    // Define the jsonEditor
     container = document.getElementById(jsonContainer)
     const options = {
         mode: 'tree',
         modes: ['code', 'tree', 'view']
     }
     const editor = new JSONEditor(container, options)
+    loadJson(editor)
 
-    const response = await fetch("config.json")
-    const initialJson = await response.json()
-    
-    // Populate the editor
-    editor.set(initialJson)
+    closeBtn.onclick = () => {
+        modalEl.style.display = "none"
+        // Get the updated JSON
+        updatedJson = editor.get()
+        BROWSER.storage.sync.set(updatedJson)
+        document.getElementById(jsonContainer).innerHTML = ""
+        location.reload()
+    }
+}
 
-    return editor.get()
+async function loadJson(editor) {
+    BROWSER.storage.sync.get(async result => {
+        if (Object.keys(result).length == 0) {
+            const response = await fetch("config.json")
+            result = await response.json()
+        }
+        // Populate the editor
+        editor.set(result)
+    })
+}
+
+function detectBrowser() {
+    // Firefox
+    if (typeof InstallTrigger !== 'undefined')
+        BROWSER = browser
+    else if (!!window.chrome && (!!window.chrome.webstore || !!window.chrome.runtime))
+        BROWSER = chrome
+
+    return BROWSER
 }
\ No newline at end of file