Redesigned settings and popup, updated dependencies

background.js

@@ -98,43 +98,43 @@ function isDangerous(tab, theHtml) {
 	if (opt.doRegexSafeDomains) {
 		let result = batchTest(safeDomains, pageDomain);
 		if (result.result)
-			return {result: false, reason: "Domain matches safe domain regex: ", target: result.item};
+			return {result: false, reason: "Domain matches the following safe domain regex: ", target: result.item};
 	} else {
 		let result = contains(safeDomains, pageDomain);
 		if (result.result)
-			return {result: false, reason: "Domain is safe domain: ", target: result.item};
+			return {result: false, reason: "Domain is set as a safe domain: ", target: result.item};
 	}
 
 	//Test danger domains
 	if (opt.doRegexDangerDomains) {
 		let result = batchTest(dangerDomains, pageDomain);
 		if (result.result)
-			return {result: true, reason: "Domain matches dangerous domain regex: ", target: result.item};
+			return {result: true, reason: "Domain matches the following dangerous domain regex: ", target: result.item};
 	} else {
 		let result = contains(dangerDomains, pageDomain);
 		if (result.result)
-			return {result: true, reason: "Domain is dangerous domain: ", target: result.item};
+			return {result: true, reason: "Domain is set as a dangerous domain: ", target: result.item};
 	}
 
 	if(theHtml != null) {
 		//Test keywords
 		if(opt.doRegexDangerKeywords) {
 			let result = batchTest(badWords, theHtml);
 			if (result.result)
-				return {result: true, reason: "HTML matches dangerous keyword regex: ", target: result.item};
+				return {result: true, reason: "HTML matches the following dangerous keyword regex: ", target: result.item};
 		} else {
 			let result = stringContainsAnyStringsOfArrayOfStrings(theHtml, badWords);
 			if(!result.result) {
 				result = stringContainsAnyStringsOfArrayOfStrings(theHtml, escapedBadWords);
 				if(result.result)
-					return {result: true, reason: "Dangerous keyword (escaped) found on page: ", target: result.item};
+					return {result: true, reason: "The following dangerous keyword (escaped) was found on this page: ", target: result.item};
 			} else {
-				return {result: true, reason: "Dangerous keyword found on page: ", target: result.item};
+				return {result: true, reason: "The following dangerous keyword was found on this page: ", target: result.item};
 			}
 		}
 	}
 
-	return {result: false, reason: "Page does not match any dangerous keywords or domains"};
+	return {result: false, reason: "This page does not match any dangerous keywords or domains."};
 }
 
 //Remove the history for a url

manifest.json

@@ -1,6 +1,6 @@
 {
 	"manifest_version": 2,
-	"applications": {
+	"browser_specific_settings": {
 		"gecko": {
 			"id": "@dynamichistory"
 		}
@@ -15,7 +15,6 @@
 		"chrome_style": true,
 		"browser_style": true
 	},
-
 	"permissions": [
 		"activeTab",
 		"tabs",
@@ -33,12 +32,35 @@
 		"page": "background.html"
 	},
 	"browser_action": {
+		"browser_style": true,
 		"default_icon": {
 			"16": "icon16.png",
 			"32": "icon32.png",
 			"48": "icon48.png",
 			"128": "icon128.png"
 		},
+		"theme_icons": [
+			{
+				"dark": "icon16.png",
+				"light": "icon16light.png",
+				"size": 16
+			},
+			{
+				"dark": "icon32.png",
+				"light": "icon32light.png",
+				"size": 32
+			},
+			{
+				"dark": "icon48.png",
+				"light": "icon48light.png",
+				"size": 48
+			},
+			{
+				"dark": "icon128.png",
+				"light": "icon128light.png",
+				"size": 128
+			}
+		],
 		"default_popup": "popup.html"
 	},
 	"sandbox": {