Fixed confidence, formatting

drivers/chrome/_locales/en/messages.json

@@ -40,7 +40,7 @@
 	"categoryName33":           { "message": "Web Server Extension" },
 	"categoryName34":           { "message": "Database" },
 	"categoryName35":           { "message": "Map" },
-	"categoryName36":           { "message": "Advertising Network" }
+	"categoryName36":           { "message": "Advertising Network" },
 	"categoryName37":           { "message": "Network Sevice" },
 	"categoryName38":           { "message": "Media Server" },
 	"categoryName39":           { "message": "Webcam" },

drivers/chrome/manifest.json

@@ -1,18 +1,16 @@
 { "name": "Wappalyzer",
 	"homepage_url": "https://wappalyzer.com?pk_campaign=chrome&pk_kwd=context",
 	"description": "Identifies software on the web",
-	"version": "2.30",
+	"version": "2.31",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
+		"16":  "images/icon_hot.png",
 		"32":  "images/icon_32.png",
 		"128": "images/icon_128.png"
 	},
 	"browser_action": {
-		"default_icon": {
-			"19": "images/icon_19.png",
-			"38": "images/icon_38.png"
-		},
+		"default_icon": "images/icon_32.png",
 		"default_title": "Wappalyzer - click for details",
 		"default_popup": "popup.html"
 	},

drivers/firefox/package.json

@@ -8,7 +8,7 @@
   "description": "Identifies software on the web",
   "author": "Elbert Alias",
   "license": "GPLv3",
-  "version": "3.0.0",
+  "version": "3.0.1",
 	"main": "driver",
 	"preferences": [{
 		"name": "tracking",

share/apps.json

@@ -1138,6 +1138,7 @@
 			"env": "^Handlebars$"
 		},
 		"Hello Bar": {
+			"website": "hellobar.com",
 			"cats": [ 5 ],
 			"script": "(hellobar\\.com/hellobar\\.js|new HelloBar)",
 			"html": "/hellobar\\.js" 

share/js/wappalyzer.js

@@ -14,7 +14,7 @@ var wappalyzer = (function() {
 	 */
 	var Application = function(app, detected) {
 		this.app             = app;
-		this.confidence      = [];
+		this.confidence      = {};
 		this.confidenceTotal = 0;
 		this.detected        = Boolean(detected);
 		this.version         = '';
@@ -66,7 +66,7 @@ var wappalyzer = (function() {
 			this.detected = true;
 
 			// Set confidence level
-			this.confidence.push(pattern.confidence ? pattern.confidence : 100);
+			this.confidence[type + ' ' + ( key ? key + ' ' : '' ) + pattern.regex] = pattern.confidence ? pattern.confidence : 100;
 
 			// Detect version number
 			if ( pattern.version ) {
@@ -419,7 +419,7 @@ var wappalyzer = (function() {
 
 							// Apply app confidence to implied app
 							for ( id in confidence ) {
-								apps[implied.string].confidence.push(confidence[id] * ( implied.confidence ? implied.confidence / 100 : 1 ));
+								apps[implied.string].confidence[id + ' implied by ' + app] = confidence[id] * ( implied.confidence ? implied.confidence / 100 : 1 );
 							}
 						});
 					}