16 files changed, 52 insertions, 36 deletions

diff --git a/images/icon-light-128.png b/images/icon-dark-theme-128.png
index 002c9d5..002c9d5 100644
--- a/images/icon-light-128.png
+++ b/images/icon-dark-theme-128.png
diff --git a/images/icon-light-16.png b/images/icon-dark-theme-16.png
index 23d6675..23d6675 100644
--- a/images/icon-light-16.png
+++ b/images/icon-dark-theme-16.png
diff --git a/images/icon-light-19.png b/images/icon-dark-theme-19.png
index f5eaa06..f5eaa06 100644
--- a/images/icon-light-19.png
+++ b/images/icon-dark-theme-19.png
diff --git a/images/icon-light-32.png b/images/icon-dark-theme-32.png
index 28d2dc0..28d2dc0 100644
--- a/images/icon-light-32.png
+++ b/images/icon-dark-theme-32.png
diff --git a/images/icon-light-38.png b/images/icon-dark-theme-38.png
index 7e900ba..7e900ba 100644
--- a/images/icon-light-38.png
+++ b/images/icon-dark-theme-38.png
diff --git a/images/icon-light-48.png b/images/icon-dark-theme-48.png
index e2826c4..e2826c4 100644
--- a/images/icon-light-48.png
+++ b/images/icon-dark-theme-48.png
diff --git a/images/icon-light-64.png b/images/icon-dark-theme-64.png
index 97f057a..97f057a 100644
--- a/images/icon-light-64.png
+++ b/images/icon-dark-theme-64.png
diff --git a/images/icon-dark-128.png b/images/icon-light-theme-128.png
index 5ef6a8b..5ef6a8b 100644
--- a/images/icon-dark-128.png
+++ b/images/icon-light-theme-128.png
diff --git a/images/icon-dark-16.png b/images/icon-light-theme-16.png
index 9482d4b..9482d4b 100644
--- a/images/icon-dark-16.png
+++ b/images/icon-light-theme-16.png
diff --git a/images/icon-dark-19.png b/images/icon-light-theme-19.png
index def8e2f..def8e2f 100644
--- a/images/icon-dark-19.png
+++ b/images/icon-light-theme-19.png
diff --git a/images/icon-dark-32.png b/images/icon-light-theme-32.png
index 2bc01ff..2bc01ff 100644
--- a/images/icon-dark-32.png
+++ b/images/icon-light-theme-32.png
diff --git a/images/icon-dark-38.png b/images/icon-light-theme-38.png
index 2e08aec..2e08aec 100644
--- a/images/icon-dark-38.png
+++ b/images/icon-light-theme-38.png
diff --git a/images/icon-dark-48.png b/images/icon-light-theme-48.png
index f63956b..f63956b 100644
--- a/images/icon-dark-48.png
+++ b/images/icon-light-theme-48.png
diff --git a/images/icon-dark-64.png b/images/icon-light-theme-64.png
index accf6a5..accf6a5 100644
--- a/images/icon-dark-64.png
+++ b/images/icon-light-theme-64.png
diff --git a/js/background.js b/js/background.js
index 3c84b38..a3b5da3 100644
--- a/js/background.js
+++ b/js/background.js
@@ -29,12 +29,13 @@ var redirectThreshold = 3;
 
 function setIcon(image) {
 	var data = { 
-		path: {
-			19 : 'images/' + image + '-19.png',
-			38 : 'images/' + image + '-38.png'
-		}
+		path: {}
 	};
 
+	for (let nr of [16,19,32,38,48,64,128]) {
+		data.path[nr] = `images/${image}-${nr}.png`;
+	}
+
 	chrome.browserAction.setIcon(data, function() {
 		var err = chrome.runtime.lastError;
 		if (err) {
@@ -201,12 +202,21 @@ function setUpRedirectListener() {
 
 function updateIcon() {
 	chrome.storage.local.get({disabled:false}, function(obj) {
-		if (window.matchMedia('(prefers-color-scheme: dark)')) {
-			setIcon('icon-light');
+		if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+			setIcon('icon-dark-theme');
 		} else {
-			setIcon('icon-dark');
+			setIcon('icon-light-theme');
+		}
+
+		if (obj.disabled) {
+			chrome.browserAction.setBadgeText({text: 'off'});
+			chrome.browserAction.setBadgeBackgroundColor({color: 'red'});
+			if (chrome.browserAction.setBadgeTextColor) { //Not supported in Chrome
+				chrome.browserAction.setBadgeTextColor({color: '#fafafa'});
+			}
+		} else {
+			chrome.browserAction.setBadgeText({text: ''});
 		}
-		//setIcon(obj.disabled ? 'icon-light' : 'icon-dark');
 	});	
 }
 
@@ -410,4 +420,10 @@ function handleStartup(){
 	chrome.storage.local.set({
 		enableNotifications: false
 	});
+
+	updateIcon(); //To set dark/light icon...
+	let mql = window.matchMedia('(prefers-color-scheme: dark)');
+	mql.addEventListener('change', function(e) {
+		console.log('IT CHANGED ' + e.matches);
+	});
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index b95744b..560d4c8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,13 +4,13 @@
   "description": "Automatically redirect content based on user-defined rules.",
   "version": "3.5",
   "icons": {
-    "16": "images/icon-dark-16.png",
-    "19": "images/icon-dark-19.png",
-    "32": "images/icon-dark-32.png",
-    "38": "images/icon-dark-38.png",
-    "48": "images/icon-dark-48.png",
-    "64": "images/icon-dark-64.png",
-    "128": "images/icon-dark-128.png"
+    "16": "images/icon-light-theme-16.png",
+    "19": "images/icon-light-theme-19.png",
+    "32": "images/icon-light-theme-32.png",
+    "38": "images/icon-light-theme-38.png",
+    "48": "images/icon-light-theme-48.png",
+    "64": "images/icon-light-theme-64.png",
+    "128": "images/icon-light-theme-128.png"
   },
   "permissions": [
     "webRequest",
@@ -39,50 +39,50 @@
   },
   "browser_action": {
     "default_icon": {
-      "16": "images/icon-dark-16.png",
-      "19": "images/icon-dark-19.png",
-      "32": "images/icon-dark-32.png",
-      "38": "images/icon-dark-38.png",
-      "48": "images/icon-dark-48.png",
-      "64": "images/icon-dark-64.png",
-      "128": "images/icon-dark-128.png"
+      "16": "images/icon-light-theme-16.png",
+      "19": "images/icon-light-theme-19.png",
+      "32": "images/icon-light-theme-32.png",
+      "38": "images/icon-light-theme-38.png",
+      "48": "images/icon-light-theme-48.png",
+      "64": "images/icon-light-theme-64.png",
+      "128": "images/icon-light-theme-128.png"
     },
     "default_title": "Redirector",
     "default_popup": "popup.html",
     "theme_icons": [
       {
-        "light": "images/icon-dark-16.png",
-        "dark": "images/icon-light-16.png",
+        "light": "images/icon-light-theme-16.png",
+        "dark": "images/icon-dark-theme-16.png",
         "size": 16
       },
       {
-        "light": "images/icon-dark-19.png",
-        "dark": "images/icon-light-19.png",
+        "light": "images/icon-light-theme-19.png",
+        "dark": "images/icon-dark-theme-19.png",
         "size": 19
       },
       {
-        "light": "images/icon-dark-32.png",
-        "dark": "images/icon-light-32.png",
+        "light": "images/icon-light-theme-32.png",
+        "dark": "images/icon-dark-theme-32.png",
         "size": 32
       },
       {
-        "light": "images/icon-dark-38.png",
-        "dark": "images/icon-light-38.png",
+        "light": "images/icon-light-theme-38.png",
+        "dark": "images/icon-dark-theme-38.png",
         "size": 38
       },
       {
-        "light": "images/icon-dark-48.png",
-        "dark": "images/icon-light-48.png",
+        "light": "images/icon-light-theme-48.png",
+        "dark": "images/icon-dark-theme-48.png",
         "size": 48
       },
       {
-        "light": "images/icon-dark-64.png",
-        "dark": "images/icon-light-64.png",
+        "light": "images/icon-light-theme-64.png",
+        "dark": "images/icon-dark-theme-64.png",
         "size": 64
       },
       {
-        "light": "images/icon-dark-128.png",
-        "dark": "images/icon-light-128.png",
+        "light": "images/icon-light-theme-128.png",
+        "dark": "images/icon-dark-theme-128.png",
         "size": 128
       }
     ]