diff --git a/.gitignore b/.gitignore
index 19de018bb..7d65964c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,8 @@ npm-debug.log
 tags
 
 !.gitkeep
+
+Thumbs.db
+Desktop.ini
+*.DS_Store
+._*
diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build
index 45de3da42..9c4989728 100755
--- a/bin/wappalyzer-build
+++ b/bin/wappalyzer-build
@@ -24,7 +24,7 @@ node $WAPPALYZER_NODE_PATH/node_modules/jsonlint/lib/cli.js -ist $'\t' $WAPPALYZ
 
 echo "Compressing PNG and SVG icons..."
 
-node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* --out-dir $WAPPALYZER_ROOT/src/icons
+node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* --out-dir $WAPPALYZER_ROOT/src/icons 2>&1 > /dev/null
 
 echo "Converting SVG icons to PNG..."
 
@@ -37,9 +37,11 @@ do
 
 	dest="$WAPPALYZER_ROOT/src/icons/converted/$(basename "$svg").png"
 
-	if [[ ! -f "$dest" ]]; then
-		node $WAPPALYZER_NODE_PATH/node_modules/svg2png/bin/svg2png-cli "$svg" --width=32 --height=32 --output "$dest" || true
+	if [[ -f "$dest" ]]; then
+		rm "$dest"
 	fi
+
+	#node $WAPPALYZER_NODE_PATH/node_modules/svg2png/bin/svg2png-cli "$svg" --width=32 --height=32 --output "$dest" || true
 done
 
 IFS="$OIFS"
@@ -66,17 +68,17 @@ pushd $WAPPALYZER_ROOT/src/drivers/chrome > /dev/null
 
 zip -qr $WAPPALYZER_ROOT/build/wappalyzer_chrome.zip .
 
-popd > /dev/null
+# WebExtension
+echo "Building WebExtension driver..."
 
-# Bookmarklet
-echo "Building Bookmarklet driver..."
+pushd $WAPPALYZER_ROOT/src/drivers/webextension > /dev/null
 
-echo "var json =" > /tmp/bookmarklet
+zip -qr $WAPPALYZER_ROOT/build/wappalyzer_webextension.zip . -x manifest.edge.json
 
-cat $WAPPALYZER_ROOT/src/apps.json >> /tmp/bookmarklet
+zip -qr $WAPPALYZER_ROOT/build/wappalyzer_webextension.edge.zip . -x manifest.json
 
-echo -e ";\n\nwappalyzer.apps = json.apps;\nwappalyzer.categories = json.categories;" >> /tmp/bookmarklet
+printf "@ manifest.edge.json\n@=manifest.json\n" | zipnote -w $WAPPALYZER_ROOT/build/wappalyzer_webextension.edge.zip
 
-mv /tmp/bookmarklet $WAPPALYZER_ROOT/src/drivers/bookmarklet/js/apps.js
+popd > /dev/null
 
 echo "Done. Builds have been created in $WAPPALYZER_ROOT/build."
diff --git a/bin/wappalyzer-links b/bin/wappalyzer-links
index 7e4b1e45d..251cebbf2 100755
--- a/bin/wappalyzer-links
+++ b/bin/wappalyzer-links
@@ -46,9 +46,14 @@ if [ "$(compgen -G "$path/icons/converted/*.png" | head -n1)" ]; then
 	ln -f $path/icons/converted/*.png $path/drivers/chrome/images/icons/converted
 fi
 
-ln -f $path/wappalyzer.js $path/drivers/bookmarklet/js
-ln -f $path/icons/*.png   $path/drivers/bookmarklet/images/icons
-ln -f $path/icons/*.svg   $path/drivers/bookmarklet/images/icons
+ln -f $path/wappalyzer.js $path/drivers/webextension/js
+ln -f $path/apps.json     $path/drivers/webextension
+ln -f $path/icons/*.png   $path/drivers/webextension/images/icons
+ln -f $path/icons/*.svg   $path/drivers/webextension/images/icons
+
+if [ "$(compgen -G "$path/icons/converted/*.png" | head -n1)" ]; then
+	ln -f $path/icons/converted/*.png $path/drivers/webextension/images/icons/converted
+fi
 
 echo "OK"
 
diff --git a/bin/wappalyzer-validate b/bin/wappalyzer-validate
index d9d09a617..0106c4d18 100755
--- a/bin/wappalyzer-validate
+++ b/bin/wappalyzer-validate
@@ -1,23 +1,20 @@
 #!/bin/bash
 
-path=$1
+path="$1"
 
-if [ -z $path ]
-then
-	if [ -z $WAPPALYZER_ROOT ]
-	then
+if [ -z "$path" ]; then
+	if [ -z "$WAPPALYZER_ROOT" ]; then
 		echo "-$(basename $0): No path specified"
 
 		exit 1
 	fi
 
-	path=$WAPPALYZER_ROOT
+	path="$WAPPALYZER_ROOT"
 fi
 
 set -eu
 
-if [ ! -d $path/src ]
-then
+if [ ! -d "$path/src" ]; then
 	echo "-$(basename $0): Incorrect path"
 
 	exit 1
@@ -27,7 +24,7 @@ path="$path/src"
 
 echo "Validating apps.json..."
 
-node $WAPPALYZER_NODE_PATH/node_modules/jsonlint/lib/cli.js --quiet -V $WAPPALYZER_ROOT/schema.json $path/apps.json
+node "$WAPPALYZER_NODE_PATH/node_modules/jsonlint/lib/cli.js" --quiet -V "$WAPPALYZER_ROOT/schema.json" "$path/apps.json"
 
 echo "Validating regular expressions..."
 
diff --git a/bin/wappalyzer-validate-regex b/bin/wappalyzer-validate-regex
index 36012c57a..f7976c116 100755
--- a/bin/wappalyzer-validate-regex
+++ b/bin/wappalyzer-validate-regex
@@ -80,7 +80,7 @@ for ( app in json.apps ) {
 		}
 	});
 
-	if ( /[a-z]+:\/\//i.test(json.apps[app].website) ) {
-		throw new Error('Do not include the protocol in the website URL\n' + app + ': ' + json.apps[app].website);
+	if ( !/^https?:\/\//i.test(json.apps[app].website) ) {
+		throw new Error('Invalid website URL\n' + app + ': ' + json.apps[app].website);
 	}
 }
diff --git a/schema.json b/schema.json
index 8be26af2a..c70605b61 100644
--- a/schema.json
+++ b/schema.json
@@ -9,7 +9,16 @@
 			"additionalProperties": false,
 			"patternProperties": {
 				"^[0-9]+$": {
-					"type": "string"
+					"type": "object",
+					"required": true,
+					"properties": {
+						"priority": {
+							"type": "string"
+						},
+						"name": {
+							"type": "string"
+						}
+					}
 				}
 			}
 		},
@@ -22,7 +31,7 @@
 					"cats": {
 						"type": "array",
 						"items": {
-							"type": "integer"
+							"type": "string"
 						},
 						"required": true
 					},
diff --git a/src/apps.json b/src/apps.json
index 363ee4648..04b2f0408 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -2,16 +2,16 @@
 	"apps": {
 		"1&1": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "1and1.svg",
 			"implies": "PHP",
 			"url": "/shop/catalog/browse\\?sessid=",
-			"website": "1and1.com"
+			"website": "http://1and1.com"
 		},
 		"1C-Bitrix": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "BITRIX_",
@@ -21,31 +21,31 @@
 			"icon": "1C-Bitrix.png",
 			"implies": "PHP",
 			"script": "1c-bitrix",
-			"website": "www.1c-bitrix.ru"
+			"website": "http://www.1c-bitrix.ru"
 		},
 		"2z Project": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "2z Project.png",
 			"meta": {
 				"generator": "2z project ([\\d.]+)\\;version:\\1"
 			},
-			"website": "2zproject-cms.ru"
+			"website": "http://2zproject-cms.ru"
 		},
 		"3DM": {
 			"cats": [
-				19
+				"19"
 			],
 			"html": "<title>3ware 3DM([\\d\\.]+)?\\;version:\\1",
 			"icon": "3DM.png",
 			"implies": "3ware",
-			"website": "www.3ware.com"
+			"website": "http://www.3ware.com"
 		},
 		"3dCart": {
 			"cats": [
-				1,
-				6
+				"1",
+				"6"
 			],
 			"headers": {
 				"Set-Cookie": "3dvisit",
@@ -53,21 +53,21 @@
 			},
 			"icon": "3dCart.png",
 			"script": "(?:twlh(?:track)?\\.asp|3d_upsell\\.js)",
-			"website": "www.3dcart.com"
+			"website": "http://www.3dcart.com"
 		},
 		"3ware": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "3ware\\/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "3ware.png",
-			"website": "www.3ware.com"
+			"website": "http://www.3ware.com"
 		},
 		"AD EBiS": {
 			"cats": [
-				10
+				"10"
 			],
 			"html": [
 				"<!-- EBiS contents tag",
@@ -76,11 +76,11 @@
 				"<!-- EBiS common tag"
 			],
 			"icon": "ebis.png",
-			"website": "www.ebis.ne.jp"
+			"website": "http://www.ebis.ne.jp"
 		},
 		"AMPcms": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^amp_js_init$",
 			"headers": {
@@ -89,166 +89,166 @@
 			},
 			"icon": "AMPcms.png",
 			"implies": "PHP",
-			"website": "www.ampcms.org"
+			"website": "http://www.ampcms.org"
 		},
 		"AOLserver": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "AOLserver/?([\\d.]+)?\\;version:\\1"
 			},
 			"icon": "AOLserver.png",
-			"website": "aolserver.com"
+			"website": "http://aolserver.com"
 		},
 		"AT Internet Analyzer": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": [
 				"^xtsite$",
 				"^ATInternet$"
 			],
-			"icon": "AT Internet Analyzer.png",
-			"website": "atinternet.com/en"
+			"icon": "AT Internet.png",
+			"website": "http://atinternet.com/en"
 		},
 		"AT Internet XiTi": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^Xt_",
-			"icon": "AT Internet XiTi.png",
+			"icon": "AT Internet.png",
 			"script": "xiti\\.com/hit\\.xiti",
-			"website": "atinternet.com/en"
+			"website": "http://atinternet.com/en"
 		},
 		"ATEN": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "ATEN HTTP Server(?:\\(?V?([\\d\\.]+)\\)?)?\\;version:\\1"
 			},
 			"icon": "ATEN.png",
-			"website": "www.aten.com"
+			"website": "http://www.aten.com"
 		},
 		"AWStats": {
 			"cats": [
-				10
+				"10"
 			],
 			"icon": "AWStats.png",
 			"implies": "Perl",
 			"meta": {
 				"generator": "AWStats ([\\d.]+(?: \\(build [\\d.]+\\))?)\\;version:\\1"
 			},
-			"website": "awstats.sourceforge.net"
+			"website": "http://awstats.sourceforge.net"
 		},
 		"Accessible Portal": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Accessible Portal.png",
 			"implies": "PHP",
 			"meta": {
 				"generator": "Accessible Portal"
 			},
-			"website": "www.accessibleportal.com"
+			"website": "http://www.accessibleportal.com"
 		},
 		"Act-On": {
 			"cats": [
-				32
+				"32"
 			],
 			"env": "^ActOn$",
 			"icon": "ActOn.png",
-			"website": "act-on.com"
+			"website": "http://act-on.com"
 		},
 		"AdInfinity": {
 			"cats": [
-				36
+				"36"
 			],
 			"icon": "AdInfinity.png",
 			"script": "adinfinity\\.com\\.au",
-			"website": "adinfinity.com.au"
+			"website": "http://adinfinity.com.au"
 		},
 		"AdRiver": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^adriver$",
 			"html": "(?:<embed[^>]+(?:src=\"https?://mh\\d?\\.adriver\\.ru/|flashvars=\"[^\"]*(?:http:%3A//(?:ad|mh\\d?)\\.adriver\\.ru/|adriver_banner))|<(?:(?:iframe|img)[^>]+src|a[^>]+href)=\"https?://ad\\.adriver\\.ru/)",
 			"icon": "AdRiver.png",
 			"script": "(?:adriver\\.core\\.\\d\\.js|https?://(?:content|ad|masterh\\d)\\.adriver\\.ru/)",
-			"website": "adriver.ru"
+			"website": "http://adriver.ru"
 		},
 		"AdRoll": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^adroll_",
 			"icon": "AdRoll.svg",
 			"script": "(?:a|s)\\.adroll\\.com",
-			"website": "adroll.com"
+			"website": "http://adroll.com"
 		},
 		"Adcash": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^(?:ac_bgclick_URL|ct_(?:siteunder|tag|n(?:SuUrl(?:Opp)?)|Su(?:Loaded|Url)))$",
 			"icon": "Adcash.svg",
 			"script": "^[^\\/]*//(?:[^\\/]+\\.)?adcash\\.com/(?:script|ad)/",
 			"url": "^https?://(?:[^\\/]+\\.)?adcash\\.com/script/pop_",
-			"website": "adcash.com"
+			"website": "http://adcash.com"
 		},
 		"AddShoppers": {
 			"cats": [
-				5
+				"5"
 			],
 			"icon": "AddShoppers.png",
 			"script": "cdn\\.shop\\.pe/widget/",
-			"website": "www.addshoppers.com"
+			"website": "http://www.addshoppers.com"
 		},
 		"AddThis": {
 			"cats": [
-				5
+				"5"
 			],
 			"env": "^addthis",
 			"icon": "AddThis.svg",
 			"script": "addthis\\.com/js/",
-			"website": "www.addthis.com"
+			"website": "http://www.addthis.com"
 		},
 		"AddToAny": {
 			"cats": [
-				5
+				"5"
 			],
 			"env": "^a2apage_init$",
 			"icon": "AddToAny.png",
 			"script": "addtoany\\.com/menu/page\\.js",
-			"website": "www.addtoany.com"
+			"website": "http://www.addtoany.com"
 		},
 		"Adminer": {
 			"cats": [
-				3
+				"3"
 			],
 			"html": [
 				"Adminer</a> <span class=\"version\">([\\d.]+)</span>\\;version:\\1",
 				"onclick=\"bodyClick\\(event\\);\" onload=\"verifyVersion\\('([\\d.]+)'\\);\">\\;version:\\1"
 			],
-			"implies": "PHP",
 			"icon": "adminer.png",
-			"website": "www.adminer.org"
+			"implies": "PHP",
+			"website": "http://www.adminer.org"
 		},
 		"Adnegah": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^ados(?:Results)?$",
 			"html": "<iframe [^>]*src=\"[^\"]+adnegah\\.net",
 			"icon": "adnegah.png",
 			"script": "[^a-z]adnegah.*\\.js",
-			"website": "Adnegah.net"
+			"website": "http://Adnegah.net"
 		},
 		"Adobe ColdFusion": {
 			"cats": [
-				18
+				"18"
 			],
 			"env": "^_cfEmails$",
 			"headers": {
@@ -259,11 +259,11 @@
 			"implies": "CFML",
 			"script": "/cfajax/",
 			"url": "\\.cfm(?:$|\\?)",
-			"website": "adobe.com/products/coldfusion-family.html"
+			"website": "http://adobe.com/products/coldfusion-family.html"
 		},
 		"Adobe Experience Manager": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": [
 				"<div class=\"[^\"]*parbase",
@@ -272,31 +272,31 @@
 			"icon": "Adobe Experience Manager.svg",
 			"implies": "Java",
 			"script": "/etc/designs/",
-			"website": "www.adobe.com/au/marketing-cloud/enterprise-content-management.html"
+			"website": "http://www.adobe.com/au/marketing-cloud/enterprise-content-management.html"
 		},
 		"Adobe GoLive": {
 			"cats": [
-				20
+				"20"
 			],
 			"icon": "Adobe GoLive.png",
 			"meta": {
 				"generator": "Adobe GoLive(?:\\s([\\d.]+))?\\;version:\\1"
 			},
-			"website": "www.adobe.com/products/golive"
+			"website": "http://www.adobe.com/products/golive"
 		},
 		"Adobe Muse": {
 			"cats": [
-				20
+				"20"
 			],
 			"icon": "Adobe Muse.svg",
 			"meta": {
 				"generator": "^Muse(?:$| ?/?(\\d[\\d.]+))\\;version:\\1"
 			},
-			"website": "muse.adobe.com"
+			"website": "http://muse.adobe.com"
 		},
 		"Adobe RoboHelp": {
 			"cats": [
-				4
+				"4"
 			],
 			"env": "^gbWh(?:Ver|Lang|Msg|Util|Proxy)$",
 			"icon": "Adobe RoboHelp.svg",
@@ -304,39 +304,39 @@
 				"generator": "^Adobe RoboHelp(?: ([\\d]+))?\\;version:\\1"
 			},
 			"script": "(?:wh(?:utils|ver|proxy|lang|topic|msg)|ehlpdhtm)\\.js",
-			"website": "adobe.com/products/robohelp.html"
+			"website": "http://adobe.com/products/robohelp.html"
 		},
 		"Advanced Web Stats": {
 			"cats": [
-				10
+				"10"
 			],
 			"html": "aws\\.src = [^<]+caphyon-analytics",
 			"icon": "Advanced Web Stats.png",
 			"implies": "Java",
-			"website": "www.advancedwebstats.com"
+			"website": "http://www.advancedwebstats.com"
 		},
 		"Advert Stream": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^advst_is_above_the_fold$",
 			"icon": "Advert Stream.png",
 			"script": "(?:ad\\.advertstream\\.com|adxcore\\.com)",
-			"website": "www.advertstream.com"
+			"website": "http://www.advertstream.com"
 		},
 		"Adzerk": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^ados(?:Results)?$",
 			"html": "<iframe [^>]*src=\"[^\"]+adzerk\\.net",
 			"icon": "Adzerk.png",
 			"script": "adzerk\\.net/ados\\.js",
-			"website": "adzerk.com"
+			"website": "http://adzerk.com"
 		},
 		"Aegea": {
 			"cats": [
-				11
+				"11"
 			],
 			"headers": {
 				"X-Powered-By": "^E2 Aegea v(\\d+)$\\;version:\\1"
@@ -346,79 +346,79 @@
 				"PHP",
 				"jQuery"
 			],
-			"website": "blogengine.ru"
+			"website": "http://blogengine.ru"
 		},
 		"AfterBuy": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": [
 				"<dd>This OnlineStore is brought to you by ViA-Online GmbH Afterbuy. Information and contribution at https://www.afterbuy.de</dd>"
 			],
 			"icon": "after-buy.png",
 			"script": "shop-static\\.afterbuy\\.de",
-			"website": "www.afterbuy.de"
+			"website": "http://www.afterbuy.de"
 		},
 		"Aircall": {
 			"cats": [
-				52
+				"52"
 			],
 			"icon": "aircall.png",
 			"script": "^https?://cdn\\.aircall\\.io/",
-			"website": "aircall.io"
+			"website": "http://aircall.io"
 		},
 		"Airee": {
 			"cats": [
-				31
+				"31"
 			],
 			"headers": {
 				"Server": "Airee"
 			},
 			"icon": "Airee.png",
-			"website": "xn--80aqc2a.xn--p1ai"
+			"website": "http://xn--80aqc2a.xn--p1ai"
 		},
 		"Akamai": {
 			"cats": [
-				31
+				"31"
 			],
 			"headers": {
 				"X-Akamai-Transformed": ""
 			},
 			"icon": "Akamai.png",
-			"website": "akamai.com"
+			"website": "http://akamai.com"
 		},
 		"Akka HTTP": {
 			"cats": [
-				18,
-				22
+				"18",
+				"22"
 			],
 			"headers": {
 				"Server": "akka-http(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "akka-http.png",
-			"website": "akka.io"
+			"website": "http://akka.io"
 		},
 		"Algolia Realtime Search": {
 			"cats": [
-				29
+				"29"
 			],
 			"env": "^AlgoliaSearch$",
 			"icon": "Algolia Realtime Search.svg",
-			"website": "www.algolia.com"
+			"website": "http://www.algolia.com"
 		},
 		"Allegro RomPager": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Allegro-Software-RomPager(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Allegro RomPager.png",
-			"website": "allegrosoft.com/embedded-web-server-s2"
+			"website": "http://allegrosoft.com/embedded-web-server-s2"
 		},
 		"AlloyUI": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^AUI$",
 			"icon": "AlloyUI.png",
@@ -427,51 +427,51 @@
 				"YUI"
 			],
 			"script": "^https?://cdn\\.alloyui\\.com/",
-			"website": "www.alloyui.com"
+			"website": "http://www.alloyui.com"
 		},
 		"Amaya": {
 			"cats": [
-				20
+				"20"
 			],
 			"icon": "Amaya.png",
 			"meta": {
 				"generator": "Amaya(?: V?([\\d.]+[a-z]))?\\;version:\\1"
 			},
-			"website": "www.w3.org/Amaya"
+			"website": "http://www.w3.org/Amaya"
 		},
 		"Amazon Cloudfront": {
 			"cats": [
-				31
+				"31"
 			],
 			"headers": {
 				"X-Amz-Cf-Id": ""
 			},
 			"icon": "Amazon-Cloudfront.svg",
-			"website": "aws.amazon.com/cloudfront/"
-    },
+			"website": "http://aws.amazon.com/cloudfront/"
+		},
 		"Amazon EC2": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "\\(Amazon\\)"
 			},
 			"icon": "aws-ec2.svg",
-			"website": "aws.amazon.com/ec2/"
-		},
-    "Amazon S3": {
-      "cats": [
-        19
-      ],
-      "headers": {
-        "Server": "AmazonS3"
-      },
-      "icon": "aws-s3.svg",
-      "website": "aws.amazon.com/s3/"
-    },
+			"website": "http://aws.amazon.com/ec2/"
+		},
+		"Amazon S3": {
+			"cats": [
+				"19"
+			],
+			"headers": {
+				"Server": "AmazonS3"
+			},
+			"icon": "aws-s3.svg",
+			"website": "http://aws.amazon.com/s3/"
+		},
 		"Ametys": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Ametys.png",
 			"implies": "Java",
@@ -479,37 +479,22 @@
 				"generator": "(?:Ametys|Anyware Technologies)"
 			},
 			"script": "ametys\\.js",
-			"website": "ametys.org"
+			"website": "http://ametys.org"
 		},
 		"Amiro.CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Amiro.CMS.png",
 			"implies": "PHP",
 			"meta": {
 				"generator": "Amiro"
 			},
-			"website": "amirocms.com"
-		},
-		"Anchor CMS": {
-			"cats": [
-				1,
-				11
-			],
-			"icon": "Anchor CMS.png",
-			"implies": [
-				"PHP",
-				"MySQL"
-			],
-			"meta": {
-				"generator": "Anchor CMS"
-			},
-			"website": "anchorcms.com"
+			"website": "http://amirocms.com"
 		},
 		"Angular Material": {
 			"cats": [
-				18
+				"18"
 			],
 			"env": "^ngMaterial$",
 			"icon": "Angular.svg",
@@ -518,11 +503,11 @@
 				"/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular-material(?:\\.min)?\\.js\\;version:\\1",
 				"angular-material.*\\.js"
 			],
-			"website": "material.angularjs.org"
+			"website": "http://material.angularjs.org"
 		},
 		"AngularJS": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^angular$",
 			"icon": "AngularJS.png",
@@ -531,89 +516,89 @@
 				"/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular(?:\\.min)?\\.js\\;version:\\1",
 				"angular.*\\.js"
 			],
-			"website": "angularjs.org"
+			"website": "http://angularjs.org"
 		},
 		"Apache": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\b)HTTPD)\\;version:\\1"
 			},
 			"icon": "Apache.svg",
-			"website": "apache.org"
+			"website": "http://apache.org"
 		},
 		"Apache HBase": {
 			"cats": [
-				34
+				"34"
 			],
 			"html": "<style[^>]+static/hbase",
-			"implies": "Java",
 			"icon": "Apache HBase.png",
-			"website": "hbase.apache.org"
+			"implies": "Java",
+			"website": "http://hbase.apache.org"
 		},
 		"Apache Hadoop": {
 			"cats": [
-				34
+				"34"
 			],
 			"html": "<style[^>]+static/hadoop",
 			"icon": "Apache Hadoop.svg",
-			"website": "hadoop.apache.org"
+			"website": "http://hadoop.apache.org"
 		},
 		"Apache JSPWiki": {
 			"cats": [
-				8
+				"8"
 			],
 			"html": "<html[^>]* xmlns:jspwiki=",
 			"icon": "Apache JSPWiki.png",
-			"script": "jspwiki",
 			"implies": "Apache Tomcat",
+			"script": "jspwiki",
 			"url": "wiki\\.jsp",
-			"website": "jspwiki.org"
+			"website": "http://jspwiki.org"
 		},
 		"Apache Tomcat": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Apache-Coyote(/1\\.1)?\\;version:\\1?4.1+:",
 				"X-Powered-By": "\bTomcat\b(?:-([\\d.]+))?\\;version:\\1"
 			},
-			"implies": "Java",
 			"icon": "Apache Tomcat.svg",
-			"website": "tomcat.apache.org"
+			"implies": "Java",
+			"website": "http://tomcat.apache.org"
 		},
 		"Apache Traffic Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "ATS/?([\\d.]+)?\\;version:\\1"
 			},
 			"icon": "Apache Traffic Server.png",
-			"website": "trafficserver.apache.org/"
+			"website": "http://trafficserver.apache.org/"
 		},
 		"Apache Wicket": {
 			"cats": [
-				18
+				"18"
 			],
 			"env": "^Wicket",
 			"icon": "Apache Wicket.svg",
 			"implies": "Java",
-			"website": "wicket.apache.org"
+			"website": "http://wicket.apache.org"
 		},
 		"AppNexus": {
 			"cats": [
-				36
+				"36"
 			],
 			"html": "<(?:iframe|img)[^>]+adnxs\\.(?:net|com)",
 			"icon": "AppNexus.svg",
 			"script": "adnxs\\.(?:net|com)",
-			"website": "appnexus.com"
+			"website": "http://appnexus.com"
 		},
 		"Arastta": {
 			"cats": [
-				6
+				"6"
 			],
 			"excludes": "OpenCart",
 			"headers": {
@@ -624,19 +609,19 @@
 			"icon": "Arastta.svg",
 			"implies": "PHP",
 			"script": "arastta\\.js",
-			"website": "arastta.org"
+			"website": "http://arastta.org"
 		},
 		"Arc Forum": {
 			"cats": [
-				2
+				"2"
 			],
 			"html": "ping\\.src = node\\.href;\\s+[^>]+\\s+}\\s+</script>",
 			"icon": "Arc Forum.png",
-			"website": "arclanguage.org"
+			"website": "http://arclanguage.org"
 		},
 		"Artifactory": {
 			"cats": [
-				47
+				"47"
 			],
 			"env": "^ArtifactoryUpdates$",
 			"html": [
@@ -646,11 +631,11 @@
 			"script": [
 				"wicket/resource/org\\.artifactory\\."
 			],
-			"website": "jfrog.com/open-source/#os-arti"
+			"website": "http://jfrog.com/open-source/#os-arti"
 		},
 		"Artifactory Web Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Artifactory(?:/([\\d.]+))?\\;version:\\1"
@@ -659,35 +644,35 @@
 			"implies": [
 				"Artifactory"
 			],
-			"website": "jfrog.com/open-source/#os-arti"
+			"website": "http://jfrog.com/open-source/#os-arti"
 		},
 		"ArvanCloud": {
 			"cats": [
-				31
+				"31"
 			],
 			"env": "^ArvanCloud$",
 			"headers": {
 				"AR-PoweredBy": "Arvan Cloud \\(arvancloud.com\\)"
 			},
 			"icon": "ArvanCloud.png",
-			"website": "www.ArvanCloud.com"
+			"website": "http://www.ArvanCloud.com"
 		},
 		"AsciiDoc": {
 			"cats": [
-				1,
-				20,
-				27
+				"1",
+				"20",
+				"27"
 			],
 			"env": "^asciidoc$",
 			"icon": "AsciiDoc.png",
 			"meta": {
 				"generator": "^AsciiDoc ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.methods.co.nz/asciidoc"
+			"website": "http://www.methods.co.nz/asciidoc"
 		},
 		"Asymptix PHP Framework": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"X-Powered-By": "Asymptix PHP Framework(?:.*)"
@@ -697,11 +682,11 @@
 			],
 			"icon": "Asymptix PHP Framework.png",
 			"implies": "PHP",
-			"website": "github.com/Asymptix/Framework"
+			"website": "http://github.com/Asymptix/Framework"
 		},
 		"Atlassian Bitbucket": {
 			"cats": [
-				47
+				"47"
 			],
 			"env": "^bitbucket$",
 			"icon": "Atlassian Bitbucket.svg",
@@ -709,11 +694,11 @@
 			"meta": {
 				"application-name": "Bitbucket"
 			},
-			"website": "www.atlassian.com/software/bitbucket/overview/"
+			"website": "http://www.atlassian.com/software/bitbucket/overview/"
 		},
 		"Atlassian Confluence": {
 			"cats": [
-				8
+				"8"
 			],
 			"headers": {
 				"X-Confluence-Request-Time": ""
@@ -724,22 +709,22 @@
 			"meta": {
 				"confluence-request-time": ""
 			},
-			"website": "www.atlassian.com/software/confluence/overview/team-collaboration-software"
+			"website": "http://www.atlassian.com/software/confluence/overview/team-collaboration-software"
 		},
 		"Atlassian FishEye": {
 			"cats": [
-				47
+				"47"
 			],
 			"headers": {
 				"Set-cookie": "FESESSIONID"
 			},
 			"html": "<title>(?:Log in to )?FishEye (?:and Crucible )?([\\d.]+)?</title>\\;version:\\1",
 			"icon": "Atlassian FishEye.svg",
-			"website": "www.atlassian.com/software/fisheye/overview/"
+			"website": "http://www.atlassian.com/software/fisheye/overview/"
 		},
 		"Atlassian Jira": {
 			"cats": [
-				13
+				"13"
 			],
 			"env": "^jira$",
 			"html": "Powered by\\s+<a href=[^>]+atlassian\\.com/(?:software/jira|jira-bug-tracking/)[^>]+>Atlassian\\s+JIRA(?:[^v]*v(?:ersion: )?(\\d+\\.\\d+(?:\\.\\d+)?))?\\;version:\\1",
@@ -749,56 +734,56 @@
 				"ajs-version-number": "([\\d\\.]+)\\;version:\\1",
 				"application-name": "JIRA"
 			},
-			"website": "www.atlassian.com/software/jira/overview/"
+			"website": "http://www.atlassian.com/software/jira/overview/"
 		},
 		"Atlassian Jira Issue Collector": {
 			"cats": [
-				13,
-				47
+				"13",
+				"47"
 			],
 			"icon": "Atlassian Jira.svg",
 			"script": [
 				"jira-issue-collector-plugin",
 				"atlassian\\.jira\\.collector\\.plugin"
 			],
-			"website": "www.atlassian.com/software/jira/overview/"
+			"website": "http://www.atlassian.com/software/jira/overview/"
 		},
 		"Aurelia": {
 			"cats": [
-				12
+				"12"
 			],
-			"icon": "Aurelia.svg",
 			"html": [
 				"<[^>]+aurelia-app=[^>]",
 				"<[^>]+data-main=[^>]aurelia-bootstrapper",
 				"<[^>]+au-target-id=[^>]\\d"
 			],
+			"icon": "Aurelia.svg",
 			"script": [
 				"aurelia(?:\\.min)?\\.js"
 			],
-			"website": "aurelia.io"
+			"website": "http://aurelia.io"
 		},
 		"Avangate": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^(?:__)?avng8_",
 			"html": "<link[^>]* href=\"^https?://edge\\.avangate\\.net/",
 			"icon": "Avangate.svg",
 			"script": "^https?://edge\\.avangate\\.net/",
-			"website": "avangate.com"
+			"website": "http://avangate.com"
 		},
 		"BEM": {
 			"cats": [
-				12
+				"12"
 			],
 			"html": "<[^>]+data-bem",
 			"icon": "BEM.png",
-			"website": "en.bem.info"
+			"website": "http://en.bem.info"
 		},
 		"BIGACE": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "(?:Powered by <a href=\"[^>]+BIGACE|<!--\\s+Site is running BIGACE)",
 			"icon": "BIGACE.png",
@@ -806,21 +791,21 @@
 			"meta": {
 				"generator": "BIGACE ([\\d.]+)\\;version:\\1"
 			},
-			"website": "bigace.de"
+			"website": "http://bigace.de"
 		},
 		"Backbone.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Backbone$",
 			"icon": "Backbone.js.png",
 			"implies": "Underscore.js",
 			"script": "backbone.*\\.js",
-			"website": "backbonejs.org"
+			"website": "http://backbonejs.org"
 		},
 		"Backdrop": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^Backdrop$",
 			"excludes": "Drupal",
@@ -829,12 +814,12 @@
 			"meta": {
 				"generator": "Backdrop CMS(?: (\\d))?\\;version:\\1"
 			},
-			"website": "backdropcms.org"
+			"website": "http://backdropcms.org"
 		},
 		"Banshee": {
 			"cats": [
-				1,
-				18
+				"1",
+				"18"
 			],
 			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(?:v([\\d.]+))?\\;version:\\1",
 			"icon": "Banshee.png",
@@ -842,44 +827,44 @@
 			"meta": {
 				"generator": "Banshee PHP"
 			},
-			"website": "www.banshee-php.org"
+			"website": "http://www.banshee-php.org"
 		},
 		"BaseHTTP": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "BaseHTTP\\/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "BaseHTTP.png",
 			"implies": "Python",
-			"website": "docs.python.org/2/library/basehttpserver.html"
+			"website": "http://docs.python.org/2/library/basehttpserver.html"
 		},
 		"BigDump": {
 			"cats": [
-				3
+				"3"
 			],
 			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer ver\\. ([\\d.b]+)\\;version:\\1",
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": [
 				"MySQL",
 				"PHP"
 			],
-			"website": "www.ozerov.de/bigdump.php"
+			"website": "http://www.ozerov.de/bigdump.php"
 		},
 		"Bigcommerce": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "<link href=[^>]+cdn\\d+\\.bigcommerce\\.com/",
 			"icon": "Bigcommerce.png",
 			"script": "cdn\\d+\\.bigcommerce\\.com/",
 			"url": "mybigcommerce\\.com",
-			"website": "www.bigcommerce.com"
+			"website": "http://www.bigcommerce.com"
 		},
 		"Bigware": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"Set-Cookie": "(?:bigwareCsid|bigWAdminID)"
@@ -888,89 +873,89 @@
 			"icon": "Bigware.png",
 			"implies": "PHP",
 			"url": "(?:\\?|&)bigWAdminID=",
-			"website": "bigware.de"
+			"website": "http://bigware.de"
 		},
 		"BittAds": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^bitt$",
 			"icon": "BittAds.png",
 			"script": "bittads\\.com/js/bitt\\.js$",
-			"website": "bittads.com"
+			"website": "http://bittads.com"
 		},
 		"Blesta": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"Set-Cookie": "blesta_sid"
 			},
 			"icon": "Blesta.png",
-			"website": "www.blesta.com"
+			"website": "http://www.blesta.com"
 		},
 		"Blip.tv": {
 			"cats": [
-				14
+				"14"
 			],
 			"html": "<(?:param|embed|iframe)[^>]+blip\\.tv/play",
 			"icon": "Blip.tv.png",
-			"website": "blip.tv"
+			"website": "http://blip.tv"
 		},
 		"Blogger": {
 			"cats": [
-				11
+				"11"
 			],
 			"icon": "Blogger.png",
 			"meta": {
 				"generator": "blogger"
 			},
 			"url": "\\.blogspot\\.com",
-			"website": "www.blogger.com"
+			"website": "http://www.blogger.com"
 		},
 		"Bluefish": {
 			"cats": [
-				20
+				"20"
 			],
 			"icon": "Bluefish.png",
 			"meta": {
 				"generator": "Bluefish(?:\\s([\\d.]+))?\\;version:\\1"
 			},
-			"website": "sourceforge.net/projects/bluefish"
+			"website": "http://sourceforge.net/projects/bluefish"
 		},
 		"Boa": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Boa\\/?([\\d\\.a-z]+)?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "www.boa.org"
+			"icon": "default.svg",
+			"website": "http://www.boa.org"
 		},
 		"Boba.js": {
 			"cats": [
-				12
+				"12"
 			],
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "Google Analytics",
 			"script": "boba(?:\\.min)?\\.js",
-			"website": "boba.space150.com"
+			"website": "http://boba.space150.com"
 		},
 		"Bolt": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Bolt.png",
 			"implies": "PHP",
 			"meta": {
 				"generator": "Bolt"
 			},
-			"website": "bolt.cm"
+			"website": "http://bolt.cm"
 		},
 		"Bonfire": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"Set-Cookie": "bf_session="
@@ -978,82 +963,82 @@
 			"html": "Powered by <a[^>]+href=\"https?://(?:www\\.)?cibonfire\\.com[^>]*>Bonfire v([^<]+)\\;version:\\1",
 			"icon": "Bonfire.png",
 			"implies": "CodeIgniter",
-			"website": "cibonfire.com"
+			"website": "http://cibonfire.com"
 		},
 		"Bounce Exchange": {
 			"cats": [
-				32
+				"32"
 			],
 			"env": "^bouncex$",
 			"html": "<script[^>]*>[^>]+\\.src\\s*=\\s*['\"](?:https?:)?//tag\\.bounceexchange\\.com/",
 			"icon": "Bounce Exchange.svg",
 			"script": "^https?://tag\\.bounceexchange\\.com/",
-			"website": "www.bounceexchange.com"
+			"website": "http://www.bounceexchange.com"
 		},
 		"Brother": {
 			"cats": [
-				40
+				"40"
 			],
 			"html": [
 				"(?:<!--|<BR>)Copyright\\(C\\) [\\d-]+ Brother Industries",
 				"<TITLE>\n\\s*BROTHER "
 			],
 			"icon": "Brother.png",
-			"website": "www.brother.com"
+			"website": "http://www.brother.com"
 		},
 		"BrowserCMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "BrowserCMS.png",
 			"implies": "Ruby",
 			"meta": {
 				"generator": "BrowserCMS ([\\d.]+)\\;version:\\1"
 			},
-			"website": "browsercms.org"
+			"website": "http://browsercms.org"
 		},
 		"Bubble": {
 			"cats": [
-				1,
-				3,
-				18,
-				22
+				"1",
+				"3",
+				"18",
+				"22"
 			],
 			"env": "^appquery$",
 			"icon": "bubble.png",
 			"implies": "Node.js",
-			"website": "bubble.is"
+			"website": "http://bubble.is"
 		},
 		"BugSense": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^BugSense$",
 			"icon": "BugSense.png",
 			"script": "bugsense\\.js",
-			"website": "bugsense.com"
+			"website": "http://bugsense.com"
 		},
 		"BugSnag": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^BugSnag$",
 			"icon": "BugSnag.png",
 			"script": "bugsnag.*\\.js",
-			"website": "bugsnag.com"
+			"website": "http://bugsnag.com"
 		},
 		"Bugzilla": {
 			"cats": [
-				13
+				"13"
 			],
 			"html": "href=\"enter_bug\\.cgi\">",
 			"icon": "Bugzilla.png",
 			"implies": "Perl",
-			"website": "www.bugzilla.org"
+			"website": "http://www.bugzilla.org"
 		},
 		"Burning Board": {
 			"cats": [
-				2
+				"2"
 			],
 			"html": "<a href=\"[^>]+woltlab\\.com[^<]+<strong>Burning Board",
 			"icon": "Burning Board.png",
@@ -1061,52 +1046,52 @@
 				"PHP",
 				"Woltlab Community Framework"
 			],
-			"website": "www.woltlab.com"
+			"website": "http://www.woltlab.com"
 		},
 		"Business Catalyst": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<!-- BC_OBNW -->",
 			"icon": "Business Catalyst.png",
 			"script": "CatalystScripts",
-			"website": "businesscatalyst.com"
+			"website": "http://businesscatalyst.com"
 		},
 		"BuySellAds": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^_bsa",
 			"html": "<script[^>]*>[^<]+?bsa.src\\s*=\\s*['\"](?:https?:)?\\/{2}\\w\\d\\.buysellads\\.com\\/[\\w\\d\\/]+?bsa\\.js['\"]",
 			"icon": "BuySellAds.png",
 			"script": "^https?://s\\d\\.buysellads\\.com/",
-			"website": "buysellads.com"
+			"website": "http://buysellads.com"
 		},
 		"C++": {
 			"cats": [
-				27
+				"27"
 			],
 			"icon": "C++.png",
-			"website": "isocpp.org"
+			"website": "http://isocpp.org"
 		},
 		"CFML": {
 			"cats": [
-				27
+				"27"
 			],
 			"icon": "CFML.png",
-			"website": "adobe.com/products/coldfusion-family.html"
+			"website": "http://adobe.com/products/coldfusion-family.html"
 		},
 		"CKEditor": {
 			"cats": [
-				24
+				"24"
 			],
 			"env": "^CKEDITOR$",
 			"icon": "CKEditor.png",
-			"website": "ckeditor.com"
+			"website": "http://ckeditor.com"
 		},
 		"CMS Made Simple": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "^CMSSESSID"
@@ -1116,30 +1101,30 @@
 			"meta": {
 				"generator": "CMS Made Simple"
 			},
-			"website": "cmsmadesimple.org"
+			"website": "http://cmsmadesimple.org"
 		},
 		"CMSimple": {
 			"cats": [
-				1
+				"1"
 			],
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "PHP",
 			"meta": {
 				"generator": "CMSimple( [\\d.]+)?\\;version:\\1"
 			},
-			"website": "www.cmsimple.org/en"
+			"website": "http://www.cmsimple.org/en"
 		},
 		"CO2Stats": {
 			"cats": [
-				10
+				"10"
 			],
 			"html": "src=[^>]+co2stats\\.com/propres\\.php",
 			"icon": "CO2Stats.png",
-			"website": "co2stats.com"
+			"website": "http://co2stats.com"
 		},
 		"CPG Dragonfly": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Powered-By": "Dragonfly CMS"
@@ -1149,11 +1134,11 @@
 			"meta": {
 				"generator": "CPG Dragonfly"
 			},
-			"website": "dragonflycms.org"
+			"website": "http://dragonflycms.org"
 		},
 		"CS Cart": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^fn_compare_strings$",
 			"html": [
@@ -1162,11 +1147,11 @@
 			],
 			"icon": "CS Cart.png",
 			"implies": "PHP",
-			"website": "www.cs-cart.com"
+			"website": "http://www.cs-cart.com"
 		},
 		"CacheFly": {
 			"cats": [
-				31
+				"31"
 			],
 			"headers": {
 				"Server": "^CFS ",
@@ -1174,22 +1159,22 @@
 				"X-CF2": ""
 			},
 			"icon": "CacheFly.png",
-			"website": "www.cachefly.com"
+			"website": "http://www.cachefly.com"
 		},
 		"Caddy": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "^Caddy$"
 			},
-			"implies": "Go",
 			"icon": "caddy.svg",
-			"website": "caddyserver.com"
+			"implies": "Go",
+			"website": "http://caddyserver.com"
 		},
 		"CakePHP": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"Set-Cookie": "cakephp="
@@ -1199,49 +1184,49 @@
 			"meta": {
 				"application-name": "CakePHP"
 			},
-			"website": "cakephp.org"
+			"website": "http://cakephp.org"
 		},
 		"Canon": {
 			"cats": [
-				40
+				"40"
 			],
 			"icon": "Canon.png",
-			"website": "www.canon.com"
+			"website": "http://www.canon.com"
 		},
 		"Canon HTTP Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "CANON HTTP Server(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "Canon HTTP Server.png",
+			"icon": "Canon.png",
 			"implies": "Canon",
-			"website": "www.canon.com"
+			"website": "http://www.canon.com"
 		},
 		"Captch Me": {
 			"cats": [
-				16,
-				36
+				"16",
+				"36"
 			],
 			"env": "^Captchme",
 			"icon": "Captch Me.svg",
 			"script": "^https?://api\\.captchme\\.net/",
-			"website": "captchme.com"
+			"website": "http://captchme.com"
 		},
 		"Carbon Ads": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^_carbonads",
 			"html": "<[a-z]+ [^>]*id=\"carbonads-container\"",
 			"icon": "Carbon Ads.png",
 			"script": "[^\\/]*\\/\\/(?:engine|srv)\\.carbonads\\.com\\/",
-			"website": "carbonads.net"
+			"website": "http://carbonads.net"
 		},
 		"Cargo": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<link [^>]+Cargo feed",
 			"icon": "Cargo.png",
@@ -1250,12 +1235,12 @@
 				"cargo_title": ""
 			},
 			"script": "/cargo\\.",
-			"website": "cargocollective.com"
+			"website": "http://cargocollective.com"
 		},
 		"Catberry.js": {
 			"cats": [
-				12,
-				18
+				"12",
+				"18"
 			],
 			"env": "^catberry$",
 			"headers": {
@@ -1263,43 +1248,43 @@
 			},
 			"icon": "Catberry.js.png",
 			"implies": "Node.js",
-			"website": "catberry.org"
+			"website": "http://catberry.org"
 		},
 		"Catwalk": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Catwalk\\/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "Catwalk.png",
 			"implies": "Canon",
-			"website": "www.canon.com"
+			"website": "http://www.canon.com"
 		},
 		"CentOS": {
 			"cats": [
-				28
+				"28"
 			],
 			"headers": {
 				"Server": "CentOS",
 				"X-Powered-By": "CentOS"
 			},
 			"icon": "CentOS.png",
-			"website": "centos.org"
+			"website": "http://centos.org"
 		},
 		"CenteHTTPd": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "CenteHTTPd(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "CenteHTTPd.png",
-			"website": "cente.jp/cente/app/HTTPdc.html"
+			"website": "http://cente.jp/cente/app/HTTPdc.html"
 		},
 		"Chameleon": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Chameleon.png",
 			"implies": [
@@ -1309,11 +1294,11 @@
 			"meta": {
 				"generator": "chameleon-cms"
 			},
-			"website": "chameleon-system.de"
+			"website": "http://chameleon-system.de"
 		},
 		"Chamilo": {
 			"cats": [
-				21
+				"21"
 			],
 			"headers": {
 				"X-Powered-By": "Chamilo ([\\d.]+)\\;version:\\1"
@@ -1324,51 +1309,51 @@
 			"meta": {
 				"generator": "Chamilo ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.chamilo.org"
+			"website": "http://www.chamilo.org"
 		},
 		"Chartbeat": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^_sf_(?:endpt|async_config)$",
 			"icon": "Chartbeat.png",
 			"script": "chartbeat\\.js",
-			"website": "chartbeat.com"
+			"website": "http://chartbeat.com"
 		},
 		"Cherokee": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Cherokee/([\\d.]+)\\;version:\\1"
 			},
 			"icon": "Cherokee.png",
-			"website": "www.cherokee-project.com"
+			"website": "http://www.cherokee-project.com"
 		},
 		"CherryPy": {
 			"cats": [
-				18,
-				22
+				"18",
+				"22"
 			],
 			"headers": {
 				"Server": "CherryPy\\/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "CherryPy.png",
 			"implies": "Python",
-			"website": "www.cherrypy.org"
+			"website": "http://www.cherrypy.org"
 		},
 		"Chitika": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "ch_c(?:lient|olor_site_link)",
 			"icon": "Chitika.png",
 			"script": "scripts\\.chitika\\.net/",
-			"website": "chitika.com"
+			"website": "http://chitika.com"
 		},
 		"Ckan": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Access-Control-Allow-Headers": "X-CKAN-API-KEY",
@@ -1381,67 +1366,78 @@
 				"Java",
 				"PostgreSQL\\;confidence:80"
 			],
-			"website": "ckan.org/"
+			"website": "http://ckan.org/"
 		},
 		"ClickHeat": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^clickHeat",
 			"icon": "ClickHeat.png",
 			"implies": "PHP",
 			"script": "clickheat.*\\.js",
-			"website": "www.labsmedia.com/clickheat/index.html"
+			"website": "http://www.labsmedia.com/clickheat/index.html"
 		},
 		"ClickTale": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^ClickTale",
 			"icon": "ClickTale.png",
-			"website": "www.clicktale.com"
+			"website": "http://www.clicktale.com"
 		},
 		"Clicky": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^clicky$",
 			"icon": "Clicky.png",
 			"script": "static\\.getclicky\\.com",
-			"website": "getclicky.com"
+			"website": "http://getclicky.com"
 		},
 		"Clientexec": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "clientexec\\.[^>]*\\s?=\\s?[^>]*;",
 			"icon": "Clientexec.png",
-			"website": "www.clientexec.com"
+			"website": "http://www.clientexec.com"
+		},
+		"CloudCart": {
+			"cats": [
+				"6"
+			],
+			"icon": "cloudcart.svg",
+			"meta": {
+				"author": "^CloudCart LLC$"
+			},
+			"script": "/cloudcart-(?:assets|storage)/",
+			"website": "http://cloudcart.com"
 		},
 		"CloudFlare": {
 			"cats": [
-				31
+				"31"
 			],
 			"env": "^CloudFlare$",
 			"headers": {
 				"Server": "cloudflare"
 			},
 			"icon": "CloudFlare.svg",
-			"website": "www.cloudflare.com"
+			"website": "http://www.cloudflare.com"
 		},
 		"Cloudera": {
 			"cats": [
-				34
+				"34"
 			],
 			"headers": {
 				"Server": "cloudera"
 			},
 			"icon": "Cloudera.png",
-			"website": "www.cloudera.com"
+			"website": "http://www.cloudera.com"
 		},
 		"CodeIgniter": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"Set-Cookie": "(?:exp_last_activity|exp_tracker|ci_(?:session|(csrf_token)))\\;version:\\1?2+:"
@@ -1449,49 +1445,49 @@
 			"html": "<input[^>]+name=\"ci_csrf_token\"\\;version:2+",
 			"icon": "CodeIgniter.png",
 			"implies": "PHP",
-			"website": "codeigniter.com"
+			"website": "http://codeigniter.com"
 		},
 		"CodeMirror": {
 			"cats": [
-				19
+				"19"
 			],
 			"env": "^CodeMirror$",
 			"icon": "CodeMirror.png",
-			"website": "codemirror.net"
+			"website": "http://codemirror.net"
 		},
 		"Comandia": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^Comandia$",
 			"html": "<link[^>]+=['\"]//cdn\\.mycomandia\\.com",
 			"icon": "Comandia.svg",
-			"website": "comandia.com"
+			"website": "http://comandia.com"
 		},
 		"Commerce Server": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"COMMERCE-SERVER-SOFTWARE": ""
 			},
 			"icon": "Commerce Server.png",
 			"implies": "Microsoft ASP.NET",
-			"website": "commerceserver.net"
+			"website": "http://commerceserver.net"
 		},
 		"CompaqHTTPServer": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "CompaqHTTPServer\\/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "HP.svg",
-			"website": "www.hp.com"
+			"website": "http://www.hp.com"
 		},
 		"Concrete5": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^CCM_IMAGE_PATH$",
 			"icon": "Concrete5.png",
@@ -1500,22 +1496,22 @@
 				"generator": "concrete5 - ([\\d.ab]+)\\;version:\\1"
 			},
 			"script": "concrete/js/",
-			"website": "concrete5.org"
+			"website": "http://concrete5.org"
 		},
 		"Connect": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"X-Powered-By": "^Connect$"
 			},
 			"icon": "Connect.png",
 			"implies": "Node.js",
-			"website": "www.senchalabs.org/connect"
+			"website": "http://www.senchalabs.org/connect"
 		},
 		"Contao": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": [
 				"<!--[^>]+powered by (?:TYPOlight|Contao)[^>]*-->",
@@ -1526,22 +1522,22 @@
 			"meta": {
 				"generator": "^Contao Open Source CMS$"
 			},
-			"website": "contao.org"
+			"website": "http://contao.org"
 		},
 		"Contenido": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Contenido.png",
 			"implies": "PHP",
 			"meta": {
 				"generator": "Contenido ([\\d.]+)\\;version:\\1"
 			},
-			"website": "contenido.org/en"
+			"website": "http://contenido.org/en"
 		},
 		"Contens": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Contens.png",
 			"implies": [
@@ -1551,131 +1547,131 @@
 			"meta": {
 				"generator": "Contensis CMS Version ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.contens.com/en/pub/index.cfm"
+			"website": "http://www.contens.com/en/pub/index.cfm"
 		},
 		"ContentBox": {
 			"cats": [
-				1,
-				11
+				"1",
+				"11"
 			],
 			"icon": "ContentBox.png",
 			"implies": "Adobe ColdFusion",
 			"meta": {
 				"generator": "ContentBox powered by ColdBox"
 			},
-			"website": "www.gocontentbox.org"
+			"website": "http://www.gocontentbox.org"
 		},
 		"ConversionLab": {
 			"cats": [
-				10
+				"10"
 			],
 			"icon": "ConversionLab.png",
 			"script": "conversionlab\\.trackset\\.com/track/tsend\\.js",
-			"website": "www.trackset.it/conversionlab"
+			"website": "http://www.trackset.it/conversionlab"
 		},
 		"Coppermine": {
 			"cats": [
-				7
+				"7"
 			],
 			"html": "<!--Coppermine Photo Gallery ([\\d.]+)\\;version:\\1",
 			"icon": "Coppermine.png",
 			"implies": "PHP",
-			"website": "coppermine-gallery.net"
+			"website": "http://coppermine-gallery.net"
 		},
 		"Cosmoshop": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "Cosmoshop.png",
 			"script": "cosmoshop_functions\\.js",
-			"website": "cosmoshop.de"
+			"website": "http://cosmoshop.de"
 		},
 		"Cotonti": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Cotonti.png",
 			"implies": "PHP",
 			"meta": {
 				"generator": "Cotonti"
 			},
-			"website": "www.cotonti.com"
+			"website": "http://www.cotonti.com"
 		},
 		"CouchDB": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "CouchDB/([\\d.]+)\\;version:\\1"
 			},
 			"icon": "CouchDB.png",
-			"website": "couchdb.apache.org"
+			"website": "http://couchdb.apache.org"
 		},
 		"Cowboy": {
 			"cats": [
-				18,
-				22
+				"18",
+				"22"
 			],
 			"headers": {
 				"Server": "Cowboy"
 			},
 			"icon": "Cowboy.png",
 			"implies": "Erlang",
-			"website": "ninenines.eu"
+			"website": "http://ninenines.eu"
 		},
 		"CppCMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Powered-By": "CppCMS/([\\d.]+)\\;version:\\1"
 			},
 			"icon": "CppCMS.png",
 			"implies": "C++",
-			"website": "cppcms.com"
+			"website": "http://cppcms.com"
 		},
 		"Craft CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "CraftSessionId=",
 				"X-Powered-By": "Craft CMS"
 			},
 			"icon": "Craft CMS.png",
-			"implies": "PHP",
-			"website": "buildwithcraft.com"
+			"implies": "Yii",
+			"website": "http://buildwithcraft.com"
 		},
 		"Crazy Egg": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^CE2$",
 			"icon": "Crazy Egg.png",
 			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js",
-			"website": "crazyegg.com"
+			"website": "http://crazyegg.com"
 		},
 		"Criteo": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^criteo",
 			"icon": "Criteo.svg",
 			"script": "[^/]*//(?:cas\\.criteo\\.com|(?:[^/]\\.)?criteo\\.net)/",
-			"website": "criteo.com"
+			"website": "http://criteo.com"
 		},
 		"Cross Pixel": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^crsspxl$",
 			"icon": "Cross Pixel.png",
 			"script": "tag\\.crsspxl\\.com/s1\\.js",
-			"website": "datadesk.crsspxl.com"
+			"website": "http://datadesk.crsspxl.com"
 		},
 		"CubeCart": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "(?:Powered by <a href=[^>]+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
 			"icon": "CubeCart.png",
@@ -1683,46 +1679,46 @@
 			"meta": {
 				"generator": "cubecart"
 			},
-			"website": "www.cubecart.com"
+			"website": "http://www.cubecart.com"
 		},
 		"Cufon": {
 			"cats": [
-				17
+				"17"
 			],
 			"env": "^Cufon$",
 			"icon": "Cufon.png",
 			"script": "cufon-yui\\.js",
-			"website": "cufon.shoqolate.com"
+			"website": "http://cufon.shoqolate.com"
 		},
 		"D3": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^d3$",
 			"icon": "D3.png",
 			"script": "d3(?:\\. v\\d+)?(?:\\.min)?\\.js",
-			"website": "d3js.org"
+			"website": "http://d3js.org"
 		},
 		"DHTMLX": {
 			"cats": [
-				12
+				"12"
 			],
 			"icon": "DHTMLX.png",
 			"script": "dhtmlxcommon\\.js",
-			"website": "dhtmlx.com"
+			"website": "http://dhtmlx.com"
 		},
 		"DM Polopoly": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<(?:link [^>]*href|img [^>]*src)=\"/polopoly_fs/",
 			"icon": "DM Polopoly.png",
 			"implies": "Java",
-			"website": "www.atex.com/products/dm-polopoly"
+			"website": "http://www.atex.com/products/dm-polopoly"
 		},
 		"DNN": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^DotNetNuke$",
 			"headers": {
@@ -1744,22 +1740,22 @@
 				"/js/dnncore\\.js",
 				"/js/dnn\\.js"
 			],
-			"website": "dnnsoftware.com"
+			"website": "http://dnnsoftware.com"
 		},
 		"DTG": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": [
 				"<a[^>]+Site Powered by DTG"
 			],
 			"icon": "DTG.png",
 			"implies": "Mono.net",
-			"website": "www.dtg.nl"
+			"website": "http://www.dtg.nl"
 		},
 		"Dancer": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"Server": "Perl Dancer ([\\d.]+)\\;version:\\1",
@@ -1767,11 +1763,11 @@
 			},
 			"icon": "Dancer.png",
 			"implies": "Perl",
-			"website": "perldancer.org"
+			"website": "http://perldancer.org"
 		},
 		"Danneo CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Powered-By": "CMS Danneo ([\\d.]+)\\;version:\\1"
@@ -1784,22 +1780,22 @@
 			"meta": {
 				"generator": "Danneo CMS ([\\d.]+)\\;version:\\1"
 			},
-			"website": "danneo.com"
+			"website": "http://danneo.com"
 		},
 		"Darwin": {
 			"cats": [
-				28
+				"28"
 			],
 			"headers": {
 				"Server": "Darwin",
 				"X-Powered-By": "Darwin"
 			},
 			"icon": "Darwin.png",
-			"website": "opensource.apple.com"
+			"website": "http://opensource.apple.com"
 		},
 		"DataLife Engine": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^dle_root$",
 			"icon": "DataLife Engine.png",
@@ -1810,68 +1806,68 @@
 			"meta": {
 				"generator": "DataLife Engine"
 			},
-			"website": "dle-news.ru"
+			"website": "http://dle-news.ru"
 		},
 		"DataTables": {
 			"cats": [
-				12
+				"12"
 			],
 			"icon": "DataTables.png",
 			"implies": "jQuery",
 			"script": "dataTables.*\\.js",
-			"website": "datatables.net"
+			"website": "http://datatables.net"
 		},
 		"David Webbox": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "David-WebBox/([\\d.a]+ \\(\\d+\\))\\;version:\\1"
 			},
 			"icon": "David Webbox.png",
-			"website": "www.tobit.com"
+			"website": "http://www.tobit.com"
 		},
 		"Debian": {
 			"cats": [
-				28
+				"28"
 			],
 			"headers": {
 				"Server": "Debian",
 				"X-Powered-By": "(?:Debian|dotdeb|(potato|woody|sarge|etch|lenny|squeeze|wheezy|jessie|stretch|sid))\\;version:\\1"
 			},
 			"icon": "Debian.png",
-			"website": "debian.org"
+			"website": "http://debian.org"
 		},
 		"Decorum": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "DECORUM(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"DedeCMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^DedeContainer",
 			"icon": "DedeCMS.png",
 			"implies": "PHP",
 			"script": "dedeajax",
-			"website": "dedecms.com"
+			"website": "http://dedecms.com"
 		},
 		"Dell": {
 			"cats": [
-				40
+				"40"
 			],
 			"icon": "Dell.png",
-			"website": "dell.com"
+			"website": "http://dell.com"
 		},
 		"Demandware": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^dwAnalytics$",
 			"headers": {
@@ -1879,20 +1875,20 @@
 			},
 			"html": "<[^>]+demandware\\.edgesuite",
 			"icon": "Demandware.png",
-			"website": "demandware.com"
+			"website": "http://demandware.com"
 		},
 		"Deployd": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^dpd$",
 			"icon": "Deployd.png",
 			"script": "dpd\\.js",
-			"website": "deployd.com"
+			"website": "http://deployd.com"
 		},
 		"DirectAdmin": {
 			"cats": [
-				9
+				"9"
 			],
 			"headers": {
 				"Server": "DirectAdmin Daemon v([\\d.]+)\\;version:\\1"
@@ -1903,11 +1899,11 @@
 				"PHP",
 				"Apache"
 			],
-			"website": "www.directadmin.com"
+			"website": "http://www.directadmin.com"
 		},
 		"Discourse": {
 			"cats": [
-				2
+				"2"
 			],
 			"env": "Discourse",
 			"icon": "Discourse.png",
@@ -1915,63 +1911,63 @@
 			"meta": {
 				"generator": "Discourse(?: ?/?([\\d.]+\\d))?\\;version:\\1"
 			},
-			"website": "discourse.org"
+			"website": "http://discourse.org"
 		},
 		"Discuz! X": {
 			"cats": [
-				2
+				"2"
 			],
 			"env": [
 				"^discuz_uid$",
 				"^DISCUZCODE$"
 			],
-			"icon": "Discuz! X.png",
+			"icon": "Discuz X.png",
 			"implies": "PHP",
 			"meta": {
 				"generator": "Discuz! X([\\d\\.]+)?\\;version:\\1"
 			},
-			"website": "discuz.com"
+			"website": "http://discuz.com"
 		},
 		"Disqus": {
 			"cats": [
-				15
+				"15"
 			],
 			"env": "^DISQUS",
 			"html": "<div[^>]+id=\"disqus_thread\"",
 			"icon": "Disqus.svg",
 			"script": "disqus_url",
-			"website": "disqus.com"
+			"website": "http://disqus.com"
 		},
 		"Django": {
 			"cats": [
-				18
+				"18"
 			],
 			"env": "^__admin_media_prefix__",
 			"html": "(?:powered by <a[^>]+>Django ?([\\d.]+)?|<input[^>]*name=[\"']csrfmiddlewaretoken[\"'][^>]*>)\\;version:\\1",
 			"icon": "Django.png",
 			"implies": "Python",
-			"website": "djangoproject.com"
+			"website": "http://djangoproject.com"
 		},
 		"Django CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Django CMS.png",
 			"implies": "Django",
-			"website": "django-cms.org"
+			"website": "http://django-cms.org"
 		},
 		"Dojo": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^dojo$",
 			"icon": "Dojo.png",
 			"script": "([\\d.]+)/dojo/dojo(?:\\.xd)?\\.js\\;version:\\1",
-			"website": "dojotoolkit.org"
+			"website": "http://dojotoolkit.org"
 		},
 		"Dokeos": {
 			"cats": [
-				21
+				"21"
 			],
 			"headers": {
 				"X-Powered-By": "Dokeos"
@@ -1987,11 +1983,11 @@
 			"meta": {
 				"generator": "Dokeos"
 			},
-			"website": "dokeos.com"
+			"website": "http://dokeos.com"
 		},
 		"DokuWiki": {
 			"cats": [
-				8
+				"8"
 			],
 			"headers": {
 				"Set-Cookie": "DokuWiki="
@@ -2001,19 +1997,19 @@
 			"meta": {
 				"generator": "DokuWiki( Release [\\-\\d]+)?\\;version:\\1"
 			},
-			"website": "www.dokuwiki.org"
+			"website": "http://www.dokuwiki.org"
 		},
 		"Dotclear": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Dotclear.png",
 			"implies": "PHP",
-			"website": "dotclear.org"
+			"website": "http://dotclear.org"
 		},
 		"DoubleClick Ad Exchange (AdX)": {
 			"cats": [
-				36
+				"36"
 			],
 			"icon": "DoubleClick.svg",
 			"script": [
@@ -2021,64 +2017,64 @@
 				"tpc\\.googlesyndication\\.com/safeframe",
 				"googlesyndication\\.com.*abg\\.js"
 			],
-			"website": "www.doubleclickbygoogle.com/solutions/digital-marketing/ad-exchange/"
+			"website": "http://www.doubleclickbygoogle.com/solutions/digital-marketing/ad-exchange/"
 		},
 		"DoubleClick Campaign Manager (DCM)": {
 			"cats": [
-				36
+				"36"
 			],
 			"icon": "DoubleClick.svg",
 			"script": "2mdn\\.net",
-			"website": "www.doubleclickbygoogle.com/solutions/digital-marketing/campaign-manager/"
+			"website": "http://www.doubleclickbygoogle.com/solutions/digital-marketing/campaign-manager/"
 		},
 		"DoubleClick Floodlight": {
 			"cats": [
-				36
+				"36"
 			],
 			"icon": "DoubleClick.svg",
 			"script": "https?://fls.doubleclick.net",
-			"website": "support.google.com/ds/answer/6029713?hl=en"
+			"website": "http://support.google.com/ds/answer/6029713?hl=en"
 		},
 		"DoubleClick for Publishers (DFP)": {
 			"cats": [
-				36
+				"36"
 			],
 			"icon": "DoubleClick.svg",
 			"script": "googletagservices\\.com/tag/js/gpt(?:_mobile)?\\.js",
-			"website": "www.google.com/dfp"
+			"website": "http://www.google.com/dfp"
 		},
 		"DovetailWRP": {
 			"cats": [
-				1
+				"1"
 			],
-			"html": "<link[^>]* href=\"\/DovetailWRP\/",
+			"html": "<link[^>]* href=\"\\/DovetailWRP\\/",
 			"icon": "DovetailWRP.png",
-			"implies": "ASP.NET",
-			"script": "\/DovetailWRP\/",
-			"website": "www.dovetailinternet.com"
+			"implies": "Microsoft ASP.NET",
+			"script": "\\/DovetailWRP\\/",
+			"website": "http://www.dovetailinternet.com"
 		},
 		"Doxygen": {
 			"cats": [
-				4
+				"4"
 			],
 			"html": "(?:<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen\\.css)\\;version:\\1",
 			"icon": "Doxygen.png",
 			"meta": {
 				"generator": "Doxygen ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.stack.nl/~dimitri/doxygen/"
+			"website": "http://www.stack.nl/~dimitri/doxygen/"
 		},
 		"DreamWeaver": {
 			"cats": [
-				20
+				"20"
 			],
 			"html": "(?:<!--[^>]*(?:InstanceBeginEditable|Dreamweaver([^>]+)target|DWLayoutDefaultTable)|function MM_preloadImages\\(\\) \\{)\\;version:\\1",
 			"icon": "DreamWeaver.png",
-			"website": "www.adobe.com/products/dreamweaver"
+			"website": "http://www.adobe.com/products/dreamweaver"
 		},
 		"Drupal": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^Drupal$",
 			"headers": {
@@ -2093,22 +2089,22 @@
 				"generator": "Drupal(?:\\s([\\d.]+))?\\;version:\\1"
 			},
 			"script": "drupal\\.js",
-			"website": "drupal.org"
+			"website": "http://drupal.org"
 		},
 		"Drupal Commerce": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "<[^>]+(?:id=\"block[_-]commerce[_-]cart[_-]cart|class=\"commerce[_-]product[_-]field)",
 			"icon": "Drupal Commerce.png",
 			"implies": "Drupal",
-			"website": "drupalcommerce.org"
+			"website": "http://drupalcommerce.org"
 		},
 		"Dynamicweb": {
 			"cats": [
-				1,
-				6,
-				10
+				"1",
+				"6",
+				"10"
 			],
 			"headers": {
 				"Set-Cookie": "Dynamicweb="
@@ -2118,35 +2114,35 @@
 			"meta": {
 				"generator": "Dynamicweb ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.dynamicweb.dk"
+			"website": "http://www.dynamicweb.dk"
 		},
 		"Dynatrace": {
 			"cats": [
-				10
+				"10"
 			],
 			"icon": "Dynatrace.png",
 			"script": "dtagent.*\\.js",
-			"website": "dynatrace.com"
+			"website": "http://dynatrace.com"
 		},
 		"E-Commerce Paraguay": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "eCommercePy.png",
 			"script": "cdn\\.e-commerceparaguay\\.com",
-			"website": "e-commerceparaguay.com"
+			"website": "http://e-commerceparaguay.com"
 		},
 		"E-Merchant": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "E-Merchant.png",
 			"script": "cdn\\.e-merchant\\.com",
-			"website": "e-merchant.com"
+			"website": "http://e-merchant.com"
 		},
 		"EC-CUBE": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "ec-cube.png",
 			"implies": "PHP",
@@ -2154,41 +2150,41 @@
 				"eccube\\.js",
 				"win_op\\.js"
 			],
-			"website": "www.ec-cube.net"
+			"website": "http://www.ec-cube.net"
 		},
 		"ELOG": {
 			"cats": [
-				19
+				"19"
 			],
 			"html": "<title>ELOG Logbook Selection</title>",
 			"icon": "ELOG.png",
-			"website": "midas.psi.ch/elog"
+			"website": "http://midas.psi.ch/elog"
 		},
 		"ELOG HTTP": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "ELOG HTTP( \\d[\\-\\d\\.]+)?\\;version:\\1"
 			},
-			"icon": "ELOG HTTP.png",
+			"icon": "ELOG.png",
 			"implies": "ELOG",
-			"website": "midas.psi.ch/elog"
+			"website": "http://midas.psi.ch/elog"
 		},
 		"EPages": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"X-Powered-By": "epages 6"
 			},
 			"html": "<div class=\"BoxContainer\">",
 			"icon": "epages.png",
-			"website": "www.epages.com/"
+			"website": "http://www.epages.com/"
 		},
 		"EPiServer": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "EPi(?:Trace|Server)[^;]*="
@@ -2198,11 +2194,11 @@
 			"meta": {
 				"generator": "EPiServer"
 			},
-			"website": "episerver.com"
+			"website": "http://episerver.com"
 		},
 		"EPrints": {
 			"cats": [
-				19
+				"19"
 			],
 			"env": "^EPJS_menu_template$",
 			"icon": "EPrints.png",
@@ -2210,43 +2206,43 @@
 			"meta": {
 				"generator": "EPrints ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.eprints.org"
+			"website": "http://www.eprints.org"
 		},
 		"ESERV-10": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "ESERV-10(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "ESERV-10.png",
-			"website": "www.violasystems.com"
+			"website": "http://www.violasystems.com"
 		},
 		"EWS-NIC4": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "EWS-NIC4(?:\\/([\\d\\.a-z]+))?\\;version:\\1"
 			},
 			"icon": "EWS-NIC4.png",
 			"implies": "Dell",
-			"website": "dell.com"
+			"website": "http://dell.com"
 		},
 		"EdgeCast": {
 			"cats": [
-				31
+				"31"
 			],
 			"headers": {
-				"Server": "^EC(?:S|Acc)"
+				"Server": "^ECD\\s\\(\\S+\\)"
 			},
 			"icon": "EdgeCast.png",
 			"url": "https?://(?:[^/]+\\.)?edgecastcdn\\.net/",
-			"website": "www.edgecast.com"
+			"website": "http://www.edgecast.com"
 		},
 		"Elcodi": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"X-Elcodi": ""
@@ -2256,167 +2252,175 @@
 				"PHP",
 				"Symfony"
 			],
-			"website": "elcodi.io"
+			"website": "http://elcodi.io"
 		},
 		"Eleanor CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Eleanor CMS.png",
 			"implies": "PHP",
 			"meta": {
 				"generator": "Eleanor"
 			},
-			"website": "eleanor-cms.ru"
-		},
-		"Elm": {
-			"cats": [
-				27,
-				12
-			],
-			"env": "^Elm$",
-			"icon": "Elm.png",
-			"website": "elm-lang.org"
+			"website": "http://eleanor-cms.ru"
 		},
 		"Eloqua": {
 			"cats": [
-				32
+				"32"
 			],
 			"env": "^elq(?:SiteID|Load|CurESite)$",
 			"icon": "Oracle.png",
 			"script": "elqCfg\\.js",
-			"website": "eloqua.com"
+			"website": "http://eloqua.com"
 		},
 		"EmbedThis Appweb": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Mbedthis-Appweb(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "EmbedThis Appweb.png",
-			"website": "embedthis.com/appweb"
+			"icon": "Embedthis.png",
+			"website": "http://embedthis.com/appweb"
 		},
 		"Embedthis-http": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Embedthis-http(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "Embedthis-http.png",
-			"website": "github.com/embedthis/http"
+			"icon": "Embedthis.png",
+			"website": "http://github.com/embedthis/http"
 		},
 		"Ember.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Ember$",
 			"icon": "Ember.js.png",
 			"implies": "Handlebars",
-			"website": "emberjs.com"
+			"website": "http://emberjs.com"
 		},
 		"Enyo": {
 			"cats": [
-				12,
-				26
+				"12",
+				"26"
 			],
 			"env": "^enyo$",
 			"icon": "Enyo.png",
 			"script": "\benyo\\.js",
-			"website": "enyojs.com"
+			"website": "http://enyojs.com"
 		},
 		"Epoch": {
 			"cats": [
-				25
+				"25"
 			],
 			"html": "<link[^>]+?href=\"[^\"]+epoch(?:\\.min)?\\.css",
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "D3",
 			"script": "epoch(?:\\.min)?\\.js",
-			"website": "fastly.github.io/epoch"
+			"website": "http://fastly.github.io/epoch"
 		},
 		"Epom": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^Epom",
 			"icon": "Epom.png",
 			"url": "^https?://(?:[^/]+\\.)?ad(?:op)?shost1\\.com/",
-			"website": "epom.com"
+			"website": "http://epom.com"
 		},
 		"Erlang": {
 			"cats": [
-				27
+				"27"
 			],
 			"headers": {
 				"Server": "Erlang( OTP/(?:[\\-\\d\\.ABR]+))?\\;version:\\1"
 			},
 			"icon": "Erlang.png",
-			"website": "www.erlang.org"
+			"website": "http://www.erlang.org"
+		},
+		"Etherpad": {
+			"cats": [
+				"24"
+			],
+			"env": [
+				"^pad(?:editbar|impexp)$"
+			],
+			"headers": {
+				"Server": "^Etherpad"
+			},
+			"icon": "etherpad.png",
+			"implies": "Node.js",
+			"script": [
+				"/ep_etherpad-lite/"
+			],
+			"website": "https://etherpad.org"
 		},
 		"Exagon Concept": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Server": "Exagon Server"
 			},
 			"icon": "ExagonConcept.svg",
-			"website": "www.exagon-concept.com"
+			"website": "http://www.exagon-concept.com"
 		},
 		"Exhibit": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^Exhibit$",
 			"icon": "Exhibit.png",
 			"script": "exhibit.*\\.js",
-			"website": "simile-widgets.org/exhibit/"
+			"website": "http://simile-widgets.org/exhibit/"
 		},
 		"Express": {
 			"cats": [
-				18,
-				22
+				"18",
+				"22"
 			],
 			"headers": {
 				"X-Powered-By": "^Express$"
 			},
 			"icon": "Express.png",
 			"implies": "Node.js",
-			"website": "expressjs.com"
+			"website": "http://expressjs.com"
 		},
 		"ExpressionEngine": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "(?:exp_last_activity|exp_tracker)"
 			},
 			"icon": "ExpressionEngine.png",
 			"implies": "PHP",
-			"website": "expressionengine.com"
+			"website": "http://expressionengine.com"
 		},
 		"ExtJS": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Ext$",
 			"icon": "ExtJS.png",
 			"script": "ext-base\\.js",
-			"website": "www.extjs.com"
+			"website": "http://www.extjs.com"
 		},
 		"FAST ESP": {
 			"cats": [
-				29
+				"29"
 			],
 			"html": "<form[^>]+id=\"fastsearch\"",
 			"icon": "FAST ESP.png",
-			"website": "microsoft.com/enterprisesearch"
+			"website": "http://microsoft.com/enterprisesearch"
 		},
 		"FAST Search for SharePoint": {
 			"cats": [
-				29
+				"29"
 			],
 			"html": "<input[^>]+ name=\"ParametricSearch",
 			"icon": "FAST Search for SharePoint.png",
@@ -2425,101 +2429,110 @@
 				"Microsoft ASP.NET"
 			],
 			"url": "Pages/SearchResults\\.aspx\\?k=",
-			"website": "sharepoint.microsoft.com/en-us/product/capabilities/search/Pages/Fast-Search.aspx"
+			"website": "http://sharepoint.microsoft.com/en-us/product/capabilities/search/Pages/Fast-Search.aspx"
 		},
 		"FWP": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "<!--\\s+FwP Systems",
 			"icon": "FWP.png",
 			"meta": {
 				"generator": "FWP Shop"
 			},
-			"website": "fwpshop.org"
+			"website": "http://fwpshop.org"
 		},
 		"Facebook": {
 			"cats": [
-				5
+				"5"
 			],
 			"icon": "Facebook.svg",
 			"script": "//connect\\.facebook\\.net/[^/]*/[a-z]*\\.js",
-			"website": "facebook.com"
+			"website": "http://facebook.com"
 		},
 		"Fact Finder": {
 			"cats": [
-				29
+				"29"
 			],
 			"html": "<!-- Factfinder",
 			"icon": "Fact Finder.png",
 			"script": "Suggest\\.ff",
 			"url": "(?:/ViewParametricSearch|ffsuggest\\.[a-z]htm)",
-			"website": "fact-finder.com"
+			"website": "http://fact-finder.com"
+		},
+		"FancyBox": {
+			"cats": [
+				"12"
+			],
+			"icon": "FancyBox.png",
+			"implies": "jQuery",
+			"script": "jquery\\.fancybox\\.pack\\.js$",
+			"website": "http://fancyapps.com/fancybox"
 		},
 		"Fat-Free Framework": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"X-Powered-By": "Fat-Free Framework"
 			},
 			"icon": "Fat-Free Framework.png",
 			"implies": "PHP",
-			"website": "fatfreeframework.com"
+			"website": "http://fatfreeframework.com"
 		},
 		"Fedora": {
 			"cats": [
-				28
+				"28"
 			],
 			"headers": {
 				"Server": "Fedora"
 			},
 			"icon": "Fedora.png",
-			"website": "fedoraproject.org"
+			"website": "http://fedoraproject.org"
 		},
 		"Firebase": {
 			"cats": [
-				34
+				"34"
 			],
 			"icon": "Firebase.png",
 			"script": "firebase.*\\.js",
-			"website": "firebase.com"
+			"website": "http://firebase.com"
 		},
 		"Fireblade": {
 			"cats": [
-				31
+				"31"
 			],
 			"headers": {
 				"Server": "fbs"
 			},
 			"icon": "Fireblade.png",
-			"website": "fireblade.com"
+			"website": "http://fireblade.com"
 		},
 		"FlashCom": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "FlashCom/?([\\d\\.]+)?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"Flask": {
 			"cats": [
-				18,
-				22
+				"18",
+				"22"
 			],
 			"headers": {
 				"Server": "Werkzeug/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "Flask.png",
 			"implies": "Python",
-			"website": "flask.pocoo.org"
+			"website": "http://flask.pocoo.org"
 		},
 		"FlexCMP": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Flex-Lang": "",
@@ -2530,20 +2543,20 @@
 			"meta": {
 				"generator": "FlexCMP"
 			},
-			"website": "www.flexcmp.com/cms/home"
+			"website": "http://www.flexcmp.com/cms/home"
 		},
 		"FluxBB": {
 			"cats": [
-				2
+				"2"
 			],
 			"html": "Powered by (?:<strong>)?<a href=\"[^>]+fluxbb",
 			"icon": "FluxBB.png",
-			"website": "fluxbb.org",
-			"implies": "PHP"
+			"implies": "PHP",
+			"website": "http://fluxbb.org"
 		},
 		"Flyspray": {
 			"cats": [
-				13
+				"13"
 			],
 			"headers": {
 				"Set-Cookie": "flyspray_project="
@@ -2551,265 +2564,282 @@
 			"html": "(?:<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform)",
 			"icon": "Flyspray.png",
 			"implies": "PHP",
-			"website": "flyspray.org"
+			"website": "http://flyspray.org"
 		},
 		"Font Awesome": {
 			"cats": [
-				17
+				"17"
 			],
 			"html": [
 				"<link[^>]* href=[^>]+font-awesome(?:\\.min)?\\.css",
 				"<script[^>]* src=[^>]+fontawesome(?:\\.js)?"
 			],
 			"icon": "Font Awesome.png",
-			"website": "fontawesome.io"
+			"website": "http://fontawesome.io"
 		},
 		"Fortune3": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "(?:<link [^>]*href=\"[^\\/]*\\/\\/www\\.fortune3\\.com\\/[^\"]*siterate\\/rate\\.css|Powered by <a [^>]*href=\"[^\"]+fortune3\\.com)",
 			"icon": "Fortune3.png",
 			"script": "cartjs\\.php\\?(?:.*&)?s=[^&]*myfortune3cart\\.com",
-			"website": "fortune3.com"
+			"website": "http://fortune3.com"
+		},
+		"Foswiki": {
+			"cats": [
+				"8"
+			],
+			"env": "^foswiki$",
+			"headers": {
+				"Set-Cookie": "^(?:FOSWIKISTRIKEONE|SFOSWIKISID)",
+				"X-Foswikiaction": "",
+				"X-Foswikiuri": ""
+			},
+			"html": [
+				"<div class=\"foswiki(?:Copyright|Page|Main)\">"
+			],
+			"icon": "foswiki.png",
+			"implies": "Perl",
+			"meta": {
+				"foswiki.SERVERTIME": "",
+				"foswiki.WIKINAME": ""
+			},
+			"website": "http://foswiki.org"
 		},
 		"FreeBSD": {
 			"cats": [
-				28
+				"28"
 			],
 			"headers": {
 				"Server": "FreeBSD(?: ([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "FreeBSD.png",
-			"website": "freebsd.org"
+			"website": "http://freebsd.org"
 		},
 		"FreeTextBox": {
 			"cats": [
-				24
+				"24"
 			],
 			"env": "^FTB_",
 			"html": "/<!--\\s*\\*\\s*FreeTextBox v\\d+ \\(([.\\d]+)(?:(?:.|\n)+?<!--\\s*\\*\\s*License Type: (Distribution|Professional)License)?/i\\;version:\\1 \\2",
 			"icon": "FreeTextBox.png",
 			"implies": "Microsoft ASP.NET",
-			"website": "freetextbox.com"
+			"website": "http://freetextbox.com"
 		},
 		"Froala Editor": {
 			"cats": [
-				24
+				"24"
 			],
 			"icon": "Froala.svg",
 			"implies": [
 				"jQuery"
 			],
-			"website": "froala.com/wysiwyg-editor"
+			"website": "http://froala.com/wysiwyg-editor"
 		},
 		"FrontPage": {
 			"cats": [
-				20
+				"20"
 			],
 			"html": "<html[^>]+urn:schemas-microsoft-com:office:office",
 			"icon": "FrontPage.png",
 			"meta": {
 				"generator": "Microsoft FrontPage(?:\\s((?:Express )?[\\d.]+))?\\;version:\\1"
 			},
-			"website": "office.microsoft.com/frontpage"
+			"website": "http://office.microsoft.com/frontpage"
 		},
 		"Fusion Ads": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^_fusion",
 			"icon": "Fusion Ads.png",
 			"script": "^[^\\/]*//[ac]dn\\.fusionads\\.net/(?:api/([\\d.]+)/)?\\;version:\\1",
-			"website": "fusionads.net"
+			"website": "http://fusionads.net"
 		},
 		"G-WAN": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "G-WAN"
 			},
 			"icon": "G-WAN.png",
-			"website": "gwan.com"
+			"website": "http://gwan.com"
 		},
 		"GX WebManager": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<!--\\s+Powered by GX",
 			"icon": "GX WebManager.png",
 			"meta": {
 				"generator": "GX WebManager(?: ([\\d.]+))?\\;version:\\1"
 			},
-			"website": "www.gxsoftware.com/en/products/web-content-management.htm"
+			"website": "http://www.gxsoftware.com/en/products/web-content-management.htm"
 		},
 		"Gallery": {
 			"cats": [
-				7
+				"7"
 			],
 			"env": "^galleryAuthToken$",
 			"html": "<div id=\"gsNavBar\" class=\"gcBorder1\">",
 			"icon": "Gallery.png",
-			"website": "gallery.menalto.com"
+			"website": "http://gallery.menalto.com"
 		},
 		"Gambio": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^gm_session_id$",
 			"html": "(?:<link[^>]* href=\"templates/gambio/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->|<!--[\\s=]+Shopsoftware by Gambio GmbH \\(c\\))",
 			"icon": "Gambio.png",
 			"implies": "PHP",
 			"script": "gm_javascript\\.js\\.php",
-			"website": "gambio.de"
+			"website": "http://gambio.de"
 		},
 		"Gauges": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^_gauges$",
 			"headers": {
 				"Set-Cookie": "_gauges_[^;]+="
 			},
 			"icon": "Gauges.png",
-			"website": "get.gaug.es"
+			"website": "http://get.gaug.es"
 		},
 		"Gentoo": {
 			"cats": [
-				28
+				"28"
 			],
 			"headers": {
 				"X-Powered-By": "gentoo"
 			},
 			"icon": "Gentoo.png",
-			"website": "www.gentoo.org"
+			"website": "http://www.gentoo.org"
 		},
 		"Gerrit": {
 			"cats": [
-				47
+				"47"
 			],
-			"meta": {
-				"title": "^Gerrit Code Review$"
-			},
 			"env": "^gerrit_",
-			"script": "^gerrit_ui/gerrit_ui",
 			"html": "<(?:div|style) id=\"gerrit_",
+			"icon": "gerrit.svg",
 			"implies": [
 				"Java",
 				"git"
 			],
-			"icon": "gerrit.svg",
-			"website": "www.gerritcodereview.com"
+			"meta": {
+				"title": "^Gerrit Code Review$"
+			},
+			"script": "^gerrit_ui/gerrit_ui",
+			"website": "http://www.gerritcodereview.com"
 		},
 		"Get Satisfaction": {
 			"cats": [
-				13
+				"13"
 			],
 			"env": "^GSFN",
 			"icon": "Get Satisfaction.png",
-			"website": "getsatisfaction.com"
+			"website": "http://getsatisfaction.com"
 		},
 		"GetSimple CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "GetSimple CMS.png",
 			"implies": "PHP",
 			"meta": {
 				"generator": "GetSimple"
 			},
-			"website": "get-simple.info"
+			"website": "http://get-simple.info"
 		},
 		"Ghost": {
 			"cats": [
-				11
+				"11"
 			],
 			"headers": {
 				"X-Ghost-Cache-Status": ""
 			},
 			"icon": "Ghost.png",
+			"implies": "Node.js",
 			"meta": {
 				"generator": "Ghost(?:\\s([\\d.]+))?\\;version:\\1"
 			},
-			"implies": "Node.js",
-			"website": "ghost.org"
+			"website": "http://ghost.org"
 		},
 		"GitBook": {
 			"cats": [
-				4
+				"4"
 			],
 			"icon": "GitBook.png",
 			"meta": {
 				"generator": "GitBook(?:.([\\d.]+))?\\;version:\\1"
 			},
-			"website": "gitbook.io"
-		},
-		"Gitiles": {
-			"cats": [
-				47
-			],
-			"implies": [
-				"Java",
-				"git"
-			],
-			"html": "Powered by <a href=\"https://gerrit.googlesource.com/gitiles/\">Gitiles<",
-			"icon": "default.png",
-			"website": "gerrit.googlesource.com/gitiles/"
+			"website": "http://gitbook.io"
 		},
 		"GitLab": {
 			"cats": [
-				13,
-				47
+				"13",
+				"47"
 			],
+			"env": "^GitLab$",
 			"headers": {
 				"Set-cookie": "_gitlab_session"
 			},
-			"meta": {
-				"description": "^GitLab"
-			},
 			"html": [
-				"<meta content=\"GitLab\" property=\"og:site_name\">",
-				"<meta content=\"https?://[^/]+/assets/gitlab_logo-"
+				"<meta content=\"https?://[^/]+/assets/gitlab_logo-",
+				"GitLab</title>",
+				"<header class=\"navbar navbar-fixed-top navbar-gitlab with-horizontal-nav\">"
 			],
-			"env": "^GitLab$",
 			"icon": "GitLab.svg",
-			"implies": [
-				"Ruby",
-				"Ruby on Rails"
-			],
-			"website": "about.gitlab.com"
+			"implies": "Ruby on Rails",
+			"meta": {
+				"description": "^GitLab",
+				"og:site_name": "^GitLab$"
+			},
+			"website": "http://about.gitlab.com"
 		},
 		"GitLab CI": {
 			"cats": [
-				44,
-				47
+				"44",
+				"47"
 			],
 			"icon": "GitLab CI.png",
-			"implies": [
-				"Ruby",
-				"Ruby on Rails"
-			],
+			"implies": "Ruby on Rails",
 			"meta": {
 				"description": "GitLab Continuous Integration"
 			},
-			"website": "about.gitlab.com/gitlab-ci"
+			"website": "http://about.gitlab.com/gitlab-ci"
 		},
 		"GitPHP": {
 			"cats": [
-				47
+				"47"
 			],
-			"icon": "default.png",
-			"implies": "PHP",
 			"html": [
 				"<!-- gitphp web interface ([\\d.]+)\\;version:\\1",
 				"<a href=\"http://www.gitphp.org/\" target=\"_blank\">GitPHP by Chris Han"
 			],
-			"website": "gitphp.org"
+			"icon": "default.svg",
+			"implies": "PHP",
+			"website": "http://gitphp.org"
+		},
+		"Gitiles": {
+			"cats": [
+				"47"
+			],
+			"html": "Powered by <a href=\"https://gerrit.googlesource.com/gitiles/\">Gitiles<",
+			"icon": "default.svg",
+			"implies": [
+				"Java",
+				"git"
+			],
+			"website": "http://gerrit.googlesource.com/gitiles/"
 		},
 		"GlassFish": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "GlassFish(?: Server)?(?: Open Source Edition)?(?: ?/?([\\d.]+))?\\;version:\\1"
@@ -2818,37 +2848,44 @@
 			"implies": [
 				"Java"
 			],
-			"website": "glassfish.java.net"
+			"website": "http://glassfish.java.net"
 		},
 		"Glyphicons": {
 			"cats": [
-				17
+				"17"
 			],
 			"html": "(?:<link[^>]* href=[^>]+glyphicons(?:\\.min)?\\.css|<img[^>]* src=[^>]+glyphicons)",
 			"icon": "Glyphicons.png",
-			"website": "glyphicons.com"
+			"website": "http://glyphicons.com"
+		},
+		"Go": {
+			"cats": [
+				"27"
+			],
+			"icon": "Go.svg",
+			"website": "https://golang.org"
 		},
 		"GoAhead": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "GoAhead"
 			},
 			"icon": "GoAhead.png",
-			"website": "embedthis.com/products/goahead/index.html"
+			"website": "http://embedthis.com/products/goahead/index.html"
 		},
 		"GoStats": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^_go(?:stats|_track)",
 			"icon": "GoStats.png",
-			"website": "gostats.com"
+			"website": "http://gostats.com"
 		},
 		"Gogs": {
 			"cats": [
-				47
+				"47"
 			],
 			"headers": {
 				"Set-Cookie": "i_like_gogits="
@@ -2862,11 +2899,11 @@
 				"keywords": "go, git, self-hosted, gogs"
 			},
 			"script": "js/gogs\\.js",
-			"website": "gogs.io"
+			"website": "http://gogs.io"
 		},
 		"Google AdSense": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": [
 				"^google_ad_",
@@ -2880,11 +2917,11 @@
 				"2mdn\\.net",
 				"ad\\.ca\\.doubleclick\\.net"
 			],
-			"website": "google.com/adsense"
+			"website": "http://google.com/adsense"
 		},
 		"Google Analytics": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^gaGlobal$",
 			"headers": {
@@ -2892,116 +2929,119 @@
 			},
 			"icon": "Google Analytics.svg",
 			"script": "google-analytics\\.com\\/(?:ga|urchin|(analytics))\\.js\\;version:\\1?UA:",
-			"website": "google.com/analytics"
+			"website": "http://google.com/analytics"
 		},
 		"Google App Engine": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Google Frontend"
 			},
 			"icon": "Google App Engine.png",
-			"website": "code.google.com/appengine"
+			"website": "http://code.google.com/appengine"
 		},
 		"Google Charts": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^__g(?:oogleVisualizationAbstractRendererElementsCount|vizguard)__$",
 			"icon": "Google Charts.png",
-			"website": "developers.google.com/chart/"
+			"website": "http://developers.google.com/chart/"
 		},
 		"Google Code Prettify": {
 			"cats": [
-				19
+				"19"
 			],
 			"env": "^prettyPrint$",
 			"icon": "Google Code Prettify.png",
-			"website": "code.google.com/p/google-code-prettify"
+			"website": "http://code.google.com/p/google-code-prettify"
 		},
 		"Google Font API": {
 			"cats": [
-				17
+				"17"
 			],
 			"env": "^WebFonts$",
 			"html": "<link[^>]* href=[^>]+fonts\\.(?:googleapis|google)\\.com",
 			"icon": "Google Font API.png",
 			"script": "googleapis\\.com/.+webfont",
-			"website": "google.com/fonts"
+			"website": "http://google.com/fonts"
 		},
 		"Google Maps": {
 			"cats": [
-				35
+				"35"
 			],
 			"icon": "Google Maps.png",
 			"script": [
 				"(?:maps\\.google\\.com/maps\\?file=api(?:&v=([\\d.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\1",
 				"//maps.googleapis.com/maps/api/js"
 			],
-			"website": "maps.google.com"
+			"website": "http://maps.google.com"
 		},
 		"Google PageSpeed": {
 			"cats": [
-				23,
-				33
+				"23",
+				"33"
 			],
 			"headers": {
 				"X-Mod-Pagespeed": "([\\d.]+)\\;version:\\1",
 				"X-Page-Speed": "(.+)\\;version:\\1"
 			},
 			"icon": "Google PageSpeed.png",
-			"website": "developers.google.com/speed/pagespeed/mod"
+			"website": "http://developers.google.com/speed/pagespeed/mod"
 		},
 		"Google Plus": {
 			"cats": [
-				5
+				"5"
 			],
 			"icon": "Google Plus.svg",
 			"script": "apis\\.google\\.com/js/[a-z]*\\.js",
-			"website": "plus.google.com"
+			"website": "http://plus.google.com"
 		},
 		"Google Sites": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Google Sites.png",
 			"url": "sites\\.google\\.com",
-			"website": "sites.google.com"
+			"website": "http://sites.google.com"
 		},
 		"Google Tag Manager": {
 			"cats": [
-				42
+				"42"
+			],
+			"env": [
+				"^googletag$",
+				"^google_tag_manager$"
 			],
-			"env": "^googletag$",
 			"html": "googletagmanager\\.com/ns\\.html[^>]+></iframe>",
 			"icon": "Google Tag Manager.png",
-			"website": "www.google.com/tagmanager"
+			"website": "http://www.google.com/tagmanager"
 		},
 		"Google Wallet": {
 			"cats": [
-				41
+				"41"
 			],
 			"icon": "Google Wallet.png",
 			"script": [
 				"checkout\\.google\\.com",
 				"wallet\\.google\\.com"
 			],
-			"website": "wallet.google.com"
+			"website": "http://wallet.google.com"
 		},
 		"Google Web Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "gws"
 			},
 			"icon": "Google Web Server.png",
-			"website": "en.wikipedia.org/wiki/Google_Web_Server"
+			"website": "http://en.wikipedia.org/wiki/Google_Web_Server"
 		},
 		"Google Web Toolkit": {
 			"cats": [
-				18
+				"18"
 			],
 			"env": "^__gwt_",
 			"icon": "Google Web Toolkit.png",
@@ -3009,57 +3049,57 @@
 			"meta": {
 				"gwt:property": ""
 			},
-			"website": "developers.google.com/web-toolkit"
+			"website": "http://developers.google.com/web-toolkit"
 		},
 		"Graffiti CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "graffitibot[^;]="
 			},
 			"icon": "Graffiti CMS.png",
+			"implies": "Microsoft ASP.NET",
 			"meta": {
 				"generator": "Graffiti CMS ([^\"]+)\\;version:\\1"
 			},
 			"script": "/graffiti\\.js",
-			"implies": "Microsoft ASP.NET",
-			"website": "graffiticms.codeplex.com"
+			"website": "http://graffiticms.codeplex.com"
 		},
 		"Grandstream": {
 			"cats": [
-				22,
-				39
+				"22",
+				"39"
 			],
 			"headers": {
 				"Server": "Grandstream\\/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "Grandstream.png",
-			"website": "www.grandstream.com"
+			"website": "http://www.grandstream.com"
 		},
 		"Grav": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Grav.png",
 			"implies": "PHP",
 			"meta": {
 				"generator": "GravCMS(?:\\s([\\d.]+))?\\;version:\\1"
 			},
-			"website": "getgrav.org"
+			"website": "http://getgrav.org"
 		},
 		"Gravatar": {
 			"cats": [
-				19
+				"19"
 			],
 			"env": "^Gravatar$",
 			"html": "<[^>]+gravatar\\.com/avatar/",
 			"icon": "Gravatar.png",
-			"website": "gravatar.com"
+			"website": "http://gravatar.com"
 		},
 		"Gravity Forms": {
 			"cats": [
-				19
+				"19"
 			],
 			"html": [
 				"<div class=(?:\"|')[^>]*gform_wrapper",
@@ -3069,19 +3109,19 @@
 			],
 			"icon": "gravityforms.svg",
 			"implies": "WordPress",
-			"website": "gravityforms.com"
+			"website": "http://gravityforms.com"
 		},
 		"Gravity Insights": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^GravityInsights$",
 			"icon": "Gravity Insights.png",
-			"website": "insights.gravity.com"
+			"website": "http://insights.gravity.com"
 		},
 		"Green Valley CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<img[^>]+/dsresource\\?objectid=",
 			"icon": "Green Valley CMS.png",
@@ -3089,220 +3129,229 @@
 			"meta": {
 				"DC.identifier": "/content\\.jsp\\?objectid="
 			},
-			"website": "www.greenvalley.nl/Public/Producten/Content_Management/CMS"
+			"website": "http://www.greenvalley.nl/Public/Producten/Content_Management/CMS"
 		},
 		"HERE": {
 			"cats": [
-				35
+				"35"
 			],
 			"icon": "HERE.png",
 			"script": "https?://js\\.cit\\.api\\.here\\.com/se/([\\d.]+)\\/\\;version:\\1",
-			"website": "developer.here.com"
+			"website": "http://developer.here.com"
 		},
 		"HHVM": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"X-Powered-By": "HHVM/?([\\d.]+)?\\;version:\\1"
 			},
 			"icon": "HHVM.png",
 			"implies": "PHP\\;confidence:50",
-			"website": "hhvm.com"
+			"website": "http://hhvm.com"
 		},
 		"HP": {
 			"cats": [
-				40
+				"40"
 			],
 			"icon": "HP.svg",
-			"website": "hp.com"
+			"website": "http://hp.com"
 		},
 		"HP ChaiServer": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "HP-Chai(?:Server|SOE)(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "HP.svg",
 			"implies": "HP",
-			"website": "hp.com"
+			"website": "http://hp.com"
 		},
 		"HP Compact Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "HP_Compact_Server(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "HP.svg",
-			"website": "hp.com"
+			"website": "http://hp.com"
 		},
 		"HP ProCurve": {
 			"cats": [
-				37
+				"37"
 			],
 			"icon": "HP.svg",
-			"website": "hp.com/networking"
+			"website": "http://hp.com/networking"
 		},
 		"HP System Management": {
 			"cats": [
-				46
+				"46"
 			],
 			"headers": {
 				"Server": "HP System Management"
 			},
 			"icon": "HP.svg",
-			"website": "hp.com"
+			"website": "http://hp.com"
 		},
 		"HP iLO": {
 			"cats": [
-				22,
-				46
+				"22",
+				"46"
 			],
 			"headers": {
 				"Server": "HP-iLO-Server(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "HP.svg",
-			"website": "hp.com"
+			"website": "http://hp.com"
 		},
 		"HTTP Kit": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "^http-kit"
 			},
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "Java",
-			"website": "http-kit.org"
+			"website": "http://http-kit.org"
 		},
 		"HTTP-Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "(?:^|[^-])\bHTTP-Server(?: ?/?V?([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"HTTP/2": {
 			"cats": [
-				19
+				"19"
 			],
 			"excludes": "SPDY",
 			"headers": {
 				"X-Firefox-Spdy": "h2"
 			},
 			"icon": "http2.png",
-			"website": "http2.github.io"
+			"website": "http://http2.github.io"
+		},
+		"Haddock": {
+			"cats": [
+				"4"
+			],
+			"html": "<p>Produced by <a href=\"http://www.haskell.org/haddock/\">Haddock</a> version ([0-9.]+)</p>\\;version:\\1",
+			"icon": "default.svg",
+			"script": "haddock-util\\.js",
+			"website": "http://www.haskell.org/haddock/"
 		},
 		"Hammer.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Hammer$",
 			"icon": "Hammer.js.png",
 			"script": "hammer(?:\\.min)?\\.js",
-			"website": "hammerjs.github.io"
+			"website": "http://hammerjs.github.io"
 		},
 		"Handlebars": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Handlebars$",
 			"html": "<[^>]*type=[^>]text\\/x-handlebars-template",
 			"icon": "Handlebars.png",
 			"script": "handlebars(?:\\.runtime)?(?:-v([\\d.]+?))?(?:\\.min)?\\.js\\;version:\\1",
-			"website": "handlebarsjs.com"
+			"website": "http://handlebarsjs.com"
 		},
 		"Happy ICS Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Happy ICS Server(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "OmniTouch 8660 My Teamwork",
-			"website": "???"
+			"website": "http://example.com"
 		},
 		"Haskell": {
 			"cats": [
-				27
+				"27"
 			],
 			"icon": "Haskell.png",
-			"website": "wiki.haskell.org/Haskell"
+			"website": "http://wiki.haskell.org/Haskell"
 		},
 		"HeadJS": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^head$\\;confidence:50",
 			"html": "<[^>]*data-headjs-load",
 			"icon": "HeadJS.png",
 			"script": "head\\.(?:core|load)(?:\\.min)?\\.js",
-			"website": "headjs.com"
+			"website": "http://headjs.com"
 		},
 		"Heap": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^heap$",
 			"icon": "Heap.png",
 			"script": "heap-\\d+.js",
-			"website": "heapanalytics.com"
+			"website": "http://heapanalytics.com"
 		},
 		"Hello Bar": {
 			"cats": [
-				5
+				"5"
 			],
 			"env": "^HelloBar$",
 			"icon": "Hello Bar.png",
 			"script": "hellobar\\.js",
-			"website": "hellobar.com"
+			"website": "http://hellobar.com"
 		},
 		"Hiawatha": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Hiawatha v([\\d.]+)\\;version:\\1"
 			},
 			"icon": "Hiawatha.png",
-			"website": "hiawatha-webserver.org"
+			"website": "http://hiawatha-webserver.org"
 		},
 		"Highcharts": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^Highcharts$",
 			"html": "<svg[^>]*><desc>Created with Highcharts ([\\d.]*)\\;version:\\1",
 			"icon": "Highcharts.png",
 			"script": "highcharts.*\\.js",
-			"website": "highcharts.com"
+			"website": "http://highcharts.com"
 		},
 		"Highstock": {
 			"cats": [
-				25
+				"25"
 			],
 			"html": "<svg[^>]*><desc>Created with Highstock ([\\d.]*)\\;version:\\1",
-			"icon": "Highstock.png",
+			"icon": "Highcharts.png",
 			"script": "highstock(?:\\-|\\.)?([\\d\\.]*\\d).*\\.js\\;version:\\1",
-			"website": "highcharts.com/products/highstock"
+			"website": "http://highcharts.com/products/highstock"
 		},
 		"Hippo": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<[^>]+/binaries/(?:[^/]+/)*content/gallery/",
 			"icon": "Hippo.png",
-			"website": "onehippo.org"
+			"website": "http://onehippo.org"
 		},
 		"Hogan.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Hogan$",
 			"icon": "Hogan.js.png",
@@ -3310,11 +3359,11 @@
 				"hogan-(?:-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
 				"([\\d.]+)/hogan(?:\\.min)?\\.js\\;version:\\1"
 			],
-			"website": "twitter.github.com/hogan.js"
+			"website": "http://twitter.github.com/hogan.js"
 		},
 		"Hotaru CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "hotaru_mobile="
@@ -3324,31 +3373,31 @@
 			"meta": {
 				"generator": "Hotaru CMS"
 			},
-			"website": "hotarucms.org"
+			"website": "http://hotarucms.org"
 		},
 		"HubSpot": {
 			"cats": [
-				32
+				"32"
 			],
 			"env": "^(?:_hsq|hubspot)$",
 			"html": "<!-- Start of Async HubSpot",
 			"icon": "HubSpot.png",
-			"website": "hubspot.com"
+			"website": "http://hubspot.com"
 		},
 		"Hugo": {
 			"cats": [
-				1,
-				11
+				"1",
+				"11"
 			],
 			"icon": "Hugo.png",
 			"meta": {
 				"generator": "Hugo ([\\d.]+)?\\;version:\\1"
 			},
-			"website": "gohugo.io"
+			"website": "http://gohugo.io"
 		},
 		"Hybris": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"Set-Cookie": "_hybris"
@@ -3356,49 +3405,49 @@
 			"html": "<[^>]+(?:/sys_master/|/hybr/|/_ui/desktop/)",
 			"icon": "Hybris.png",
 			"implies": "Java",
-			"website": "hybris.com"
+			"website": "http://hybris.com"
 		},
 		"IBM Coremetrics": {
 			"cats": [
-				10
+				"10"
 			],
 			"icon": "IBM.svg",
 			"script": "cmdatatagutils\\.js",
-			"website": "ibm.com/software/marketing-solutions/coremetrics"
+			"website": "http://ibm.com/software/marketing-solutions/coremetrics"
 		},
 		"IBM HTTP Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "IBM_HTTP_Server(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "IBM.svg",
-			"website": "ibm.com/software/webservers/httpservers"
+			"website": "http://ibm.com/software/webservers/httpservers"
 		},
 		"IBM Tivoli Storage Manager": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "TSM_HTTP(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "IBM.svg",
-			"website": "ibm.com"
+			"website": "http://ibm.com"
 		},
 		"IBM WebSphere Commerce": {
 			"cats": [
-				6
+				"6"
 			],
+			"html": "href=\"(?:\\/|[^>]+)webapp\\/wcs\\/",
 			"icon": "IBM.svg",
-			"html": "href=\"(?:\/|[^>]+)webapp\/wcs\/",
 			"implies": "Java",
 			"url": "/wcs/",
-			"website": "ibm.com/software/genservers/commerceproductline"
+			"website": "http://ibm.com/software/genservers/commerceproductline"
 		},
 		"IBM WebSphere Portal": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"IBM-Web2-Location": "",
@@ -3407,22 +3456,22 @@
 			"icon": "IBM.svg",
 			"implies": "Java",
 			"url": "/wps/",
-			"website": "ibm.com/software/websphere/portal"
+			"website": "http://ibm.com/software/websphere/portal"
 		},
 		"IIS": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "IIS(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "IIS.png",
 			"implies": "Windows Server",
-			"website": "www.iis.net"
+			"website": "http://www.iis.net"
 		},
 		"INFOnline": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": [
 				"^szmvars$",
@@ -3430,34 +3479,34 @@
 			],
 			"icon": "INFOnline.png",
 			"script": "^https?://(?:[^/]+\\.)?i(?:oam|v)wbox\\.de/",
-			"website": "infonline.de"
+			"website": "http://infonline.de"
 		},
 		"IPB": {
 			"cats": [
-				2
+				"2"
 			],
+			"env": "^(?:IPBoard$|ipb_var|ipsSettings)",
+			"html": "<link[^>]+ipb_[^>]+\\.css",
+			"icon": "IPB.png",
 			"implies": [
 				"PHP",
 				"MySQL"
 			],
-			"env": "^(?:IPBoard$|ipb_var|ipsSettings)",
-			"html": "<link[^>]+ipb_[^>]+\\.css",
-			"icon": "IPB.png",
 			"script": "jscripts/ips_",
-			"website": "www.invisionpower.com"
+			"website": "http://www.invisionpower.com"
 		},
 		"Immutable.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Immutable$",
 			"icon": "Immutable.js.png",
 			"script": "^immutable\\.(?:min\\.)?js$",
-			"website": "facebook.github.io/immutable-js/"
+			"website": "http://facebook.github.io/immutable-js/"
 		},
 		"ImpressCMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "ICMSession[^;]+=",
@@ -3469,44 +3518,44 @@
 				"generator": "ImpressCMS"
 			},
 			"script": "include/linkexternal\\.js",
-			"website": "www.impresscms.org"
+			"website": "http://www.impresscms.org"
 		},
 		"ImpressPages": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "ImpressPages.png",
 			"implies": "PHP",
 			"meta": {
 				"generator": "ImpressPages(?: CMS)?( [\\d.]*)\\;version:\\1"
 			},
-			"website": "impresspages.org"
+			"website": "http://impresspages.org"
 		},
 		"InProces": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<!-- CSS InProces Portaal default -->",
 			"icon": "InProces.png",
 			"script": "brein/inproces/website/websitefuncties\\.js",
-			"website": "www.brein.nl/oplossing/product/website"
+			"website": "http://www.brein.nl/oplossing/product/website"
 		},
 		"Incapsula": {
 			"cats": [
-				31
+				"31"
 			],
 			"headers": {
 				"X-CDN": "Incapsula"
 			},
 			"icon": "Incapsula.png",
-			"website": "www.incapsula.com"
+			"website": "http://www.incapsula.com"
 		},
 		"Indexhibit": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<(?:link|a href) [^>]+ndxz-studio",
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": [
 				"PHP",
 				"Apache",
@@ -3515,43 +3564,51 @@
 			"meta": {
 				"generator": "Indexhibit"
 			},
-			"website": "www.indexhibit.org"
+			"website": "http://www.indexhibit.org"
 		},
 		"Indico": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-cookie": "MAKACSESSION"
 			},
 			"html": "Powered by\\s+(?:CERN )?<a href=\"http://(?:cdsware\\.cern\\.ch/indico/|indico-software\\.org|cern\\.ch/indico)\">(?:CDS )?Indico( [\\d\\.]+)?\\;version:\\1",
 			"icon": "Indico.png",
-			"website": "indico-software.org"
+			"website": "http://indico-software.org"
 		},
 		"Indy": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Indy(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "indyproject.org"
+			"icon": "default.svg",
+			"website": "http://indyproject.org"
+		},
+		"InfernoJS": {
+			"cats": [
+				"12"
+			],
+			"env": "^Inferno$",
+			"icon": "InfernoJS.png",
+			"website": "https://infernojs.org/"
 		},
 		"Infusionsoft": {
 			"cats": [
-				32
+				"32"
 			],
 			"html": [
 				"<input [^>]*name=\"infusionsoft_version\" [^>]*value=\"([^>]*)\" [^>]*\\/>\\;version:\\1",
 				"<input [^>]*value=\"([^>]*)\" [^>]*name=\"infusionsoft_version\" [^>]*\\/>\\;version:\\1"
 			],
 			"icon": "infusionsoft.svg",
-			"website": "infusionsoft.com"
+			"website": "http://infusionsoft.com"
 		},
 		"InstantCMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "InstantCMS\\[logdate\\]="
@@ -3561,87 +3618,87 @@
 			"meta": {
 				"generator": "InstantCMS"
 			},
-			"website": "www.instantcms.ru"
+			"website": "http://www.instantcms.ru"
 		},
 		"Intel Active Management Technology": {
 			"cats": [
-				22,
-				46
+				"22",
+				"46"
 			],
 			"headers": {
 				"Server": "Intel\\(R\\) Active Management Technology(?: ([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Intel Active Management Technology.png",
-			"website": "intel.com"
+			"website": "http://intel.com"
 		},
 		"IntenseDebate": {
 			"cats": [
-				15
+				"15"
 			],
 			"icon": "IntenseDebate.png",
 			"script": "intensedebate\\.com",
-			"website": "intensedebate.com"
+			"website": "http://intensedebate.com"
 		},
 		"Intercom": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^Intercom$",
 			"icon": "Intercom.png",
 			"script": "(?:api\\.intercom\\.io/api|static\\.intercomcdn\\.com/intercom\\.v1)",
-			"website": "intercom.io"
+			"website": "http://intercom.io"
 		},
 		"Intershop": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "Intershop.png",
 			"script": "(?:is-bin|INTERSHOP)",
-			"website": "intershop.com"
+			"website": "http://intershop.com"
 		},
 		"Invenio": {
 			"cats": [
-				50
+				"50"
 			],
 			"headers": {
 				"Set-cookie": "INVENIOSESSION"
 			},
 			"html": "(?:Powered by|System)\\s+(?:CERN )?<a (?:class=\"footer\" )?href=\"http://(?:cdsware\\.cern\\.ch(?:/invenio)?|invenio-software\\.org|cern\\.ch/invenio)(?:/)?\">(?:CDS )?Invenio</a>\\s*v?([\\d\\.]+)?\\;version:\\1",
 			"icon": "Invenio.png",
-			"website": "invenio-software.org"
+			"website": "http://invenio-software.org"
 		},
 		"Ionicons": {
 			"cats": [
-				17
+				"17"
 			],
 			"html": "<link[^>]* href=[^>]+ionicons(?:\\.min)?\\.css",
 			"icon": "Ionicons.png",
-			"website": "ionicons.com"
+			"website": "http://ionicons.com"
 		},
 		"JAlbum": {
 			"cats": [
-				7
+				"7"
 			],
 			"icon": "JAlbum.png",
 			"implies": "Java",
 			"meta": {
 				"generator": "JAlbum( [\\d.]+)?\\;version:\\1"
 			},
-			"website": "jalbum.net/en"
+			"website": "http://jalbum.net/en"
 		},
 		"JBoss Application Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"X-Powered-By": "JBoss(?:-([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "JBoss Application Server.png",
-			"website": "jboss.org/jbossas.html"
+			"website": "http://jboss.org/jbossas.html"
 		},
 		"JBoss Web": {
 			"cats": [
-				22
+				"22"
 			],
 			"excludes": "Apache Tomcat",
 			"headers": {
@@ -3649,11 +3706,11 @@
 			},
 			"icon": "JBoss Web.png",
 			"implies": "JBoss Application Server",
-			"website": "jboss.org/jbossweb"
+			"website": "http://jboss.org/jbossweb"
 		},
 		"JC-HTTPD": {
 			"cats": [
-				22
+				"22"
 			],
 			"excludes": "Apache",
 			"headers": {
@@ -3661,171 +3718,171 @@
 			},
 			"icon": "JC-HTTPD.png",
 			"implies": "Canon",
-			"website": "canon.com"
+			"website": "http://canon.com"
 		},
 		"JS Charts": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^JSChart$",
 			"icon": "JS Charts.png",
 			"script": "jscharts.*\\.js",
-			"website": "www.jscharts.com"
+			"website": "http://www.jscharts.com"
 		},
 		"JTL Shop": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"Set-Cookie": "JTLSHOP="
 			},
 			"html": "(?:<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)",
 			"icon": "JTL Shop.png",
-			"website": "www.jtl-software.de/produkte/jtl-shop3"
+			"website": "http://www.jtl-software.de/produkte/jtl-shop3"
 		},
 		"Jalios": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Jalios.png",
 			"meta": {
 				"generator": "Jalios"
 			},
-			"website": "www.jalios.com"
+			"website": "http://www.jalios.com"
 		},
 		"Java": {
 			"cats": [
-				27
+				"27"
 			],
 			"headers": {
 				"Set-Cookie": "JSESSIONID"
 			},
 			"icon": "Java.png",
-			"website": "java.com"
+			"website": "http://java.com"
 		},
 		"Java Servlet": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"X-Powered-By": "Servlet(?:.([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Java.png",
 			"implies": "Java",
-			"website": "www.oracle.com/technetwork/java/index-jsp-135475.html"
+			"website": "http://www.oracle.com/technetwork/java/index-jsp-135475.html"
+		},
+		"JavaScript Infovis Toolkit": {
+			"cats": [
+				"25"
+			],
+			"env": "^\\$jit$",
+			"icon": "JavaScript Infovis Toolkit.png",
+			"script": "jit.*\\.js",
+			"website": "http://thejit.org"
 		},
 		"JavaServer Faces": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"X-Powered-By": "JSF(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "JavaServer Faces.png",
 			"implies": "Java",
-			"website": "javaserverfaces.java.net"
+			"website": "http://javaserverfaces.java.net"
 		},
 		"JavaServer Pages": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"X-Powered-By": "JSP(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Java.png",
 			"implies": "Java",
-			"website": "www.oracle.com/technetwork/java/javaee/jsp/index.html"
-		},
-		"JavaScript Infovis Toolkit": {
-			"cats": [
-				25
-			],
-			"env": "^\\$jit$",
-			"icon": "JavaScript Infovis Toolkit.png",
-			"script": "jit.*\\.js",
-			"website": "thejit.org"
+			"website": "http://www.oracle.com/technetwork/java/javaee/jsp/index.html"
 		},
 		"Jekyll": {
 			"cats": [
-				1,
-				11
+				"1",
+				"11"
 			],
 			"icon": "Jekyll.png",
 			"meta": {
 				"generator": "Jekyll (v[\\d.]+)?\\;version:\\1"
 			},
-			"website": "jekyllrb.com"
+			"website": "http://jekyllrb.com"
 		},
 		"Jenkins": {
 			"cats": [
-				44
+				"44"
 			],
 			"headers": {
 				"X-Jenkins": "([\\d\\.]+)\\;version:\\1"
 			},
 			"icon": "Jenkins.png",
 			"implies": "Java",
-			"website": "jenkins-ci.org"
+			"website": "http://jenkins-ci.org"
 		},
 		"Jetty": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Jetty(?:\\(([\\d\\.]*\\d+))?\\;version:\\1"
 			},
 			"icon": "Jetty.png",
 			"implies": "Java",
-			"website": "www.eclipse.org/jetty"
+			"website": "http://www.eclipse.org/jetty"
 		},
 		"Jimdo": {
 			"cats": [
-				1
+				"1"
 			],
+			"env": "^jimdo_(?:Data|Gen\\d+)$",
 			"headers": {
 				"X-Jimdo-Instance": "",
 				"X-Jimdo-Wid": ""
 			},
-			"env": "^jimdo_(?:Data|Gen\\d+)$",
 			"icon": "jimdo.png",
-			"website": "www.jimdo.com/"
+			"website": "http://www.jimdo.com/"
 		},
 		"Jirafe": {
 			"cats": [
-				10,
-				32
+				"10",
+				"32"
 			],
 			"env": "^jirafe$",
 			"icon": "Jirafe.png",
 			"script": "/jirafe\\.js",
-			"website": "jirafe.com"
+			"website": "http://jirafe.com"
 		},
 		"Jive": {
 			"cats": [
-				19
+				"19"
 			],
 			"headers": {
-				"x-jive-chrome-wrapped": "",
+				"X-JIVE-USER-ID": "",
+				"X-JSL": "",
 				"X-Jive-Flow-Id": "",
 				"X-Jive-Request-Id": "",
-				"X-JIVE-USER-ID": "",
-				"X-JSL": ""
+				"x-jive-chrome-wrapped": ""
 			},
 			"icon": "Jive.png",
-			"website": "www.jivesoftware.com"
+			"website": "http://www.jivesoftware.com"
 		},
 		"Jo": {
 			"cats": [
-				26,
-				12
+				"26",
+				"12"
 			],
 			"env": "^jo(?:Cache|DOM|Event)$",
 			"icon": "Jo.png",
-			"website": "joapp.com"
+			"website": "http://joapp.com"
 		},
 		"JobberBase": {
 			"cats": [
-				19
+				"19"
 			],
 			"env": "^Jobber$",
 			"icon": "JobberBase.png",
@@ -3833,11 +3890,11 @@
 			"meta": {
 				"generator": "Jobberbase"
 			},
-			"website": "jobberbase.com"
+			"website": "http://jobberbase.com"
 		},
 		"Joomla": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^(?:jcomments|Joomla)$",
 			"headers": {
@@ -3850,41 +3907,41 @@
 				"generator": "Joomla!(?: ([\\d.]+))?\\;version:\\1"
 			},
 			"url": "option=com_",
-			"website": "joomla.org"
+			"website": "http://joomla.org"
 		},
 		"K2": {
 			"cats": [
-				19
+				"19"
 			],
 			"env": "^K2RatingURL$",
 			"html": "<!--(?: JoomlaWorks \"K2\"| Start K2)",
 			"icon": "K2.png",
 			"implies": "Joomla",
-			"website": "getk2.org"
+			"website": "http://getk2.org"
 		},
 		"KISSmetrics": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^KM_COOKIE_DOMAIN$",
 			"icon": "KISSmetrics.png",
-			"website": "www.kissmetrics.com"
+			"website": "http://www.kissmetrics.com"
 		},
 		"KS_HTTP": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "KS_HTTP\\/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "KS_HTTP.png",
 			"implies": "Canon",
-			"website": "www.canon.com"
+			"website": "http://www.canon.com"
 		},
 		"Kampyle": {
 			"cats": [
-				10,
-				13
+				"10",
+				"13"
 			],
 			"env": "^k_track$",
 			"headers": {
@@ -3892,11 +3949,11 @@
 			},
 			"icon": "Kampyle.png",
 			"script": "cf\\.kampyle\\.com/k_button\\.js",
-			"website": "www.kampyle.com"
+			"website": "http://www.kampyle.com"
 		},
 		"Kamva": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^Kamva$",
 			"icon": "Kamva.svg",
@@ -3904,21 +3961,21 @@
 				"generator": "[CK]amva"
 			},
 			"script": "cdn\\.mykamva\\.ir",
-			"website": "kamva.ir"
+			"website": "http://kamva.ir"
 		},
 		"Kendo UI": {
 			"cats": [
-				18
+				"18"
 			],
 			"env": "^kendo$",
 			"html": "<link[^>]*\\s+href=[^>]*styles/kendo\\.common(?:\\.min)?\\.css[^>]*/>",
 			"icon": "Kendo UI.png",
 			"implies": "jQuery",
-			"website": "www.kendoui.com"
+			"website": "http://www.kendoui.com"
 		},
 		"Kentico CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "CMSPreferredCulture="
@@ -3927,12 +3984,22 @@
 			"meta": {
 				"generator": "Kentico CMS ([\\d.R]+ \\(build [\\d.]+\\))\\;version:\\1"
 			},
-			"website": "www.kentico.com"
+			"website": "http://www.kentico.com"
+		},
+		"KeyCDN": {
+			"cats": [
+				"31"
+			],
+			"headers": {
+				"Server": "^keycdn-engine$"
+			},
+			"icon": "KeyCDN.png",
+			"website": "http://www.keycdn.com"
 		},
 		"Kibana": {
 			"cats": [
-				29,
-				25
+				"29",
+				"25"
 			],
 			"headers": {
 				"kbn-name": "kibana",
@@ -3942,51 +4009,51 @@
 			"icon": "kibana.svg",
 			"implies": "Node.js",
 			"url": "kibana#/dashboard/",
-			"website": "www.elastic.co/products/kibana"
+			"website": "http://www.elastic.co/products/kibana"
 		},
 		"KineticJS": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^Kinetic$",
 			"icon": "KineticJS.png",
 			"script": "kinetic(?:-v?([\\d.]+))?(?:\\.min)?\\.js\\;version:\\1",
-			"website": "kineticjs.com"
+			"website": "http://kineticjs.com"
 		},
 		"Klarna Checkout": {
 			"cats": [
-				41,
-				6,
-				5
+				"41",
+				"6",
+				"5"
 			],
 			"env": "^_klarnaCheckout$",
 			"icon": "Klarna.svg",
-			"website": "klarna.com"
+			"website": "http://klarna.com"
 		},
 		"Knockout.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^ko$",
 			"icon": "Knockout.js.png",
-			"website": "knockoutjs.com"
+			"website": "http://knockoutjs.com"
 		},
 		"Koa": {
 			"cats": [
-				18,
-				22
+				"18",
+				"22"
 			],
 			"headers": {
 				"X-Powered-By": "^koa$"
 			},
 			"icon": "Koa.png",
 			"implies": "Node.js",
-			"website": "koajs.com"
+			"website": "http://koajs.com"
 		},
 		"Koala Framework": {
 			"cats": [
-				1,
-				18
+				"1",
+				"18"
 			],
 			"html": "<!--[^>]+This website is powered by Koala Web Framework CMS",
 			"icon": "Koala Framework.png",
@@ -3994,20 +4061,20 @@
 			"meta": {
 				"generator": "^Koala Web Framework CMS"
 			},
-			"website": "koala-framework.org"
+			"website": "http://koala-framework.org"
 		},
 		"Koego": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^ego_domains$",
 			"icon": "Koego.png",
 			"script": "tracking\\.koego\\.com/end/ego\\.js",
-			"website": "www.koego.com/en"
+			"website": "http://www.koego.com/en"
 		},
 		"Kohana": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"Set-Cookie": "kohanasession",
@@ -4015,11 +4082,11 @@
 			},
 			"icon": "Kohana.png",
 			"implies": "PHP",
-			"website": "kohanaframework.org"
+			"website": "http://kohanaframework.org"
 		},
 		"Koken": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "koken_referrer="
@@ -4037,46 +4104,46 @@
 				"generator": "Koken ([\\d.]+)\\;version:\\1"
 			},
 			"script": "koken(?:\\.js\\?([\\d.]+)|/storage)\\;version:\\1",
-			"website": "koken.me"
+			"website": "http://koken.me"
 		},
 		"Kolibri CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Powered-By": "Kolibri"
 			},
-			"icon": "default.png",
+			"icon": "default.svg",
 			"meta": {
 				"generator": "Kolibri"
 			},
-			"website": "alias.io"
+			"website": "http://alias.io"
 		},
 		"Komodo CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Komodo CMS.png",
 			"implies": "PHP",
 			"meta": {
 				"generator": "^Komodo CMS"
 			},
-			"website": "www.komodocms.com"
+			"website": "http://www.komodocms.com"
 		},
 		"Koobi": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<!--[^K>-]+Koobi ([a-z\\d.]+)\\;version:\\1",
 			"icon": "Koobi.png",
 			"meta": {
 				"generator": "Koobi"
 			},
-			"website": "dream4.de/cms"
+			"website": "http://dream4.de/cms"
 		},
 		"Kooboo CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-KoobooCMS-Version": "(.*)\\;version:\\1"
@@ -4084,19 +4151,19 @@
 			"icon": "Kooboo CMS.png",
 			"implies": "Microsoft ASP.NET",
 			"script": "/Kooboo",
-			"website": "kooboo.com"
+			"website": "http://kooboo.com"
 		},
 		"Kotisivukone": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Kotisivukone.png",
 			"script": "kotisivukone(?:\\.min)?\\.js",
-			"website": "www.kotisivukone.fi"
+			"website": "http://www.kotisivukone.fi"
 		},
 		"LEPTON": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "lep\\d+sessionid="
@@ -4106,78 +4173,78 @@
 			"meta": {
 				"generator": "LEPTON"
 			},
-			"website": "www.lepton-cms.org"
+			"website": "http://www.lepton-cms.org"
 		},
 		"LabVIEW": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "LabVIEW(?:/([\\d\\.]+))?\\;version:\\1"
 			},
 			"icon": "LabVIEW.png",
-			"website": "ni.com/labview"
+			"website": "http://ni.com/labview"
 		},
 		"Laravel": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"Set-Cookie": "laravel_session"
 			},
 			"icon": "Laravel.png",
 			"implies": "PHP",
-			"website": "laravel.com"
+			"website": "http://laravel.com"
 		},
 		"Lazy.js": {
 			"cats": [
-				12
+				"12"
 			],
-			"icon": "default.png",
+			"icon": "default.svg",
 			"script": "lazy(?:\\.browser)?(?:\\.min)?\\.js",
-			"website": "danieltao.com/lazy.js"
+			"website": "http://danieltao.com/lazy.js"
 		},
 		"Leaflet": {
 			"cats": [
-				35
+				"35"
 			],
 			"icon": "Leaflet.png",
 			"script": "leaflet.*\\.js",
-			"website": "leafletjs.com"
+			"website": "http://leafletjs.com"
 		},
 		"Less": {
 			"cats": [
-				19
+				"19"
 			],
 			"html": "<link[^>]+ rel=\"stylesheet/less\"",
 			"icon": "Less.png",
-			"website": "lesscss.org"
+			"website": "http://lesscss.org"
 		},
 		"Liferay": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^Liferay$",
 			"headers": {
 				"Liferay-Portal": "[a-z\\s]+([\\d.]+)\\;version:\\1"
 			},
 			"icon": "Liferay.png",
-			"website": "www.liferay.com"
+			"website": "http://www.liferay.com"
 		},
 		"Lift": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"X-Lift-Version": "(.+)\\;version:\\1"
 			},
 			"icon": "Lift.png",
 			"implies": "Scala",
-			"website": "liftweb.net"
+			"website": "http://liftweb.net"
 		},
 		"LightMon Engine": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "lm_online"
@@ -4188,88 +4255,88 @@
 			"meta": {
 				"generator": "LightMon Engine"
 			},
-			"website": "lightmon.ru"
+			"website": "http://lightmon.ru"
 		},
 		"Lightbox": {
 			"cats": [
-				7,
-				12
+				"7",
+				"12"
 			],
 			"html": "<link [^>]*href=\"[^\"]+lightbox(?:\\.min)?\\.css",
 			"icon": "Lightbox.png",
 			"script": "lightbox.*\\.js",
-			"website": "lokeshdhakar.com/projects/lightbox2/"
+			"website": "http://lokeshdhakar.com/projects/lightbox2/"
 		},
 		"Lightspeed eCom": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "<!-- \\[START\\] 'blocks/head.rain' -->",
 			"icon": "Lightspeed.svg",
 			"script": "http://assets.webshopapp.com",
 			"url": "seoshop.webshopapp.com",
-			"website": "www.lightspeedhq.com/products/ecommerce/"
+			"website": "http://www.lightspeedhq.com/products/ecommerce/"
 		},
 		"Lighty": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"Set-Cookie": "lighty_version"
 			},
 			"icon": "Lighty.png",
 			"implies": "PHP",
-			"website": "gitlab.com/lighty/framework"
+			"website": "http://gitlab.com/lighty/framework"
 		},
 		"LimeSurvey": {
 			"cats": [
-				19
+				"19"
 			],
 			"headers": {
 				"generator": "LimeSurvey"
 			},
 			"icon": "LimeSurvey.png",
-			"website": "limesurvey.org/"
+			"website": "http://limesurvey.org/"
 		},
 		"LinkSmart": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^(?:_mb_site_guid$|LS_JSON|LinkSmart(?:_|$))",
 			"icon": "LinkSmart.png",
 			"script": "^https?://cdn\\.linksmart\\.com/linksmart_([\\d.]+?)(?:\\.min)?\\.js\\;version:\\1",
-			"website": "linksmart.com"
+			"website": "http://linksmart.com"
 		},
 		"Linkedin": {
 			"cats": [
-				5
+				"5"
 			],
 			"icon": "Linkedin.svg",
 			"script": "//platform\\.linkedin\\.com/in\\.js",
-			"website": "linkedin.com"
+			"website": "http://linkedin.com"
 		},
 		"List.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^List$",
 			"icon": "List.js.png",
 			"script": "^list\\.(?:min\\.)?js$",
-			"website": "www.listjs.com"
+			"website": "http://www.listjs.com"
 		},
 		"LiteSpeed": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "^LiteSpeed$"
 			},
 			"icon": "LiteSpeed.png",
-			"website": "litespeedtech.com"
+			"website": "http://litespeedtech.com"
 		},
 		"Lithium": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": [
 				"^LITHIUM$"
@@ -4280,35 +4347,35 @@
 			"html": " <a [^>]+Powered by Lithium",
 			"icon": "Lithium.png",
 			"implies": "PHP",
-			"website": "www.lithium.com"
+			"website": "http://www.lithium.com"
 		},
 		"LiveAgent": {
 			"cats": [
-				52
+				"52"
 			],
 			"env": "^LiveAgent$",
 			"icon": "LiveAgent.png",
-			"website": "www.ladesk.com"
+			"website": "http://www.ladesk.com"
 		},
 		"LiveChat": {
 			"cats": [
-				52
+				"52"
 			],
 			"icon": "LiveChat.png",
 			"script": "cdn\\.livechatinc\\.com/.*tracking\\.js",
-			"website": "livechatinc.com"
+			"website": "http://livechatinc.com"
 		},
 		"LiveJournal": {
 			"cats": [
-				11
+				"11"
 			],
 			"icon": "LiveJournal.png",
 			"url": "\\.livejournal\\.com",
-			"website": "www.livejournal.com"
+			"website": "http://www.livejournal.com"
 		},
 		"LiveStreet CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^LIVESTREET",
 			"headers": {
@@ -4316,11 +4383,11 @@
 			},
 			"icon": "LiveStreet CMS.png",
 			"implies": "PHP",
-			"website": "livestreetcms.com"
+			"website": "http://livestreetcms.com"
 		},
 		"Livefyre": {
 			"cats": [
-				15
+				"15"
 			],
 			"env": [
 				"^fyre$",
@@ -4329,11 +4396,11 @@
 			"html": "<[^>]+(?:id|class)=\"livefyre",
 			"icon": "Livefyre.png",
 			"script": "livefyre_init\\.js",
-			"website": "livefyre.com"
+			"website": "http://livefyre.com"
 		},
 		"Liveinternet": {
 			"cats": [
-				10
+				"10"
 			],
 			"html": [
 				"<script[^<>]*>[^]{0,128}?src\\s*=\\s*['\"]//counter\\.yadro\\.ru/hit(?:;\\S+)?\\?(?:t\\d+\\.\\d+;)?r",
@@ -4343,19 +4410,19 @@
 			],
 			"icon": "Liveinternet.png",
 			"script": "/js/al/common.js\\?[0-9_]+",
-			"website": "liveinternet.ru/rating/"
+			"website": "http://liveinternet.ru/rating/"
 		},
 		"Lo-dash": {
 			"cats": [
-				12
+				"12"
 			],
 			"icon": "Lo-dash.png",
 			"script": "lodash.*\\.js",
-			"website": "www.lodash.com"
+			"website": "http://www.lodash.com"
 		},
 		"Locomotive": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<link[^>]*/sites/[a-z\\d]{24}/theme/stylesheets",
 			"icon": "Locomotive.png",
@@ -4363,81 +4430,89 @@
 				"Ruby on Rails",
 				"MongoDB"
 			],
-			"website": "www.locomotivecms.com"
+			"website": "http://www.locomotivecms.com"
 		},
 		"Logitech Media Server": {
 			"cats": [
-				22,
-				38
+				"22",
+				"38"
 			],
 			"headers": {
 				"Server": "Logitech Media Server(?: \\(([\\d\\.]+))?\\;version:\\1"
 			},
 			"icon": "Logitech Media Server.png",
-			"website": "www.mysqueezebox.com"
+			"website": "http://www.mysqueezebox.com"
 		},
 		"Lotus Domino": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Lotus-Domino"
 			},
 			"icon": "Lotus Domino.png",
 			"implies": "Java",
-			"website": "www-01.ibm.com/software/lotus/products/domino"
+			"website": "http://www-01.ibm.com/software/lotus/products/domino"
 		},
 		"Lua": {
 			"cats": [
-				27
+				"27"
 			],
 			"headers": {
 				"X-Powered-By": "\bLua(?: ([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Lua.png",
-			"website": "www.lua.org"
+			"website": "http://www.lua.org"
 		},
 		"Lucene": {
 			"cats": [
-				34
+				"34"
 			],
 			"icon": "Lucene.png",
 			"implies": "Java",
-			"website": "lucene.apache.org/core/"
+			"website": "http://lucene.apache.org/core/"
 		},
 		"M.R. Inc BoxyOS": {
 			"cats": [
-				28
+				"28"
 			],
-			"icon": "M.R. Inc BoxyOS.png",
-			"website": "mrincworld.com"
+			"icon": "M.R. Inc.png",
+			"website": "http://mrincworld.com"
 		},
 		"M.R. Inc SiteFrame": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"Powered-By": "M\\.R\\. Inc SiteFrame"
 			},
-			"icon": "M.R. Inc SiteFrame.png",
-			"website": "mrincworld.com"
+			"icon": "M.R. Inc.png",
+			"website": "http://mrincworld.com"
 		},
 		"M.R. Inc Webserver": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "M\\.R\\. Inc Webserver"
 			},
-			"icon": "M.R. Inc Webserver.png",
+			"icon": "M.R. Inc.png",
 			"implies": [
 				"M.R. Inc BoxyOS"
 			],
-			"website": "mrincworld.com"
+			"website": "http://mrincworld.com"
+		},
+		"MHonArc": {
+			"cats": [
+				"50"
+			],
+			"html": "<!-- MHonArc v([0-9.]+) -->\\;version:\\1",
+			"icon": "mhonarc.png",
+			"website": "http://www.mhonarc.at"
 		},
 		"MOBOTIX": {
 			"cats": [
-				39
+				"39"
 			],
 			"icon": "MOBOTIX.png",
 			"meta": {
@@ -4446,11 +4521,11 @@
 				"publisher": "MOBOTIX AG\\;confidence:40"
 			},
 			"url": "control/userimage\\.html\\;confidence:70",
-			"website": "mobotix.com"
+			"website": "http://mobotix.com"
 		},
 		"MODX": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^MODX_MEDIA_PATH$",
 			"headers": {
@@ -4465,20 +4540,23 @@
 			],
 			"icon": "MODX.png",
 			"implies": "PHP",
-			"website": "modx.com"
+			"meta": {
+				"generator": "MODX[^\\d.]*([\\d.]+)?\\;version:\\1"
+			},
+			"website": "http://modx.com"
 		},
 		"MadAdsMedia": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^setM(?:Iframe|RefURL)$",
 			"icon": "MadAdsMedia.png",
 			"script": "^https?://(?:ads-by|pixel)\\.madadsmedia.com/",
-			"website": "madadsmedia.com"
+			"website": "http://madadsmedia.com"
 		},
 		"Magento": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": [
 				"^(?:Mage|VarienForm)$"
@@ -4498,11 +4576,11 @@
 				"static/_requirejs\\;confidence:50\\;version:2",
 				"static/frontend\\;confidence:20\\;version:2"
 			],
-			"website": "www.magentocommerce.com"
+			"website": "http://www.magentocommerce.com"
 		},
 		"Mailchimp": {
 			"cats": [
-				32
+				"32"
 			],
 			"html": [
 				"<form [^>]*data-mailchimp-url",
@@ -4516,39 +4594,39 @@
 				"s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js",
 				"cdn-images.mailchimp.com/[^>]*.css"
 			],
-			"website": "mailchimp.com"
+			"website": "http://mailchimp.com"
 		},
 		"Mambo": {
 			"cats": [
-				1
+				"1"
 			],
 			"excludes": "Joomla",
 			"icon": "Mambo.png",
 			"meta": {
 				"generator": "Mambo"
 			},
-			"website": "mambo-foundation.org"
+			"website": "http://mambo-foundation.org"
 		},
 		"MantisBT": {
 			"cats": [
-				13
+				"13"
 			],
 			"html": "<img[^>]+ alt=\"Powered by Mantis Bugtracker",
 			"icon": "MantisBT.png",
 			"implies": "PHP",
-			"website": "www.mantisbt.org"
+			"website": "http://www.mantisbt.org"
 		},
 		"ManyContacts": {
 			"cats": [
-				5
+				"5"
 			],
 			"icon": "ManyContacts.png",
 			"script": "\\/assets\\/js\\/manycontacts\\.min\\.js",
-			"website": "www.manycontacts.com"
+			"website": "http://www.manycontacts.com"
 		},
 		"Marionette.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Marionette$",
 			"icon": "Marionette.js.svg",
@@ -4557,61 +4635,76 @@
 				"Backbone.js"
 			],
 			"script": "backbone\\.marionette.*\\.js",
-			"website": "marionettejs.com"
+			"website": "http://marionettejs.com"
 		},
 		"Marketo": {
 			"cats": [
-				32
+				"32"
 			],
 			"env": "^Munchkin$",
 			"icon": "Marketo.png",
 			"script": "munchkin\\.marketo\\.net/munchkin\\.js",
-			"website": "www.marketo.com"
+			"website": "http://www.marketo.com"
 		},
 		"Materialize CSS": {
 			"cats": [
-				18
+				"18"
 			],
 			"html": "<link[^>]* href=\"[^\"]*materialize(?:\\.min)?\\.css",
 			"icon": "Materialize CSS.png",
 			"implies": "jQuery",
 			"script": "materialize(?:\\.min)?\\.js",
-			"website": "materializecss.com"
+			"website": "http://materializecss.com"
 		},
 		"MathJax": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^MathJax$",
 			"icon": "MathJax.png",
 			"script": "mathjax\\.js",
-			"website": "mathjax.org"
+			"website": "http://mathjax.org"
+		},
+		"Mattermost": {
+			"cats": [
+				"2"
+			],
+			"env": "mm_(?:config|license|user|current_user_id)",
+			"html": "<noscript> To use Mattermost, please enable JavaScript. </noscript>",
+			"icon": "mattermost.png",
+			"implies": [
+				"Go",
+				"React",
+				"PostgreSQL\\;confidence:50",
+				"MySQL\\;confidence:50"
+			],
+			"website": "http://about.mattermost.com"
 		},
 		"MaxCDN": {
 			"cats": [
-				31
+				"31"
 			],
 			"headers": {
 				"Server": "^NetDNA",
 				"X-CDN-Forward": "^maxcdn$"
 			},
 			"icon": "MaxCDN.png",
-			"website": "www.maxcdn.com"
+			"website": "http://www.maxcdn.com"
 		},
 		"MaxSite CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "MaxSite CMS.png",
 			"implies": "PHP",
 			"meta": {
 				"generator": "MaxSite CMS"
 			},
-			"website": "max-3000.com"
+			"website": "http://max-3000.com"
 		},
 		"Mean.io": {
 			"cats": [
-				12
+				"12"
 			],
 			"headers": {
 				"X-Powered-CMS": "Mean\\.io"
@@ -4620,32 +4713,31 @@
 			"implies": [
 				"MongoDB",
 				"Express",
-				"AngularJS",
-				"Node.js"
+				"AngularJS"
 			],
-			"website": "mean.io"
+			"website": "http://mean.io"
 		},
 		"MediaElement.js": {
 			"cats": [
-				14
+				"14"
 			],
 			"env": "^mejs$",
 			"icon": "MediaElement.js.png",
-			"website": "mediaelementjs.com"
+			"website": "http://mediaelementjs.com"
 		},
 		"MediaTomb": {
 			"cats": [
-				38
+				"38"
 			],
 			"headers": {
 				"Server": "MediaTomb(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "MediaTomb.png",
-			"website": "mediatomb.cc"
+			"website": "http://mediatomb.cc"
 		},
 		"MediaWiki": {
 			"cats": [
-				8
+				"8"
 			],
 			"html": "(?:<a[^>]+>Powered by MediaWiki</a>|<[^>]+id=\"t-specialpages)",
 			"icon": "MediaWiki.png",
@@ -4653,40 +4745,40 @@
 			"meta": {
 				"generator": "MediaWiki"
 			},
-			"website": "www.mediawiki.org"
+			"website": "http://www.mediawiki.org"
 		},
 		"Meebo": {
 			"cats": [
-				5
+				"5"
 			],
 			"html": "(?:<iframe id=\"meebo-iframe\"|Meebo\\('domReady'\\))",
 			"icon": "Meebo.png",
-			"website": "www.meebo.com"
+			"website": "http://www.meebo.com"
 		},
 		"Melis CMS V2": {
 			"cats": [
-				1,
-				6
+				"1",
+				"6"
 			],
 			"html": "<!-- Rendered with Melics CMS V2",
+			"icon": "meliscmsv2.png",
 			"meta": {
 				"powered-by": "^Melis CMS"
 			},
-			"icon": "meliscmsv2.png",
-			"website": "www.melistechnology.com/"
+			"website": "http://www.melistechnology.com/"
 		},
 		"Meteor": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Meteor$",
 			"html": "<link[^>]+__meteor-css__",
 			"icon": "Meteor.png",
-			"website": "meteor.com"
+			"website": "http://meteor.com"
 		},
 		"Methode": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^eidosBase$",
 			"html": "<!-- Methode uuid: \"[a-f\\d]+\" ?-->",
@@ -4698,11 +4790,11 @@
 				"eomportal-loid": "[\\d.]+",
 				"eomportal-uuid": "[a-f\\d]+"
 			},
-			"website": "www.eidosmedia.com/solutions"
+			"website": "http://www.eidosmedia.com/solutions"
 		},
 		"Microsoft ASP.NET": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"Set-Cookie": "ASPSESSION|ASP\\.NET_SessionId",
@@ -4713,21 +4805,21 @@
 			"icon": "Microsoft ASP.NET.png",
 			"implies": "IIS\\;confidence:50",
 			"url": "\\.aspx(?:$|\\?)",
-			"website": "www.asp.net"
+			"website": "http://www.asp.net"
 		},
 		"Microsoft HTTPAPI": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Microsoft-HTTPAPI(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Microsoft.svg",
-			"website": "microsoft.com"
+			"website": "http://microsoft.com"
 		},
 		"Microsoft SharePoint": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^_spBodyOnLoadCalled$",
 			"headers": {
@@ -4740,267 +4832,267 @@
 			"meta": {
 				"generator": "Microsoft SharePoint"
 			},
-			"website": "sharepoint.microsoft.com"
+			"website": "http://sharepoint.microsoft.com"
 		},
 		"Mietshop": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "<a href=\"https://ssl.mietshop.d",
 			"icon": "mietshop.png",
 			"meta": {
 				"generator": "Mietshop"
 			},
-			"website": "www.mietshop.de/"
+			"website": "http://www.mietshop.de/"
 		},
 		"Milligram": {
 			"cats": [
-				18
+				"18"
 			],
 			"html": [
 				"<link[^>]+?href=\"[^\"]+milligram(?:\\.min)?\\.css"
 			],
 			"icon": "Milligram.png",
-			"website": "milligram.github.io"
+			"website": "http://milligram.github.io"
 		},
 		"MiniBB": {
 			"cats": [
-				2
+				"2"
 			],
 			"html": "<a href=\"[^\"]+minibb[^<]+</a>[^<]+\n<!--End of copyright link",
 			"icon": "MiniBB.png",
-			"website": "www.minibb.com"
+			"website": "http://www.minibb.com"
 		},
 		"MiniServ": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "MiniServ\\/?([\\d\\.]+)?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "sourceforge.net/projects/miniserv"
+			"icon": "default.svg",
+			"website": "http://sourceforge.net/projects/miniserv"
 		},
 		"Mint": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^Mint$",
 			"icon": "Mint.png",
 			"script": "mint/\\?js",
-			"website": "haveamint.com"
+			"website": "http://haveamint.com"
 		},
 		"Mixpanel": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^Mixpanel$",
 			"icon": "Mixpanel.png",
 			"script": "api\\.mixpanel\\.com/track",
-			"website": "mixpanel.com"
+			"website": "http://mixpanel.com"
 		},
 		"Mobify": {
 			"cats": [
-				26
+				"26"
 			],
 			"env": "^Mobify$",
 			"icon": "Mobify.png",
 			"script": "mobify\\.com",
-			"website": "www.mobify.com"
+			"website": "http://www.mobify.com"
 		},
 		"MochiKit": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^MochiKit$",
 			"icon": "MochiKit.png",
 			"script": "MochiKit(?:\\.min)?\\.js",
-			"website": "mochikit.com"
+			"website": "http://mochikit.com"
 		},
 		"MochiWeb": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "MochiWeb(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "github.com/mochi/mochiweb"
+			"icon": "default.svg",
+			"website": "http://github.com/mochi/mochiweb"
 		},
 		"Modernizr": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Modernizr$",
 			"icon": "Modernizr.png",
 			"script": "modernizr(?:-([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
-			"website": "www.modernizr.com"
+			"website": "http://www.modernizr.com"
 		},
 		"Modified": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "modified.png",
 			"meta": {
 				"generator": "\\(c\\) by modified eCommerce Shopsoftware ------ http://www.modified-shop.org"
 			},
-			"website": "www.modified-shop.org/"
+			"website": "http://www.modified-shop.org/"
 		},
 		"Moguta.CMS": {
 			"cats": [
-				1,
-				6
+				"1",
+				"6"
 			],
 			"html": "(?:<script|link)[^>]*mg-(?:core|plugins|templates)",
 			"icon": "Moguta.CMS.png",
 			"implies": "PHP",
-			"website": "moguta.ru"
+			"website": "http://moguta.ru"
 		},
 		"MoinMoin": {
 			"cats": [
-				8
+				"8"
 			],
 			"env": "^show_switch2gui$",
 			"icon": "MoinMoin.png",
 			"implies": "Python",
 			"script": "moin(?:_static(\\d)(\\d)(\\d)|.+)/common/js/common\\.js\\;version:\\1.\\2.\\3",
-			"website": "moinmo.in"
+			"website": "http://moinmo.in"
 		},
 		"Mojolicious": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"x-powered-by": "mojolicious"
 			},
 			"icon": "Mojolicious.png",
 			"implies": "Perl",
-			"website": "mojolicio.us"
+			"website": "http://mojolicio.us"
 		},
 		"Mollom": {
 			"cats": [
-				16
+				"16"
 			],
 			"html": "<img[^>]+\\.mollom\\.com",
 			"icon": "Mollom.png",
 			"script": "mollom(?:\\.min)?\\.js",
-			"website": "mollom.com"
+			"website": "http://mollom.com"
 		},
 		"Moment Timezone": {
 			"cats": [
-				12
+				"12"
 			],
-			"icon": "Moment Timezone.png",
+			"icon": "Moment.js.png",
 			"implies": "Moment.js",
 			"script": "moment-timezone(?:\\-data)?(?:\\.min)?\\.js",
-			"website": "momentjs.com/timezone/"
+			"website": "http://momentjs.com/timezone/"
 		},
 		"Moment.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^moment$",
 			"icon": "Moment.js.png",
 			"script": "moment(?:\\.min)?\\.js",
-			"website": "momentjs.com"
+			"website": "http://momentjs.com"
 		},
 		"Mondo Media": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "Mondo Media.png",
 			"meta": {
 				"generator": "Mondo Shop"
 			},
-			"website": "mondo-media.de"
+			"website": "http://mondo-media.de"
 		},
 		"MongoDB": {
 			"cats": [
-				34
+				"34"
 			],
 			"icon": "MongoDB.png",
-			"website": "www.mongodb.org"
+			"website": "http://www.mongodb.org"
 		},
 		"Mongrel": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Mongrel"
 			},
 			"icon": "Mongrel.png",
 			"implies": "Ruby",
-			"website": "mongrel2.org"
+			"website": "http://mongrel2.org"
 		},
 		"Monkey HTTP Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Monkey/?([\\d.]+)?\\;version:\\1"
 			},
 			"icon": "Monkey HTTP Server.png",
-			"website": "monkey-project.com"
+			"website": "http://monkey-project.com"
 		},
 		"Mono": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"X-Powered-By": "Mono"
 			},
 			"icon": "Mono.png",
-			"website": "mono-project.com"
+			"website": "http://mono-project.com"
 		},
 		"Mono.net": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^_monoTracker$",
 			"icon": "Mono.net.png",
 			"implies": "Piwik",
 			"script": "monotracker(?:\\.min)?\\.js",
-			"website": "www.mono.net"
+			"website": "http://www.mono.net"
 		},
 		"MooTools": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^MooTools$",
 			"icon": "MooTools.png",
 			"script": "mootools.*\\.js",
-			"website": "mootools.net"
+			"website": "http://mootools.net"
 		},
 		"Moodle": {
 			"cats": [
-				21
+				"21"
 			],
 			"env": "^moodle",
 			"headers": {
 				"Set-Cookie": "(?:MoodleSession|MOODLEID_)"
 			},
-			"meta": {
-				"keywords": "^moodle"
-			},
 			"html": "<img[^>]+moodlelogo",
 			"icon": "Moodle.png",
 			"implies": "PHP",
-			"website": "moodle.org"
+			"meta": {
+				"keywords": "^moodle"
+			},
+			"website": "http://moodle.org"
 		},
 		"Motion-httpd": {
 			"cats": [
-				22
+				"22"
 			],
 			"excludes": "Apache",
 			"headers": {
 				"Server": "Motion-httpd(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "lavrsen.dk/foswiki/bin/view/Motion"
+			"icon": "default.svg",
+			"website": "http://lavrsen.dk/foswiki/bin/view/Motion"
 		},
 		"MotoCMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<link [^>]*href=\"[^>]*\\/mt-content\\/[^>]*\\.css",
 			"icon": "MotoCMS.svg",
@@ -5010,63 +5102,63 @@
 				"jQuery"
 			],
 			"script": ".*\\/mt-includes\\/[asetj]{2,6}\\/.*\\.js.*",
-			"website": "motocms.com"
+			"website": "http://motocms.com"
 		},
 		"Movable Type": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Movable Type.png",
 			"meta": {
 				"generator": "Movable Type"
 			},
-			"website": "movabletype.org"
+			"website": "http://movabletype.org"
 		},
 		"Moxa": {
 			"cats": [
-				37
+				"37"
 			],
 			"headers": {
 				"Server": "MoxaHttp(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Moxa.png",
-			"website": "moxa.com"
+			"website": "http://moxa.com"
 		},
 		"Mozard Suite": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Mozard Suite.png",
 			"meta": {
 				"author": "Mozard"
 			},
 			"url": "/mozard/!suite",
-			"website": "mozard.nl"
+			"website": "http://mozard.nl"
 		},
 		"Mura CMS": {
 			"cats": [
-				1,
-				11
+				"1",
+				"11"
 			],
 			"icon": "Mura CMS.png",
 			"implies": "Adobe ColdFusion",
 			"meta": {
 				"generator": "Mura CMS ([\\d]+)\\;version:\\1"
 			},
-			"website": "www.getmura.com"
+			"website": "http://www.getmura.com"
 		},
 		"Mustache": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Mustache$",
 			"icon": "Mustache.png",
 			"script": "mustache(?:\\.min)?\\.js",
-			"website": "mustache.github.com"
+			"website": "http://mustache.github.com"
 		},
 		"MyBB": {
 			"cats": [
-				2
+				"2"
 			],
 			"env": "^MyBB$",
 			"html": "(?:<script [^>]+\\s+<!--\\s+lang\\.no_new_posts|<a[^>]* title=\"Powered By MyBB)",
@@ -5075,63 +5167,63 @@
 				"PHP",
 				"MySQL"
 			],
-			"website": "www.mybb.com"
+			"website": "http://www.mybb.com"
 		},
 		"MyBlogLog": {
 			"cats": [
-				5
+				"5"
 			],
 			"icon": "MyBlogLog.png",
 			"script": "pub\\.mybloglog\\.com",
-			"website": "www.mybloglog.com"
+			"website": "http://www.mybloglog.com"
 		},
 		"MySQL": {
 			"cats": [
-				34
+				"34"
 			],
 			"icon": "MySQL.svg",
-			"website": "mysql.com"
+			"website": "http://mysql.com"
 		},
 		"Mynetcap": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Mynetcap.png",
 			"meta": {
 				"generator": "Mynetcap"
 			},
-			"website": "www.netcap-creation.fr"
+			"website": "http://www.netcap-creation.fr"
 		},
 		"NOIX": {
 			"cats": [
-				19
+				"19"
 			],
 			"html": "(?:<[^>]+(?:src|href)=[^>]*/media/noix|<!-- NOIX)",
 			"icon": "NOIX.png",
-			"website": "www.noix.com.br/tecnologias/joomla"
+			"website": "http://www.noix.com.br/tecnologias/joomla"
 		},
 		"NVD3": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^nv$",
 			"html": "<link[^>]* href=[^>]+nv\\.d3(?:\\.min)?\\.css",
 			"icon": "NVD3.png",
 			"implies": "D3",
 			"script": "nv\\.d3(?:\\.min)?\\.js",
-			"website": "nvd3.org"
+			"website": "http://nvd3.org"
 		},
 		"Nedstat": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^sitestat$",
 			"icon": "Nedstat.png",
-			"website": "www.nedstat.com"
+			"website": "http://www.nedstat.com"
 		},
 		"Neos CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"excludes": "TYPO3 CMS",
 			"headers": {
@@ -5140,11 +5232,11 @@
 			"icon": "Neos.svg",
 			"implies": "Neos Flow",
 			"url": "/neos/",
-			"website": "neos.io"
+			"website": "http://neos.io"
 		},
 		"Neos Flow": {
 			"cats": [
-				18
+				"18"
 			],
 			"excludes": "TYPO3 CMS",
 			"headers": {
@@ -5152,137 +5244,137 @@
 			},
 			"icon": "Neos.svg",
 			"implies": "PHP",
-			"website": "flow.neos.io"
+			"website": "http://flow.neos.io"
 		},
 		"Nepso": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Powered-CMS": "Nepso"
 			},
 			"icon": "Nepso.png",
-			"website": "nepso.com"
+			"website": "http://nepso.com"
 		},
 		"Netmonitor": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^netmonitor$",
 			"icon": "Netmonitor.png",
 			"script": "netmonitor\\.fi/nmtracker\\.js",
-			"website": "netmonitor.fi/en"
+			"website": "http://netmonitor.fi/en"
 		},
 		"Neto": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^NETO$",
 			"icon": "Neto.svg",
 			"script": "jquery\\.neto.*\\.js",
-			"website": "www.neto.com.au"
+			"website": "http://www.neto.com.au"
 		},
 		"Netsuite": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"Set-Cookie": "NS_VER="
 			},
 			"icon": "Netsuite.png",
-			"website": "netsuite.com"
+			"website": "http://netsuite.com"
 		},
 		"Nette Framework": {
 			"cats": [
-			  18
+				"18"
 			],
+			"env": "^Nette$",
 			"headers": {
-			  "X-Powered-By": "Nette Framework",
-			  "Set-Cookie": "nette-browser="
+				"Set-Cookie": "nette-browser=",
+				"X-Powered-By": "Nette Framework"
 			},
-			"env": "Nette",
 			"html": [
-			  "<input[^>]+data-nette-rules",
-			  "<div[^>]+id=\"snippet-",
-			  "<input[^>]+id=\"frm-"
+				"<input[^>]+data-nette-rules",
+				"<div[^>]+id=\"snippet-",
+				"<input[^>]+id=\"frm-"
 			],
 			"icon": "Nette Framework.png",
 			"implies": "PHP",
-			"website": "nette.org"
+			"website": "http://nette.org"
 		},
 		"New Relic": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^NREUM",
 			"icon": "New Relic.png",
-			"website": "newrelic.com"
+			"website": "http://newrelic.com"
 		},
 		"Nginx": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "nginx(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Nginx.svg",
-			"website": "nginx.org/en"
+			"website": "http://nginx.org/en"
 		},
 		"Node.js": {
 			"cats": [
-				27
+				"27"
 			],
 			"icon": "node.js.png",
-			"website": "nodejs.org"
+			"website": "http://nodejs.org"
 		},
 		"OWL Carousel": {
 			"cats": [
-				5,
-				7
+				"5",
+				"7"
 			],
 			"html": "<link [^>]*href=\"[^\"]+owl.carousel(?:\\.min)?\\.css",
 			"icon": "OWL Carousel.png",
 			"implies": "jQuery",
 			"script": "owl.carousel.*\\.js",
-			"website": "owlgraphic.com/owlcarousel"
+			"website": "http://owlgraphic.com/owlcarousel"
 		},
 		"OXID eShop": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^ox(?:TopMenu|ModalPopup|LoginBox|InputValidator)",
 			"html": "<!--[^-]*OXID eShop",
 			"icon": "OXID eShop.png",
-			"website": "oxid-esales.com"
+			"website": "http://oxid-esales.com"
 		},
 		"October CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "october_session="
 			},
 			"icon": "October CMS.png",
 			"implies": "Laravel",
-			"website": "octobercms.com"
+			"website": "http://octobercms.com"
 		},
 		"Octopress": {
 			"cats": [
-				1,
-				11
+				"1",
+				"11"
 			],
 			"html": "Powered by <a href=\"http://octopress.org\">",
+			"icon": "octopress.png",
 			"implies": "Jekyll",
 			"meta": {
 				"generator": "Octopress"
 			},
-			"icon": "octopress.png",
-			"website": "octopress.org"
+			"website": "http://octopress.org"
 		},
 		"Odoo": {
 			"cats": [
-				1,
-				6
+				"1",
+				"6"
 			],
 			"html": "<link[^>]* href=[^>]+/web/css/(?:web\\.assets_common/|website\\.assets_frontend/)\\;confidence:25",
 			"icon": "Odoo.png",
@@ -5296,53 +5388,53 @@
 				"generator": "Odoo"
 			},
 			"script": "/web/js/(?:web\\.assets_common/|website\\.assets_frontend/)\\;confidence:25",
-			"website": "odoo.com"
+			"website": "http://odoo.com"
 		},
 		"OmniTouch 8660 My Teamwork": {
 			"cats": [
-				19
+				"19"
 			],
 			"icon": "OmniTouch 8660 My Teamwork.png",
-			"website": "enterprise.alcatel-lucent.com"
+			"website": "http://enterprise.alcatel-lucent.com"
 		},
 		"OneAPM": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^BWEUM",
 			"icon": "OneAPM.png",
-			"website": "www.oneapm.com"
+			"website": "http://www.oneapm.com"
 		},
 		"OneStat": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^OneStat",
 			"icon": "OneStat.png",
-			"website": "www.onestat.com"
+			"website": "http://www.onestat.com"
 		},
 		"Open AdStream": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^OAS_AD$",
 			"icon": "Open AdStream.png",
-			"website": "xaxis.com"
+			"website": "http://xaxis.com"
 		},
 		"Open Classifieds": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "Open Classifieds.png",
 			"meta": {
 				"author": "open-classifieds\\.com",
 				"copyright": "Open Classifieds ?([0-9.]+)?\\;version:\\1"
 			},
-			"website": "open-classifieds.com"
+			"website": "http://open-classifieds.com"
 		},
 		"Open Journal Systems": {
 			"cats": [
-				50
+				"50"
 			],
 			"headers": {
 				"Set-Cookie": "\bOJSSID\b"
@@ -5352,20 +5444,20 @@
 			"meta": {
 				"generator": "Open Journal Systems(?: ([\\d.]+))?\\;version:\\1"
 			},
-			"website": "pkp.sfu.ca/ojs"
+			"website": "http://pkp.sfu.ca/ojs"
 		},
 		"Open Web Analytics": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^_?owa_",
 			"html": "<!-- (?:Start|End) Open Web Analytics Tracker -->",
 			"icon": "Open Web Analytics.png",
-			"website": "openwebanalytics.com"
+			"website": "http://openwebanalytics.com"
 		},
 		"Open eShop": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "Open eShop.png",
 			"implies": "PHP",
@@ -5373,20 +5465,20 @@
 				"author": "open-eshop\\.com",
 				"copyright": "Open eShop ?([0-9.]+)?\\;version:\\1"
 			},
-			"website": "open-eshop.com/"
+			"website": "http://open-eshop.com/"
 		},
 		"OpenCart": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "(?:index\\.php\\?route=[a-z]+/|Powered By <a href=\"[^>]+OpenCart)",
 			"icon": "OpenCart.png",
 			"implies": "PHP",
-			"website": "www.opencart.com"
+			"website": "http://www.opencart.com"
 		},
 		"OpenCms": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Server": "OpenCms"
@@ -5395,22 +5487,22 @@
 			"icon": "OpenCms.png",
 			"implies": "Java",
 			"script": "opencms",
-			"website": "www.opencms.org"
+			"website": "http://www.opencms.org"
 		},
 		"OpenGSE": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "GSE"
 			},
 			"icon": "OpenGSE.png",
 			"implies": "Java",
-			"website": "code.google.com/p/opengse"
+			"website": "http://code.google.com/p/opengse"
 		},
 		"OpenGrok": {
 			"cats": [
-				19
+				"19"
 			],
 			"headers": {
 				"Set-Cookie": "OpenGrok"
@@ -5420,20 +5512,20 @@
 			"meta": {
 				"generator": "OpenGrok(?: v?([\\d.]+))?\\;version:\\1"
 			},
-			"website": "hub.opensolaris.org/bin/view/Project+opengrok/WebHome"
+			"website": "http://hub.opensolaris.org/bin/view/Project+opengrok/WebHome"
 		},
 		"OpenLayers": {
 			"cats": [
-				35
+				"35"
 			],
 			"env": "^OpenLayers$",
 			"icon": "OpenLayers.png",
 			"script": "openlayers",
-			"website": "openlayers.org"
+			"website": "http://openlayers.org"
 		},
 		"OpenNemas": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Powered-By": "OpenNemas"
@@ -5442,11 +5534,11 @@
 			"meta": {
 				"generator": "OpenNemas"
 			},
-			"website": "www.opennemas.com"
+			"website": "http://www.opennemas.com"
 		},
 		"OpenResty": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "openresty(?:/([\\d.]+))?\\;version:\\1"
@@ -5456,43 +5548,43 @@
 				"Nginx",
 				"Lua"
 			],
-			"website": "openresty.org"
+			"website": "http://openresty.org"
 		},
 		"OpenSSL": {
 			"cats": [
-				33
+				"33"
 			],
 			"headers": {
 				"Server": "OpenSSL(?:/([\\d.]+[a-z]?))?\\;version:\\1"
 			},
 			"icon": "OpenSSL.png",
-			"website": "openssl.org"
+			"website": "http://openssl.org"
 		},
 		"OpenText Web Solutions": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<!--[^>]+published by Open Text Web Solutions",
 			"icon": "OpenText Web Solutions.png",
 			"implies": "Microsoft ASP.NET",
-			"website": "websolutions.opentext.com"
+			"website": "http://websolutions.opentext.com"
 		},
 		"OpenX": {
 			"cats": [
-				36
+				"36"
 			],
 			"icon": "OpenX.png",
 			"script": [
 				"https?://[^/]*\\.openx\\.net",
 				"https?://[^/]*\\.servedbyopenx\\.com"
 			],
-			"website": "openx.com"
+			"website": "http://openx.com"
 		},
 		"Ophal": {
 			"cats": [
-				1,
-				11,
-				18
+				"1",
+				"11",
+				"18"
 			],
 			"headers": {
 				"X-Powered-By": "Ophal(?: (.*))? \\(ophal\\.org\\)\\;version:\\1"
@@ -5503,163 +5595,163 @@
 				"generator": "Ophal(?: (.*))? \\(ophal\\.org\\)\\;version:\\1"
 			},
 			"script": "ophal\\.js",
-			"website": "ophal.org"
+			"website": "http://ophal.org"
 		},
 		"Optimizely": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^optimizely$",
 			"icon": "Optimizely.png",
 			"script": "optimizely\\.com.*\\.js",
-			"website": "optimizely.com"
+			"website": "http://optimizely.com"
 		},
 		"Oracle Application Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Oracle[- ]Application[- ]Server(?: Containers for J2EE)?(?:[- ](\\d[\\da-z./]+))?\\;version:\\1"
 			},
 			"icon": "Oracle.png",
-			"website": "www.oracle.com/technetwork/middleware/ias/overview/index.html"
+			"website": "http://www.oracle.com/technetwork/middleware/ias/overview/index.html"
 		},
 		"Oracle Commerce": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"X-ATG-Version": "(?:ATGPlatform/([\\d.]+))?\\;version:\\1"
 			},
 			"html": "<[^>]+_dyncharset",
 			"icon": "Oracle.png",
-			"website": "www.oracle.com/applications/customer-experience/commerce/products/commerce-platform/index.html"
+			"website": "http://www.oracle.com/applications/customer-experience/commerce/products/commerce-platform/index.html"
 		},
 		"Oracle Commerce Cloud": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"OracleCommerceCloud-Version": "(.*)\\;version:\\1"
 			},
 			"html": "<[^>]+id=\"oracle-cc\"",
 			"icon": "Oracle.png",
-			"website": "cloud.oracle.com/commerce-cloud"
+			"website": "http://cloud.oracle.com/commerce-cloud"
 		},
 		"Oracle Dynamic Monitoring Service": {
 			"cats": [
-				19
+				"19"
 			],
 			"headers": {
 				"x-oracle-dms-ecid": ""
 			},
 			"icon": "Oracle.png",
-			"website": "oracle.com"
+			"website": "http://oracle.com"
 		},
 		"Oracle HTTP Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Oracle-HTTP-Server(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Oracle.png",
-			"website": "oracle.com"
+			"website": "http://oracle.com"
 		},
 		"Oracle Recommendations On Demand": {
 			"cats": [
-				10
+				"10"
 			],
 			"icon": "Oracle.png",
 			"script": "atgsvcs.+atgsvcs\\.js",
-			"website": "www.oracle.com/us/products/applications/commerce/recommendations-on-demand/index.html"
+			"website": "http://www.oracle.com/us/products/applications/commerce/recommendations-on-demand/index.html"
 		},
 		"Oracle Web Cache": {
 			"cats": [
-				23
+				"23"
 			],
 			"headers": {
 				"Server": "Oracle(?:AS)?[- ]Web[- ]Cache(?:[- /]([\\da-z./]+))?\\;version:\\1"
 			},
 			"icon": "Oracle.png",
-			"website": "oracle.com"
+			"website": "http://oracle.com"
 		},
 		"Orchard CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Orchard CMS.png",
 			"implies": "Microsoft ASP.NET",
 			"meta": {
 				"generator": "Orchard"
 			},
-			"website": "orchardproject.net"
+			"website": "http://orchardproject.net"
 		},
 		"Outbrain": {
 			"cats": [
-				5
+				"5"
 			],
 			"env": "^(?:OutbrainPermaLink|OB_releaseVer)$",
 			"icon": "Outbrain.png",
 			"script": "widgets\\.outbrain\\.com/outbrain\\.js",
-			"website": "outbrain.com"
+			"website": "http://outbrain.com"
 		},
 		"Outlook Web App": {
 			"cats": [
-				30
+				"30"
 			],
-			"env": "^(?:(?:g_f)?Owa|IsOwaPremiumBrowser)$",
+			"env": "^IsOwaPremiumBrowser$",
 			"html": "<link\\s[^>]*href=\"[^\"]*?([\\d.]+)/themes/resources/owafont\\.css\\;version:\\1",
 			"icon": "Outlook Web App.png",
 			"implies": "Microsoft ASP.NET",
 			"url": "/owa/auth/log(?:on|off)\\.aspx",
-			"website": "help.outlook.com"
+			"website": "http://help.outlook.com"
 		},
 		"PANSITE": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "PANSITE.png",
 			"meta": {
 				"generator": "PANSITE"
 			},
-			"website": "panvision.de/Produkte/Content_Management/index.asp"
+			"website": "http://panvision.de/Produkte/Content_Management/index.asp"
 		},
 		"PDF.js": {
 			"cats": [
-				19
+				"19"
 			],
 			"env": "^PDFJS$",
 			"html": "<\\/div>\\s*<!-- outerContainer -->\\s*<div\\s*id=\"printContainer\"><\\/div>",
 			"icon": "PDF.js.svg",
 			"url": "/web/viewer\\.html?file=[^&]\\.pdf",
-			"website": "mozilla.github.io/pdf.js/"
+			"website": "http://mozilla.github.io/pdf.js/"
 		},
 		"PHP": {
 			"cats": [
-				27
+				"27"
 			],
 			"headers": {
-				"Server": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1",
+				"Server": "php/?([\\d.]+)?\\;version:\\1",
 				"Set-Cookie": "PHPSESSID",
-				"X-Powered-By": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1"
+				"X-Powered-By": "php/?([\\d.]+)?\\;version:\\1"
 			},
 			"icon": "PHP.png",
 			"url": "\\.php(?:$|\\?)",
-			"website": "php.net"
+			"website": "http://php.net"
 		},
 		"PHP-Fusion": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "Powered by <a href=\"[^>]+php-fusion",
 			"icon": "PHP-Fusion.png",
 			"implies": "PHP",
-			"website": "www.php-fusion.co.uk"
+			"website": "http://www.php-fusion.co.uk"
 		},
 		"PHP-Nuke": {
 			"cats": [
-				2
+				"1"
 			],
 			"html": "<[^>]+Powered by PHP-Nuke",
 			"icon": "PHP-Nuke.png",
@@ -5667,114 +5759,114 @@
 			"meta": {
 				"generator": "PHP-Nuke"
 			},
-			"website": "phpnuke.org"
+			"website": "http://phpnuke.org"
 		},
 		"Pagekit": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Pagekit.png",
 			"meta": {
 				"generator": "Pagekit"
 			},
-			"website": "pagekit.com"
+			"website": "http://pagekit.com"
 		},
 		"Pardot": {
 			"cats": [
-				32
+				"32"
 			],
 			"env": "^pi(?:Tracker|Hostname|Protocol|CId|AId)$",
-			"icon": "Pardot.png",
 			"headers": {
 				"X-Pardot-LB": "",
 				"X-Pardot-Route": "",
 				"X-Pardot-Rsp": ""
 			},
-			"website": "pardot.com"
+			"icon": "Pardot.png",
+			"website": "http://pardot.com"
 		},
 		"Parse.ly": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^PARSELY$",
 			"icon": "Parse.ly.png",
-			"website": "parse.ly"
+			"website": "http://parse.ly"
 		},
 		"Paths.js": {
 			"cats": [
-				25
+				"25"
 			],
-			"icon": "default.png",
+			"icon": "default.svg",
 			"script": "paths(?:\\.min)?\\.js",
-			"website": "github.com/andreaferretti/paths-js"
+			"website": "http://github.com/andreaferretti/paths-js"
 		},
 		"PayPal": {
 			"cats": [
-				41
+				"41"
 			],
 			"env": "^PAYPAL$",
 			"html": "<input[^>]+_s-xclick",
 			"icon": "PayPal.png",
 			"script": "paypalobjects\\.com/js",
-			"website": "paypal.com"
+			"website": "http://paypal.com"
 		},
 		"PencilBlue": {
 			"cats": [
-				1,
-				11
+				"1",
+				"11"
 			],
 			"headers": {
 				"X-Powered-By": "PencilBlue"
 			},
 			"icon": "PencilBlue.png",
 			"implies": "Node.js",
-			"website": "pencilblue.org"
+			"website": "http://pencilblue.org"
 		},
 		"Penguin": {
 			"cats": [
-				18
+				"18"
 			],
 			"env": "^penguin$",
 			"html": "<link[^>]+?href=\"[^\"]+penguin(?:\\.min)?\\.css",
 			"icon": "Penguin.svg",
 			"script": "penguin(?:\\.min)?\\.js",
-			"website": "penguin.docs.bqws.io"
+			"website": "http://penguin.docs.bqws.io"
 		},
 		"Percussion": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<[^>]+class=\"perc-region\"",
 			"icon": "Percussion.png",
 			"meta": {
 				"generator": "(?:Percussion|Rhythmyx)"
 			},
-			"website": "percussion.com"
+			"website": "http://percussion.com"
 		},
 		"PerfSONAR-PS": {
 			"cats": [
-				19
+				"19"
 			],
 			"headers": {
 				"User-agent": "perfSONAR-PS/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "PerfSONAR-PS.png",
-			"website": "psps.perfsonar.net"
+			"website": "http://psps.perfsonar.net"
 		},
 		"Perl": {
 			"cats": [
-				27
+				"27"
 			],
 			"headers": {
 				"Server": "\bPerl\b(?: ?/?v?([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Perl.png",
 			"url": "\\.pl(?:$|\\?)",
-			"website": "perl.org"
+			"website": "http://perl.org"
 		},
 		"Petrojs": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^petrojs$",
 			"icon": "Petrojs.png",
@@ -5782,12 +5874,12 @@
 				"petrojs(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
 				"(?:/([\\d.]+)/)?petrojs(?:\\.min)?\\.js\\;version:\\1"
 			],
-			"website": "petrojs.thepetronics.com"
+			"website": "http://petrojs.thepetronics.com"
 		},
 		"Phabricator": {
 			"cats": [
-				13,
-				47
+				"13",
+				"47"
 			],
 			"headers": {
 				"Set-Cookie": "phsid="
@@ -5798,61 +5890,61 @@
 				"PHP"
 			],
 			"script": "/phabricator/[a-f0-9]{8}/rsrc/js/phui/[a-z-]+\\.js$",
-			"website": "phacility.com"
+			"website": "http://phacility.com"
 		},
 		"Phaser": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "Phaser",
 			"icon": "Phaser.png",
-			"website": "phaser.io"
+			"website": "http://phaser.io"
 		},
 		"Phusion Passenger": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"X-Powered-By": "^Phusion Passenger"
 			},
 			"icon": "Phusion Passenger.png",
-			"website": "phusionpassenger.com"
+			"website": "http://phusionpassenger.com"
 		},
 		"Piano Solo": {
 			"cats": [
-				43
+				"43"
 			],
 			"env": "^PianoMedia$",
 			"headers": {
 				"Set-Cookie": "pianovisitkey"
 			},
 			"icon": "Piano Solo.png",
-			"website": "www.pianomedia.com/products"
+			"website": "http://www.pianomedia.com/products"
 		},
 		"Pimcore": {
 			"cats": [
-				1,
-				6,
-				18
+				"1",
+				"6",
+				"18"
 			],
 			"headers": {
 				"X-Powered-By": "pimcore"
 			},
 			"icon": "pimcore.svg",
 			"implies": "PHP",
-			"website": "pimcore.org"
+			"website": "http://pimcore.org"
 		},
 		"Pinterest": {
 			"cats": [
-				5
+				"5"
 			],
 			"icon": "Pinterest.svg",
 			"script": "//assets\\.pinterest\\.com/js/pinit\\.js",
-			"website": "pinterest.com"
+			"website": "http://pinterest.com"
 		},
 		"Piwik": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": [
 				"^Piwik$",
@@ -5868,31 +5960,31 @@
 				"google-play-app": "app-id=org\\.piwik\\.mobile2"
 			},
 			"script": "piwik\\.js|piwik\\.php",
-			"website": "piwik.org"
+			"website": "http://piwik.org"
 		},
 		"Planet": {
 			"cats": [
-				49
+				"49"
 			],
 			"icon": "Planet.png",
 			"meta": {
 				"generator": "^Planet(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"website": "planetplanet.org"
+			"website": "http://planetplanet.org"
 		},
 		"Plentymarkets": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "Plentymarkets.png",
 			"meta": {
 				"generator": "plentymarkets"
 			},
-			"website": "plentymarkets.eu"
+			"website": "http://plentymarkets.eu"
 		},
 		"Plesk": {
 			"cats": [
-				9
+				"9"
 			],
 			"headers": {
 				"X-Powered-By": "PleskLin",
@@ -5900,11 +5992,11 @@
 			},
 			"icon": "Plesk.png",
 			"script": "common\\.js\\?plesk",
-			"website": "plesk.com"
+			"website": "http://plesk.com"
 		},
 		"Pligg": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^pligg_",
 			"html": "<span[^>]+id=\"xvotes-0",
@@ -5912,95 +6004,95 @@
 			"meta": {
 				"generator": "Pligg"
 			},
-			"website": "pligg.com"
+			"website": "http://pligg.com"
 		},
 		"Plone": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Plone.png",
 			"implies": "Python",
 			"meta": {
 				"generator": "Plone"
 			},
-			"website": "plone.org"
+			"website": "http://plone.org"
 		},
 		"Plotly": {
 			"cats": [
-				25
+				"25"
 			],
+			"env": "Plotly",
 			"icon": "Plotly.png",
 			"implies": "D3",
-			"env": "Plotly",
 			"script": "https?://cdn\\.plot\\.ly/plotly",
-			"website": "plot.ly/javascript/"
+			"website": "http://plot.ly/javascript/"
 		},
 		"Plura": {
 			"cats": [
-				19
+				"19"
 			],
 			"html": "<iframe src=\"[^>]+pluraserver\\.com",
 			"icon": "Plura.png",
-			"website": "www.pluraprocessing.com"
+			"website": "http://www.pluraprocessing.com"
 		},
 		"Po.st": {
 			"cats": [
-				5
+				"5"
 			],
 			"env": "^pwidget_config$",
 			"icon": "Po.st.png",
-			"website": "www.po.st/"
+			"website": "http://www.po.st/"
 		},
 		"Polymer": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Polymer$",
 			"html": "(?:<polymer-[^>]+|<link[^>]+rel=\"import\"[^>]+/polymer\\.html\")",
 			"icon": "Polymer.png",
 			"script": "polymer\\.js",
-			"website": "polymer-project.org"
+			"website": "http://polymer-project.org"
 		},
 		"Posterous": {
 			"cats": [
-				1,
-				11
+				"1",
+				"11"
 			],
 			"env": "^Posterous",
 			"html": "<div class=\"posterous",
 			"icon": "Posterous.png",
-			"website": "posterous.com"
+			"website": "http://posterous.com"
 		},
 		"PostgreSQL": {
 			"cats": [
-				34
+				"34"
 			],
 			"icon": "PostgreSQL.png",
-			"website": "www.postgresql.org/"
+			"website": "http://www.postgresql.org/"
 		},
 		"Powergap": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": [
 				"<a[^>]+title=\"POWERGAP",
 				"<input type=\"hidden\" name=\"shopid\""
 			],
 			"icon": "Powergap.png",
-			"website": "powergap.de"
+			"website": "http://powergap.de"
 		},
 		"Prefix-Free": {
 			"cats": [
-				19
+				"19"
 			],
 			"env": "^PrefixFree$",
 			"icon": "Prefix-Free.png",
 			"script": "prefixfree\\.js",
-			"website": "leaverou.github.io/prefixfree/"
+			"website": "http://leaverou.github.io/prefixfree/"
 		},
 		"PrestaShop": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": [
 				"^freeProductTranslation$\\;confidence:25",
@@ -6018,49 +6110,49 @@
 			"meta": {
 				"generator": "PrestaShop"
 			},
-			"website": "www.prestashop.com"
+			"website": "http://www.prestashop.com"
 		},
 		"Project Wonderful": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^pw_adloader$",
 			"html": "<div[^>]+id=\"pw_adbox_",
 			"icon": "Project Wonderful.png",
 			"script": "^https?://(?:www\\.)?projectwonderful\\.com/(?:pwa\\.js|gen\\.php)",
-			"website": "projectwonderful.com"
+			"website": "http://projectwonderful.com"
 		},
 		"Prospector": {
 			"cats": [
-				36
+				"36"
 			],
 			"html": "<[^>]+data-name=['\"]prospectscript",
 			"icon": "Prospector.png",
 			"script": "processprospector\\.js",
-			"website": "prospector.io"
+			"website": "http://prospector.io"
 		},
 		"Prototype": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Prototype$",
 			"icon": "Prototype.png",
 			"script": "(?:prototype|protoaculous)(?:-([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
-			"website": "www.prototypejs.org"
+			"website": "http://www.prototypejs.org"
 		},
 		"Protovis": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^protovis$",
-			"icon": "default.png",
+			"icon": "default.svg",
 			"script": "protovis.*\\.js",
-			"website": "mbostock.github.com/protovis"
+			"website": "http://mbostock.github.com/protovis"
 		},
 		"Proximis Omnichannel": {
 			"cats": [
-				6,
-				1
+				"6",
+				"1"
 			],
 			"env": "^__change$",
 			"html": "<html[^>]+data-ng-app=\"RbsChangeApp\"",
@@ -6072,19 +6164,19 @@
 			"meta": {
 				"generator": "Proximis Omnichannel"
 			},
-			"website": "www.proximis.com"
+			"website": "http://www.proximis.com"
 		},
 		"PubMatic": {
 			"cats": [
-				36
+				"36"
 			],
 			"icon": "PubMatic.png",
 			"script": "https?://[^/]*\\.pubmatic\\.com",
-			"website": "www.pubmatic.com/"
+			"website": "http://www.pubmatic.com/"
 		},
 		"Public CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "PUBLICCMS_USER",
@@ -6092,27 +6184,27 @@
 			},
 			"icon": "Public CMS.png",
 			"implies": "Java",
-			"website": "www.publiccms.com"
+			"website": "http://www.publiccms.com"
 		},
 		"Pure CSS": {
 			"cats": [
-				18
+				"18"
 			],
 			"html": "<link[^>]+(?:([\\d.])+/)?pure(?:-min)?\\.css\\;version:\\1",
 			"icon": "Pure CSS.png",
-			"website": "purecss.io"
+			"website": "http://purecss.io"
 		},
 		"Pygments": {
 			"cats": [
-				19
+				"19"
 			],
 			"html": "<link[^>]+pygments.css[\"']",
 			"icon": "pygments.png",
-			"website": "pygments.org"
+			"website": "http://pygments.org"
 		},
 		"PyroCMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "pyrocms",
@@ -6120,81 +6212,81 @@
 			},
 			"icon": "PyroCMS.png",
 			"implies": "Laravel",
-			"website": "pyrocms.com"
+			"website": "http://pyrocms.com"
 		},
 		"Python": {
 			"cats": [
-				27
+				"27"
 			],
 			"headers": {
 				"Server": "(?:^|\\s)Python(?:/([\\d.]+))?\\;confidence:50\\;version:\\1"
 			},
 			"icon": "Python.png",
-			"website": "python.org"
+			"website": "http://python.org"
 		},
 		"Quantcast": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^quantserve$",
 			"icon": "Quantcast.png",
 			"script": "edge\\.quantserve\\.com/quant\\.js",
-			"website": "www.quantcast.com"
+			"website": "http://www.quantcast.com"
 		},
 		"Question2Answer": {
 			"cats": [
-				15
+				"15"
 			],
 			"html": "<!-- Powered by Question2Answer",
 			"icon": "question2answer.png",
 			"implies": "PHP",
 			"script": "\\./qa-content/qa-page\\.js\\?([0-9.]+)\\;version:\\1",
-			"website": "www.question2answer.org"
+			"website": "http://www.question2answer.org"
 		},
 		"Quick.CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<a href=\"[^>]+opensolution\\.org/\">CMS by",
 			"icon": "Quick.CMS.png",
 			"meta": {
 				"generator": "Quick\\.CMS(?: v([\\d.]+))?\\;version:\\1"
 			},
-			"website": "opensolution.org"
+			"website": "http://opensolution.org"
 		},
 		"Quick.Cart": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "<a href=\"[^>]+opensolution\\.org/\">(?:Shopping cart by|Sklep internetowy)",
 			"icon": "Quick.Cart.png",
 			"meta": {
 				"generator": "Quick\\.Cart(?: v([\\d.]+))?\\;version:\\1"
 			},
-			"website": "opensolution.org"
+			"website": "http://opensolution.org"
 		},
 		"Quill": {
 			"cats": [
-				24
+				"24"
 			],
 			"env": "^Quill$",
 			"icon": "Quill.png",
-			"website": "quilljs.com"
+			"website": "http://quilljs.com"
 		},
 		"RAID HTTPServer": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "RAID HTTPServer(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"RBS Change": {
 			"cats": [
-				1,
-				6
+				"1",
+				"6"
 			],
 			"html": "<html[^>]+xmlns:change=",
 			"icon": "RBS Change.png",
@@ -6202,30 +6294,30 @@
 			"meta": {
 				"generator": "RBS Change"
 			},
-			"website": "www.rbschange.fr"
+			"website": "http://www.rbschange.fr"
 		},
 		"RCMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "RCMS.png",
 			"meta": {
 				"generator": "^(?:RCMS|ReallyCMS)"
 			},
-			"website": "www.rcms.fi"
+			"website": "http://www.rcms.fi"
 		},
 		"RD Station": {
 			"cats": [
-				32
+				"32"
 			],
 			"env": "^RDStation$",
 			"icon": "RD Station.png",
 			"script": "d335luupugsy2\\.cloudfront\\.net/js/loader-scripts/.*-loader\\.js",
-			"website": "rdstation.com.br"
+			"website": "http://rdstation.com.br"
 		},
 		"RDoc": {
 			"cats": [
-				4
+				"4"
 			],
 			"html": [
 				"<link[^>]+href=\"[^\"]*rdoc-style\\.css",
@@ -6233,22 +6325,22 @@
 			],
 			"icon": "RDoc.png",
 			"implies": "Ruby",
-			"website": "github.com/RDoc/RDoc"
+			"website": "http://github.com/RDoc/RDoc"
 		},
 		"RackCache": {
 			"cats": [
-				23
+				"23"
 			],
 			"headers": {
 				"X-Rack-Cache": ""
 			},
 			"icon": "RackCache.png",
 			"implies": "Ruby",
-			"website": "github.com/rtomayko/rack-cache"
+			"website": "http://github.com/rtomayko/rack-cache"
 		},
 		"RainLoop": {
 			"cats": [
-				30
+				"30"
 			],
 			"env": "^rainloop",
 			"headers": {
@@ -6261,49 +6353,49 @@
 			"icon": "RainLoop.png",
 			"implies": "PHP",
 			"script": "rainloop/v/([^/]+)\\;version:\\1",
-			"website": "rainloop.net"
+			"website": "http://rainloop.net"
 		},
 		"Rakuten DBCore": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "Rakuten DBCore.png",
 			"meta": {
 				"generator": "Rakuten DBCore",
 				"generator:site": "http://ecservice.rakuten.com.br"
 			},
-			"website": "ecservice.rakuten.com.br"
+			"website": "http://ecservice.rakuten.com.br"
 		},
 		"Ramda": {
 			"cats": [
-				12
+				"12"
 			],
 			"icon": "Ramda.png",
 			"script": "ramda.*\\.js",
-			"website": "ramdajs.com"
+			"website": "http://ramdajs.com"
 		},
 		"Raphael": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^Raphael$",
 			"icon": "Raphael.png",
 			"script": "raphael.*\\.js",
-			"website": "raphaeljs.com"
+			"website": "http://raphaeljs.com"
 		},
 		"Rapid Logic": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Rapid Logic(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"React": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^React$",
 			"html": "<[^>]+data-react",
@@ -6313,33 +6405,33 @@
 				"/([\\d.]+)/react(?:\\.min)?\\.js\\;version:\\1",
 				"react.*\\.js"
 			],
-			"website": "facebook.github.io/react"
+			"website": "http://facebook.github.io/react"
 		},
 		"Red Hat": {
 			"cats": [
-				28
+				"28"
 			],
 			"headers": {
 				"Server": "Red Hat",
 				"X-Powered-By": "Red Hat"
 			},
 			"icon": "Red Hat.png",
-			"website": "redhat.com"
+			"website": "http://redhat.com"
 		},
 		"Reddit": {
 			"cats": [
-				2
+				"2"
 			],
 			"env": "^reddit$",
 			"html": "(?:<a[^>]+Powered by Reddit|powered by <a[^>]+>reddit<)",
 			"icon": "Reddit.png",
 			"implies": "Python",
 			"url": "^(?:www\\.)?reddit\\.com",
-			"website": "code.reddit.com"
+			"website": "http://code.reddit.com"
 		},
 		"Redmine": {
 			"cats": [
-				13
+				"13"
 			],
 			"html": "Powered by <a href=\"[^>]+Redmine",
 			"icon": "Redmine.png",
@@ -6347,87 +6439,87 @@
 			"meta": {
 				"description": "Redmine"
 			},
-			"website": "www.redmine.org"
+			"website": "http://www.redmine.org"
 		},
 		"Reinvigorate": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^reinvigorate$",
 			"icon": "Reinvigorate.png",
-			"website": "www.reinvigorate.net"
+			"website": "http://www.reinvigorate.net"
 		},
 		"RequireJS": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^requirejs$",
 			"icon": "RequireJS.png",
 			"script": "require.*\\.js",
-			"website": "requirejs.org"
+			"website": "http://requirejs.org"
 		},
 		"Resin": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "^Resin(?:/(\\S*))?\\;version:\\1"
 			},
 			"icon": "Resin.png",
 			"implies": "Java",
-			"website": "caucho.com"
+			"website": "http://caucho.com"
 		},
 		"Reveal.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Reveal$",
 			"icon": "Reveal.js.png",
 			"script": "reveal(?:\\.min)?\\.js",
-			"website": "lab.hakim.se/reveal-js"
+			"website": "http://lab.hakim.se/reveal-js"
 		},
 		"Revel": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"Set-Cookie": "^REVEL_(?:FLASH|SESSION)="
 			},
 			"icon": "Revel.png",
 			"implies": "Go",
-			"website": "revel.github.io"
+			"website": "http://revel.github.io"
 		},
 		"Rickshaw": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^Rickshaw$",
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "D3",
 			"script": "rickshaw(?:\\.min)?\\.js",
-			"website": "code.shutterstock.com/rickshaw/"
+			"website": "http://code.shutterstock.com/rickshaw/"
 		},
 		"RightJS": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^RightJS$",
 			"icon": "RightJS.png",
 			"script": "right\\.js",
-			"website": "rightjs.org"
+			"website": "http://rightjs.org"
 		},
 		"Riot": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^riot$",
 			"icon": "Riot.png",
 			"script": "riot(?:\\+compiler)?(?:\\.min)?\\.js",
-			"website": "muut.com/riotjs"
+			"website": "http://muut.com/riotjs"
 		},
 		"RiteCMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "RiteCMS.png",
 			"implies": [
@@ -6437,13 +6529,16 @@
 			"meta": {
 				"generator": "^RiteCMS(?: (.+))?\\;version:\\1"
 			},
-			"website": "ritecms.com"
+			"website": "http://ritecms.com"
 		},
 		"Roadiz CMS": {
 			"cats": [
-				1,
-				11
+				"1",
+				"11"
 			],
+			"headers": {
+				"X-Powered-By": "Roadiz CMS"
+			},
 			"icon": "Roadiz CMS.png",
 			"implies": [
 				"PHP",
@@ -6452,14 +6547,11 @@
 			"meta": {
 				"generator": "^Roadiz ([a-z0-9\\s\\.]+) - \\;version:\\1"
 			},
-			"headers": {
-				"X-Powered-By": "Roadiz CMS"
-			},
-			"website": "www.roadiz.io"
+			"website": "http://www.roadiz.io"
 		},
 		"Robin": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": [
 				"_robin_getRobinJs",
@@ -6467,13 +6559,13 @@
 				"robin_storage_settings"
 			],
 			"icon": "Robin.png",
-			"website": "www.robinhq.com"
+			"website": "http://www.robinhq.com"
 		},
 		"RockRMS": {
 			"cats": [
-				1,
-				11,
-				32
+				"1",
+				"11",
+				"32"
 			],
 			"icon": "RockRMS.svg",
 			"implies": [
@@ -6484,39 +6576,39 @@
 			"meta": {
 				"generator": "^Rock v.*"
 			},
-			"website": "www.rockrms.com"
+			"website": "http://www.rockrms.com"
 		},
 		"RoundCube": {
 			"cats": [
-				30
+				"30"
 			],
 			"env": "^(?:rcmail|rcube_|roundcube)",
 			"html": "<title>RoundCube",
 			"icon": "RoundCube.png",
 			"implies": "PHP",
-			"website": "roundcube.net"
+			"website": "http://roundcube.net"
 		},
 		"Rubicon Project": {
 			"cats": [
-				36
+				"36"
 			],
 			"icon": "Rubicon Project.png",
 			"script": "https?://[^/]*\\.rubiconproject\\.com",
-			"website": "rubiconproject.com/"
+			"website": "http://rubiconproject.com/"
 		},
 		"Ruby": {
 			"cats": [
-				27
+				"27"
 			],
 			"headers": {
 				"Server": "(?:Mongrel|WEBrick|Ruby)"
 			},
 			"icon": "Ruby.png",
-			"website": "ruby-lang.org"
+			"website": "http://ruby-lang.org"
 		},
 		"Ruby on Rails": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"Server": "(?:mod_rails|mod_rack|Phusion(?:\\.|_)Passenger)\\;confidence:50",
@@ -6528,96 +6620,96 @@
 				"csrf-param": "authenticity_token\\;confidence:50"
 			},
 			"script": "/assets/application-[a-z\\d]{32}/\\.js\\;confidence:50",
-			"website": "rubyonrails.org"
+			"website": "http://rubyonrails.org"
 		},
 		"Ruxit": {
 			"cats": [
-				10
+				"10"
 			],
 			"icon": "Ruxit.png",
 			"script": "ruxitagentjs",
-			"website": "ruxit.com"
+			"website": "http://ruxit.com"
 		},
 		"RxJS": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Rx$\\;confidence:20",
 			"icon": "RxJS.png",
 			"script": "rx(?:\\.\\w+)?(?:\\.compat)?(?:\\.min)?\\.js",
-			"website": "reactivex.io"
+			"website": "http://reactivex.io"
 		},
 		"S.Builder": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "S.Builder.png",
 			"meta": {
 				"generator": "S\\.Builder"
 			},
-			"website": "www.sbuilder.ru"
+			"website": "http://www.sbuilder.ru"
 		},
 		"SAP": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "SAP NetWeaver Application Server"
 			},
 			"icon": "SAP.png",
-			"website": "sap.com"
+			"website": "http://sap.com"
 		},
 		"SDL Tridion": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<img[^>]+_tcm\\d{2,3}-\\d{6}\\.",
 			"icon": "SDL Tridion.png",
-			"website": "www.sdl.com/products/tridion"
+			"website": "http://www.sdl.com/products/tridion"
 		},
 		"SIMsite": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "SIMsite.png",
 			"meta": {
 				"SIM.medium": ""
 			},
 			"script": "/sim(?:site|core)/js",
-			"website": "simgroep.nl/internet/portfolio-contentbeheer_41623/"
+			"website": "http://simgroep.nl/internet/portfolio-contentbeheer_41623/"
 		},
 		"SMF": {
 			"cats": [
-				2
+				"2"
 			],
 			"env": "^smf_",
 			"icon": "SMF.png",
 			"implies": "PHP",
-			"website": "www.simplemachines.org"
+			"website": "http://www.simplemachines.org"
 		},
 		"SOBI 2": {
 			"cats": [
-				19
+				"19"
 			],
 			"html": "(?:<!-- start of Sigsiu Online Business Index|<div[^>]* class=\"sobi2)",
 			"icon": "SOBI 2.png",
 			"implies": "Joomla",
-			"website": "www.sigsiu.net/sobi2.html"
+			"website": "http://www.sigsiu.net/sobi2.html"
 		},
 		"SPDY": {
 			"cats": [
-				19
+				"19"
 			],
 			"excludes": "HTTP/2",
 			"headers": {
 				"X-Firefox-Spdy": "\\d\\.\\d"
 			},
 			"icon": "SPDY.png",
-			"website": "chromium.org/spdy"
+			"website": "http://chromium.org/spdy"
 		},
 		"SPIP": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Spip-Cache": ""
@@ -6627,140 +6719,137 @@
 			"meta": {
 				"generator": "(?:^|\\s)SPIP(?:\\s([\\d.]+(?:\\s\\[\\d+\\])?))?\\;version:\\1"
 			},
-			"website": "www.spip.net"
+			"website": "http://www.spip.net"
 		},
 		"SQL Buddy": {
 			"cats": [
-				3
+				"3"
 			],
-			"implies": "PHP",
 			"html": "(?:<title>SQL Buddy</title>|<[^>]+onclick=\"sideMainClick\\(\"home\\.php)",
 			"icon": "SQL Buddy.png",
-			"website": "www.sqlbuddy.com"
+			"implies": "PHP",
+			"website": "http://www.sqlbuddy.com"
 		},
 		"SQLite": {
 			"cats": [
-				34
+				"34"
 			],
 			"icon": "SQLite.png",
-			"website": "www.sqlite.org"
+			"website": "http://www.sqlite.org"
 		},
 		"SUSE": {
 			"cats": [
-				28
+				"28"
 			],
 			"headers": {
 				"Server": "SUSE(?:/?\\s?-?([\\d.]+))?\\;version:\\1",
 				"X-Powered-By": "SUSE(?:/?\\s?-?([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "SUSE.png",
-			"website": "suse.com"
+			"website": "http://suse.com"
 		},
 		"SWFObject": {
 			"cats": [
-				19
+				"19"
 			],
 			"env": "^SWFObject$",
 			"icon": "SWFObject.png",
 			"script": "swfobject.*\\.js",
-			"website": "github.com/swfobject/swfobject"
+			"website": "http://github.com/swfobject/swfobject"
 		},
 		"Saia PCD": {
 			"cats": [
-				45
+				"45"
 			],
 			"headers": {
 				"Server": "Saia PCD(?:([/a-z\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Saia PCD.png",
-			"website": "saia-pcd.com"
+			"website": "http://saia-pcd.com"
 		},
 		"Sails.js": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"Set-Cookie": "^sails\\.sid$",
 				"X-Powered-By": "^Sails$"
 			},
 			"icon": "Sails.js.svg",
-			"implies": [
-				"Node.js",
-				"Express"
-			],
-			"website": "sailsjs.org"
+			"implies": "Express",
+			"website": "http://sailsjs.org"
 		},
 		"Sarka-SPIP": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Sarka-SPIP.png",
 			"implies": "SPIP",
 			"meta": {
 				"generator": "Sarka-SPIP(?:\\s([\\d.]+))?\\;version:\\1"
 			},
-			"website": "sarka-spip.net"
+			"website": "http://sarka-spip.net"
 		},
 		"Scala": {
 			"cats": [
-				27
+				"27"
 			],
 			"icon": "Scala.png",
-			"website": "www.scala-lang.org"
+			"website": "http://www.scala-lang.org"
 		},
 		"Schneider": {
 			"cats": [
-				45
+				"45"
 			],
 			"icon": "Schneider.png",
-			"website": "schneider-electric.com"
+			"website": "http://schneider-electric.com"
 		},
 		"Schneider Web Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Schneider-WEB(?:/V?([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "Schneider Web Server.png",
+			"icon": "Schneider.png",
 			"implies": [
 				"Schneider"
 			],
-			"website": "schneider-electric.com"
+			"website": "http://schneider-electric.com"
 		},
 		"Scientific Linux": {
 			"cats": [
-				28
+				"28"
 			],
 			"headers": {
 				"Server": "Scientific Linux",
 				"X-Powered-By": "Scientific Linux"
 			},
 			"icon": "Scientific Linux.png",
-			"website": "scientificlinux.org"
+			"website": "http://scientificlinux.org"
 		},
 		"Segment": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^analytics$",
 			"html": "<script[\\s\\S]*cdn\\.segment\\.com/analytics.js[\\s\\S]*script>",
 			"icon": "Segment.png",
 			"script": "cdn\\.segment\\.com/analytics\\.js",
-			"website": "segment.com"
+			"website": "http://segment.com"
 		},
 		"Select2": {
 			"cats": [
-				12
+				"12"
 			],
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "jQuery",
 			"script": "select2.*\\.js",
-			"website": "select2.github.io"
+			"website": "http://select2.github.io"
 		},
 		"Semantic-ui": {
 			"cats": [
-				18
+				"18"
 			],
 			"html": [
 				"(?:<div class=\"ui\\s[^>]+\">)\\;confidence:30",
@@ -6768,49 +6857,49 @@
 			],
 			"icon": "Semantic-ui.png",
 			"script": "(?:semantic(?:\\.js|\\.min\\.js))",
-			"website": "semantic-ui.com"
+			"website": "http://semantic-ui.com"
 		},
 		"Sencha Touch": {
 			"cats": [
-				12,
-				26
+				"12",
+				"26"
 			],
 			"icon": "Sencha Touch.png",
 			"script": "sencha-touch.*\\.js",
-			"website": "sencha.com/products/touch"
+			"website": "http://sencha.com/products/touch"
 		},
 		"Sentinel Keys Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "SentinelKeysServer\\/?([\\d\\.]+)?\\;version:\\1"
 			},
-			"icon": "Sentinel Keys Server.png",
-			"website": "www.safenet-inc.com/software-monetization/sentinel-rms"
+			"icon": "Sentinel.png",
+			"website": "http://www.safenet-inc.com/software-monetization/sentinel-rms"
 		},
 		"Sentinel License Monitor": {
 			"cats": [
-				19
+				"19"
 			],
 			"html": "<title>Sentinel (?:Keys )?License Monitor</title>",
-			"icon": "Sentinel License Monitor.png",
-			"website": "www.safenet-inc.com/software-monetization/sentinel-rms/"
+			"icon": "Sentinel.png",
+			"website": "http://www.safenet-inc.com/software-monetization/sentinel-rms/"
 		},
 		"Sentinel Protection Server": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "SentinelProtectionServer\\/?([\\d\\.]+)?\\;version:\\1"
 			},
-			"icon": "Sentinel Protection Server.png",
-			"website": "www.safenet-inc.com/software-monetization/sentinel-rms/"
+			"icon": "Sentinel.png",
+			"website": "http://www.safenet-inc.com/software-monetization/sentinel-rms/"
 		},
 		"Serendipity": {
 			"cats": [
-				1,
-				11
+				"1",
+				"11"
 			],
 			"icon": "Serendipity.png",
 			"implies": "PHP",
@@ -6818,62 +6907,62 @@
 				"Powered-By": "Serendipity v\\.(.+)\\;version:\\1",
 				"generator": "Serendipity"
 			},
-			"website": "s9y.org"
+			"website": "http://s9y.org"
 		},
 		"Shadow": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"X-Powered-By": "ShadowFramework"
 			},
 			"icon": "Shadow.png",
 			"implies": "PHP",
-			"website": "shadow-technologies.co.uk"
+			"website": "http://shadow-technologies.co.uk"
 		},
 		"ShareThis": {
 			"cats": [
-				5
+				"5"
 			],
 			"env": "^SHARETHIS$",
 			"icon": "ShareThis.png",
 			"script": "w\\.sharethis\\.com/",
-			"website": "sharethis.com"
+			"website": "http://sharethis.com"
 		},
 		"ShellInABox": {
 			"cats": [
-				46
+				"46"
 			],
+			"env": "^ShellInABox$",
 			"html": [
 				"<title>Shell In A Box</title>",
 				"must be enabled for ShellInABox</noscript>"
 			],
-			"env": "^ShellInABox$",
 			"icon": "ShellInABox.png",
-			"website": "shellinabox.com"
+			"website": "http://shellinabox.com"
 		},
 		"ShinyStat": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^SSsdk$",
 			"html": "<img[^>]*\\s+src=['\"]?https?://www\\.shinystat\\.com/cgi-bin/shinystat\\.cgi\\?[^'\"\\s>]*['\"\\s/>]",
 			"icon": "ShinyStat.png",
 			"script": "^https?://codice(?:business|ssl|pro|isp)?\\.shinystat\\.com/cgi-bin/getcod\\.cgi",
-			"website": "shinystat.com"
+			"website": "http://shinystat.com"
 		},
 		"Shopalize": {
 			"cats": [
-				5,
-				10
+				"5",
+				"10"
 			],
 			"env": "^Shopalize$",
 			"icon": "Shopalize.png",
-			"website": "shopalize.com"
+			"website": "http://shopalize.com"
 		},
 		"Shopatron": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^shptUrl$",
 			"html": [
@@ -6885,11 +6974,11 @@
 				"keywords": "Shopatron"
 			},
 			"script": "mediacdn\\.shopatron\\.com",
-			"website": "ecommerce.shopatron.com"
+			"website": "http://ecommerce.shopatron.com"
 		},
 		"Shopery": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"X-Shopery": ""
@@ -6900,20 +6989,20 @@
 				"Symfony",
 				"Elcodi"
 			],
-			"website": "shopery.com"
+			"website": "http://shopery.com"
 		},
 		"Shopify": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^Shopify$",
 			"html": "<link[^>]+=['\"]//cdn\\.shopify\\.com",
 			"icon": "Shopify.svg",
-			"website": "shopify.com"
+			"website": "http://shopify.com"
 		},
 		"Shoptet": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^shoptet$",
 			"html": "<link [^>]*href=\"https?://cdn\\.myshoptet\\.com/",
@@ -6925,11 +7014,11 @@
 			"script": [
 				"^https?://cdn\\.myshoptet\\.com/"
 			],
-			"website": "www.shoptet.cz"
+			"website": "http://www.shoptet.cz"
 		},
 		"Shopware": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "<title>Shopware ([\\d\\.]+) [^<]+\\;version:\\1",
 			"icon": "Shopware.png",
@@ -6942,318 +7031,318 @@
 				"application-name": "Shopware"
 			},
 			"script": "(?:(shopware)|/web/cache/[0-9]{10}_.+)\\.js\\;version:\\1?4:5",
-			"website": "shopware.com"
+			"website": "http://shopware.com"
 		},
 		"Silva": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Powered-By": "SilvaCMS"
 			},
 			"icon": "Silva.png",
-			"website": "silvacms.org"
+			"website": "http://silvacms.org"
 		},
 		"SilverStripe": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "Powered by <a href=\"[^>]+SilverStripe",
 			"icon": "SilverStripe.svg",
 			"meta": {
 				"generator": "SilverStripe"
 			},
-			"website": "www.silverstripe.org"
+			"website": "http://www.silverstripe.org"
 		},
 		"SimpleHTTP": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "SimpleHTTP(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"Site Meter": {
 			"cats": [
-				10
+				"10"
 			],
 			"icon": "Site Meter.png",
 			"script": "sitemeter\\.com/js/counter\\.js\\?site=",
-			"website": "www.sitemeter.com"
+			"website": "http://www.sitemeter.com"
 		},
 		"SiteCatalyst": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^s_(?:account|objectID|code|INST)$",
 			"icon": "SiteCatalyst.png",
 			"script": "/s[_-]code.*\\.js",
-			"website": "www.adobe.com/solutions/digital-marketing.html"
+			"website": "http://www.adobe.com/solutions/digital-marketing.html"
 		},
 		"SiteEdit": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "SiteEdit.png",
 			"meta": {
 				"generator": "SiteEdit"
 			},
-			"website": "www.siteedit.ru"
+			"website": "http://www.siteedit.ru"
 		},
 		"Sitecore": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-cookie": "SC_ANALYTICS_GLOBAL_COOKIE"
 			},
 			"html": "<img[^>]+src=\"[^>]*/~/media/[^>]+\\.ashx",
 			"icon": "Sitecore.png",
-			"website": "sitecore.net"
+			"website": "http://sitecore.net"
 		},
 		"Sitefinity": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Sitefinity.svg",
 			"implies": "Microsoft ASP.NET",
 			"meta": {
 				"generator": "^Sitefinity (.+)$\\;version:\\1"
 			},
-			"website": "www.sitefinity.com"
+			"website": "http://www.sitefinity.com"
 		},
 		"Sivuviidakko": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Sivuviidakko.png",
 			"meta": {
 				"generator": "Sivuviidakko"
 			},
-			"website": "sivuviidakko.fi"
+			"website": "http://sivuviidakko.fi"
 		},
 		"Sizmek": {
 			"cats": [
-				36
+				"36"
 			],
 			"html": "(?:<a [^>]*href=\"[^/]*//[^/]*serving-sys\\.com/|<img [^>]*src=\"[^/]*//[^/]*serving-sys\\.com/)",
 			"icon": "Sizmek.png",
 			"script": "[^/]*//[^/]*serving-sys\\.com/",
-			"website": "sizmek.com"
+			"website": "http://sizmek.com"
 		},
 		"Slimbox": {
 			"cats": [
-				7,
-				12
+				"7",
+				"12"
 			],
 			"html": "<link [^>]*href=\"[^/]*slimbox(?:-rtl)?\\.css",
 			"icon": "Slimbox.png",
 			"implies": "MooTools",
 			"script": "slimbox\\.js",
-			"website": "www.digitalia.be/software/slimbox"
+			"website": "http://www.digitalia.be/software/slimbox"
 		},
 		"Slimbox 2": {
 			"cats": [
-				7,
-				12
+				"7",
+				"12"
 			],
 			"html": "<link [^>]*href=\"[^/]*slimbox2(?:-rtl)?\\.css",
 			"icon": "Slimbox 2.png",
 			"implies": "jQuery",
 			"script": "slimbox2\\.js",
-			"website": "www.digitalia.be/software/slimbox2"
+			"website": "http://www.digitalia.be/software/slimbox2"
 		},
 		"Smart Ad Server": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^SmartAdServer$",
 			"html": "<img[^>]+smartadserver\\.com\\/call",
 			"icon": "Smart Ad Server.png",
-			"website": "smartadserver.com"
+			"website": "http://smartadserver.com"
 		},
 		"SmartSite": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<[^>]+/smartsite\\.(?:dws|shtml)\\?id=",
 			"icon": "SmartSite.png",
 			"meta": {
 				"author": "Redacteur SmartInstant"
 			},
-			"website": "www.seneca.nl/pub/Smartsite/Smartsite-Smartsite-iXperion"
+			"website": "http://www.seneca.nl/pub/Smartsite/Smartsite-Smartsite-iXperion"
 		},
 		"Smartstore": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "Smartstore.png",
 			"script": "smjslib\\.js",
-			"website": "smartstore.com"
+			"website": "http://smartstore.com"
 		},
 		"Snap": {
 			"cats": [
-				18,
-				22
+				"18",
+				"22"
 			],
 			"headers": {
 				"Server": "Snap/([.\\d]+)\\;version:\\1"
 			},
 			"icon": "Snap.png",
 			"implies": "Haskell",
-			"website": "snapframework.com"
+			"website": "http://snapframework.com"
 		},
 		"Snap.svg": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Snap$",
 			"icon": "Snap.svg.png",
 			"script": "snap\\.svg(?:-min)?\\.js",
-			"website": "snapsvg.io"
+			"website": "http://snapsvg.io"
 		},
 		"Snoobi": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^snoobi$",
 			"icon": "Snoobi.png",
 			"script": "snoobi\\.com/snoop\\.php",
-			"website": "www.snoobi.com"
+			"website": "http://www.snoobi.com"
 		},
 		"SobiPro": {
 			"cats": [
-				19
+				"19"
 			],
 			"env": "^SobiProUrl$",
 			"icon": "SobiPro.png",
 			"implies": "Joomla",
-			"website": "sigsiu.net/sobipro.html"
+			"website": "http://sigsiu.net/sobipro.html"
 		},
 		"Socket.io": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^io$",
 			"icon": "Socket.io.png",
 			"implies": "Node.js",
 			"script": "socket.io.*\\.js",
-			"website": "socket.io"
+			"website": "http://socket.io"
 		},
 		"Solodev": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"solodev_session": ""
 			},
-			"html": "<div class=(?:\"|')dynamicDiv(?:\"|') id=(?:\"|')dd\\.\\d\\.\\d(?:\\.\\d)?(?:\"|')>",
+			"html": "<div class=[\"']dynamicDiv[\"'] id=[\"']dd\\.\\d\\.\\d(?:\\.\\d)?[\"']>",
 			"icon": "Solodev.png",
 			"implies": "PHP",
-			"website": "www.solodev.com"
+			"website": "http://www.solodev.com"
 		},
 		"Solr": {
 			"cats": [
-				34
+				"34"
 			],
 			"icon": "Solr.png",
 			"implies": "Lucene",
-			"website": "lucene.apache.org/solr/"
+			"website": "http://lucene.apache.org/solr/"
 		},
 		"Solve Media": {
 			"cats": [
-				16,
-				36
+				"16",
+				"36"
 			],
 			"env": "^(?:_?ACPuzzle|adcopy-puzzle-image-image$)",
 			"icon": "Solve Media.png",
 			"script": "^https?://api\\.solvemedia\\.com/",
-			"website": "solvemedia.com"
+			"website": "http://solvemedia.com"
 		},
 		"SoundManager": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^(?:SoundManager|BaconPlayer)$",
 			"icon": "SoundManager.png",
-			"website": "www.schillmania.com/projects/soundmanager2"
+			"website": "http://www.schillmania.com/projects/soundmanager2"
 		},
 		"Sphinx": {
 			"cats": [
-				4
+				"4"
 			],
 			"env": "^DOCUMENTATION_OPTIONS$",
 			"icon": "Sphinx.png",
 			"implies": "Python",
-			"website": "sphinx.pocoo.org"
+			"website": "http://sphinx.pocoo.org"
 		},
 		"SpiderControl iniNet": {
 			"cats": [
-				45
+				"45"
 			],
 			"icon": "SpiderControl iniNet.png",
 			"meta": {
 				"generator": "iniNet SpiderControl"
 			},
-			"website": "spidercontrol.net/ininet"
+			"website": "http://spidercontrol.net/ininet"
 		},
 		"Splunk": {
 			"cats": [
-				19
+				"19"
 			],
 			"html": "<p class=\"footer\">&copy; [-\\d]+ Splunk Inc\\.(?: Splunk ([\\d\\.]+(?: build [\\d\\.]*\\d)?))?[^<]*</p>\\;version:\\1",
 			"icon": "Splunk.png",
 			"meta": {
 				"author": "Splunk Inc\\;confidence:50"
 			},
-			"website": "splunk.com"
+			"website": "http://splunk.com"
 		},
 		"Splunkd": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Splunkd"
 			},
-			"icon": "Splunkd.png",
-			"website": "splunk.com"
+			"icon": "Splunk.png",
+			"website": "http://splunk.com"
 		},
 		"Spree": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "(?:<link[^>]*/assets/store/all-[a-z\\d]{32}\\.css[^>]+>|<script>\\s*Spree\\.(?:routes|translations|api_key))",
 			"icon": "Spree.png",
 			"implies": "Ruby on Rails",
-			"website": "spreecommerce.com"
+			"website": "http://spreecommerce.com"
 		},
 		"Squarespace": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^Squarespace",
 			"headers": {
 				"X-ServedBy": "squarespace"
 			},
 			"icon": "Squarespace.png",
-			"website": "www.squarespace.com"
+			"website": "http://www.squarespace.com"
 		},
 		"SquirrelMail": {
 			"cats": [
-				30
+				"30"
 			],
 			"env": "^squirrelmail_loginpage_onload$",
 			"html": "<small>SquirrelMail version ([.\\d]+)[^<]*<br \\;version:\\1",
 			"icon": "SquirrelMail.png",
 			"implies": "PHP",
 			"url": "/src/webmail\\.php(?:$|\\?)",
-			"website": "squirrelmail.org"
+			"website": "http://squirrelmail.org"
 		},
 		"Squiz Matrix": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Powered-By": "Squiz Matrix"
@@ -7264,67 +7353,67 @@
 			"meta": {
 				"generator": "Squiz Matrix"
 			},
-			"website": "squiz.net"
+			"website": "http://squiz.net"
 		},
 		"Stackla": {
 			"cats": [
-				5
+				"5"
 			],
 			"env": "^Stackla$",
 			"icon": "Stackla.png",
 			"script": "assetscdn\\.stackla\\.com\\/media\\/js\\/widget\\/(?:[a-zA-Z0-9.]+)?\\.js",
-			"website": "stackla.com/"
+			"website": "http://stackla.com/"
 		},
 		"Stackla Social Hub": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^stacklaSocialHub$",
-			"icon": "Stackla Social Hub.png",
-			"website": "stackla.com/"
+			"icon": "Stackla.png",
+			"website": "http://stackla.com/"
 		},
 		"Stamplay": {
 			"cats": [
-				34,
-				47
+				"34",
+				"47"
 			],
 			"headers": {
 				"Server": "Stamplay"
 			},
 			"icon": "Stamplay.png",
 			"script": "stamplay.*\\.js",
-			"website": "stamplay.com"
+			"website": "http://stamplay.com"
 		},
 		"Starlet": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "^Plack::Handler::Starlet"
 			},
 			"icon": "Starlet.png",
 			"implies": "Perl",
-			"website": "metacpan.org/pod/Starlet"
+			"website": "http://metacpan.org/pod/Starlet"
 		},
 		"StatCounter": {
 			"cats": [
-				10
+				"10"
 			],
 			"icon": "StatCounter.png",
 			"script": "statcounter\\.com/counter/counter",
-			"website": "www.statcounter.com"
+			"website": "http://www.statcounter.com"
 		},
 		"Store Systems": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "Shopsystem von <a href=[^>]+store-systems\\.de\"|\\.mws_boxTop",
 			"icon": "Store Systems.png",
-			"website": "store-systems.de"
+			"website": "http://store-systems.de"
 		},
 		"Strapdown.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"icon": "strapdown.js.png",
 			"implies": [
@@ -7332,38 +7421,38 @@
 				"Google Code Prettify"
 			],
 			"script": "strapdown\\.js",
-			"website": "strapdownjs.com"
+			"website": "http://strapdownjs.com"
 		},
 		"Strato": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "<a href=\"http://www.strato.de/\" target=\"_blank\">",
 			"icon": "strato.png",
-			"website": "shop.strato.com"
+			"website": "http://shop.strato.com"
 		},
 		"Stripe": {
 			"cats": [
-				41
+				"41"
 			],
 			"env": "^Stripe$",
 			"html": "<input[^>]+data-stripe",
 			"icon": "Stripe.png",
 			"script": "js\\.stripe\\.com",
-			"website": "stripe.com"
+			"website": "http://stripe.com"
 		},
 		"SublimeVideo": {
 			"cats": [
-				14
+				"14"
 			],
 			"env": "^sublimevideo$",
 			"icon": "SublimeVideo.png",
 			"script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
-			"website": "sublimevideo.net"
+			"website": "http://sublimevideo.net"
 		},
 		"Subrion": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Powered-CMS": "Subrion CMS"
@@ -7373,61 +7462,61 @@
 			"meta": {
 				"generator": "^Subrion "
 			},
-			"website": "subrion.com"
+			"website": "http://subrion.com"
 		},
 		"Sulu": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Generator": "Sulu/?(.+)?$\\;version:\\1"
 			},
 			"icon": "Sulu.svg",
 			"implies": "Symfony",
-			"website": "sulu.io"
+			"website": "http://sulu.io"
 		},
 		"SumoMe": {
 			"cats": [
-				5,
-				32
+				"5",
+				"32"
 			],
 			"icon": "SumoMe.png",
 			"script": "load\\.sumome\\.com",
-			"website": "sumome.com"
+			"website": "http://sumome.com"
 		},
 		"SunOS": {
 			"cats": [
-				28
+				"28"
 			],
 			"headers": {
 				"Server": "SunOS( [\\d\\.]+)?\\;version:\\1",
 				"Servlet-engine": "SunOS( [\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "Oracle.png",
-			"website": "oracle.com/solaris"
+			"website": "http://oracle.com/solaris"
 		},
 		"Supersized": {
 			"cats": [
-				7,
-				25
+				"7",
+				"25"
 			],
 			"icon": "Supersized.png",
 			"script": "supersized(?:\\.([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
-			"website": "buildinternet.com/project/supersized"
+			"website": "http://buildinternet.com/project/supersized"
 		},
 		"SweetAlert": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^swal$",
 			"html": "<link[^>]+?href=\"[^\"]+sweet-alert(?:\\.min)?\\.css",
 			"icon": "SweetAlert.png",
 			"script": "sweet-alert(?:\\.min)?\\.js",
-			"website": "tristanedwards.me/sweetalert"
+			"website": "http://tristanedwards.me/sweetalert"
 		},
 		"Swiftlet": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"X-Generator": "Swiftlet",
@@ -7440,41 +7529,50 @@
 			"meta": {
 				"generator": "Swiftlet"
 			},
-			"website": "swiftlet.org"
+			"website": "http://swiftlet.org"
+		},
+		"Swiftype": {
+			"cats": [
+				"29"
+			],
+			"env": "Swiftype",
+			"icon": "swiftype.png",
+			"script": "swiftype\\.com/embed\\.js$",
+			"website": "http://swiftype.com"
 		},
 		"Symfony": {
 			"cats": [
-				18
+				"18"
 			],
 			"icon": "Symfony.png",
 			"implies": "PHP",
-			"website": "symfony.com"
+			"website": "http://symfony.com"
 		},
 		"Synology DiskStation": {
 			"cats": [
-				48
+				"48"
 			],
-			"icon": "Synology DiskStation.png",
 			"html": "<noscript><div class='syno-no-script'",
+			"icon": "Synology DiskStation.png",
 			"meta": {
 				"application-name": "Synology DiskStation",
 				"description": "^DiskStation provides a full-featured network attached storage"
 			},
 			"script": "webapi/entry\\.cgi\\?api=SYNO\\.(?:Core|Filestation)\\.Desktop\\.",
-			"website": "synology.com"
+			"website": "http://synology.com"
 		},
 		"SyntaxHighlighter": {
 			"cats": [
-				19
+				"19"
 			],
 			"env": "^SyntaxHighlighter$",
 			"html": "<(?:script|link)[^>]*sh(?:Core|Brush|ThemeDefault)",
 			"icon": "SyntaxHighlighter.png",
-			"website": "github.com/syntaxhighlighter"
+			"website": "http://github.com/syntaxhighlighter"
 		},
 		"TWiki": {
 			"cats": [
-				8
+				"8"
 			],
 			"headers": {
 				"Set-cookie": "TWIKISID"
@@ -7483,11 +7581,11 @@
 			"icon": "TWiki.png",
 			"implies": "Perl",
 			"script": "(?:TWikiJavascripts|twikilib(?:\\.min)?\\.js)",
-			"website": "twiki.org"
+			"website": "http://twiki.org"
 		},
 		"TYPO3 CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<(?:script[^>]+ src|link[^>]+ href)=[^>]+typo3temp/",
 			"icon": "TYPO3.svg",
@@ -7496,11 +7594,11 @@
 				"generator": "TYPO3\\s+(?:CMS\\s+)?([\\d.]+)?(?:\\s+CMS)?\\;version:\\1"
 			},
 			"url": "/typo3/",
-			"website": "www.typo3.org"
+			"website": "http://www.typo3.org"
 		},
 		"Taiga": {
 			"cats": [
-				13
+				"13"
 			],
 			"env": "^taigaConfig$",
 			"icon": "Taiga.png",
@@ -7508,27 +7606,36 @@
 				"Django",
 				"AngularJS"
 			],
-			"website": "taiga.io"
+			"website": "http://taiga.io"
 		},
 		"Tawk.to": {
 			"cats": [
-				52
+				"52"
 			],
 			"icon": "TawkTo.png",
 			"script": "//embed\\.tawk\\.to",
-			"website": "tawk.to"
+			"website": "http://tawk.to"
 		},
 		"Tealeaf": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^TeaLeaf$",
 			"icon": "Tealeaf.png",
-			"website": "www.tealeaf.com"
+			"website": "http://www.tealeaf.com"
+		},
+		"Tealium": {
+			"cats": [
+				"36"
+			],
+			"env": "^TEALIUMENABLED$",
+			"icon": "Tealium.png",
+			"script": "//tags\\.tiqcdn\\.com/",
+			"website": "http://tealium.com"
 		},
 		"TeamCity": {
 			"cats": [
-				44
+				"44"
 			],
 			"html": "<span class=\"versionTag\"><span class=\"vWord\">Version</span> ([\\d\\.]+)\\;version:\\1",
 			"icon": "TeamCity.png",
@@ -7539,45 +7646,45 @@
 			"meta": {
 				"application-name": "TeamCity"
 			},
-			"website": "jetbrains.com/teamcity"
+			"website": "http://jetbrains.com/teamcity"
 		},
 		"Telescope": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "Telescope",
 			"icon": "Telescope.png",
 			"implies": "Meteor",
-			"website": "telescopeapp.org"
+			"website": "http://telescopeapp.org"
 		},
 		"Tengine": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Tengine"
 			},
 			"icon": "Tengine.png",
-			"website": "tengine.taobao.org"
+			"website": "http://tengine.taobao.org"
 		},
 		"Textpattern CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Textpattern CMS.png",
-			"meta": {
-				"generator": "Textpattern"
-			},
 			"implies": [
 				"PHP",
 				"MySQL"
 			],
-			"website": "textpattern.com"
+			"meta": {
+				"generator": "Textpattern"
+			},
+			"website": "http://textpattern.com"
 		},
 		"Thelia": {
 			"cats": [
-				1,
-				6
+				"1",
+				"6"
 			],
 			"html": "<(?:link|style|script)[^>]+/assets/frontOffice/",
 			"icon": "Thelia.png",
@@ -7585,25 +7692,25 @@
 				"PHP",
 				"Symfony"
 			],
-			"website": "thelia.net"
+			"website": "http://thelia.net"
 		},
 		"ThinkPHP": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"X-Powered-By": "ThinkPHP"
 			},
 			"icon": "ThinkPHP.png",
 			"implies": "PHP",
-			"website": "www.thinkphp.cn"
+			"website": "http://www.thinkphp.cn"
 		},
 		"TiddlyWiki": {
 			"cats": [
-				1,
-				2,
-				4,
-				8
+				"1",
+				"2",
+				"4",
+				"8"
 			],
 			"env": "tiddler",
 			"html": "<[^>]*type=[^>]text\\/vnd\\.tiddlywiki",
@@ -7614,43 +7721,43 @@
 				"generator": "^TiddlyWiki$",
 				"tiddlywiki-version": "(.*)\\;version:\\1"
 			},
-			"website": "tiddlywiki.com"
+			"website": "http://tiddlywiki.com"
 		},
 		"Tiki Wiki CMS Groupware": {
 			"cats": [
-				1,
-				2,
-				8,
-				11,
-				13
+				"1",
+				"2",
+				"8",
+				"11",
+				"13"
 			],
 			"icon": "Tiki Wiki CMS Groupware.png",
 			"meta": {
 				"generator": "^Tiki"
 			},
 			"script": "(?:/|_)tiki",
-			"website": "tiki.org"
+			"website": "http://tiki.org"
 		},
 		"Timeplot": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^Timeplot$",
 			"icon": "Timeplot.png",
 			"script": "timeplot.*\\.js",
-			"website": "www.simile-widgets.org/timeplot/"
+			"website": "http://www.simile-widgets.org/timeplot/"
 		},
 		"TinyMCE": {
 			"cats": [
-				24
+				"24"
 			],
 			"env": "^tinyMCE$",
 			"icon": "TinyMCE.png",
-			"website": "tinymce.com"
+			"website": "http://tinymce.com"
 		},
 		"Titan": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": [
 				"^titan$",
@@ -7658,32 +7765,32 @@
 			],
 			"html": "<script[^>]+>var titan",
 			"icon": "Titan.png",
-			"website": "titan360.com"
+			"website": "http://titan360.com"
 		},
 		"TomatoCart": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^AjaxShoppingCart$",
 			"icon": "TomatoCart.png",
 			"meta": {
 				"generator": "TomatoCart"
 			},
-			"website": "tomatocart.com"
+			"website": "http://tomatocart.com"
 		},
 		"TornadoServer": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "TornadoServer(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "TornadoServer.png",
-			"website": "tornadoweb.org"
+			"website": "http://tornadoweb.org"
 		},
 		"Trac": {
 			"cats": [
-				13
+				"13"
 			],
 			"html": [
 				"<a id=\"tracpowered",
@@ -7691,20 +7798,32 @@
 			],
 			"icon": "Trac.png",
 			"implies": "Python",
-			"website": "trac.edgewall.org"
+			"website": "http://trac.edgewall.org"
 		},
 		"TrackJs": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^TrackJs$",
 			"icon": "TrackJs.png",
 			"script": "tracker.js",
-			"website": "trackjs.com"
+			"website": "http://trackjs.com"
+		},
+		"Translucide": {
+			"cats": [
+				"1"
+			],
+			"icon": "translucide.svg",
+			"implies": [
+				"PHP",
+				"jQuery"
+			],
+			"script": "lucide\\.init\\.js",
+			"website": "http://www.translucide.net"
 		},
 		"Tumblr": {
 			"cats": [
-				11
+				"11"
 			],
 			"headers": {
 				"X-Tumblr-User": ""
@@ -7712,59 +7831,59 @@
 			"html": "<iframe src=\"[^>]+tumblr\\.com",
 			"icon": "Tumblr.png",
 			"url": "^https?://(?:www\\.)?[^/]+\\.tumblr\\.com/",
-			"website": "www.tumblr.com"
+			"website": "http://www.tumblr.com"
 		},
 		"TweenMax": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^TweenMax$",
 			"icon": "TweenMax.png",
 			"script": "TweenMax(?:\\.min)?\\.js",
-			"website": "greensock.com/tweenmax"
+			"website": "http://greensock.com/tweenmax"
 		},
 		"Twilight CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Powered-CMS": "Twilight CMS"
 			},
 			"icon": "Twilight CMS.png",
-			"website": "www.twilightcms.com"
+			"website": "http://www.twilightcms.com"
 		},
 		"TwistPHP": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"X-Powered-By": "TwistPHP"
 			},
 			"icon": "TwistPHP.png",
 			"implies": "PHP",
-			"website": "twistphp.com"
+			"website": "http://twistphp.com"
 		},
 		"TwistedWeb": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "TwistedWeb(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "TwistedWeb.png",
-			"website": "twistedmatrix.com/trac/wiki/TwistedWeb"
+			"website": "http://twistedmatrix.com/trac/wiki/TwistedWeb"
 		},
 		"Twitter": {
 			"cats": [
-				5
+				"5"
 			],
 			"icon": "Twitter.svg",
 			"script": "//platform\\.twitter\\.com/widgets\\.js",
-			"website": "twitter.com"
+			"website": "http://twitter.com"
 		},
 		"Twitter Bootstrap": {
 			"cats": [
-				18
+				"18"
 			],
 			"env": "^Twipsy$\\;confidence:50",
 			"html": [
@@ -7774,108 +7893,108 @@
 			],
 			"icon": "Twitter Bootstrap.png",
 			"script": "(?:twitter\\.github\\.com/bootstrap|bootstrap(?:\\.js|\\.min\\.js))",
-			"website": "getbootstrap.com"
+			"website": "http://getbootstrap.com"
 		},
 		"Twitter Emoji (Twemoji)": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^twemoji$",
-			"icon": "default.png",
+			"icon": "default.svg",
 			"script": "twemoji(?:\\.min)?\\.js",
-			"website": "twitter.github.io/twemoji/"
+			"website": "http://twitter.github.io/twemoji/"
 		},
 		"Twitter Flight": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^flight$",
 			"icon": "Twitter Flight.png",
 			"implies": "jQuery",
-			"website": "flightjs.github.io/"
+			"website": "http://flightjs.github.io/"
 		},
 		"Twitter typeahead.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^typeahead$",
 			"icon": "Twitter typeahead.js.png",
 			"implies": "jQuery\\;confidence:50",
 			"script": "(?:typeahead|bloodhound)\\.(?:jquery|bundle)?(?:\\.min)?\\.js",
-			"website": "twitter.github.io/typeahead.js"
+			"website": "http://twitter.github.io/typeahead.js"
 		},
 		"TypePad": {
 			"cats": [
-				11
+				"11"
 			],
 			"icon": "TypePad.png",
 			"meta": {
 				"generator": "typepad"
 			},
 			"url": "typepad\\.com",
-			"website": "www.typepad.com"
+			"website": "http://www.typepad.com"
 		},
 		"Typekit": {
 			"cats": [
-				17
+				"17"
 			],
 			"env": "^Typekit$",
 			"icon": "Typekit.png",
 			"script": "use\\.typekit\\.com",
-			"website": "typekit.com"
+			"website": "http://typekit.com"
 		},
 		"UIKit": {
 			"cats": [
-				18
+				"18"
 			],
 			"icon": "UIKit.png",
 			"script": "uikit.*\\.js",
-			"website": "getuikit.com"
+			"website": "http://getuikit.com"
 		},
 		"UNIX": {
 			"cats": [
-				28
+				"28"
 			],
 			"headers": {
 				"Server": "Unix"
 			},
 			"icon": "UNIX.png",
-			"website": "unix.org"
+			"website": "http://unix.org"
 		},
 		"Ubercart": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "Ubercart.png",
 			"implies": "Drupal",
 			"script": "uc_cart/uc_cart_block\\.js",
-			"website": "www.ubercart.org"
+			"website": "http://www.ubercart.org"
 		},
 		"Ubuntu": {
 			"cats": [
-				28
+				"28"
 			],
 			"headers": {
 				"Server": "Ubuntu",
 				"X-Powered-By": "Ubuntu"
 			},
 			"icon": "Ubuntu.png",
-			"website": "www.ubuntu.com/server"
+			"website": "http://www.ubuntu.com/server"
 		},
 		"UltraCart": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^ucCatalog",
 			"html": "<form [^>]*action=\"[^\"]*\\/cgi-bin\\/UCEditor\\?(?:[^\"]*&)?merchantId=[^\"]",
 			"icon": "UltraCart.png",
 			"script": "cgi-bin\\/UCJavaScript\\?(?:[^\"]*&)?merchantid=.",
 			"url": "/cgi-bin/UCEditor\\?(?:.*&)?merchantid=.",
-			"website": "ultracart.com"
+			"website": "http://ultracart.com"
 		},
 		"Umbraco": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^(?:UC_(?:IMAGE_SERVICE|ITEM_INFO_SERVICE|SETTINGS)|Umbraco)$",
 			"headers": {
@@ -7888,66 +8007,66 @@
 				"generator": "umbraco"
 			},
 			"url": "/umbraco/login\\.aspx(?:$|\\?)",
-			"website": "umbraco.com"
+			"website": "http://umbraco.com"
 		},
 		"Unbounce": {
 			"cats": [
-				20,
-				51
+				"20",
+				"51"
 			],
 			"headers": {
 				"X-Unbounce-PageId": ""
 			},
 			"icon": "Unbounce.png",
-			"website": "unbounce.com"
+			"website": "http://unbounce.com"
 		},
 		"Underscore.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"icon": "Underscore.js.png",
 			"script": "underscore.*\\.js",
-			"website": "underscorejs.org"
+			"website": "http://underscorejs.org"
 		},
 		"Usabilla": {
 			"cats": [
-				13
+				"13"
 			],
 			"env": "^usabilla_live$",
 			"icon": "Usabilla.svg",
-			"website": "usabilla.com"
+			"website": "http://usabilla.com"
 		},
 		"UserLike": {
 			"cats": [
-				52
+				"52"
 			],
 			"icon": "UserLike.svg",
 			"script": [
 				"userlike\\.min\\.js",
 				"userlikelib\\.min\\.js"
 			],
-			"website": "userlike.com"
+			"website": "http://userlike.com"
 		},
 		"UserRules": {
 			"cats": [
-				13
+				"13"
 			],
 			"env": "^_usrp$",
 			"icon": "UserRules.png",
-			"website": "www.userrules.com"
+			"website": "http://www.userrules.com"
 		},
 		"UserVoice": {
 			"cats": [
-				13
+				"13"
 			],
 			"env": "^UserVoice$",
 			"icon": "UserVoice.png",
-			"website": "uservoice.com"
+			"website": "http://uservoice.com"
 		},
 		"Ushahidi": {
 			"cats": [
-				1,
-				35
+				"1",
+				"35"
 			],
 			"env": "^Ushahidi$",
 			"headers": {
@@ -7960,52 +8079,52 @@
 				"OpenLayers"
 			],
 			"script": "/js/ushahidi\\.js$",
-			"website": "www.ushahidi.com"
+			"website": "http://www.ushahidi.com"
 		},
 		"VIVVO": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^vivvo",
 			"headers": {
 				"Set-Cookie": "VivvoSessionId"
 			},
 			"icon": "VIVVO.png",
-			"website": "vivvo.net"
+			"website": "http://vivvo.net"
 		},
 		"VP-ASP": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "<a[^>]+>Powered By VP-ASP Shopping Cart</a>",
 			"icon": "VP-ASP.png",
 			"implies": "Microsoft ASP.NET",
 			"script": "vs350\\.js",
-			"website": "www.vpasp.com"
+			"website": "http://www.vpasp.com"
 		},
 		"VTEX Enterprise": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"powered": "vtex"
 			},
 			"icon": "VTEX Enterprise.png",
-			"website": "vtex.com"
+			"website": "http://vtex.com"
 		},
 		"VTEX Integrated Store": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"X-Powered-By": "vtex-integrated-store"
 			},
 			"icon": "VTEX Integrated Store.png",
-			"website": "lojaintegrada.com.br"
+			"website": "http://lojaintegrada.com.br"
 		},
 		"Vanilla": {
 			"cats": [
-				2
+				"2"
 			],
 			"headers": {
 				"X-Powered-By": "Vanilla"
@@ -8013,11 +8132,11 @@
 			"html": "<body id=\"(?:DiscussionsPage|vanilla)",
 			"icon": "Vanilla.png",
 			"implies": "PHP",
-			"website": "vanillaforums.org"
+			"website": "http://vanillaforums.org"
 		},
 		"Varnish": {
 			"cats": [
-				23
+				"23"
 			],
 			"headers": {
 				"Via": ".*Varnish",
@@ -8028,88 +8147,88 @@
 				"X-Varnish-Hostname": ""
 			},
 			"icon": "Varnish.svg",
-			"website": "www.varnish-cache.org"
+			"website": "http://www.varnish-cache.org"
 		},
 		"Venda": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"X-venda-hitid": ""
 			},
 			"icon": "Venda.png",
-			"website": "venda.com"
+			"website": "http://venda.com"
 		},
 		"Veoxa": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^(?:Veoxa_|VuVeoxaContent)",
 			"html": "<img [^>]*src=\"[^\"]+tracking\\.veoxa\\.com",
 			"icon": "Veoxa.png",
 			"script": "tracking\\.veoxa\\.com",
-			"website": "veoxa.com"
+			"website": "http://veoxa.com"
 		},
 		"VideoJS": {
 			"cats": [
-				14
+				"14"
 			],
 			"env": "^VideoJS$",
 			"html": "<div[^>]+class=\"video-js+\">",
 			"icon": "VideoJS.png",
 			"script": "zencdn\\.net/c/video\\.js",
-			"website": "videojs.com"
+			"website": "http://videojs.com"
 		},
 		"VigLink": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^(?:vglnk(?:$|_)|vl_(?:cB|disable)$)",
 			"icon": "VigLink.png",
 			"script": "(?:^[^/]*//[^/]*viglink\\.com/api/|vglnk\\.js)",
-			"website": "viglink.com"
+			"website": "http://viglink.com"
 		},
 		"Vignette": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<[^>]+=\"vgn-?ext",
 			"icon": "Vignette.png",
-			"website": "www.vignette.com"
+			"website": "http://www.vignette.com"
 		},
 		"Vimeo": {
 			"cats": [
-				14
+				"14"
 			],
 			"html": "(?:<(?:param|embed)[^>]+vimeo\\.com/moogaloop|<iframe[^>]player\\.vimeo\\.com)",
 			"icon": "Vimeo.png",
-			"website": "vimeo.com"
+			"website": "http://vimeo.com"
 		},
 		"Virata EmWeb": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Virata-EmWeb(?:/(R?[\\d._]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": [
 				"HP"
 			],
-			"website": "???"
+			"website": "http://example.com"
 		},
 		"VirtueMart": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "<div id=\"vmMainPage",
 			"icon": "VirtueMart.png",
 			"implies": "Joomla",
-			"website": "virtuemart.net"
+			"website": "http://virtuemart.net"
 		},
 		"Visual WebGUI": {
 			"cats": [
-				18
+				"18"
 			],
 			"env": "^VWGEventArgs$",
 			"icon": "Visual WebGUI.png",
@@ -8119,37 +8238,37 @@
 			},
 			"script": "\\.js\\.wgx$",
 			"url": "\\.wgx$",
-			"website": "www.gizmox.com/products/visual-web-gui/"
+			"website": "http://www.gizmox.com/products/visual-web-gui/"
 		},
 		"VisualPath": {
 			"cats": [
-				10
+				"10"
 			],
 			"icon": "VisualPath.png",
 			"script": "visualpath[^/]*\\.trackset\\.it/[^/]+/track/include\\.js",
-			"website": "www.trackset.com/web-analytics-software/visualpath"
+			"website": "http://www.trackset.com/web-analytics-software/visualpath"
 		},
 		"Volusion": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^volusion$",
 			"html": "<link [^>]*href=\"[^\"]*/vspfiles/",
 			"icon": "Volusion.png",
 			"script": "/volusion\\.js(?:\\?([\\d.]*))?\\;version:\\1",
-			"website": "volusion.com"
+			"website": "http://volusion.com"
 		},
 		"Vox": {
 			"cats": [
-				11
+				"11"
 			],
 			"icon": "Vox.png",
 			"url": "\\.vox\\.com",
-			"website": "www.vox.com"
+			"website": "http://www.vox.com"
 		},
 		"Vue.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Vue$",
 			"icon": "Vue.js.png",
@@ -8158,11 +8277,11 @@
 				"/([\\d.]+)/vue(?:\\.min)?\\.js\\;version:\\1",
 				"vue.*\\.js\\;confidence:20"
 			],
-			"website": "vuejs.org"
+			"website": "http://vuejs.org"
 		},
 		"W3 Total Cache": {
 			"cats": [
-				23
+				"23"
 			],
 			"headers": {
 				"X-Powered-By": "W3 Total Cache(?:/([\\d.]+))?\\;version:\\1"
@@ -8170,29 +8289,29 @@
 			"html": "<!--[^>]+W3 Total Cache",
 			"icon": "W3 Total Cache.png",
 			"implies": "WordPress",
-			"website": "www.w3-edge.com/wordpress-plugins/w3-total-cache"
+			"website": "http://www.w3-edge.com/wordpress-plugins/w3-total-cache"
 		},
 		"W3Counter": {
 			"cats": [
-				10
+				"10"
 			],
 			"icon": "W3Counter.png",
 			"script": "w3counter\\.com/tracker\\.js",
-			"website": "www.w3counter.com"
+			"website": "http://www.w3counter.com"
 		},
 		"WHMCS": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"Set-Cookie": "^WHMCS.*"
 			},
 			"icon": "WHMCS.png",
-			"website": "www.whmcs.com"
+			"website": "http://www.whmcs.com"
 		},
 		"WP Rocket": {
 			"cats": [
-				23
+				"23"
 			],
 			"headers": {
 				"X-Powered-By": "WP Rocket(?:/([\\d.]+))?\\;version:\\1"
@@ -8200,30 +8319,30 @@
 			"html": "<!--[^>]+WP Rocket",
 			"icon": "WP Rocket.png",
 			"implies": "WordPress",
-			"website": "wp-rocket.me"
+			"website": "http://wp-rocket.me"
 		},
 		"Warp": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "^Warp/(\\d+(?:\\.\\d+)+)?$\\;version:\\1"
 			},
 			"icon": "Warp.png",
 			"implies": "Haskell",
-			"website": "www.stackage.org/package/warp"
+			"website": "http://www.stackage.org/package/warp"
 		},
 		"Web Optimizer": {
 			"cats": [
-				10
+				"10"
 			],
 			"html": "<title [^>]*lang=\"wo\">",
 			"icon": "Web Optimizer.png",
-			"website": "www.web-optimizer.us"
+			"website": "http://www.web-optimizer.us"
 		},
 		"Web2py": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"X-Powered-By": "web2py"
@@ -8237,11 +8356,11 @@
 				"generator": "^Web2py"
 			},
 			"script": "web2py\\.js",
-			"website": "web2py.com"
+			"website": "http://web2py.com"
 		},
 		"WebGUI": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "^wgSession="
@@ -8251,58 +8370,58 @@
 			"meta": {
 				"generator": "^WebGUI ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.webgui.org"
+			"website": "http://www.webgui.org"
 		},
 		"WebPublisher": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "WebPublisher.png",
 			"meta": {
 				"generator": "WEB\\|Publisher"
 			},
-			"website": "scannet.dk"
+			"website": "http://scannet.dk"
 		},
 		"Webix": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^webix$",
 			"icon": "Webix.png",
 			"script": "\bwebix\\.js",
-			"website": "webix.com"
+			"website": "http://webix.com"
 		},
 		"Webs": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Server": "Webs\\.com/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "Webs.png",
-			"website": "webs.com"
+			"website": "http://webs.com"
 		},
 		"WebsPlanet": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "WebsPlanet.png",
 			"meta": {
 				"generator": "WebsPlanet"
 			},
-			"website": "websplanet.com"
+			"website": "http://websplanet.com"
 		},
 		"Websale": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "Websale.png",
 			"url": "/websale7/",
-			"website": "websale.de"
+			"website": "http://websale.de"
 		},
 		"WebsiteBaker": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "WebsiteBaker.png",
 			"implies": [
@@ -8312,134 +8431,134 @@
 			"meta": {
 				"generator": "WebsiteBaker"
 			},
-			"website": "websitebaker2.org/en/home.php"
+			"website": "http://websitebaker2.org/en/home.php"
 		},
 		"Webtrekk": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^webtrekk",
 			"icon": "Webtrekk.png",
-			"website": "www.webtrekk.com"
+			"website": "http://www.webtrekk.com"
 		},
 		"Webtrends": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^(?:WTOptimize|WebTrends)",
 			"html": "<img[^>]+id=\"DCSIMG\"[^>]+webtrends",
 			"icon": "Webtrends.png",
-			"website": "worldwide.webtrends.com"
+			"website": "http://worldwide.webtrends.com"
 		},
 		"Weebly": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "Weebly.png",
 			"script": "cdn\\d+\\.editmysite\\.com",
-			"website": "www.weebly.com"
+			"website": "http://www.weebly.com"
 		},
 		"Wikispaces": {
 			"cats": [
-				8
+				"8"
 			],
 			"html": [
 				"<script[^>]*>[^<]*session_url:\\s*'https://session\\.wikispaces\\.com/",
 				"<\\w+[^>]*\\s+class=\"[^\"]*WikispacesContent\\s+WikispacesBs3[^\"]*\""
 			],
 			"icon": "Wikispaces.png",
-			"website": "www.wikispaces.com"
+			"website": "http://www.wikispaces.com"
 		},
 		"WikkaWiki": {
 			"cats": [
-				8
+				"8"
 			],
 			"html": "Powered by <a href=\"[^>]+WikkaWiki",
 			"icon": "WikkaWiki.png",
 			"meta": {
 				"generator": "WikkaWiki"
 			},
-			"website": "wikkawiki.org"
+			"website": "http://wikkawiki.org"
 		},
 		"Windows CE": {
 			"cats": [
-				28
+				"28"
 			],
 			"headers": {
 				"Server": "\bWinCE\b"
 			},
 			"icon": "Microsoft.svg",
-			"website": "microsoft.com"
+			"website": "http://microsoft.com"
 		},
 		"Windows Server": {
 			"cats": [
-				28
+				"28"
 			],
 			"headers": {
 				"Server": "Win32|Win64"
 			},
 			"icon": "Microsoft.svg",
-			"website": "microsoft.com/windowsserver"
+			"website": "http://microsoft.com/windowsserver"
 		},
 		"Wink": {
 			"cats": [
-				26,
-				12
+				"26",
+				"12"
 			],
 			"env": "^wink$",
 			"icon": "Wink.png",
 			"script": "(?:_base/js/base|wink).*\\.js",
-			"website": "winktoolkit.org"
+			"website": "http://winktoolkit.org"
 		},
 		"Winstone Servlet Container": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Winstone Servlet (?:Container|Engine) v?([\\d.]+)?\\;version:\\1",
 				"X-Powered-By": "Winstone(?:.([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "winstone.sourceforge.net"
+			"icon": "default.svg",
+			"website": "http://winstone.sourceforge.net"
 		},
 		"Wix": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^wix(?:Events|Data|Errors)",
 			"headers": {
 				"Set-Cookie": "Domain=\\.wix\\.com",
 				"X-Wix-Dispatcher-Cache-Hit": ""
 			},
+			"icon": "Wix.png",
 			"meta": {
 				"X-Wix-Renderer-Server": ""
 			},
-			"icon": "Wix.png",
 			"script": "static\\.wixstatic\\.com",
-			"website": "wix.com"
+			"website": "http://wix.com"
 		},
 		"Wolf CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "(?:<a href=\"[^>]+wolfcms\\.org[^>]+>Wolf CMS(?:</a>)? inside|Thank you for using <a[^>]+>Wolf CMS)",
 			"icon": "Wolf CMS.png",
 			"implies": "PHP",
-			"website": "www.wolfcms.org"
+			"website": "http://www.wolfcms.org"
 		},
 		"Woltlab Community Framework": {
 			"cats": [
-				18
+				"18"
 			],
 			"html": "var WCF_PATH[^>]+",
 			"icon": "Woltlab Community Framework.png",
 			"implies": "PHP",
 			"script": "WCF\\..*\\.js",
-			"website": "www.woltlab.com"
+			"website": "http://www.woltlab.com"
 		},
 		"WooCommerce": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "woocommerce",
 			"html": "<!-- WooCommerce",
@@ -8449,20 +8568,20 @@
 				"generator": "WooCommerce ([\\d.]+)\\;version:\\1"
 			},
 			"script": "woocommerce",
-			"website": "www.woothemes.com/woocommerce"
+			"website": "http://www.woothemes.com/woocommerce"
 		},
 		"Woopra": {
 			"cats": [
-				10
+				"10"
 			],
 			"icon": "Woopra.png",
 			"script": "static\\.woopra\\.com",
-			"website": "www.woopra.com"
+			"website": "http://www.woopra.com"
 		},
 		"WordPress": {
 			"cats": [
-				1,
-				11
+				"1",
+				"11"
 			],
 			"env": "^wp_username$",
 			"html": [
@@ -8475,28 +8594,31 @@
 				"generator": "WordPress( [\\d.]+)?\\;version:\\1"
 			},
 			"script": "/wp-includes/",
-			"website": "wordpress.org"
+			"website": "http://wordpress.org"
 		},
 		"WordPress Super Cache": {
 			"cats": [
-				23
+				"23"
 			],
+			"headers": {
+				"WP-Super-Cache": ""
+			},
 			"html": "<!--[^>]+WP-Super-Cache",
-			"icon": "default.png",
+			"icon": "wp_super_cache.png",
 			"implies": "WordPress",
-			"website": "z9.io/wp-super-cache/"
+			"website": "http://z9.io/wp-super-cache/"
 		},
 		"Wowza Media Server": {
 			"cats": [
-				38
+				"38"
 			],
 			"html": "<title>Wowza Media Server \\d+ ((?:\\w+ Edition )?\\d+\\.[\\d\\.]+(?: build\\d+)?)?\\;version:\\1",
 			"icon": "Wowza Media Server.png",
-			"website": "www.wowza.com"
+			"website": "http://www.wowza.com"
 		},
 		"X-Cart": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^(?:xcart_web_dir|xliteConfig)$",
 			"headers": {
@@ -8512,11 +8634,11 @@
 				"generator": "X-Cart(?: (\\d+))?\\;version:\\1"
 			},
 			"script": "/skin/common_files/modules/Product_Options/func\\.js",
-			"website": "x-cart.com"
+			"website": "http://x-cart.com"
 		},
 		"XAMPP": {
 			"cats": [
-				22
+				"22"
 			],
 			"html": "<title>XAMPP(?: Version ([\\d\\.]+))?</title>\\;version:\\1",
 			"icon": "XAMPP.png",
@@ -8529,19 +8651,19 @@
 			"meta": {
 				"author": "Kai Oswald Seidler\\;confidence:10"
 			},
-			"website": "www.apachefriends.org/en/xampp.html"
+			"website": "http://www.apachefriends.org/en/xampp.html"
 		},
 		"XMB": {
 			"cats": [
-				2
+				"2"
 			],
 			"html": "<!-- Powered by XMB",
 			"icon": "XMB.png",
-			"website": "www.xmbforum.com"
+			"website": "http://www.xmbforum.com"
 		},
 		"XOOPS": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^xoops",
 			"icon": "XOOPS.png",
@@ -8549,11 +8671,11 @@
 			"meta": {
 				"generator": "XOOPS"
 			},
-			"website": "xoops.org"
+			"website": "http://xoops.org"
 		},
 		"XRegExp": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^XRegExp$",
 			"icon": "XRegExp.png",
@@ -8562,47 +8684,47 @@
 				"/([\\d.]+)/xregexp(?:\\.min)?\\.js\\;version:\\1",
 				"xregexp.*\\.js"
 			],
-			"website": "xregexp.com"
+			"website": "http://xregexp.com"
 		},
 		"Xajax": {
 			"cats": [
-				12
+				"12"
 			],
 			"icon": "Xajax.png",
 			"script": "xajax_core.*\\.js",
-			"website": "xajax-project.org"
+			"website": "http://xajax-project.org"
 		},
 		"Xanario": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "Xanario.png",
 			"meta": {
 				"generator": "xanario shopsoftware"
 			},
-			"website": "xanario.de"
+			"website": "http://xanario.de"
 		},
 		"XenForo": {
 			"cats": [
-				2
+				"2"
 			],
 			"html": "(?:jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding|<html[^>]+id=\"XenForo\")",
 			"icon": "XenForo.png",
-			"website": "xenforo.com"
+			"website": "http://xenforo.com"
 		},
 		"Xitami": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Xitami(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Xitami.png",
-			"website": "xitami.com"
+			"website": "http://xitami.com"
 		},
 		"Xonic": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": [
 				"Powered by <a href=\"http://www.xonic-solutions.de/index.php\" target=\"_blank\">xonic-solutions Shopsoftware</a>"
@@ -8612,46 +8734,46 @@
 				"keywords": "xonic-solutions"
 			},
 			"script": "core/jslib/jquery\\.xonic\\.js\\.php",
-			"website": "www.xonic-solutions.de"
+			"website": "http://www.xonic-solutions.de"
 		},
 		"XpressEngine": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "XpressEngine.png",
 			"meta": {
 				"generator": "XpressEngine"
 			},
-			"website": "www.xpressengine.com/"
+			"website": "http://www.xpressengine.com/"
 		},
 		"YUI": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^YAHOO$",
 			"icon": "YUI.png",
 			"script": "(?:/yui/|yui\\.yahooapis\\.com)",
-			"website": "yuilibrary.com"
+			"website": "http://yuilibrary.com"
 		},
 		"YUI Doc": {
 			"cats": [
-				4
+				"4"
 			],
 			"html": "(?:<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf|<body[^>]+class=\"yui3-skin-sam)",
 			"icon": "yahoo.png",
-			"website": "developer.yahoo.com/yui/yuidoc"
+			"website": "http://developer.yahoo.com/yui/yuidoc"
 		},
 		"YaBB": {
 			"cats": [
-				2
+				"2"
 			],
 			"html": "Powered by <a href=\"[^>]+yabbforum",
 			"icon": "YaBB.png",
-			"website": "www.yabbforum.com"
+			"website": "http://www.yabbforum.com"
 		},
 		"Yahoo Advertising": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^adxinserthtml$",
 			"html": [
@@ -8660,11 +8782,11 @@
 			],
 			"icon": "yahoo.png",
 			"script": "adinterax\\.com",
-			"website": "advertising.yahoo.com"
+			"website": "http://advertising.yahoo.com"
 		},
 		"Yahoo! Ecommerce": {
 			"cats": [
-				6
+				"6"
 			],
 			"env": "^YStore$",
 			"headers": {
@@ -8672,20 +8794,20 @@
 			},
 			"html": "<link[^>]+store\\.yahoo\\.net",
 			"icon": "yahoo.png",
-			"website": "smallbusiness.yahoo.com/ecommerce"
+			"website": "http://smallbusiness.yahoo.com/ecommerce"
 		},
 		"Yahoo! Web Analytics": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^YWA$",
 			"icon": "yahoo.png",
 			"script": "d\\.yimg\\.com/mi/ywa\\.js",
-			"website": "web.analytics.yahoo.com"
+			"website": "http://web.analytics.yahoo.com"
 		},
 		"Yandex.Direct": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": [
 				"^yandex_partner_id$",
@@ -8695,20 +8817,20 @@
 			"html": "<yatag class=\"ya-partner__ads\">",
 			"icon": "Yandex.Direct.png",
 			"script": "https?://an\\.yandex\\.ru/",
-			"website": "partner.yandex.com"
+			"website": "http://partner.yandex.com"
 		},
 		"Yandex.Metrika": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^yandex_metrika",
 			"icon": "Yandex.Metrika.png",
 			"script": "mc\\.yandex\\.ru\\/metrika\\/watch\\.js",
-			"website": "metrika.yandex.com"
+			"website": "http://metrika.yandex.com"
 		},
 		"Yaws": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "Yaws(?: ([\\d.]+))?\\;version:\\1"
@@ -8717,42 +8839,44 @@
 			"implies": [
 				"Erlang"
 			],
-			"website": "yaws.hyber.org"
+			"website": "http://yaws.hyber.org"
 		},
 		"Yieldlab": {
 			"cats": [
-				36
+				"36"
 			],
 			"icon": "Yieldlab.png",
 			"script": "^https?://(?:[^/]+\\.)?yieldlab\\.net/",
-			"website": "yieldlab.de"
+			"website": "http://yieldlab.de"
 		},
 		"Yii": {
 			"cats": [
-				18
+				"18"
 			],
 			"html": [
-				"Powered by <a href=\"http://www.yiiframework.com/\" rel=\"external\">Yii Framework</a>"
+				"Powered by <a href=\"http://www.yiiframework.com/\" rel=\"external\">Yii Framework</a>",
+				"<input type=\"hidden\" value=\"[a-zA-Z0-9]{40}\" name=\"YII_CSRF_TOKEN\" \\/>",
+				"<!\\[CDATA\\[YII-BLOCK-(?:HEAD|BODY-BEGIN|BODY-END)\\]"
 			],
 			"icon": "Yii.png",
 			"implies": [
 				"PHP"
 			],
-			"website": "yiiframework.com"
+			"website": "http://yiiframework.com"
 		},
 		"Yoast SEO": {
 			"cats": [
-				32
+				"32"
 			],
 			"html": [
 				"<!-- This site is optimized with the Yoast"
 			],
 			"icon": "Yoast SEO.png",
-			"website": "yoast.com"
+			"website": "http://yoast.com"
 		},
 		"YouTrack": {
 			"cats": [
-				13
+				"13"
 			],
 			"html": [
 				"no-title=\"YouTrack\">",
@@ -8760,40 +8884,40 @@
 				"type=\"application/opensearchdescription\\+xml\" title=\"YouTrack\"/>"
 			],
 			"icon": "YouTrack.png",
-			"website": "www.jetbrains.com/youtrack/"
+			"website": "http://www.jetbrains.com/youtrack/"
 		},
 		"YouTube": {
 			"cats": [
-				14
+				"14"
 			],
 			"html": "<(?:param|embed|iframe)[^>]+youtube(?:-nocookie)?\\.com/(?:v|embed)",
 			"icon": "YouTube.png",
-			"website": "www.youtube.com"
+			"website": "http://www.youtube.com"
 		},
 		"ZK": {
 			"cats": [
-				18
+				"18"
 			],
 			"html": "<!-- ZK [\\.\\d\\s]+-->",
 			"icon": "ZK.png",
 			"implies": "Java",
 			"script": "zkau/",
-			"website": "zkoss.org"
+			"website": "http://zkoss.org"
 		},
 		"ZURB Foundation": {
 			"cats": [
-				18
+				"18"
 			],
 			"html": [
 				"<link[^>]+foundation[^>\"]+css",
 				"<div [^>]*class=\"[^\"]*(?:small|medium|large)-\\d{1,2} columns"
 			],
 			"icon": "ZURB Foundation.png",
-			"website": "foundation.zurb.com"
+			"website": "http://foundation.zurb.com"
 		},
 		"Zabbix": {
 			"cats": [
-				19
+				"19"
 			],
 			"env": "^zbxCallPostScripts$",
 			"html": "<body[^>]+zbxCallPostScripts",
@@ -8803,103 +8927,103 @@
 				"Author": "ZABBIX SIA\\;confidence:70"
 			},
 			"url": "\\/zabbix\\/\\;confidence:30",
-			"website": "zabbix.com"
+			"website": "http://zabbix.com"
 		},
 		"Zanox": {
 			"cats": [
-				36
+				"36"
 			],
 			"env": "^zanox$",
 			"html": "<img [^>]*src=\"[^\"]+ad\\.zanox\\.com",
 			"icon": "Zanox.png",
 			"script": "zanox\\.com/scripts/zanox\\.js$",
-			"website": "zanox.com"
+			"website": "http://zanox.com"
 		},
 		"Zen Cart": {
 			"cats": [
-				6
+				"6"
 			],
 			"icon": "Zen Cart.png",
 			"meta": {
 				"generator": "Zen Cart"
 			},
-			"website": "www.zen-cart.com"
+			"website": "http://www.zen-cart.com"
 		},
 		"Zend": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Set-Cookie": "ZENDSERVERSESSID",
 				"X-Powered-By": "Zend"
 			},
 			"icon": "Zend.png",
-			"website": "zend.com"
+			"website": "http://zend.com"
 		},
 		"Zendesk Chat": {
 			"cats": [
-				52
+				"52"
 			],
 			"icon": "Zendesk Chat.png",
 			"script": "v2\\.zopim\\.com",
-			"website": "zopim.com"
+			"website": "http://zopim.com"
 		},
 		"Zepto": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Zepto$",
 			"icon": "Zepto.png",
 			"script": "zepto.*\\.js",
-			"website": "zeptojs.com"
+			"website": "http://zeptojs.com"
 		},
 		"Zeuscart": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "<form name=\"product\" method=\"post\" action=\"[^\"]+\\?do=addtocart&prodid=\\d+\"(?!<\\/form>.)+<input type=\"hidden\" name=\"addtocart\" value=\"\\d+\">",
 			"icon": "Zeuscart.png",
 			"implies": "PHP",
 			"url": "\\?do=prodetail&action=show&prodid=\\d+",
-			"website": "zeuscart.com"
+			"website": "http://zeuscart.com"
 		},
 		"Zinnia": {
 			"cats": [
-				11
+				"11"
 			],
 			"icon": "Zinnia.png",
 			"implies": "Django",
 			"meta": {
 				"generator": "Zinnia"
 			},
-			"website": "django-blog-zinnia.com"
+			"website": "http://django-blog-zinnia.com"
 		},
 		"Zope": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "^Zope/"
 			},
 			"icon": "Zope.png",
-			"website": "zope.org"
+			"website": "http://zope.org"
 		},
 		"a-blog cms": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "a-blog cms.svg",
 			"implies": "PHP",
 			"meta": {
 				"generator": "a-blog cms"
 			},
-			"website": "www.a-blogcms.jp"
+			"website": "http://www.a-blogcms.jp"
 		},
 		"actionhero.js": {
 			"cats": [
-				1,
-				18,
-				22
+				"1",
+				"18",
+				"22"
 			],
 			"env": "^actionheroClient$",
 			"headers": {
@@ -8908,40 +9032,40 @@
 			"icon": "actionhero.js.png",
 			"implies": "Node.js",
 			"script": "actionheroClient\\.js",
-			"website": "www.actionherojs.com"
+			"website": "http://www.actionherojs.com"
 		},
 		"amCharts": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^AmCharts$",
 			"icon": "amCharts.png",
 			"script": "amcharts.*\\.js",
-			"website": "amcharts.com"
+			"website": "http://amcharts.com"
 		},
 		"basket.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^basket$\\;confidence:20",
 			"icon": "basket.js.png",
 			"script": "basket.*\\.js\\;confidence:10",
-			"website": "addyosmani.github.io/basket.js/"
+			"website": "http://addyosmani.github.io/basket.js/"
 		},
 		"cPanel": {
 			"cats": [
-				9
+				"9"
 			],
 			"headers": {
 				"Server": "cpsrvd/([\\d.]+)\\;version:\\1"
 			},
 			"html": "<!-- cPanel",
 			"icon": "cPanel.png",
-			"website": "www.cpanel.net"
+			"website": "http://www.cpanel.net"
 		},
 		"cgit": {
 			"cats": [
-				19
+				"19"
 			],
 			"html": [
 				"<[^>]+id='cgit'",
@@ -8952,42 +9076,42 @@
 			"meta": {
 				"generator": "^cgit v([\\d.a-z-]+)$\\;version:\\1"
 			},
-			"website": "git.zx2c4.com/cgit"
+			"website": "http://git.zx2c4.com/cgit"
 		},
 		"comScore": {
 			"cats": [
-				10
+				"10"
 			],
 			"env": "^_?COMSCORE$",
 			"html": "<iframe[^>]* (?:id=\"comscore\"|scr=[^>]+comscore)|\\.scorecardresearch\\.com/beacon\\.js|COMSCORE\\.beacon",
 			"icon": "comScore.png",
 			"script": "\\.scorecardresearch\\.com/beacon\\.js|COMSCORE\\.beacon",
-			"website": "comscore.com"
+			"website": "http://comscore.com"
 		},
 		"debut": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "debut\\/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "debut.png",
 			"implies": "Brother",
-			"website": "www.brother.com"
+			"website": "http://www.brother.com"
 		},
 		"dwhttpd": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "dwhttpd\\/?([\\d\\.a-z]+)?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"e107": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"Set-Cookie": "e107_tz[^;]+=",
@@ -8996,32 +9120,32 @@
 			"icon": "e107.png",
 			"implies": "PHP",
 			"script": "[^a-z\\d]e107\\.js",
-			"website": "e107.org"
+			"website": "http://e107.org"
 		},
 		"eDevice SmartStack": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "eDevice SmartStack(?: ?/?([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "eDevice SmartStack.png",
-			"website": "edevice.com"
+			"website": "http://edevice.com"
 		},
 		"eHTTP": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "\beHTTP(?: v?([\\d\\.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "HP ProCurve",
-			"website": "???"
+			"website": "http://example.com"
 		},
 		"eSyndiCat": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^esyndicat$",
 			"headers": {
@@ -9032,12 +9156,12 @@
 			"meta": {
 				"generator": "^eSyndiCat "
 			},
-			"website": "esyndicat.com"
+			"website": "http://esyndicat.com"
 		},
 		"eZ Publish": {
 			"cats": [
-				1,
-				6
+				"1",
+				"6"
 			],
 			"headers": {
 				"X-Powered-By": "^eZ Publish"
@@ -9047,50 +9171,49 @@
 			"meta": {
 				"generator": "eZ Publish"
 			},
-			"website": "ez.no"
+			"website": "http://ez.no"
 		},
 		"enduro.js": {
 			"cats": [
-				1,
-				18,
-				47
+				"1",
+				"18",
+				"47"
 			],
 			"headers": {
 				"X-Powered-By": "^enduro.js$"
 			},
 			"icon": "enduro.js.svg",
 			"implies": "Node.js",
-			"website": "endurojs.com"
+			"website": "http://endurojs.com"
 		},
 		"git": {
 			"cats": [
-				47
+				"47"
 			],
 			"icon": "git.png",
 			"meta": {
 				"generator": "\bgit/([\\d.]+\\d)\\;version:\\1"
 			},
-			"website": "git-scm.com"
+			"website": "http://git-scm.com"
 		},
 		"gitlist": {
 			"cats": [
-				47
+				"47"
 			],
 			"html": "<p>Powered by <a[^>]+>GitList ([\\d.]+)\\;version:\\1",
+			"icon": "default.svg",
 			"implies": [
 				"PHP",
 				"git"
 			],
-			"icon": "default.png",
-			"website": "gitlist.org"
+			"website": "http://gitlist.org"
 		},
 		"gitweb": {
 			"cats": [
-				47
+				"47"
 			],
 			"html": "<!-- git web interface version ([\\d.]+)?\\;version:\\1",
-			"icon": "gitweb.png",
-			"script": "static/gitweb.js$",
+			"icon": "git.png",
 			"implies": [
 				"Perl",
 				"git"
@@ -9098,45 +9221,46 @@
 			"meta": {
 				"generator": "gitweb(?:/([\\d.]+\\d))?\\;version:\\1"
 			},
-			"website": "git-scm.com"
+			"script": "static/gitweb.js$",
+			"website": "http://git-scm.com"
 		},
 		"gunicorn": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "gunicorn(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "gunicorn.png",
 			"implies": "Python",
-			"website": "gunicorn.org"
+			"website": "http://gunicorn.org"
 		},
 		"hapi.js": {
 			"cats": [
-				18,
-				22
+				"18",
+				"22"
 			],
 			"headers": {
 				"Set-Cookie": "Fe26\\.2\\*\\*\\;confidence:50"
 			},
 			"icon": "hapi.js.png",
 			"implies": "Node.js",
-			"website": "hapijs.com"
+			"website": "http://hapijs.com"
 		},
 		"iCongo": {
 			"cats": [
-				6
+				"6"
 			],
-			"icon": "iCongo.png",
+			"icon": "Hybris.png",
 			"implies": "Adobe ColdFusion",
 			"meta": {
 				"iCongo": ""
 			},
-			"website": "hybris.com/icongo"
+			"website": "http://hybris.com/icongo"
 		},
 		"iPresta": {
 			"cats": [
-				6
+				"6"
 			],
 			"excludes": "PrestaShop",
 			"icon": "iPresta.png",
@@ -9144,51 +9268,51 @@
 			"meta": {
 				"designer": "iPresta"
 			},
-			"website": "ipresta.ir"
+			"website": "http://ipresta.ir"
 		},
 		"iWeb": {
 			"cats": [
-				20
+				"20"
 			],
 			"icon": "iWeb.png",
 			"meta": {
 				"generator": "^iWeb( [\\d.]+)?\\;version:\\1"
 			},
-			"website": "apple.com/ilife/iweb"
+			"website": "http://apple.com/ilife/iweb"
 		},
 		"ikiwiki": {
 			"cats": [
-				8
+				"8"
 			],
 			"html": [
 				"<link rel=\"alternate\" type=\"application/x-wiki\" title=\"Edit this page\" href=\"/ikiwiki\\.cgi",
-				"<a href=\"/ikiwiki\\.cgi\\?do=edit"
+				"<a href=\"/ikiwiki\\.cgi\\?do="
 			],
 			"icon": "ikiwiki.png",
-			"website": "ikiwiki.info"
+			"website": "http://ikiwiki.info"
 		},
 		"io4 CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "io4 CMS.png",
 			"meta": {
 				"generator": "GO[ |]+CMS Enterprise"
 			},
-			"website": "notenbomer.nl/Producten/Content_management/io4_|_cms"
+			"website": "http://notenbomer.nl/Producten/Content_management/io4_|_cms"
 		},
 		"jQTouch": {
 			"cats": [
-				26
+				"26"
 			],
 			"env": "^jQT$",
 			"icon": "jQTouch.png",
 			"script": "jqtouch.*\\.js",
-			"website": "jqtouch.com"
+			"website": "http://jqtouch.com"
 		},
 		"jQuery": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^jQuery$",
 			"icon": "jQuery.svg",
@@ -9197,29 +9321,29 @@
 				"/([\\d.]+)/jquery(?:\\.min)?\\.js\\;version:\\1",
 				"jquery.*\\.js"
 			],
-			"website": "jquery.com"
+			"website": "http://jquery.com"
 		},
 		"jQuery Mobile": {
 			"cats": [
-				26
+				"26"
 			],
 			"icon": "jQuery Mobile.svg",
 			"implies": "jQuery",
 			"script": "jquery\\.mobile(?:-([\\d.]+rc\\d))?.*\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1?\\1:\\2",
-			"website": "jquerymobile.com"
+			"website": "http://jquerymobile.com"
 		},
 		"jQuery Sparklines": {
 			"cats": [
-				25
+				"25"
 			],
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "jQuery",
 			"script": "jquery\\.sparkline.*\\.js",
-			"website": "omnipotent.net/jquery.sparkline/"
+			"website": "http://omnipotent.net/jquery.sparkline/"
 		},
 		"jQuery UI": {
 			"cats": [
-				12
+				"12"
 			],
 			"icon": "jQuery UI.svg",
 			"implies": "jQuery",
@@ -9228,93 +9352,93 @@
 				"([\\d.]+)/jquery-ui(?:\\.min)?\\.js\\;version:\\1",
 				"jquery-ui.*\\.js"
 			],
-			"website": "jqueryui.com"
+			"website": "http://jqueryui.com"
 		},
 		"jqPlot": {
 			"cats": [
-				25
+				"25"
 			],
 			"icon": "jqPlot.png",
 			"implies": "jQuery",
 			"script": "jqplot.*\\.js",
-			"website": "www.jqplot.com"
+			"website": "http://www.jqplot.com"
 		},
 		"libwww-perl-daemon": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "libwww-perl-daemon(?:/([\\d\\.]+))?\\;version:\\1"
 			},
 			"icon": "libwww-perl-daemon.png",
 			"implies": "Perl",
-			"website": "metacpan.org/pod/HTTP::Daemon"
+			"website": "http://metacpan.org/pod/HTTP::Daemon"
 		},
 		"lighttpd": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "lighttpd(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "lighttpd.png",
-			"website": "www.lighttpd.net"
+			"website": "http://www.lighttpd.net"
 		},
 		"math.js": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^mathjs$",
 			"icon": "math.js.png",
 			"script": "math(?:\\.min)?\\.js",
-			"website": "mathjs.org"
+			"website": "http://mathjs.org"
 		},
 		"mini_httpd": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "mini_httpd(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "mini_httpd.png",
-			"website": "acme.com/software/mini_httpd"
+			"website": "http://acme.com/software/mini_httpd"
 		},
 		"mod_auth_pam": {
 			"cats": [
-				33
+				"33"
 			],
 			"headers": {
 				"Server": "mod_auth_pam(?:/([\\d\\.]+))?\\;version:\\1"
 			},
 			"icon": "Apache.svg",
 			"implies": "Apache",
-			"website": "pam.sourceforge.net/mod_auth_pam"
+			"website": "http://pam.sourceforge.net/mod_auth_pam"
 		},
 		"mod_dav": {
 			"cats": [
-				33
+				"33"
 			],
 			"headers": {
 				"Server": "\b(?:mod_)?DAV\b(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Apache.svg",
 			"implies": "Apache",
-			"website": "webdav.org/mod_dav"
+			"website": "http://webdav.org/mod_dav"
 		},
 		"mod_fastcgi": {
 			"cats": [
-				33
+				"33"
 			],
 			"headers": {
 				"Server": "mod_fastcgi(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Apache.svg",
 			"implies": "Apache",
-			"website": "www.fastcgi.com/mod_fastcgi/docs/mod_fastcgi.html"
+			"website": "http://www.fastcgi.com/mod_fastcgi/docs/mod_fastcgi.html"
 		},
 		"mod_jk": {
 			"cats": [
-				33
+				"33"
 			],
 			"headers": {
 				"Server": "mod_jk(?:/([\\d\\.]+))?\\;version:\\1"
@@ -9324,11 +9448,11 @@
 				"Apache Tomcat",
 				"Apache"
 			],
-			"website": "tomcat.apache.org/tomcat-3.3-doc/mod_jk-howto.html"
+			"website": "http://tomcat.apache.org/tomcat-3.3-doc/mod_jk-howto.html"
 		},
 		"mod_perl": {
 			"cats": [
-				33
+				"33"
 			],
 			"headers": {
 				"Server": "mod_perl(?:/([\\d\\.]+))?\\;version:\\1"
@@ -9338,11 +9462,11 @@
 				"Perl",
 				"Apache"
 			],
-			"website": "perl.apache.org"
+			"website": "http://perl.apache.org"
 		},
 		"mod_python": {
 			"cats": [
-				33
+				"33"
 			],
 			"headers": {
 				"Server": "mod_python(?:/([\\d.]+))?\\;version:\\1"
@@ -9352,52 +9476,52 @@
 				"Python",
 				"Apache"
 			],
-			"website": "www.modpython.org"
+			"website": "http://www.modpython.org"
 		},
 		"mod_rack": {
 			"cats": [
-				33
+				"33"
 			],
 			"headers": {
 				"Server": "mod_rack(?:/([\\d.]+))?\\;version:\\1",
 				"X-Powered-By": "mod_rack(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "mod_rack.png",
+			"icon": "Phusion Passenger.png",
 			"implies": [
 				"Ruby on Rails\\;confidence:50",
 				"Apache"
 			],
-			"website": "phusionpassenger.com"
+			"website": "http://phusionpassenger.com"
 		},
 		"mod_rails": {
 			"cats": [
-				33
+				"33"
 			],
 			"headers": {
 				"Server": "mod_rails(?:/([\\d.]+))?\\;version:\\1",
 				"X-Powered-By": "mod_rails(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "mod_rails.png",
+			"icon": "Phusion Passenger.png",
 			"implies": [
 				"Ruby on Rails\\;confidence:50",
 				"Apache"
 			],
-			"website": "phusionpassenger.com"
+			"website": "http://phusionpassenger.com"
 		},
 		"mod_ssl": {
 			"cats": [
-				33
+				"33"
 			],
 			"headers": {
 				"Server": "mod_ssl(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "mod_ssl.png",
 			"implies": "Apache",
-			"website": "modssl.org"
+			"website": "http://modssl.org"
 		},
 		"mod_wsgi": {
 			"cats": [
-				33
+				"33"
 			],
 			"headers": {
 				"Server": "mod_wsgi(?:/([\\d.]+))?\\;version:\\1",
@@ -9408,38 +9532,38 @@
 				"Python\\;confidence:50",
 				"Apache"
 			],
-			"website": "code.google.com/p/modwsgi"
+			"website": "http://code.google.com/p/modwsgi"
 		},
 		"nopCommerce": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "(?:<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)",
 			"icon": "nopCommerce.png",
 			"implies": "Microsoft ASP.NET",
-			"website": "www.nopcommerce.com"
+			"website": "http://www.nopcommerce.com"
 		},
 		"openEngine": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "openEngine.png",
 			"meta": {
 				"openEngine": ""
 			},
-			"website": "openengine.de/html/pages/de/"
+			"website": "http://openengine.de/html/pages/de/"
 		},
 		"osCSS": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "<body onload=\"window\\.defaultStatus='oscss templates';\"",
 			"icon": "osCSS.png",
-			"website": "www.oscss.org"
+			"website": "http://www.oscss.org"
 		},
 		"osCommerce": {
 			"cats": [
-				6
+				"6"
 			],
 			"headers": {
 				"Set-Cookie": "osCsid="
@@ -9450,11 +9574,11 @@
 				"PHP",
 				"MySQL"
 			],
-			"website": "www.oscommerce.com"
+			"website": "http://www.oscommerce.com"
 		},
 		"osTicket": {
 			"cats": [
-				13
+				"13"
 			],
 			"headers": {
 				"Set-Cookie": "OSTSESSID"
@@ -9464,11 +9588,11 @@
 				"PHP",
 				"MySQL"
 			],
-			"website": "osticket.com"
+			"website": "http://osticket.com"
 		},
 		"ownCloud": {
 			"cats": [
-				19
+				"19"
 			],
 			"html": "<a href=\"https://owncloud.com\" target=\"_blank\">ownCloud Inc.</a><br/>Your Cloud, Your Data, Your Way!",
 			"icon": "ownCloud.png",
@@ -9476,29 +9600,29 @@
 			"meta": {
 				"apple-itunes-app": "app-id=543672169"
 			},
-			"website": "owncloud.org"
+			"website": "http://owncloud.org"
 		},
 		"papaya CMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "<link[^>]*/papaya-themes/",
 			"icon": "papaya CMS.png",
 			"implies": "PHP",
-			"website": "papaya-cms.com"
+			"website": "http://papaya-cms.com"
 		},
 		"phpAlbum": {
 			"cats": [
-				7
+				"7"
 			],
 			"html": "<!--phpalbum ([.\\d\\s]+)-->\\;version:\\1",
 			"icon": "phpAlbum.png",
 			"implies": "PHP",
-			"website": "phpalbum.net"
+			"website": "http://phpalbum.net"
 		},
 		"phpBB": {
 			"cats": [
-				2
+				"2"
 			],
 			"env": "^(?:style_cookie_settings|phpbb_)",
 			"headers": {
@@ -9510,45 +9634,29 @@
 			"meta": {
 				"copyright": "phpBB Group"
 			},
-			"website": "phpbb.com"
+			"website": "http://phpbb.com"
 		},
 		"phpCMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"env": "^phpcms",
 			"icon": "phpCMS.png",
 			"implies": "PHP",
-			"website": "phpcms.de"
+			"website": "http://phpcms.de"
 		},
 		"phpDocumentor": {
 			"cats": [
-				4
+				"4"
 			],
 			"html": "<!-- Generated by phpDocumentor",
 			"icon": "phpDocumentor.png",
 			"implies": "PHP",
-			"website": "www.phpdoc.org"
-		},
-		"phpliteadmin": {
-			"cats": [
-				3
-			],
-			"html": [
-				"<span id='logo'>phpLiteAdmin</span> <span id='version'>v([0-9.]+)<\\;version:\\1",
-				"<!-- Copyright [0-9]+ phpLiteAdmin (?:http://www.phpliteadmin.org/) -->",
-				"Powered by <a href='http://www.phpliteadmin\\.org/'"
-			],
-			"icon": "phpliteadmin.png",
-			"implies": [
-				"PHP",
-				"SQLite"
-			],
-			"website": "www.phpliteadmin.org/"
+			"website": "http://www.phpdoc.org"
 		},
 		"phpMyAdmin": {
 			"cats": [
-				3
+				"3"
 			],
 			"env": "^pma_absolute_uri$",
 			"html": "(?: \\| phpMyAdmin ([\\d.]+)<\\/title>|PMA_sendHeaderLocation\\(|<link [^>]*href=\"[^\"]*phpmyadmin\\.css\\.php)\\;version:\\1",
@@ -9557,20 +9665,20 @@
 				"PHP",
 				"MySQL"
 			],
-			"website": "www.phpmyadmin.net"
+			"website": "http://www.phpmyadmin.net"
 		},
 		"phpPgAdmin": {
 			"cats": [
-				3
+				"3"
 			],
 			"html": "(?:<title>phpPgAdmin</title>|<span class=\"appname\">phpPgAdmin)",
 			"icon": "phpPgAdmin.png",
 			"implies": "PHP",
-			"website": "phppgadmin.sourceforge.net"
+			"website": "http://phppgadmin.sourceforge.net"
 		},
 		"phpSQLiteCMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "phpSQLiteCMS.png",
 			"implies": [
@@ -9580,12 +9688,28 @@
 			"meta": {
 				"generator": "^phpSQLiteCMS(?: (.+))?$\\;version:\\1"
 			},
-			"website": "phpsqlitecms.net"
+			"website": "http://phpsqlitecms.net"
+		},
+		"phpliteadmin": {
+			"cats": [
+				"3"
+			],
+			"html": [
+				"<span id='logo'>phpLiteAdmin</span> <span id='version'>v([0-9.]+)<\\;version:\\1",
+				"<!-- Copyright [0-9]+ phpLiteAdmin (?:http://www.phpliteadmin.org/) -->",
+				"Powered by <a href='http://www.phpliteadmin\\.org/'"
+			],
+			"icon": "phpliteadmin.png",
+			"implies": [
+				"PHP",
+				"SQLite"
+			],
+			"website": "http://www.phpliteadmin.org/"
 		},
 		"phpwind": {
 			"cats": [
-				1,
-				2
+				"1",
+				"2"
 			],
 			"html": "Powered by <a href=\"[^\"]+phpwind\\.net",
 			"icon": "phpwind.png",
@@ -9593,129 +9717,129 @@
 			"meta": {
 				"generator": "^phpwind"
 			},
-			"website": "www.phpwind.net"
+			"website": "http://www.phpwind.net"
 		},
 		"prettyPhoto": {
 			"cats": [
-				7,
-				12
+				"7",
+				"12"
 			],
 			"env": "pp_(?:alreadyInitialized|descriptions|images|titles)",
 			"html": "(?:<link [^>]*href=\"[^\"]*prettyPhoto(?:\\.min)?\\.css|<a [^>]*rel=\"prettyPhoto)",
 			"icon": "prettyPhoto.png",
 			"implies": "jQuery",
 			"script": "jquery\\.prettyPhoto\\.js",
-			"website": "no-margin-for-errors.com/projects/prettyphoto-jquery-lightbox-clone/"
+			"website": "http://no-margin-for-errors.com/projects/prettyphoto-jquery-lightbox-clone/"
 		},
 		"punBB": {
 			"cats": [
-				2
+				"2"
 			],
 			"html": "Powered by <a href=\"[^>]+punbb",
 			"icon": "punBB.png",
 			"implies": "PHP",
-			"website": "punbb.informer.com"
+			"website": "http://punbb.informer.com"
 		},
 		"reCAPTCHA": {
 			"cats": [
-				16
+				"16"
 			],
 			"env": "^Recaptcha$",
 			"html": "(?:<div[^>]+id=\"recaptcha_image|<link[^>]+recaptcha|document\\.getElementById\\('recaptcha')",
 			"icon": "reCAPTCHA.png",
 			"script": "(?:api-secure\\.recaptcha\\.net|recaptcha_ajax\\.js)",
-			"website": "recaptcha.net"
+			"website": "http://recaptcha.net"
 		},
 		"sIFR": {
 			"cats": [
-				17
+				"17"
 			],
 			"icon": "sIFR.png",
 			"script": "sifr\\.js",
-			"website": "www.mikeindustries.com/blog/sifr"
+			"website": "http://www.mikeindustries.com/blog/sifr"
 		},
 		"sNews": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "sNews.png",
 			"meta": {
 				"generator": "sNews"
 			},
-			"website": "snewscms.com"
+			"website": "http://snewscms.com"
 		},
 		"script.aculo.us": {
 			"cats": [
-				12
+				"12"
 			],
 			"env": "^Scriptaculous$",
 			"icon": "script.aculo.us.png",
 			"script": "(?:scriptaculous|protoaculous)\\.js",
-			"website": "script.aculo.us"
+			"website": "http://script.aculo.us"
 		},
 		"shine.js": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^Shine$",
-			"icon": "default.png",
+			"icon": "default.svg",
 			"script": "shine(?:\\.min)?\\.js",
-			"website": "bigspaceship.github.io/shine.js/"
+			"website": "http://bigspaceship.github.io/shine.js/"
 		},
 		"spin.js": {
 			"cats": [
-				12,
-				25
+				"12",
+				"25"
 			],
 			"env": "^Spinner$",
 			"icon": "spin.js.png",
 			"script": "spin(?:\\.min)?\\.js",
-			"website": "fgnass.github.io/spin.js/"
+			"website": "http://fgnass.github.io/spin.js/"
 		},
 		"swift.engine": {
 			"cats": [
-				1
+				"1"
 			],
 			"headers": {
 				"X-Powered-By": "swift\\.engine"
 			},
 			"icon": "swift.engine.png",
-			"website": "mittec.ru/default"
+			"website": "http://mittec.ru/default"
 		},
 		"three.js": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^THREE$",
 			"icon": "three.js.png",
 			"script": "three(?:\\.min)?\\.js",
-			"website": "threejs.org"
+			"website": "http://threejs.org"
 		},
 		"thttpd": {
 			"cats": [
-				22
+				"22"
 			],
 			"headers": {
 				"Server": "\bthttpd(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "thttpd.png",
-			"website": "acme.com/software/thttpd"
+			"website": "http://acme.com/software/thttpd"
 		},
 		"total.js": {
 			"cats": [
-				18
+				"18"
 			],
 			"headers": {
 				"X-Powered-By": "^total\\.js"
 			},
 			"icon": "total.js.png",
 			"implies": "Node.js",
-			"website": "totaljs.com"
+			"website": "http://totaljs.com"
 		},
 		"uCore": {
 			"cats": [
-				1,
-				18
+				"1",
+				"18"
 			],
 			"headers": {
 				"Set-Cookie": "ucore"
@@ -9725,14 +9849,14 @@
 			"meta": {
 				"generator": "uCore PHP Framework"
 			},
-			"website": "ucore.io"
+			"website": "http://ucore.io"
 		},
 		"uKnowva": {
 			"cats": [
-				1,
-				2,
-				18,
-				50
+				"1",
+				"2",
+				"18",
+				"50"
 			],
 			"headers": {
 				"X-Content-Encoded-By": "uKnowva ([\\d.]+)\\;version:\\1"
@@ -9744,11 +9868,11 @@
 				"generator": "uKnowva (?: ([\\d.]+))?\\;version:\\1"
 			},
 			"script": "/media/conv/js/jquery.js",
-			"website": "uknowva.com"
+			"website": "http://uknowva.com"
 		},
 		"vBulletin": {
 			"cats": [
-				2
+				"2"
 			],
 			"env": "^(?:vBulletin|vB_[^g])",
 			"icon": "vBulletin.png",
@@ -9756,130 +9880,286 @@
 			"meta": {
 				"generator": "vBulletin"
 			},
-			"website": "www.vbulletin.com"
+			"website": "http://www.vbulletin.com"
 		},
 		"viennaCMS": {
 			"cats": [
-				1
+				"1"
 			],
 			"html": "powered by <a href=\"[^>]+viennacms",
-			"icon": "default.png",
-			"website": "www.viennacms.nl"
+			"icon": "default.svg",
+			"website": "http://www.viennacms.nl"
 		},
 		"vis.js": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^vis$",
 			"html": "<link[^>]+?href=\"[^\"]+vis(?:\\.min)?\\.css",
 			"icon": "vis.js.png",
 			"script": "vis(?:\\.min)?\\.js",
-			"website": "visjs.org"
+			"website": "http://visjs.org"
 		},
 		"webEdition": {
 			"cats": [
-				1
+				"1"
 			],
 			"icon": "webEdition.png",
 			"meta": {
 				"DC.title": "webEdition",
 				"generator": "webEdition"
 			},
-			"website": "webedition.de/en"
+			"website": "http://webedition.de/en"
 		},
 		"webpack": {
 			"cats": [
-				44
+				"44"
 			],
 			"env": "^webpackJsonp$",
 			"icon": "webpack.svg",
-			"website": "webpack.github.io"
+			"website": "http://webpack.github.io"
 		},
 		"xCharts": {
 			"cats": [
-				25
+				"25"
 			],
 			"env": "^xChart$",
 			"html": "<link[^>]* href=\"[^\"]*xcharts(?:\\.min)?\\.css",
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "D3",
 			"script": "xcharts\\.js",
-			"website": "tenxer.github.io/xcharts/"
+			"website": "http://tenxer.github.io/xcharts/"
 		},
 		"xtCommerce": {
 			"cats": [
-				6
+				"6"
 			],
 			"html": "<div class=\"copyright\">[^<]+<a[^>]+>xt:Commerce",
 			"icon": "xtCommerce.png",
 			"meta": {
 				"generator": "xt:Commerce"
 			},
-			"website": "www.xt-commerce.com"
+			"website": "http://www.xt-commerce.com"
 		},
 		"xui": {
 			"cats": [
-				26,
-				12
+				"26",
+				"12"
 			],
 			"env": "^xui$",
 			"icon": "xui.png",
 			"script": "[^a-z]xui.*\\.js",
-			"website": "xuijs.com"
+			"website": "http://xuijs.com"
 		}
 	},
 	"categories": {
-		"1": "CMS",
-		"2": "Message Boards",
-		"3": "Database Managers",
-		"4": "Documentation Tools",
-		"5": "Widgets",
-		"6": "Ecommerce",
-		"7": "Photo Galleries",
-		"8": "Wikis",
-		"9": "Hosting Panels",
-		"10": "Analytics",
-		"11": "Blogs",
-		"12": "JavaScript Frameworks",
-		"13": "Issue Trackers",
-		"14": "Video Players",
-		"15": "Comment Systems",
-		"16": "Captchas",
-		"17": "Font Scripts",
-		"18": "Web Frameworks",
-		"19": "Miscellaneous",
-		"20": "Editors",
-		"21": "LMS",
-		"22": "Web Servers",
-		"23": "Cache Tools",
-		"24": "Rich Text Editors",
-		"25": "JavaScript Graphics",
-		"26": "Mobile Frameworks",
-		"27": "Programming Languages",
-		"28": "Operating Systems",
-		"29": "Search Engines",
-		"30": "Web Mail",
-		"31": "CDN",
-		"32": "Marketing Automation",
-		"33": "Web Server Extensions",
-		"34": "Databases",
-		"35": "Maps",
-		"36": "Advertising Networks",
-		"37": "Network Devices",
-		"38": "Media Servers",
-		"39": "Webcams",
-		"40": "Printers",
-		"41": "Payment Processors",
-		"42": "Tag Managers",
-		"43": "Paywalls",
-		"44": "Build CI Systems",
-		"45": "Control Systems",
-		"46": "Remote Access",
-		"47": "Dev Tools",
-		"48": "Network Storage",
-		"49": "Feed Readers",
-		"50": "Document Management Systems",
-		"51": "Landing Page Builders",
-		"52": "Live Chat"
+		"1": {
+			"name": "CMS",
+			"priority": "1"
+		},
+		"2": {
+			"name": "Message Boards",
+			"priority": "1"
+		},
+		"3": {
+			"name": "Database Managers",
+			"priority": "9"
+		},
+		"4": {
+			"name": "Documentation Tools",
+			"priority": "9"
+		},
+		"5": {
+			"name": "Widgets",
+			"priority": "9"
+		},
+		"6": {
+			"name": "Ecommerce",
+			"priority": "1"
+		},
+		"7": {
+			"name": "Photo Galleries",
+			"priority": "1"
+		},
+		"8": {
+			"name": "Wikis",
+			"priority": "1"
+		},
+		"9": {
+			"name": "Hosting Panels",
+			"priority": "1"
+		},
+		"10": {
+			"name": "Analytics",
+			"priority": "9"
+		},
+		"11": {
+			"name": "Blogs",
+			"priority": "1"
+		},
+		"12": {
+			"name": "JavaScript Frameworks",
+			"priority": "3"
+		},
+		"13": {
+			"name": "Issue Trackers",
+			"priority": "9"
+		},
+		"14": {
+			"name": "Video Players",
+			"priority": "9"
+		},
+		"15": {
+			"name": "Comment Systems",
+			"priority": "9"
+		},
+		"16": {
+			"name": "Captchas",
+			"priority": "9"
+		},
+		"17": {
+			"name": "Font Scripts",
+			"priority": "9"
+		},
+		"18": {
+			"name": "Web Frameworks",
+			"priority": "2"
+		},
+		"19": {
+			"name": "Miscellaneous",
+			"priority": "9"
+		},
+		"20": {
+			"name": "Editors",
+			"priority": "9"
+		},
+		"21": {
+			"name": "LMS",
+			"priority": "1"
+		},
+		"22": {
+			"name": "Web Servers",
+			"priority": "9"
+		},
+		"23": {
+			"name": "Cache Tools",
+			"priority": "9"
+		},
+		"24": {
+			"name": "Rich Text Editors",
+			"priority": "9"
+		},
+		"25": {
+			"name": "JavaScript Graphics",
+			"priority": "3"
+		},
+		"26": {
+			"name": "Mobile Frameworks",
+			"priority": "3"
+		},
+		"27": {
+			"name": "Programming Languages",
+			"priority": "4"
+		},
+		"28": {
+			"name": "Operating Systems",
+			"priority": "5"
+		},
+		"29": {
+			"name": "Search Engines",
+			"priority": "9"
+		},
+		"30": {
+			"name": "Web Mail",
+			"priority": "9"
+		},
+		"31": {
+			"name": "CDN",
+			"priority": "9"
+		},
+		"32": {
+			"name": "Marketing Automation",
+			"priority": "9"
+		},
+		"33": {
+			"name": "Web Server Extensions",
+			"priority": "9"
+		},
+		"34": {
+			"name": "Databases",
+			"priority": "9"
+		},
+		"35": {
+			"name": "Maps",
+			"priority": "9"
+		},
+		"36": {
+			"name": "Advertising Networks",
+			"priority": "9"
+		},
+		"37": {
+			"name": "Network Devices",
+			"priority": "9"
+		},
+		"38": {
+			"name": "Media Servers",
+			"priority": "1"
+		},
+		"39": {
+			"name": "Webcams",
+			"priority": "9"
+		},
+		"40": {
+			"name": "Printers",
+			"priority": "9"
+		},
+		"41": {
+			"name": "Payment Processors",
+			"priority": "9"
+		},
+		"42": {
+			"name": "Tag Managers",
+			"priority": "9"
+		},
+		"43": {
+			"name": "Paywalls",
+			"priority": "9"
+		},
+		"44": {
+			"name": "Build CI Systems",
+			"priority": "9"
+		},
+		"45": {
+			"name": "Control Systems",
+			"priority": "9"
+		},
+		"46": {
+			"name": "Remote Access",
+			"priority": "9"
+		},
+		"47": {
+			"name": "Dev Tools",
+			"priority": "9"
+		},
+		"48": {
+			"name": "Network Storage",
+			"priority": "9"
+		},
+		"49": {
+			"name": "Feed Readers",
+			"priority": "1"
+		},
+		"50": {
+			"name": "Document Management Systems",
+			"priority": "1"
+		},
+		"51": {
+			"name": "Landing Page Builders",
+			"priority": "2"
+		},
+		"52": {
+			"name": "Live Chat",
+			"priority": "9"
+		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/drivers/bookmarklet/css/wappalyzer.css b/src/drivers/bookmarklet/css/wappalyzer.css
deleted file mode 100644
index 67836659c..000000000
--- a/src/drivers/bookmarklet/css/wappalyzer.css
+++ /dev/null
@@ -1,118 +0,0 @@
-div#wappalyzer-container * {
-	background-color: transparent !important;
-	border: none !important;
-	border-left: none !important;
-	border-top: none !important;
-	border-right: none !important;
-	border-bottom: none !important;
-	border-spacing: 0 !important;
-	color: inherit !important;
-	font-size: inherit !important;
-	font-weight: inherit !important;
-	font-family: inherit !important;
-	font-style: inherit !important;
-	line-height: inherit !important;
-	list-style: none inside !important;
-	margin: 0 !important;
-	outline: none !important;
-	padding: 0 !important;
-	text-align: inherit !important;
-	text-decoration: none !important;
-	white-space: inherit !important;
-}
-
-#wappalyzer-container {
-	background: #fff !important;
-	border: 1px solid #999;
-	box-shadow: 0 0 10px rgba(0, 0, 0, .2) !important;
-	color: #222 !important;
-	font-family: Arial, sans-serif !important;
-	font-size: 14px !important;
-	line-height: 1.5em !important;
-	margin: 0 !important;
-	position: fixed !important;
-	text-align: left !important;
-	right: 20px !important;
-	top: 20px !important;
-	width: 250px !important;
-	z-index: 99999 !important;
-}
-
-	#wappalyzer-container #wappalyzer-pending {
-		background-repeat: no-repeat !important;
-		background-position: center center !important;
-		height: 60px !important;
-	}
-
-	#wappalyzer-container a#wappalyzer-close:link,
-	#wappalyzer-container a#wappalyzer-close:hover,
-	#wappalyzer-container a#wappalyzer-close:active,
-	#wappalyzer-container a#wappalyzer-close:visited {
-		background: #f8f8f8 !important;
-		border-bottom: 1px solid #ccc !important;
-		display: block !important;
-		font-weight: bold !important;
-		line-height: 30px !important;
-		text-align: center !important;
-	}
-
-	#wappalyzer-container #wappalyzer-close:hover {
-		background: #f4f4f4 !important;
-		color: #0072B6 !important;
-	}
-
-	#wappalyzer-container #wappalyzer-empty {
-		border-bottom: 1px solid #ccc !important;
-		color: #999 !important;
-		display: block !important;
-		line-height: 30px !important;
-		text-align: center !important;
-	}
-
-	#wappalyzer-container #wappalyzer-apps {
-		padding-top: 2px !important;
-	}
-
-		#wappalyzer-container #wappalyzer-apps img {
-			vertical-align: middle !important;
-		}
-
-		#wappalyzer-container #wappalyzer-apps a:link,
-		#wappalyzer-container #wappalyzer-apps a:hover,
-		#wappalyzer-container #wappalyzer-apps a:active,
-		#wappalyzer-container #wappalyzer-apps a:visited {
-			display: block !important;
-			text-decoration: none !important;
-		}
-
-		#wappalyzer-container #wappalyzer-apps a:hover {
-			color: #0072B6 !important;
-		}
-
-		#wappalyzer-container #wappalyzer-apps div.wappalyzer-app {
-			background: #fff !important;
-			border-radius:         5px !important;
-			-moz-border-radius:    5px !important;
-			-webkit-border-radius: 5px !important;
-			margin: 0 2px 2px 2px !important;
-			padding: 7px 10px !important;
-		}
-
-		#wappalyzer-container #wappalyzer-apps a.wappalyzer-application:link,
-		#wappalyzer-container #wappalyzer-apps a.wappalyzer-application:hover,
-		#wappalyzer-container #wappalyzer-apps a.wappalyzer-application:active,
-		#wappalyzer-container #wappalyzer-apps a.wappalyzer-application:visited {
-			font-weight: bold !important;
-			margin-bottom: 3px !important;
-		}
-
-		#wappalyzer-container #wappalyzer-apps a.wappalyzer-category:link,
-		#wappalyzer-container #wappalyzer-apps a.wappalyzer-category:hover,
-		#wappalyzer-container #wappalyzer-apps a.wappalyzer-category:active,
-		#wappalyzer-container #wappalyzer-apps a.wappalyzer-category:visited {
-			color: #999 !important;
-		}
-
-		#wappalyzer-container #wappalyzer-apps a.wappalyzer-category:hover {
-			color: #0072B6 !important;
-		}
diff --git a/src/drivers/bookmarklet/js/driver.js b/src/drivers/bookmarklet/driver.js
similarity index 61%
rename from src/drivers/bookmarklet/js/driver.js
rename to src/drivers/bookmarklet/driver.js
index dc6772365..05b92a81a 100644
--- a/src/drivers/bookmarklet/js/driver.js
+++ b/src/drivers/bookmarklet/driver.js
@@ -3,60 +3,18 @@
  */
 
 (function() {
-	if ( wappalyzer == null ) return;
+	if ( typeof wappalyzer === 'undefined' ) {
+		return;
+	}
 
 	var
 		w             = wappalyzer,
-		debug         = true
+		debug         = true,
 		d             = window.document,
 		container     = d.getElementById('wappalyzer-container'),
 		domain        = window.top.location.host,
-		url           = window.top.location.href,
-		hasOwn        = Object.prototype.hasOwnProperty,
-		categoryNames = {
-			 1: 'CMS',
-			 2: 'Message Board',
-			 3: 'Database Manager',
-			 4: 'Documentation Tool',
-			 5: 'Widget',
-			 6: 'Web Shop',
-			 7: 'Photo Gallery',
-			 8: 'Wiki',
-			 9: 'Hosting Panel',
-			10: 'Analytics',
-			11: 'Blog',
-			12: 'JavaScript Framework',
-			13: 'Issue Tracker',
-			14: 'Video Player',
-			15: 'Comment System',
-			16: 'Captcha',
-			17: 'Font Script',
-			18: 'Web Framework',
-			19: 'Miscellaneous',
-			20: 'Editor',
-			21: 'LMS',
-			22: 'Web Server',
-			23: 'Cache Tool',
-			24: 'Rich Text Editor',
-			25: 'JavaScript Graphics',
-			26: 'Mobile Framework',
-			27: 'Programming Language',
-			28: 'Operating System',
-			29: 'Search Engine',
-			30: 'Web Mail',
-			31: 'CDN',
-			32: 'Marketing Automation',
-			33: 'Web Server Extensions',
-			34: 'Databases',
-			35: 'Maps',
-			36: 'Advertising Networks',
-			37: 'Network Devices',
-			38: 'Media Servers',
-			39: 'Webcams',
-			40: 'Printers',
-			41: 'Payment Processors'
-			}
-		;
+		url           = window.top.location.href.replace(/#.*$/, ''),
+		hasOwn        = Object.prototype.hasOwnProperty;
 
 	w.driver = {
 		timeout: 1000,
@@ -81,9 +39,11 @@
 		getEnvironmentVars: function() {
 			w.log('func: getEnvironmentVars');
 
-			var env = new Array;
+			var i, env = [];
 
-			for ( i in window ) { env.push(i); }
+			for ( i in window ) {
+				env.push(i);
+			}
 
 			w.analyze(domain, url, { html: d.documentElement.innerHTML, env: env });
 		},
@@ -105,11 +65,13 @@
 						var responseHeaders = {};
 
 						headers.forEach(function(line) {
+							var name, value;
+
 							if ( line ) {
 								name  = line.substring(0, line.indexOf(': '));
 								value = line.substring(line.indexOf(': ') + 2, line.length - 1);
 
-								responseHeaders[name] = value;
+								responseHeaders[name.toLowerCase()] = value;
 							}
 						});
 
@@ -128,39 +90,40 @@
 			w.log('func: diplayApps');
 
 			var
+				i,
 				first = true,
+				app,
 				category,
-				html
-				;
+				html;
 
 			html =
 				'<a id="wappalyzer-close" href="javascript: window.document.body.removeChild(window.document.getElementById(\'wappalyzer-container\')); void(0);">' +
 					'Close' +
 				'</a>' +
-				'<div id="wappalyzer-apps">'
-				;
+				'<div id="wappalyzer-apps">';
 
 			if ( w.detected[url] != null && Object.keys(w.detected[url]).length ) {
 				for ( app in w.detected[url] ) {
-					if(!hasOwn.call(w.detected[url], app)) {
+					if ( !hasOwn.call(w.detected[url], app) ) {
 						continue;
 					}
+
 					html +=
 						'<div class="wappalyzer-app' + ( first ? ' wappalyzer-first' : '' ) + '">' +
 							'<a target="_blank" class="wappalyzer-application" href="' + w.config.websiteURL + 'applications/' + app.toLowerCase().replace(/ /g, '-').replace(/[^a-z0-9-]/g, '') + '">' +
 								'<strong>' +
-									'<img src="' + w.config.websiteURL + 'bookmarklet/images/icons/' + w.apps[app].icon + '" width="16" height="16"/> ' + app +
+									'<img src="' + w.config.websiteURL + 'images/icons/' + w.apps[app].icon + '" width="16" height="16"/> ' + app +
 								'</strong>' +
-							'</a>'
-							;
+							'</a>';
 
 					for ( i in w.apps[app].cats ) {
-						if(!hasOwn.call(w.apps[app].cats, i)) {
+						if ( !hasOwn.call(w.apps[app].cats, i) ) {
 							continue;
 						}
-						category = w.apps[app].cats[i];
 
-						html += '<a target="_blank" class="wappalyzer-category" href="' + w.config.websiteURL + 'categories/' + w.categories[category] + '">' + categoryNames[category] + '</a>';
+						category = w.categories[w.apps[app].cats[i]].name;
+
+						html += '<a target="_blank" class="wappalyzer-category" href="' + w.config.websiteURL + 'categories/' + w.driver.slugify(category) + '">' + category + '</a>';
 					}
 
 					html += '</div>';
@@ -181,6 +144,10 @@
 		 */
 		goToURL: function(args) {
 			window.open(args.url);
+		},
+
+		slugify: function(string) {
+			return string.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, '');
 		}
 	};
 
diff --git a/src/drivers/bookmarklet/images/pending.gif b/src/drivers/bookmarklet/images/pending.gif
deleted file mode 100644
index 3864c0797..000000000
Binary files a/src/drivers/bookmarklet/images/pending.gif and /dev/null differ
diff --git a/src/drivers/bookmarklet/index.html b/src/drivers/bookmarklet/index.html
deleted file mode 100644
index f15dffed1..000000000
--- a/src/drivers/bookmarklet/index.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-	<head>
-		<meta charset="utf-8">
-
-		<title>Wappalyzer</title>
-
-		<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-
-		<style type="text/css">
-			body {
-				color: #000;
-				font-family: Verdana, Arial, sans-serif;
-				font-size: 14px;
-			}
-
-			#bookmarklet {
-				border: 1px solid #333;
-				color: #000;
-				display: inline-block;
-				padding: 10px 25px;
-				text-decoration: none;
-			}
-		</style>
-	</head>
-	<body>
-		<p>
-			Drag this button to your bookmarks toolbar:
-		</p>
-
-		<p>
-			<a id="bookmarklet" href="javascript: void(0);">Wappalyzer</a>
-		</p>
-
-		<div id="bookmarklet-code" style="display: none">
-			(function() {
-				var
-					d = document,
-					e = d.getElementById('wappalyzer-container');
-
-				if ( e !== null ) {
-					d.body.removeChild(e);
-				}
-
-				var
-					u = 'https://wappalyzer.com/bookmarklet/',
-					t = new Date().getTime(),
-					c = d.createElement('div'),
-					p = d.createElement('div'),
-					l = d.createElement('link'),
-					s = d.createElement('script');
-
-				c.setAttribute('id', 'wappalyzer-container');
-
-				l.setAttribute('rel', 'stylesheet');
-				l.setAttribute('href', u + 'css/wappalyzer.css');
-
-				d.head.appendChild(l);
-
-				p.setAttribute('id', 'wappalyzer-pending');
-				p.setAttribute('style', 'background-image: url(' + u + 'images/pending.gif) !important');
-
-				c.appendChild(p);
-
-				s.setAttribute('src', u + 'js/wappalyzer.js?' + t);
-
-				s.onload = function() {
-					s = d.createElement('script');
-
-					s.setAttribute('src', u + 'js/apps.js?' + t);
-
-					s.onload = function() {
-						s = d.createElement('script');
-
-						s.setAttribute('src', u + 'js/driver.js?' + t);
-
-						c.appendChild(s);
-					};
-
-					c.appendChild(s);
-				};
-
-				c.appendChild(s);
-
-				d.body.appendChild(c);
-			})();
-		</div>
-
-		<script>
-			$('#bookmarklet').attr('href', 'javascript:' + $('#bookmarklet-code').html().replace(/\s+/g, ' '));
-		</script>
-	</body>
-</html>
diff --git a/src/drivers/chrome/_locales/fr/messages.json b/src/drivers/chrome/_locales/fr/messages.json
index 52fabcef7..122d43020 100644
--- a/src/drivers/chrome/_locales/fr/messages.json
+++ b/src/drivers/chrome/_locales/fr/messages.json
@@ -1,14 +1,14 @@
 {
-	"github":               { "message": "Forker Wappalyzer sur GitHub!" },
-	"noAppsDetected":       { "message": "Pas d'applications détectées." },
+	"github":               { "message": "Forker Wappalyzer sur GitHub !" },
+	"noAppsDetected":       { "message": "Aucune application détectée." },
 	"nothingToDo":          { "message": "Rien à faire ici." },
-	"optionTracking":       { "message": "Envoyer anonymement des rapports sur les applications détectées à wappalyzer.com pour la recherche" },
-	"optionUpgradeMessage": { "message": "M'afficher les mises à jour" },
+	"optionTracking":       { "message": "Envoyer anonymement des rapports sur les applications détectées à wappalyzer.com pour recherche" },
+	"optionUpgradeMessage": { "message": "M'informer des mises à jour" },
 	"options":              { "message": "Options de Wappalyzer" },
-	"optionsSave":          { "message": "Sauver les options" },
-	"optionsSaved":         { "message": "Sauvé" },
+	"optionsSave":          { "message": "Sauvegarder les options" },
+	"optionsSaved":         { "message": "Sauvegardé" },
 	"twitter":              { "message": "Suivre Wappalyzer sur Twitter" },
-	"website":              { "message": "Aller à wappalyzer.com" },
+	"website":              { "message": "Aller sur wappalyzer.com" },
 	"categoryName1":        { "message": "CMS" },
 	"categoryName2":        { "message": "Forum" },
 	"categoryName3":        { "message": "Gestionnaire de base de données" },
diff --git a/src/drivers/chrome/images/header.png b/src/drivers/chrome/images/header.png
deleted file mode 100644
index 6dcce3087..000000000
Binary files a/src/drivers/chrome/images/header.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icon_128.png b/src/drivers/chrome/images/icon_128.png
index 0e1e1fb0c..05ad20d8f 100644
Binary files a/src/drivers/chrome/images/icon_128.png and b/src/drivers/chrome/images/icon_128.png differ
diff --git a/src/drivers/chrome/images/icon_19.png b/src/drivers/chrome/images/icon_19.png
index 5bf2371c2..9668bc65a 100644
Binary files a/src/drivers/chrome/images/icon_19.png and b/src/drivers/chrome/images/icon_19.png differ
diff --git a/src/drivers/chrome/images/icon_32.png b/src/drivers/chrome/images/icon_32.png
index 5381e555a..cc9d30b15 100644
Binary files a/src/drivers/chrome/images/icon_32.png and b/src/drivers/chrome/images/icon_32.png differ
diff --git a/src/drivers/chrome/images/icon_38.png b/src/drivers/chrome/images/icon_38.png
index fb6ed7109..95f220ff3 100644
Binary files a/src/drivers/chrome/images/icon_38.png and b/src/drivers/chrome/images/icon_38.png differ
diff --git a/src/drivers/chrome/images/icon_hot.png b/src/drivers/chrome/images/icon_hot.png
index 06464af29..31e9b7c86 100644
Binary files a/src/drivers/chrome/images/icon_hot.png and b/src/drivers/chrome/images/icon_hot.png differ
diff --git a/src/drivers/chrome/js/driver.js b/src/drivers/chrome/js/driver.js
index 67ebd9cd9..d2ec6ae29 100644
--- a/src/drivers/chrome/js/driver.js
+++ b/src/drivers/chrome/js/driver.js
@@ -54,7 +54,7 @@
 					firstRun = true;
 
 					// Set defaults
-					for ( option in defaults ) {
+					for ( var option in defaults ) {
 						localStorage[option] = defaults[option];
 					}
 				} else if ( version !== localStorage['version'] && parseInt(localStorage['upgradeMessage'], 10) ) {
@@ -189,7 +189,7 @@
 
 			if ( count > 0 ) {
 				// Find the main application to display
-				var i, appName, found = false;
+				var appName, found = false;
 
 				w.driver.categoryOrder.forEach(function(match) {
 					for ( appName in w.detected[url] ) {
@@ -218,7 +218,7 @@
 		 */
 		ping: function() {
 			if ( Object.keys(w.ping.hostnames).length && parseInt(localStorage['tracking'], 10) ) {
-				w.driver.post('http://ping.wappalyzer.com/ping/v2/', w.ping);
+				w.driver.post('http://ping.wappalyzer.com/v2/', w.ping);
 
 				w.log('w.driver.ping: ' + JSON.stringify(w.ping));
 
diff --git a/src/drivers/chrome/js/i18n.js b/src/drivers/chrome/js/i18n.js
index f8207e6e1..2f11efbc5 100644
--- a/src/drivers/chrome/js/i18n.js
+++ b/src/drivers/chrome/js/i18n.js
@@ -1,9 +1,8 @@
 document.addEventListener('DOMContentLoaded', function() {
 	var
 		i, value,
-		d     = document
-		nodes = d.getElementsByTagName('*')
-		;
+		d     = document,
+		nodes = d.getElementsByTagName('*');
 
 	for ( i = 0; i < nodes.length; i ++ ) {
 		if ( attr = nodes[i].dataset.i18n ) {
diff --git a/src/drivers/chrome/js/inject.js b/src/drivers/chrome/js/inject.js
index fd734182e..2a8856596 100644
--- a/src/drivers/chrome/js/inject.js
+++ b/src/drivers/chrome/js/inject.js
@@ -1,6 +1,7 @@
 (function() {
 	try {
-		var i, environmentVars, e = document.createEvent('Events');
+		var i, environmentVars,
+        e = document.createEvent('Events');
 
 		e.initEvent('wappalyzerEvent', true, false);
 
diff --git a/src/drivers/chrome/js/options.js b/src/drivers/chrome/js/options.js
index 7ee9be839..92d1fe3f7 100644
--- a/src/drivers/chrome/js/options.js
+++ b/src/drivers/chrome/js/options.js
@@ -15,9 +15,9 @@ document.addEventListener('DOMContentLoaded', function() {
 		},
 
 		load: function() {
-			for ( option in options.opts ) {
-				if ( value = localStorage[option] ) {
-					options.opts[option] = value;
+			for ( var option in options.opts ) {
+				if ( localStorage[option] ) {
+					options.opts[option] = localStorage[option];
 				}
 			}
 
diff --git a/src/drivers/chrome/js/popup.js b/src/drivers/chrome/js/popup.js
index b7c4d68d3..e3afa610a 100644
--- a/src/drivers/chrome/js/popup.js
+++ b/src/drivers/chrome/js/popup.js
@@ -5,7 +5,7 @@ document.addEventListener('DOMContentLoaded', function() {
 		detectedApps = d.getElementById('detected-apps');
 
 	slugify = function(string) {
-		return string.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, '');
+		return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/, '');
 	};
 
 	popup = {
@@ -37,7 +37,7 @@ document.addEventListener('DOMContentLoaded', function() {
 							confidence = response.tabCache.appsDetected[appName].confidenceTotal;
 							version    = response.tabCache.appsDetected[appName].version;
 
-							html =
+							var html =
 								'<div class="detected-app">' +
 									'<a target="_blank" href="https://wappalyzer.com/applications/' + slugify(appName) + '?pk_campaign=chrome&pk_kwd=popup">' +
 										'<img src="images/icons/' + response.apps[appName].icon + '"/>' +
diff --git a/src/drivers/chrome/manifest.json b/src/drivers/chrome/manifest.json
index fca9595db..2542cc790 100644
--- a/src/drivers/chrome/manifest.json
+++ b/src/drivers/chrome/manifest.json
@@ -1,7 +1,7 @@
 { "name": "Wappalyzer",
 	"homepage_url": "https://wappalyzer.com?pk_campaign=chrome&pk_kwd=context",
 	"description": "Identifies software on the web",
-	"version": "2.50",
+	"version": "2.52",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
diff --git a/src/drivers/firefox/data/images/icon32.png b/src/drivers/firefox/data/images/icon32.png
index 7a9f9fe98..cc9d30b15 100644
Binary files a/src/drivers/firefox/data/images/icon32.png and b/src/drivers/firefox/data/images/icon32.png differ
diff --git a/src/drivers/firefox/data/images/icon32_hot.png b/src/drivers/firefox/data/images/icon32_hot.png
deleted file mode 100644
index 0c0cd90ca..000000000
Binary files a/src/drivers/firefox/data/images/icon32_hot.png and /dev/null differ
diff --git a/src/drivers/firefox/data/js/panel.js b/src/drivers/firefox/data/js/panel.js
index 5a01f91ef..8fbfc9d3d 100644
--- a/src/drivers/firefox/data/js/panel.js
+++ b/src/drivers/firefox/data/js/panel.js
@@ -1,13 +1,13 @@
 (function() {
 	self.port.on('displayApps', function(message) {
 		var
-			div, a, img, label, name, slugify,
+			div, a, img, label, name, slugify, confidence, version,
 			d = document,
 			detectedApps = d.getElementById('detected-apps'),
 			empty = d.getElementById('empty');
 
 		slugify = function(string) {
-			return string.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, '');
+			return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/g, '');
 		};
 
 		while ( detectedApps.firstChild ) {
@@ -52,8 +52,8 @@
 				label.appendChild(name);
 				label.appendChild(d.createTextNode(( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '')));
 
-				a.appendChild(img)
-				a.appendChild(label)
+				a.appendChild(img);
+				a.appendChild(label);
 
 				div.appendChild(a);
 
diff --git a/src/drivers/firefox/data/js/tab.js b/src/drivers/firefox/data/js/tab.js
index c4bd3c65b..72719ec2b 100644
--- a/src/drivers/firefox/data/js/tab.js
+++ b/src/drivers/firefox/data/js/tab.js
@@ -1,11 +1,7 @@
 (function() {
-	var lastEnv = [];
-
 	try {
 		if ( document && document.contentType === 'text/html' ) {
-			var
-				html = new XMLSerializer().serializeToString(document)
-				env = [];
+			var html = new XMLSerializer().serializeToString(document),
 
 			self.port.emit('log', html);
 
diff --git a/src/drivers/firefox/driver.js b/src/drivers/firefox/driver.js
index bea35f383..4eb7565c0 100644
--- a/src/drivers/firefox/driver.js
+++ b/src/drivers/firefox/driver.js
@@ -450,7 +450,7 @@
 					}).post();
 				};
 
-				post('http://ping.wappalyzer.com/ping/v2/', w.ping);
+				post('http://ping.wappalyzer.com/v2/', w.ping);
 
 				w.log('w.driver.ping: ' + JSON.stringify(w.ping));
 
diff --git a/src/drivers/firefox/images/icon128.png b/src/drivers/firefox/images/icon128.png
deleted file mode 100644
index 00e8df6dc..000000000
Binary files a/src/drivers/firefox/images/icon128.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon128_hot.png b/src/drivers/firefox/images/icon128_hot.png
deleted file mode 100644
index 0e1e1fb0c..000000000
Binary files a/src/drivers/firefox/images/icon128_hot.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon16.png b/src/drivers/firefox/images/icon16.png
deleted file mode 100644
index 7ad880fcc..000000000
Binary files a/src/drivers/firefox/images/icon16.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon16_hot.png b/src/drivers/firefox/images/icon16_hot.png
deleted file mode 100644
index 06464af29..000000000
Binary files a/src/drivers/firefox/images/icon16_hot.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon32.png b/src/drivers/firefox/images/icon32.png
deleted file mode 100644
index 7a9f9fe98..000000000
Binary files a/src/drivers/firefox/images/icon32.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon32_hot.png b/src/drivers/firefox/images/icon32_hot.png
deleted file mode 100644
index 0c0cd90ca..000000000
Binary files a/src/drivers/firefox/images/icon32_hot.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon48.png b/src/drivers/firefox/images/icon48.png
index 5082284e1..82259f227 100644
Binary files a/src/drivers/firefox/images/icon48.png and b/src/drivers/firefox/images/icon48.png differ
diff --git a/src/drivers/firefox/images/icon48_hot.png b/src/drivers/firefox/images/icon48_hot.png
deleted file mode 100644
index 00bd19d77..000000000
Binary files a/src/drivers/firefox/images/icon48_hot.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon64.png b/src/drivers/firefox/images/icon64.png
index a74bf95d8..5817776b1 100644
Binary files a/src/drivers/firefox/images/icon64.png and b/src/drivers/firefox/images/icon64.png differ
diff --git a/src/drivers/firefox/images/icon64_hot.png b/src/drivers/firefox/images/icon64_hot.png
deleted file mode 100644
index 1954d72c1..000000000
Binary files a/src/drivers/firefox/images/icon64_hot.png and /dev/null differ
diff --git a/src/drivers/firefox/package.json b/src/drivers/firefox/package.json
index b92841e7b..c6a05fcf8 100644
--- a/src/drivers/firefox/package.json
+++ b/src/drivers/firefox/package.json
@@ -2,13 +2,13 @@
   "name": "wappalyzer",
   "title": "Wappalyzer",
 	"homepage": "https://wappalyzer.com",
-	"icon": "images/icon48_hot.png",
-	"icon64": "images/icon64_hot.png",
+	"icon": "images/icon48.png",
+	"icon64": "images/icon64.png",
   "id": "wappalyzer@crunchlabz.com",
   "description": "Identifies software on the web",
   "author": "Elbert Alias",
   "license": "GPLv3",
-  "version": "3.2.8",
+  "version": "3.2.11",
 	"main": "driver.js",
 	"preferences": [{
 		"name": "tracking",
diff --git a/src/drivers/phantomjs/driver.js b/src/drivers/phantomjs/driver.js
index 3137a8489..0503fbc7a 100644
--- a/src/drivers/phantomjs/driver.js
+++ b/src/drivers/phantomjs/driver.js
@@ -5,8 +5,8 @@
 		scriptDir,
 		scriptPath      = require('fs').absolute(require('system').args[0]),
 		resourceTimeout = 9000,
-		args            = [],
-		debug           = false; // Output debug messages
+		args            = [],    // TODO: Not used, maybe should be `arg`
+		debug           = false, // Output debug messages
 		quiet           = false; // Don't output errors
 
 	try {
@@ -83,12 +83,12 @@
 						cats = [];
 
 						wappalyzer.apps[app].cats.forEach(function(cat) {
-							cats.push(wappalyzer.categories[cat]);
+							cats.push(wappalyzer.categories[cat].name);
 						});
 
 						apps.push({
 							name: app,
-							confidence: wappalyzer.detected[url][app].confidenceTotal,
+							confidence: wappalyzer.detected[url][app].confidenceTotal.toString(),
 							version:    wappalyzer.detected[url][app].version,
 							icon:       wappalyzer.apps[app].icon,
 							categories: cats
@@ -133,10 +133,6 @@
 				page.settings.userAgent       = 'Mozilla/5.0 (compatible; Wappalyzer; +https://github.com/AliasIO/Wappalyzer)';
 				page.settings.resourceTimeout = resourceTimeout;
 
-				page.onConsoleMessage = function(message) {
-					require('system').stdout.write(message + "\n");
-				};
-
 				page.onError = function(message) {
 					wappalyzer.log(message, 'error');
 				};
diff --git a/src/drivers/phantomjs/package.json b/src/drivers/phantomjs/package.json
index d3201b69f..a77059371 100644
--- a/src/drivers/phantomjs/package.json
+++ b/src/drivers/phantomjs/package.json
@@ -2,7 +2,7 @@
   "name": "wappalyzer",
   "description": "Uncovers the technologies used on websites",
   "homepage": "https://github.com/AliasIO/Wappalyzer",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "author": "Elbert Alias",
   "license": "GPL-3.0",
   "repository": {
diff --git a/src/drivers/webextension/.gitignore b/src/drivers/webextension/.gitignore
new file mode 100644
index 000000000..d0671fb4f
--- /dev/null
+++ b/src/drivers/webextension/.gitignore
@@ -0,0 +1,5 @@
+apps.json
+images/icons/converted/*.png
+images/icons/*.png
+images/icons/*.svg
+js/wappalyzer.js
diff --git a/src/drivers/webextension/_locales/el/messages.json b/src/drivers/webextension/_locales/el/messages.json
new file mode 100644
index 000000000..8b63568f5
--- /dev/null
+++ b/src/drivers/webextension/_locales/el/messages.json
@@ -0,0 +1,60 @@
+{
+	"github":                   { "message": "Κάνε fork το Wappalyzer στο GitHub!" },
+	"twitter":                  { "message": "Ακολούθησε το Wappalyzer στο Twitter" },
+	"website":                  { "message": "Πήγαινε στο wappalyzer.com" },
+	"options":                  { "message": "Ρυθμίσεις Wappalyzer" },
+	"optionsSave":              { "message": "Ρυθμίσεις αποθήκευσης" },
+	"optionsSaved":             { "message": "Αποθηκεύτηκε" },
+	"optionUpgradeMessage":     { "message": "Ενημερώστε με για αναβαθμίσεις" },
+	"optionTracking":           { "message": "Ανώνυμη αποστολή αναφορών για εντοπισμένες εφαρμογές στο wappalyzer.com για έρευνα" },
+	"nothingToDo":              { "message": "Καμία ενέργεια." },
+	"noAppsDetected":           { "message": "Δεν ανιχνεύθηκαν εφαρμογές." },
+	"categoryName1":            { "message": "CMS" },
+	"categoryName2":            { "message": "Διαδικτυακό Φόρουμ" },
+	"categoryName3":            { "message": "Διαχειριστής Βάσης Δεδομένων" },
+	"categoryName4":            { "message": "Εργαλείο Τεκμηρίωσης" },
+	"categoryName5":            { "message": "Widget" },
+	"categoryName10":           { "message": "Analytics" },
+	"categoryName11":           { "message": "Blog" },
+	"categoryName12":           { "message": "Framework της JavaScript" },
+	"categoryName13":           { "message": "Issue Tracker" },
+	"categoryName14":           { "message": "Πρόγραμμα αναπαραγωγής Βίντεο" },
+	"categoryName15":           { "message": "Σύστημα Σχολίων" },
+	"categoryName16":           { "message": "Captcha" },
+	"categoryName17":           { "message": "Script Γραμματοσειράς" },
+	"categoryName18":           { "message": "Framework Διαδικτύου" },
+	"categoryName19":           { "message": "Διάφορα" },
+	"categoryName20":           { "message": "Επεξεργαστής Κειμένου" },
+	"categoryName21":           { "message": "LMS" },
+	"categoryName22":           { "message": "Διακομιστής Διαδικτύου" },
+	"categoryName23":           { "message": "Εργαλείο Μνήμης Cache" },
+	"categoryName24":           { "message": "Επεξεργαστής Εμπλουτισμένου Κειμένου" },
+	"categoryName25":           { "message": "Γραφικά JavaScript" },
+	"categoryName26":           { "message": "Framework για Κινητά" },
+	"categoryName27":           { "message": "Γλώσσα Προγραμματισμού" },
+	"categoryName28":           { "message": "Λειτουργικό Σύστημα" },
+	"categoryName29":           { "message": "Μηχανή Αναζήτησης" },
+	"categoryName30":           { "message": "Web Mail" },
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Αυτοματοποίηση Marketing" },
+	"categoryName33":           { "message": "Επέκταση Διακομιστή Διαδικτύου" },
+	"categoryName34":           { "message": "Βάση Δεδομένων" },
+	"categoryName35":           { "message": "Χάρτης" },
+	"categoryName36":           { "message": "Δίκτυο Διαφημίσεων" },
+	"categoryName37":           { "message": "Υπηρεσία Δικτύου" },
+	"categoryName38":           { "message": "Διακομιστής Πολυμέσων" },
+	"categoryName39":           { "message": "Διαδικτυακή κάμερα" },
+	"categoryName40":           { "message": "Εκτυπωτής" },
+	"categoryName41":           { "message": "Σύστημα Επεξεργασίας Πληρωμών" },
+	"categoryName42":           { "message": "Σύστημα Διαχείρισης Tags" },
+	"categoryName43":           { "message": "Paywall" },
+	"categoryName44":           { "message": "Σύστημα Build/CI" },
+	"categoryName45":           { "message": "Σύστημα SCADA" },
+	"categoryName46":           { "message": "Απομακρυσμένη Πρόσβαση" },
+	"categoryName47":           { "message": "Εργαλείο Ανάπτυξης" },
+	"categoryName48":           { "message": "Δικτυακός Αποθηκευτικός Χώρος" },
+	"categoryName49":           { "message": "Feed Readers" },
+	"categoryName50":           { "message": "Συστήματα Διαχειρίσης Εγγράφων" },
+	"categoryName51":           { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" },
+	"categoryName52":           { "message": "Live Chat" }
+}
diff --git a/src/drivers/webextension/_locales/en/messages.json b/src/drivers/webextension/_locales/en/messages.json
new file mode 100644
index 000000000..ba2c15174
--- /dev/null
+++ b/src/drivers/webextension/_locales/en/messages.json
@@ -0,0 +1,60 @@
+{
+	"github":                   { "message": "Fork Wappalyzer on GitHub!" },
+	"twitter":                  { "message": "Follow Wappalyzer on Twitter" },
+	"website":                  { "message": "Go to wappalyzer.com" },
+	"options":                  { "message": "Options" },
+	"optionsSave":              { "message": "Save options" },
+	"optionsSaved":             { "message": "Saved" },
+	"optionUpgradeMessage":     { "message": "Tell me about upgrades" },
+	"optionTracking":           { "message": "Anonymously send reports on detected applications to wappalyzer.com for research" },
+	"nothingToDo":              { "message": "Nothing to do here." },
+	"noAppsDetected":           { "message": "No applications detected." },
+	"categoryName1":            { "message": "CMS" },
+	"categoryName2":            { "message": "Message Board" },
+	"categoryName3":            { "message": "Database Manager" },
+	"categoryName4":            { "message": "Documentation Tool" },
+	"categoryName5":            { "message": "Widget" },
+	"categoryName10":           { "message": "Analytics" },
+	"categoryName11":           { "message": "Blog" },
+	"categoryName12":           { "message": "JavaScript Framework" },
+	"categoryName13":           { "message": "Issue Tracker" },
+	"categoryName14":           { "message": "Video Player" },
+	"categoryName15":           { "message": "Comment System" },
+	"categoryName16":           { "message": "Captcha" },
+	"categoryName17":           { "message": "Font Script" },
+	"categoryName18":           { "message": "Web Framework" },
+	"categoryName19":           { "message": "Miscellaneous" },
+	"categoryName20":           { "message": "Editor" },
+	"categoryName21":           { "message": "LMS" },
+	"categoryName22":           { "message": "Web Server" },
+	"categoryName23":           { "message": "Cache Tool" },
+	"categoryName24":           { "message": "Rich Text Editor" },
+	"categoryName25":           { "message": "JavaScript Graphics" },
+	"categoryName26":           { "message": "Mobile Framework" },
+	"categoryName27":           { "message": "Programming Language" },
+	"categoryName28":           { "message": "Operating System" },
+	"categoryName29":           { "message": "Search Engine" },
+	"categoryName30":           { "message": "Web Mail" },
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Marketing Automation" },
+	"categoryName33":           { "message": "Web Server Extension" },
+	"categoryName34":           { "message": "Database" },
+	"categoryName35":           { "message": "Map" },
+	"categoryName36":           { "message": "Advertising Network" },
+	"categoryName37":           { "message": "Network Service" },
+	"categoryName38":           { "message": "Media Server" },
+	"categoryName39":           { "message": "Webcam" },
+	"categoryName40":           { "message": "Printer" },
+	"categoryName41":           { "message": "Payment Processor" },
+	"categoryName42":           { "message": "Tag Manager" },
+	"categoryName43":           { "message": "Paywall" },
+	"categoryName44":           { "message": "Build/CI System" },
+	"categoryName45":           { "message": "SCADA System" },
+	"categoryName46":           { "message": "Remote Access" },
+	"categoryName47":           { "message": "Development Tool" },
+	"categoryName48":           { "message": "Network Storage" },
+	"categoryName49":           { "message": "Feed Readers" },
+	"categoryName50":           { "message": "Document Management Systems" },
+	"categoryName51":           { "message": "Landing Page Builder" },
+	"categoryName52":           { "message": "Live Chat" }
+}
diff --git a/src/drivers/webextension/_locales/es/messages.json b/src/drivers/webextension/_locales/es/messages.json
new file mode 100644
index 000000000..666deb714
--- /dev/null
+++ b/src/drivers/webextension/_locales/es/messages.json
@@ -0,0 +1,64 @@
+{
+	"github":                   { "message": "¡Forkea Wappalyzer en GitHub!" },
+	"twitter":                  { "message": "Sigue Wappalyzer en Twitter" },
+	"website":                  { "message": "Ir a wappalyzer.com" },
+	"options":                  { "message": "Opciones" },
+	"optionsSave":              { "message": "Guardar opciones" },
+	"optionsSaved":             { "message": "Guardado" },
+	"optionUpgradeMessage":     { "message": "Indicarme actualizaciones" },
+	"optionTracking":           { "message": "Enviar informes anónimos sobre las aplicaciones detectadas a wappalyzer.com para análisis" },
+	"nothingToDo":              { "message": "Nada que hacer aquí." },
+	"noAppsDetected":           { "message": "Aplicaciones no detectadas." },
+	"categoryName1":            { "message": "Gestor de Contenido" },
+	"categoryName2":            { "message": "Foro" },
+	"categoryName3":            { "message": "Gestor de Bases de Datos" },
+	"categoryName4":            { "message": "Herramienta de Documentación" },
+	"categoryName5":            { "message": "Widget" },
+	"categoryName6":            { "message": "Tienda Web" },
+	"categoryName7":            { "message": "Galería fotográfica" },
+	"categoryName8":            { "message": "Wiki" },
+	"categoryName9":            { "message": "Panel de Hosting" },
+	"categoryName10":           { "message": "Analítica" },
+	"categoryName11":           { "message": "Blog" },
+	"categoryName12":           { "message": "Framework JavaScript" },
+	"categoryName13":           { "message": "Gestor de Incidencias" },
+	"categoryName14":           { "message": "Reproductor de Vídeo" },
+	"categoryName15":           { "message": "Sistema de Comentarios" },
+	"categoryName16":           { "message": "Captcha" },
+	"categoryName17":           { "message": "Tipografía" },
+	"categoryName18":           { "message": "Framework Web" },
+	"categoryName19":           { "message": "Miscelánea" },
+	"categoryName20":           { "message": "Editor" },
+	"categoryName21":           { "message": "LMS" },
+	"categoryName22":           { "message": "Servidor Web" },
+	"categoryName23":           { "message": "Herramienta de Cache" },
+	"categoryName24":           { "message": "Editor de Texto Enriquecido" },
+	"categoryName25":           { "message": "Gráficos JavaScript" },
+	"categoryName26":           { "message": "Framework Móvil" },
+	"categoryName27":           { "message": "Lenguaje de programación" },
+	"categoryName28":           { "message": "Sistema Operativo" },
+	"categoryName29":           { "message": "Motor de Búsqueda" },
+	"categoryName30":           { "message": "Correo Web" },
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Automatización de Marketing" },
+	"categoryName33":           { "message": "Extensión de Servidor Web" },
+	"categoryName34":           { "message": "Base de Datos" },
+	"categoryName35":           { "message": "Mapa" },
+	"categoryName36":           { "message": "Red de Publicidad" },
+	"categoryName37":           { "message": "Network Sevice" },
+	"categoryName38":           { "message": "Media Server" },
+	"categoryName39":           { "message": "Webcam" },
+	"categoryName40":           { "message": "Printer" },
+	"categoryName41":           { "message": "Payment Processor" },
+	"categoryName42":           { "message": "Tag Manager" },
+	"categoryName43":           { "message": "Paywall" },
+	"categoryName44":           { "message": "Build/CI System" },
+	"categoryName45":           { "message": "SCADA System" },
+	"categoryName46":           { "message": "Remote Access" },
+	"categoryName47":           { "message": "Development Tool" },
+	"categoryName48":           { "message": "Network Storage" },
+	"categoryName49":           { "message": "Feed Readers" },
+	"categoryName50":           { "message": "Document Management Systems" },
+	"categoryName51":           { "message": "Landing Page Builder" },
+	"categoryName52":           { "message": "Live Chat" }
+}
diff --git a/src/drivers/webextension/_locales/fr/messages.json b/src/drivers/webextension/_locales/fr/messages.json
new file mode 100644
index 000000000..743d79210
--- /dev/null
+++ b/src/drivers/webextension/_locales/fr/messages.json
@@ -0,0 +1,64 @@
+{
+	"github":               { "message": "Forker Wappalyzer sur GitHub!" },
+	"noAppsDetected":       { "message": "Pas d'applications détectées." },
+	"nothingToDo":          { "message": "Rien à faire ici." },
+	"optionTracking":       { "message": "Envoyer anonymement des rapports sur les applications détectées à wappalyzer.com pour la recherche" },
+	"optionUpgradeMessage": { "message": "M'afficher les mises à jour" },
+	"options":              { "message": "Options" },
+	"optionsSave":          { "message": "Sauver les options" },
+	"optionsSaved":         { "message": "Sauvé" },
+	"twitter":              { "message": "Suivre Wappalyzer sur Twitter" },
+	"website":              { "message": "Aller à wappalyzer.com" },
+	"categoryName1":        { "message": "CMS" },
+	"categoryName2":        { "message": "Forum" },
+	"categoryName3":        { "message": "Gestionnaire de base de données" },
+	"categoryName4":        { "message": "Outil de documentation" },
+	"categoryName5":        { "message": "Widget" },
+	"categoryName6":        { "message": "Boutique en ligne" },
+	"categoryName7":        { "message": "Galerie photo" },
+	"categoryName8":        { "message": "Wiki" },
+	"categoryName9":        { "message": "Gestionnaires de serveur" },
+	"categoryName10":       { "message": "Outil de statistiques" },
+	"categoryName11":       { "message": "Blog" },
+	"categoryName12":       { "message": "Framework JavaScript" },
+	"categoryName13":       { "message": "Outil de suivi de problèmes" },
+	"categoryName14":       { "message": "Lecteur de vidéos" },
+	"categoryName15":       { "message": "Système de commentaires" },
+	"categoryName16":       { "message": "Captcha" },
+	"categoryName17":       { "message": "Script de police" },
+	"categoryName18":       { "message": "Framework web" },
+	"categoryName19":       { "message": "Divers" },
+	"categoryName20":       { "message": "Editeur" },
+	"categoryName21":       { "message": "LMS" },
+	"categoryName22":       { "message": "Serveur web" },
+	"categoryName23":       { "message": "Outil de cache" },
+	"categoryName24":       { "message": "Editeur WYSIWYG" },
+	"categoryName25":       { "message": "Graphismes JavaScript" },
+	"categoryName26":       { "message": "Framework pour mobiles" },
+	"categoryName27":       { "message": "Language de programmation" },
+	"categoryName28":       { "message": "Système d'exploitation" },
+	"categoryName29":       { "message": "Moteur de recherche" },
+	"categoryName30":       { "message": "Web Mail" },
+	"categoryName31":       { "message": "CDN" },
+	"categoryName32":       { "message": "Logiciel de marketing" },
+	"categoryName33":       { "message": "Extension de serveur web" },
+	"categoryName34":       { "message": "Base de données" },
+	"categoryName35":       { "message": "Carte" },
+	"categoryName36":       { "message": "Réseau publicitaire" },
+	"categoryName37":       { "message": "Périphérique réseau" },
+	"categoryName38":       { "message": "Serveur multimédia" },
+	"categoryName39":       { "message": "Webcam" },
+	"categoryName40":       { "message": "Imprimante" },
+	"categoryName41":       { "message": "Service de paiement" },
+	"categoryName42":       { "message": "Tag Manager" },
+	"categoryName43":       { "message": "Paywall" },
+	"categoryName44":       { "message": "Système CI" },
+	"categoryName45":       { "message": "Système SCADA" },
+	"categoryName46":       { "message": "Accès à distance" },
+	"categoryName47":       { "message": "Outil de développement" },
+	"categoryName48":       { "message": "Stockage réseau" },
+	"categoryName49":       { "message": "Lecteur RSS" },
+	"categoryName50":       { "message": "Système de gestion de documents" },
+	"categoryName51":       { "message": "Landing Page Builder" },
+	"categoryName52":       { "message": "Chat en direct" }
+}
diff --git a/src/drivers/webextension/_locales/gr/messages.json b/src/drivers/webextension/_locales/gr/messages.json
new file mode 100644
index 000000000..f512dad8f
--- /dev/null
+++ b/src/drivers/webextension/_locales/gr/messages.json
@@ -0,0 +1,60 @@
+{
+	"github":                   { "message": "Κάνε fork το Wappalyzer στο GitHub!" },
+	"twitter":                  { "message": "Ακολούθησε το Wappalyzer στο Twitter" },
+	"website":                  { "message": "Πήγαινε στο wappalyzer.com" },
+	"options":                  { "message": "Ρυθμίσεις" },
+	"optionsSave":              { "message": "Ρυθμίσεις αποθήκευσης" },
+	"optionsSaved":             { "message": "Αποθηκεύτηκε" },
+	"optionUpgradeMessage":     { "message": "Ενημερώστε με για αναβαθμίσεις" },
+	"optionTracking":           { "message": "Ανώνυμη αποστολή αναφορών για εντοπισμένες εφαρμογές στο wappalyzer.com για έρευνα" },
+	"nothingToDo":              { "message": "Καμία ενέργεια." },
+	"noAppsDetected":           { "message": "Δεν ανιχνεύθηκαν εφαρμογές." },
+	"categoryName1":            { "message": "CMS" },
+	"categoryName2":            { "message": "Διαδικτυακό Φόρουμ" },
+	"categoryName3":            { "message": "Διαχειριστής Βάσης Δεδομένων" },
+	"categoryName4":            { "message": "Εργαλείο Τεκμηρίωσης" },
+	"categoryName5":            { "message": "Widget" },
+	"categoryName10":           { "message": "Analytics" },
+	"categoryName11":           { "message": "Blog" },
+	"categoryName12":           { "message": "Framework της JavaScript" },
+	"categoryName13":           { "message": "Issue Tracker" },
+	"categoryName14":           { "message": "Πρόγραμμα αναπαραγωγής Βίντεο" },
+	"categoryName15":           { "message": "Σύστημα Σχολίων" },
+	"categoryName16":           { "message": "Captcha" },
+	"categoryName17":           { "message": "Script Γραμματοσειράς" },
+	"categoryName18":           { "message": "Framework Διαδικτύου" },
+	"categoryName19":           { "message": "Διάφορα" },
+	"categoryName20":           { "message": "Επεξεργαστής Κειμένου" },
+	"categoryName21":           { "message": "LMS" },
+	"categoryName22":           { "message": "Διακομιστής Διαδικτύου" },
+	"categoryName23":           { "message": "Εργαλείο Μνήμης Cache" },
+	"categoryName24":           { "message": "Επεξεργαστής Εμπλουτισμένου Κειμένου" },
+	"categoryName25":           { "message": "Γραφικά JavaScript" },
+	"categoryName26":           { "message": "Framework για Κινητά" },
+	"categoryName27":           { "message": "Γλώσσα Προγραμματισμού" },
+	"categoryName28":           { "message": "Λειτουργικό Σύστημα" },
+	"categoryName29":           { "message": "Μηχανή Αναζήτησης" },
+	"categoryName30":           { "message": "Web Mail" },
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Αυτοματοποίηση Marketing" },
+	"categoryName33":           { "message": "Επέκταση Διακομιστή Διαδικτύου" },
+	"categoryName34":           { "message": "Βάση Δεδομένων" },
+	"categoryName35":           { "message": "Χάρτης" },
+	"categoryName36":           { "message": "Δίκτυο Διαφημίσεων" },
+	"categoryName37":           { "message": "Υπηρεσία Δικτύου" },
+	"categoryName38":           { "message": "Διακομιστής Πολυμέσων" },
+	"categoryName39":           { "message": "Διαδικτυακή κάμερα" },
+	"categoryName40":           { "message": "Εκτυπωτής" },
+	"categoryName41":           { "message": "Σύστημα Επεξεργασίας Πληρωμών" },
+	"categoryName42":           { "message": "Σύστημα Διαχείρισης Tags" },
+	"categoryName43":           { "message": "Paywall" },
+	"categoryName44":           { "message": "Σύστημα Build/CI" },
+	"categoryName45":           { "message": "Σύστημα SCADA" },
+	"categoryName46":           { "message": "Απομακρυσμένη Πρόσβαση" },
+	"categoryName47":           { "message": "Εργαλείο Ανάπτυξης" },
+	"categoryName48":           { "message": "Δικτυακός Αποθηκευτικός Χώρος" },
+	"categoryName49":           { "message": "Feed Readers" },
+	"categoryName50":           { "message": "Συστήματα Διαχειρίσης Εγγράφων" },
+	"categoryName51":           { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" },
+	"categoryName52":           { "message": "Live Chat" }
+}
diff --git a/src/drivers/webextension/_locales/it/messages.json b/src/drivers/webextension/_locales/it/messages.json
new file mode 100644
index 000000000..ede043b3b
--- /dev/null
+++ b/src/drivers/webextension/_locales/it/messages.json
@@ -0,0 +1,65 @@
+{
+	"github":                   { "message": "Fork Wappalyzer su GitHub!" },
+	"twitter":                  { "message": "Follow Wappalyzer su Twitter" },
+	"website":                  { "message": "Vai su wappalyzer.com" },
+	"options":                  { "message": "Opzioni" },
+	"optionsSave":              { "message": "Salva opzioni" },
+	"optionsSaved":             { "message": "Salvato" },
+	"optionUpgradeMessage":     { "message": "Parlami dell'upgrade" },
+	"optionTracking":           { "message": "Inviare anonimamente un report sulle applicazioni rilevate a wappalyzer.com per l'analisi" },
+	"nothingToDo":              { "message": "Niente da fare qui." },
+	"noAppsDetected":           { "message": "Nessuna applicazione rilevata." },
+	"categoryName1":            { "message": "CMS" },
+	"categoryName2":            { "message": "Forum" },
+	"categoryName3":            { "message": "Gestore di Database" },
+	"categoryName4":            { "message": "Strumento di documentazione" },
+	"categoryName5":            { "message": "Widget" },
+	"categoryName6":            { "message": "eCommerce" },
+	"categoryName7":            { "message": "Galleria fotografica" },
+	"categoryName8":            { "message": "Wiki" },
+	"categoryName9":            { "message": "Pannello Hosting" },
+	"categoryName10":           { "message": "Analytics" },
+	"categoryName11":           { "message": "Blog" },
+	"categoryName12":           { "message": "Framework JavaScript" },
+	"categoryName13":           { "message": "Issue Tracker" },
+	"categoryName14":           { "message": "Player Video" },
+	"categoryName15":           { "message": "Sistema di commenti" },
+	"categoryName16":           { "message": "Captcha" },
+	"categoryName17":           { "message": "Font Script" },
+	"categoryName18":           { "message": "Framework Web" },
+	"categoryName19":           { "message": "Miscellanea" },
+	"categoryName20":           { "message": "Editor" },
+	"categoryName21":           { "message": "LMS" },
+	"categoryName22":           { "message": "Web Server" },
+	"categoryName23":           { "message": "Cache Tool" },
+	"categoryName24":           { "message": "Editor di Testo Ricco" },
+	"categoryName25":           { "message": "JavaScript Graphics" },
+	"categoryName26":           { "message": "Framework Mobile" },
+	"categoryName27":           { "message": "Linguaggio di programmazione" },
+	"categoryName28":           { "message": "Sistema Operativo" },
+	"categoryName29":           { "message": "Motore di Ricerca" },
+	"categoryName30":           { "message": "Web Mail" },
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Marketing Automation" },
+	"categoryName33":           { "message": "Estensione Web Server" },
+	"categoryName34":           { "message": "Database" },
+	"categoryName35":           { "message": "Mappa" },
+	"categoryName36":           { "message": "Network Pubblicitario" },
+	"categoryName37":           { "message": "Network Service" },
+	"categoryName38":           { "message": "Media Server" },
+	"categoryName39":           { "message": "Webcam" },
+	"categoryName40":           { "message": "Stampante" },
+	"categoryName41":           { "message": "Payment Processor" },
+	"categoryName42":           { "message": "Tag Manager" },
+	"categoryName43":           { "message": "Paywall" },
+	"categoryName44":           { "message": "Sistema Build/CI" },
+	"categoryName45":           { "message": "SCADA System" },
+	"categoryName46":           { "message": "Accesso" },
+	"categoryName47":           { "message": "Strumenti di Sviluppo" },
+	"categoryName48":           { "message": "Network Storage" },
+	"categoryName49":           { "message": "Lettore di Feed" },
+	"categoryName50":           { "message": "Sistema di Gestione Documenti" },
+	"categoryName51":           { "message": "Landing Page Builder" },
+	"categoryName52":           { "message": "Live Chat" }
+}
+
diff --git a/src/drivers/webextension/_locales/ro/messages.json b/src/drivers/webextension/_locales/ro/messages.json
new file mode 100644
index 000000000..6d938bc67
--- /dev/null
+++ b/src/drivers/webextension/_locales/ro/messages.json
@@ -0,0 +1,60 @@
+{
+	"github":                   { "message": "Fork-uiește Wappalyzer pe GitHub!" },
+	"twitter":                  { "message": "Urmărește Wappalyzer pe Twitter" },
+	"website":                  { "message": "Mergi la wappalyzer.com" },
+	"options":                  { "message": "Opțiuni" },
+	"optionsSave":              { "message": "Salvează opțiuni" },
+	"optionsSaved":             { "message": "Salvat" },
+	"optionUpgradeMessage":     { "message": "Anunță-mă dacă sunt actualizări" },
+	"optionTracking":           { "message": "Trimite rapoarte anonime despre aplicațiile detectate către wappalyzer.com pentru cercetare" },
+	"nothingToDo":              { "message": "Nimic de făcut pe pagina curentă." },
+	"noAppsDetected":           { "message": "Nici o aplicație detectată." },
+	"categoryName1":            { "message": "CMS" },
+	"categoryName2":            { "message": "Forum de discuții" },
+	"categoryName3":            { "message": "Manager baze de date" },
+	"categoryName4":            { "message": "Unealtă pentru documentare" },
+	"categoryName5":            { "message": "Widget" },
+	"categoryName10":           { "message": "Analiză trafic web" },
+	"categoryName11":           { "message": "Blog" },
+	"categoryName12":           { "message": "Framework JavaScript" },
+	"categoryName13":           { "message": "Tracker probleme" },
+	"categoryName14":           { "message": "Player Video" },
+	"categoryName15":           { "message": "Sistem de comentarii" },
+	"categoryName16":           { "message": "Verificare Captcha" },
+	"categoryName17":           { "message": "Script pentru fonturi" },
+	"categoryName18":           { "message": "Framework Web" },
+	"categoryName19":           { "message": "Divers" },
+	"categoryName20":           { "message": "Editor" },
+	"categoryName21":           { "message": "LMS" },
+	"categoryName22":           { "message": "Server Web" },
+	"categoryName23":           { "message": "Unealtă Cache" },
+	"categoryName24":           { "message": "Editor Texte Rich" },
+	"categoryName25":           { "message": "Grafică JavaScript" },
+	"categoryName26":           { "message": "Framework Mobile" },
+	"categoryName27":           { "message": "Limbaj de programare" },
+	"categoryName28":           { "message": "Sistem de operare" },
+	"categoryName29":           { "message": "Motor de căutare" },
+	"categoryName30":           { "message": "Poștă electronică" },
+	"categoryName31":           { "message": "CDN" },
+	"categoryName32":           { "message": "Automatizare marketing" },
+	"categoryName33":           { "message": "Extensie server web" },
+	"categoryName34":           { "message": "Bază de date" },
+	"categoryName35":           { "message": "Hartă" },
+	"categoryName36":           { "message": "Rețea de advertising" },
+	"categoryName37":           { "message": "Serviciu rețea" },
+	"categoryName38":           { "message": "Server Media" },
+	"categoryName39":           { "message": "Webcam" },
+	"categoryName40":           { "message": "Imprimantă" },
+	"categoryName41":           { "message": "Sistem de plată" },
+	"categoryName42":           { "message": "Manager cuvinte cheie" },
+	"categoryName43":           { "message": "Paywall" },
+	"categoryName44":           { "message": "Build/CI System" },
+	"categoryName45":           { "message": "SCADA System" },
+	"categoryName46":           { "message": "Remote Access" },
+	"categoryName47":           { "message": "Development Tool" },
+	"categoryName48":           { "message": "Network Storage" },
+	"categoryName49":           { "message": "Feed Readers" },
+	"categoryName50":           { "message": "Document Management Systems" },
+	"categoryName51":           { "message": "Landing Page Builder" },
+	"categoryName52":           { "message": "Live Chat" }
+}
diff --git a/src/drivers/webextension/_locales/ru/messages.json b/src/drivers/webextension/_locales/ru/messages.json
new file mode 100644
index 000000000..4cf46ecbc
--- /dev/null
+++ b/src/drivers/webextension/_locales/ru/messages.json
@@ -0,0 +1,60 @@
+{
+  "categoryName1" : { "message" : "CMS" },
+  "categoryName2" : { "message" : "Форум" },
+  "categoryName3" : { "message" : "Менеджер БД" },
+  "categoryName4" : { "message" : "Документация" },
+  "categoryName5" : { "message" : "Виджет" },
+  "categoryName10" : { "message" : "Аналитика" },
+  "categoryName11" : { "message" : "Блог" },
+  "categoryName12" : { "message" : "JS фреймворк" },
+  "categoryName13" : { "message" : "Баг трекер" },
+  "categoryName14" : { "message" : "Видео плеер" },
+  "categoryName15" : { "message" : "Система комментариев" },
+  "categoryName16" : { "message" : "Капча" },
+  "categoryName17" : { "message" : "Шрифт" },
+  "categoryName18" : { "message" : "Веб фреймворк" },
+  "categoryName19" : { "message" : "Прочее" },
+  "categoryName20" : { "message" : "HTML редактор" },
+  "categoryName21" : { "message" : "LMS" },
+  "categoryName22" : { "message" : "Веб сервер" },
+  "categoryName23" : { "message" : "Кеширование" },
+  "categoryName24" : { "message" : "WYSIWYG редактор" },
+  "categoryName25" : { "message" : "JS графика" },
+  "categoryName26" : { "message" : "Мобильный фреймворк" },
+  "categoryName27" : { "message" : "Язык программирования" },
+  "categoryName28" : { "message" : "Операционная система" },
+  "categoryName29" : { "message" : "Поисковый движок" },
+  "categoryName30" : { "message" : "Веб почта" },
+  "categoryName31" : { "message" : "CDN" },
+  "categoryName32" : { "message" : "Управление маркетингом" },
+  "categoryName33" : { "message" : "Расширение Веб сервера" },
+  "categoryName34" : { "message" : "База данных" },
+  "categoryName35" : { "message" : "Карта" },
+  "categoryName36" : { "message" : "Рекламная сеть" },
+  "categoryName37" : { "message" : "Сетевая служба" },
+  "categoryName38" : { "message" : "Медиа сервер" },
+  "categoryName39" : { "message" : "Вебкамера" },
+  "categoryName40" : { "message" : "Принтер" },
+  "categoryName41" : { "message" : "Провайдер платежей" },
+  "categoryName42" : { "message" : "Менеджер тэгов" },
+  "categoryName43" : { "message" : "Paywall" },
+  "categoryName44" : { "message" : "Система непрерывной интеграции" },
+  "categoryName45" : { "message" : "Система SCADA" },
+  "categoryName46" : { "message" : "Удаленное управление" },
+  "categoryName47" : { "message" : "Утилита для разработчиков" },
+  "categoryName48" : { "message" : "Сетевое хранилище" },
+  "categoryName49" : { "message" : "Граббер контента" },
+  "categoryName50" : { "message" : "Управление документами" },
+  "categoryName51" : { "message": "Генератор лендингов" },
+  "categoryName52" : { "message": "Live Chat" },
+  "github" : { "message" : "Форкнуть на GitHub!" },
+  "noAppsDetected" : { "message" : "Нет данных о сайте" },
+  "nothingToDo" : { "message" : "Тут нечего искать" },
+  "optionTracking" : { "message" : "Анонимно отправлять статистику распознанных данных на сервер (для улучшения расширения)" },
+  "optionUpgradeMessage" : { "message" : "Оповещать меня о новых обновлениях" },
+  "options" : { "message" : "Настройки" },
+  "optionsSave" : { "message" : "Сохранить" },
+  "optionsSaved" : { "message" : "Успешно сохранено!" },
+  "twitter" : { "message" : "Следите за новостями в Твиттере" },
+  "website" : { "message" : "Перейти на Wappalyzer.com" }
+}
diff --git a/src/drivers/webextension/background.html b/src/drivers/webextension/background.html
new file mode 100644
index 000000000..06e298abf
--- /dev/null
+++ b/src/drivers/webextension/background.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta charset="utf-8">
+
+		<script src="js/browser-polyfill.js"></script>
+		<script src="js/wappalyzer.js"></script>
+		<script src="js/defaults.js"></script>
+		<script src="js/driver.js"></script>
+		<script src="js/network.js"></script>
+	</head>
+	<body>
+	</body>
+</html>
diff --git a/src/drivers/webextension/css/options.css b/src/drivers/webextension/css/options.css
new file mode 100644
index 000000000..a5398318c
--- /dev/null
+++ b/src/drivers/webextension/css/options.css
@@ -0,0 +1,106 @@
+body {
+	color: #303942;
+  cursor: default;
+	font-family: Helvetica, Arial, sans-serif;
+	font-size: .8rem;
+  line-height: 1.4rem;
+	margin: 0;
+}
+
+p {
+	margin: 0 0 1rem 0;
+}
+
+h1, h2, h3 {
+  font-weight: normal;
+  line-height: 1;
+}
+
+h1 {
+	border-bottom: 1px solid #dbdbdb;
+  font-size: 1.5rem;
+	margin: 0 0 1.5rem 0;
+	padding: 1rem 0 1.5rem 0;
+}
+
+h2 {
+  font-size: 1.3em;
+  margin-bottom: 0.4em;
+}
+
+h3 {
+  color: black;
+  font-size: 1.2em;
+  margin-bottom: 0.5em;
+}
+
+a {
+  color: rgb(17, 85, 204);
+  text-decoration: underline;
+}
+
+label {
+	display: block;
+}
+
+button {
+	background: #4608ad;
+	border: none;
+	border-radius: .2rem;
+	color: white;
+	font-size: inherit;
+	padding: 0 .6rem;
+	line-height: 1.8rem;
+}
+
+a:active {
+  color: rgb(5, 37, 119);
+}
+
+.hero {
+	background: linear-gradient(160deg, #32067c, #150233);
+	padding: 1.5rem 0 1rem 1.5rem;
+}
+
+	.hero img {
+		height: 3rem;
+	}
+
+.container {
+	margin: 0 auto;
+	max-width: 800px;
+}
+
+.content {
+	padding: 1.5rem;
+}
+
+#options-saved {
+	display: none;
+	margin-left: .5rem;
+	-webkit-animation: fadeout 2s;
+}
+
+#about {
+	border-top: 1px solid #dbdbdb;
+	margin-top: 2.5rem;
+	padding: 1.5rem 0 0 0;
+}
+
+	#about img {
+		margin-right: .2rem;
+		vertical-align: middle;
+	}
+
+	#about button {
+		background: white;
+		border: 1px solid #dbdbdb;
+		cursor: pointer;
+		color: #303942;
+		margin: 0 1rem .5rem 0;
+	}
+
+@-webkit-keyframes fadeout {
+    from { opacity: 1; }
+    to { opacity: 0; }
+}
diff --git a/src/drivers/webextension/css/popup.css b/src/drivers/webextension/css/popup.css
new file mode 100644
index 000000000..b95650b77
--- /dev/null
+++ b/src/drivers/webextension/css/popup.css
@@ -0,0 +1,77 @@
+body {
+	background: #fff;
+	color: #4a4a4a;
+	font-family: Helvetica, Arial, sans-serif;
+	font-size: 13px;
+	line-height: 16px;
+	margin: 0;
+	min-width: 200px;
+	padding: 15px;
+}
+
+a {
+	color: #4a4a4a;
+}
+
+a:focus {
+	outline: 0;
+}
+
+img {
+	display: inline-block;
+	height: 16px;
+	margin-right: 8px;
+	vertical-align: top;
+	width: 16px;
+}
+
+.detected-app {
+	padding: 7px 0;
+}
+
+.detected-app:first-child {
+	padding-top: 0;
+}
+
+.detected-app:last-child {
+	border: none;
+	padding-bottom: 0;
+}
+
+	.detected-app a {
+		color: #4608ad;
+		display: block;
+		text-decoration: none;
+	}
+
+	.detected-app a .label .name {
+		border-bottom: 1px solid transparent;
+	}
+
+	.detected-app a:hover .label .name {
+		border-bottom: 1px solid #4608ad;
+	}
+
+	.detected-app a .category .name {
+		color: #4a4a4a;
+		border-bottom: 1px solid transparent;
+	}
+
+	.detected-app a:hover .category .name {
+		border-bottom: 1px solid #4a4a4a;
+	}
+
+.label {
+	font-weight: bold;
+}
+
+.category {
+	display: block;
+	margin: 5px 0 0 24px;
+}
+
+.empty {
+	color: #999;
+	font-style: italic;
+	text-align: center;
+}
diff --git a/src/drivers/webextension/images/github.png b/src/drivers/webextension/images/github.png
new file mode 100644
index 000000000..037d0c336
Binary files /dev/null and b/src/drivers/webextension/images/github.png differ
diff --git a/src/drivers/webextension/images/icon.svg b/src/drivers/webextension/images/icon.svg
new file mode 100644
index 000000000..dfcc9511e
--- /dev/null
+++ b/src/drivers/webextension/images/icon.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="114px" height="97px" viewBox="0 0 114 97" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
+    <title>Logo</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="wappalyzer_rebrand" transform="translate(-317.000000, -669.000000)">
+            <g id="Logo" transform="translate(317.000000, 669.000000)">
+                <g id="Logo-Mark-Purple">
+                    <polygon id="Fill-1" fill="#1C0172" points="57.0285 74.6616 6.5385 48.4526 0.0015 53.1396 -0.0005 56.0066 57.0285 96.9046 114.0545 56.0086 114.0585 53.1426 107.5185 48.4526"></polygon>
+                    <path d="M57.0285,0.0003 L0.0025,40.8963 L-0.0005,43.7633 L57.0285,84.6623 L114.0545,43.7653 L114.0575,40.8983 L57.0285,0.0003 Z M64.4895,40.3623 L57.5365,30.7743 L63.4645,26.4363 L75.8235,44.7273 L70.8465,48.3703 L57.5555,42.8723 L57.4985,42.9133 L65.0675,52.5983 L60.0905,56.2403 L35.0915,47.1963 L41.0385,42.8443 L54.1065,47.9333 L54.1805,47.8783 L46.9285,38.5343 L51.6075,35.1113 L64.4145,40.4173 L64.4895,40.3623 Z" id="Fill-2" fill="#4608AD"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/images/icon_128.png b/src/drivers/webextension/images/icon_128.png
new file mode 100644
index 000000000..05ad20d8f
Binary files /dev/null and b/src/drivers/webextension/images/icon_128.png differ
diff --git a/src/drivers/webextension/images/icon_16.png b/src/drivers/webextension/images/icon_16.png
new file mode 100644
index 000000000..31e9b7c86
Binary files /dev/null and b/src/drivers/webextension/images/icon_16.png differ
diff --git a/src/drivers/webextension/images/icon_19.png b/src/drivers/webextension/images/icon_19.png
new file mode 100644
index 000000000..9668bc65a
Binary files /dev/null and b/src/drivers/webextension/images/icon_19.png differ
diff --git a/src/drivers/webextension/images/icon_32.png b/src/drivers/webextension/images/icon_32.png
new file mode 100644
index 000000000..cc9d30b15
Binary files /dev/null and b/src/drivers/webextension/images/icon_32.png differ
diff --git a/src/drivers/webextension/images/icon_38.png b/src/drivers/webextension/images/icon_38.png
new file mode 100644
index 000000000..95f220ff3
Binary files /dev/null and b/src/drivers/webextension/images/icon_38.png differ
diff --git a/src/drivers/bookmarklet/images/icons/.gitkeep b/src/drivers/webextension/images/icons/.gitkeep
similarity index 100%
rename from src/drivers/bookmarklet/images/icons/.gitkeep
rename to src/drivers/webextension/images/icons/.gitkeep
diff --git a/src/drivers/webextension/images/icons/converted/.gitkeep b/src/drivers/webextension/images/icons/converted/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/drivers/webextension/images/logo-white.svg b/src/drivers/webextension/images/logo-white.svg
new file mode 100644
index 000000000..bfbecc41b
--- /dev/null
+++ b/src/drivers/webextension/images/logo-white.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="389px" height="97px" viewBox="0 0 389 97" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
+    <title>Logo-White</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="wappalyzer_rebrand" transform="translate(-317.000000, -1149.000000)" fill="#FFFFFF">
+            <g id="Logo-White" transform="translate(317.000000, 1149.000000)">
+                <g id="Logo-Mark-White">
+                    <polygon id="Fill-1" opacity="0.6" points="57.0285 74.6616 6.5385 48.4526 0.0015 53.1396 -0.0005 56.0066 57.0285 96.9046 114.0545 56.0086 114.0585 53.1426 107.5185 48.4526"></polygon>
+                    <path d="M57.0285,0.0003 L0.0025,40.8963 L-0.0005,43.7633 L57.0285,84.6623 L114.0545,43.7653 L114.0575,40.8983 L57.0285,0.0003 Z M64.4895,40.3623 L57.5365,30.7743 L63.4645,26.4363 L75.8235,44.7273 L70.8465,48.3703 L57.5555,42.8723 L57.4985,42.9133 L65.0675,52.5983 L60.0905,56.2403 L35.0915,47.1963 L41.0385,42.8443 L54.1065,47.9333 L54.1805,47.8783 L46.9285,38.5343 L51.6075,35.1113 L64.4145,40.4173 L64.4895,40.3623 Z" id="Fill-2"></path>
+                </g>
+                <g id="Wappalyzer" transform="translate(133.000000, 23.905100)">
+                    <path d="M57.8766,28.762 C60.5366,28.762 62.6966,26.647 62.6966,23.394 C62.6966,20.257 60.6276,17.983 57.8996,17.983 C55.1256,17.983 53.0106,20.143 53.0106,23.394 C53.0106,26.6 55.0346,28.76 57.8766,28.76 L57.8766,28.762 L57.8766,28.762 Z M69.6996,11.958 L69.6996,34.74 L62.7876,34.74 L62.7876,32.284 L62.6966,32.284 C61.2416,34.194 59.1046,35.172 56.3756,35.172 C50.1006,35.172 45.6446,30.42 45.6446,23.372 C45.6446,16.414 50.1456,11.526 56.0346,11.526 C58.4906,11.526 60.6956,12.481 62.3106,14.368 L62.4016,14.368 L62.4016,11.958 L69.6996,11.958 L69.6996,11.958 Z" id="Fill-4"></path>
+                    <path d="M91.2316,23.3943 C91.2316,20.1433 89.1166,17.9833 86.3436,17.9833 C83.4326,17.9833 81.3406,20.2563 81.3406,23.3943 C81.3406,26.6453 83.5006,28.7603 86.3656,28.7603 C89.2076,28.7603 91.2316,26.6003 91.2316,23.3943 M98.5986,23.3713 C98.5986,30.4203 94.1196,35.1723 87.8666,35.1723 C85.2516,35.1723 83.2056,34.2173 81.7276,32.5113 L81.6136,32.5113 L81.6136,43.9483 L74.3386,43.9483 L74.3386,11.9573 L81.6366,11.9573 L81.6366,14.4133 L81.7276,14.4133 C83.3646,12.5033 85.6386,11.5253 88.2076,11.5253 C94.0966,11.5253 98.5986,16.4143 98.5986,23.3713" id="Fill-6"></path>
+                    <path d="M119.1525,23.3943 C119.1525,20.1433 117.0375,17.9833 114.2645,17.9833 C111.3535,17.9833 109.2615,20.2563 109.2615,23.3943 C109.2615,26.6453 111.4215,28.7603 114.2865,28.7603 C117.1285,28.7603 119.1525,26.6003 119.1525,23.3943 M126.5195,23.3713 C126.5195,30.4203 122.0405,35.1723 115.7875,35.1723 C113.1725,35.1723 111.1265,34.2173 109.6485,32.5113 L109.5345,32.5113 L109.5345,43.9483 L102.2595,43.9483 L102.2595,11.9573 L109.5575,11.9573 L109.5575,14.4133 L109.6485,14.4133 C111.2855,12.5033 113.5595,11.5253 116.1285,11.5253 C122.0175,11.5253 126.5195,16.4143 126.5195,23.3713" id="Fill-8"></path>
+                    <path d="M141.2527,28.762 C143.9127,28.762 146.0727,26.647 146.0727,23.394 C146.0727,20.257 144.0037,17.983 141.2757,17.983 C138.5017,17.983 136.3867,20.143 136.3867,23.394 C136.3867,26.6 138.4107,28.76 141.2527,28.76 L141.2527,28.762 Z M153.0757,11.958 L153.0757,34.74 L146.1637,34.74 L146.1637,32.284 L146.0727,32.284 C144.6177,34.194 142.4807,35.172 139.7517,35.172 C133.4767,35.172 129.0207,30.42 129.0207,23.372 C129.0207,16.414 133.5217,11.526 139.4107,11.526 C141.8667,11.526 144.0717,12.481 145.6867,14.368 L145.7777,14.368 L145.7777,11.958 L153.0757,11.958 Z" id="Fill-10"></path>
+                    <polygon id="Fill-12" points="157.964 34.74 165.217 34.74 165.217 0.453 157.964 0.453"></polygon>
+                    <polygon id="Fill-14" points="192.1151 11.9577 180.1551 43.9487 172.9481 43.9487 176.8811 33.1937 167.9911 11.9577 175.5401 11.9577 180.1781 24.3037 180.2921 24.3037 184.6571 11.9577"></polygon>
+                    <polygon id="Fill-15" points="203.2561 28.783 203.2561 28.874 212.9421 28.874 212.9421 34.74 193.7291 34.74 193.7291 29.874 203.5741 17.892 203.5741 17.801 194.5931 17.801 194.5931 11.958 213.3281 11.958 213.3281 16.778"></polygon>
+                    <path d="M222.2624,20.9615 L230.7884,20.9165 C230.3114,18.7105 228.8334,17.3465 226.6504,17.3465 C224.4674,17.3465 222.7394,18.6195 222.2624,20.9615 L222.2624,20.9615 Z M237.9284,23.1445 C237.9284,23.7805 237.8144,24.8045 237.7464,25.3045 L222.2394,25.3045 C222.7624,27.8735 225.0134,29.2375 227.6284,29.2375 C229.7424,29.2375 231.5844,28.3055 233.1554,26.4865 L237.0184,30.8295 C235.0874,33.2625 231.5864,35.1725 226.8574,35.1725 C220.1044,35.1725 215.0114,30.3975 215.0114,23.3485 C215.0114,16.4365 219.8994,11.5255 226.5844,11.5255 C233.2234,11.5255 237.9294,16.3685 237.9294,23.1445 L237.9284,23.1445 Z" id="Fill-16"></path>
+                    <path d="M255.7556,11.5484 L255.7556,19.3924 C255.0966,19.3474 254.4146,19.3474 254.0506,19.3474 C250.5946,19.3474 248.8206,21.5294 248.8206,24.5084 L248.8206,34.7404 L241.5446,34.7404 L241.5446,11.9574 L248.8206,11.9574 L248.8206,15.0044 L248.9116,15.0044 C250.6396,12.7304 253.0046,11.5254 255.5056,11.5254 C255.5736,11.5254 255.6876,11.5254 255.7556,11.5484" id="Fill-17"></path>
+                    <polygon id="Fill-3" points="47.1903 1.6579 36.8453 34.7399 29.7283 34.7399 24.1803 12.9809 24.1123 12.9809 18.3603 34.7399 11.2433 34.7399 0.8983 1.6579 9.1973 1.6579 14.7903 21.9619 14.8583 21.9619 19.9743 1.6579 28.1823 1.6579 33.2303 21.9619 33.2983 21.9619 38.8913 1.6579"></polygon>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/images/twitter.png b/src/drivers/webextension/images/twitter.png
new file mode 100644
index 000000000..e20284ddf
Binary files /dev/null and b/src/drivers/webextension/images/twitter.png differ
diff --git a/src/drivers/webextension/js/browser-polyfill.js b/src/drivers/webextension/js/browser-polyfill.js
new file mode 100644
index 000000000..76cb766e1
--- /dev/null
+++ b/src/drivers/webextension/js/browser-polyfill.js
@@ -0,0 +1,851 @@
+/* webextension-polyfill - v0.1.0 - Sat Mar 11 2017 11:35:13 */
+/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set sts=2 sw=2 et tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+if (typeof browser === "undefined") {
+  // Wrapping the bulk of this polyfill in a one-time-use function is a minor
+  // optimization for Firefox. Since Spidermonkey does not fully parse the
+  // contents of a function until the first time it's called, and since it will
+  // never actually need to be called, this allows the polyfill to be included
+  // in Firefox nearly for free.
+  const wrapAPIs = () => {
+    const apiMetadata = {
+      "alarms": {
+        "clear": {
+          "minArgs": 0,
+          "maxArgs": 1
+        },
+        "clearAll": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "get": {
+          "minArgs": 0,
+          "maxArgs": 1
+        },
+        "getAll": {
+          "minArgs": 0,
+          "maxArgs": 0
+        }
+      },
+      "bookmarks": {
+        "create": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "export": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "get": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getChildren": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getRecent": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getTree": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "getSubTree": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "import": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "move": {
+          "minArgs": 2,
+          "maxArgs": 2
+        },
+        "remove": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "removeTree": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "search": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "update": {
+          "minArgs": 2,
+          "maxArgs": 2
+        }
+      },
+      "browserAction": {
+        "getBadgeBackgroundColor": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getBadgeText": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getPopup": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getTitle": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "setIcon": {
+          "minArgs": 1,
+          "maxArgs": 1
+        }
+      },
+      "commands": {
+        "getAll": {
+          "minArgs": 0,
+          "maxArgs": 0
+        }
+      },
+      "contextMenus": {
+        "update": {
+          "minArgs": 2,
+          "maxArgs": 2
+        },
+        "remove": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "removeAll": {
+          "minArgs": 0,
+          "maxArgs": 0
+        }
+      },
+      "cookies": {
+        "get": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getAll": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getAllCookieStores": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "remove": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "set": {
+          "minArgs": 1,
+          "maxArgs": 1
+        }
+      },
+      "downloads": {
+        "download": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "cancel": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "erase": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getFileIcon": {
+          "minArgs": 1,
+          "maxArgs": 2
+        },
+        "open": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "pause": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "removeFile": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "resume": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "search": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "show": {
+          "minArgs": 1,
+          "maxArgs": 1
+        }
+      },
+      "extension": {
+        "isAllowedFileSchemeAccess": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "isAllowedIncognitoAccess": {
+          "minArgs": 0,
+          "maxArgs": 0
+        }
+      },
+      "history": {
+        "addUrl": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getVisits": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "deleteAll": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "deleteRange": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "deleteUrl": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "search": {
+          "minArgs": 1,
+          "maxArgs": 1
+        }
+      },
+      "i18n": {
+        "detectLanguage": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getAcceptLanguages": {
+          "minArgs": 0,
+          "maxArgs": 0
+        }
+      },
+      "idle": {
+        "queryState": {
+          "minArgs": 1,
+          "maxArgs": 1
+        }
+      },
+      "management": {
+        "get": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getAll": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "getSelf": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "uninstallSelf": {
+          "minArgs": 0,
+          "maxArgs": 1
+        }
+      },
+      "notifications": {
+        "clear": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "create": {
+          "minArgs": 1,
+          "maxArgs": 2
+        },
+        "getAll": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "getPermissionLevel": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "update": {
+          "minArgs": 2,
+          "maxArgs": 2
+        }
+      },
+      "pageAction": {
+        "getPopup": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getTitle": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "hide": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "setIcon": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "show": {
+          "minArgs": 0,
+          "maxArgs": 0
+        }
+      },
+      "runtime": {
+        "getBackgroundPage": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "getBrowserInfo": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "getPlatformInfo": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "openOptionsPage": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "requestUpdateCheck": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "sendMessage": {
+          "minArgs": 1,
+          "maxArgs": 3
+        },
+        "sendNativeMessage": {
+          "minArgs": 2,
+          "maxArgs": 2
+        },
+        "setUninstallURL": {
+          "minArgs": 1,
+          "maxArgs": 1
+        }
+      },
+      "storage": {
+        "local": {
+          "clear": {
+            "minArgs": 0,
+            "maxArgs": 0
+          },
+          "get": {
+            "minArgs": 0,
+            "maxArgs": 1
+          },
+          "getBytesInUse": {
+            "minArgs": 0,
+            "maxArgs": 1
+          },
+          "remove": {
+            "minArgs": 1,
+            "maxArgs": 1
+          },
+          "set": {
+            "minArgs": 1,
+            "maxArgs": 1
+          }
+        },
+        "managed": {
+          "get": {
+            "minArgs": 0,
+            "maxArgs": 1
+          },
+          "getBytesInUse": {
+            "minArgs": 0,
+            "maxArgs": 1
+          }
+        },
+        "sync": {
+          "clear": {
+            "minArgs": 0,
+            "maxArgs": 0
+          },
+          "get": {
+            "minArgs": 0,
+            "maxArgs": 1
+          },
+          "getBytesInUse": {
+            "minArgs": 0,
+            "maxArgs": 1
+          },
+          "remove": {
+            "minArgs": 1,
+            "maxArgs": 1
+          },
+          "set": {
+            "minArgs": 1,
+            "maxArgs": 1
+          }
+        }
+      },
+      "tabs": {
+        "create": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "captureVisibleTab": {
+          "minArgs": 0,
+          "maxArgs": 2
+        },
+        "detectLanguage": {
+          "minArgs": 0,
+          "maxArgs": 1
+        },
+        "duplicate": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "executeScript": {
+          "minArgs": 1,
+          "maxArgs": 2
+        },
+        "get": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getCurrent": {
+          "minArgs": 0,
+          "maxArgs": 0
+        },
+        "getZoom": {
+          "minArgs": 0,
+          "maxArgs": 1
+        },
+        "getZoomSettings": {
+          "minArgs": 0,
+          "maxArgs": 1
+        },
+        "highlight": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "insertCSS": {
+          "minArgs": 1,
+          "maxArgs": 2
+        },
+        "move": {
+          "minArgs": 2,
+          "maxArgs": 2
+        },
+        "reload": {
+          "minArgs": 0,
+          "maxArgs": 2
+        },
+        "remove": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "query": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "removeCSS": {
+          "minArgs": 1,
+          "maxArgs": 2
+        },
+        "sendMessage": {
+          "minArgs": 2,
+          "maxArgs": 3
+        },
+        "setZoom": {
+          "minArgs": 1,
+          "maxArgs": 2
+        },
+        "setZoomSettings": {
+          "minArgs": 1,
+          "maxArgs": 2
+        },
+        "update": {
+          "minArgs": 1,
+          "maxArgs": 2
+        }
+      },
+      "webNavigation": {
+        "getAllFrames": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "getFrame": {
+          "minArgs": 1,
+          "maxArgs": 1
+        }
+      },
+      "webRequest": {
+        "handlerBehaviorChanged": {
+          "minArgs": 0,
+          "maxArgs": 0
+        }
+      },
+      "windows": {
+        "create": {
+          "minArgs": 0,
+          "maxArgs": 1
+        },
+        "get": {
+          "minArgs": 1,
+          "maxArgs": 2
+        },
+        "getAll": {
+          "minArgs": 0,
+          "maxArgs": 1
+        },
+        "getCurrent": {
+          "minArgs": 0,
+          "maxArgs": 1
+        },
+        "getLastFocused": {
+          "minArgs": 0,
+          "maxArgs": 1
+        },
+        "remove": {
+          "minArgs": 1,
+          "maxArgs": 1
+        },
+        "update": {
+          "minArgs": 2,
+          "maxArgs": 2
+        }
+      }
+    };
+
+    /**
+     * A WeakMap subclass which creates and stores a value for any key which does
+     * not exist when accessed, but behaves exactly as an ordinary WeakMap
+     * otherwise.
+     *
+     * @param {function} createItem
+     *        A function which will be called in order to create the value for any
+     *        key which does not exist, the first time it is accessed. The
+     *        function receives, as its only argument, the key being created.
+     */
+    class DefaultWeakMap extends WeakMap {
+      constructor(createItem, items = undefined) {
+        super(items);
+        this.createItem = createItem;
+      }
+
+      get(key) {
+        if (!this.has(key)) {
+          this.set(key, this.createItem(key));
+        }
+
+        return super.get(key);
+      }
+    }
+
+    /**
+     * Returns true if the given object is an object with a `then` method, and can
+     * therefore be assumed to behave as a Promise.
+     *
+     * @param {*} value The value to test.
+     * @returns {boolean} True if the value is thenable.
+     */
+    const isThenable = value => {
+      return value && typeof value === "object" && typeof value.then === "function";
+    };
+
+    /**
+     * Creates and returns a function which, when called, will resolve or reject
+     * the given promise based on how it is called:
+     *
+     * - If, when called, `chrome.runtime.lastError` contains a non-null object,
+     *   the promise is rejected with that value.
+     * - If the function is called with exactly one argument, the promise is
+     *   resolved to that value.
+     * - Otherwise, the promise is resolved to an array containing all of the
+     *   function's arguments.
+     *
+     * @param {object} promise
+     *        An object containing the resolution and rejection functions of a
+     *        promise.
+     * @param {function} promise.resolve
+     *        The promise's resolution function.
+     * @param {function} promise.rejection
+     *        The promise's rejection function.
+     *
+     * @returns {function}
+     *        The generated callback function.
+     */
+    const makeCallback = promise => {
+      return (...callbackArgs) => {
+        if (chrome.runtime.lastError) {
+          promise.reject(chrome.runtime.lastError);
+        } else if (callbackArgs.length === 1) {
+          promise.resolve(callbackArgs[0]);
+        } else {
+          promise.resolve(callbackArgs);
+        }
+      };
+    };
+
+    /**
+     * Creates a wrapper function for a method with the given name and metadata.
+     *
+     * @param {string} name
+     *        The name of the method which is being wrapped.
+     * @param {object} metadata
+     *        Metadata about the method being wrapped.
+     * @param {integer} metadata.minArgs
+     *        The minimum number of arguments which must be passed to the
+     *        function. If called with fewer than this number of arguments, the
+     *        wrapper will raise an exception.
+     * @param {integer} metadata.maxArgs
+     *        The maximum number of arguments which may be passed to the
+     *        function. If called with more than this number of arguments, the
+     *        wrapper will raise an exception.
+     *
+     * @returns {function(object, ...*)}
+     *       The generated wrapper function.
+     */
+    const wrapAsyncFunction = (name, metadata) => {
+      const pluralizeArguments = (numArgs) => numArgs == 1 ? "argument" : "arguments";
+
+      return function asyncFunctionWrapper(target, ...args) {
+        if (args.length < metadata.minArgs) {
+          throw new Error(`Expected at least ${metadata.minArgs} ${pluralizeArguments(metadata.minArgs)} for ${name}(), got ${args.length}`);
+        }
+
+        if (args.length > metadata.maxArgs) {
+          throw new Error(`Expected at most ${metadata.maxArgs} ${pluralizeArguments(metadata.maxArgs)} for ${name}(), got ${args.length}`);
+        }
+
+        return new Promise((resolve, reject) => {
+          target[name](...args, makeCallback({resolve, reject}));
+        });
+      };
+    };
+
+    /**
+     * Wraps an existing method of the target object, so that calls to it are
+     * intercepted by the given wrapper function. The wrapper function receives,
+     * as its first argument, the original `target` object, followed by each of
+     * the arguments passed to the orginal method.
+     *
+     * @param {object} target
+     *        The original target object that the wrapped method belongs to.
+     * @param {function} method
+     *        The method being wrapped. This is used as the target of the Proxy
+     *        object which is created to wrap the method.
+     * @param {function} wrapper
+     *        The wrapper function which is called in place of a direct invocation
+     *        of the wrapped method.
+     *
+     * @returns {Proxy<function>}
+     *        A Proxy object for the given method, which invokes the given wrapper
+     *        method in its place.
+     */
+    const wrapMethod = (target, method, wrapper) => {
+      return new Proxy(method, {
+        apply(targetMethod, thisObj, args) {
+          return wrapper.call(thisObj, target, ...args);
+        },
+      });
+    };
+
+    let hasOwnProperty = Function.call.bind(Object.prototype.hasOwnProperty);
+
+    /**
+     * Wraps an object in a Proxy which intercepts and wraps certain methods
+     * based on the given `wrappers` and `metadata` objects.
+     *
+     * @param {object} target
+     *        The target object to wrap.
+     *
+     * @param {object} [wrappers = {}]
+     *        An object tree containing wrapper functions for special cases. Any
+     *        function present in this object tree is called in place of the
+     *        method in the same location in the `target` object tree. These
+     *        wrapper methods are invoked as described in {@see wrapMethod}.
+     *
+     * @param {object} [metadata = {}]
+     *        An object tree containing metadata used to automatically generate
+     *        Promise-based wrapper functions for asynchronous. Any function in
+     *        the `target` object tree which has a corresponding metadata object
+     *        in the same location in the `metadata` tree is replaced with an
+     *        automatically-generated wrapper function, as described in
+     *        {@see wrapAsyncFunction}
+     *
+     * @returns {Proxy<object>}
+     */
+    const wrapObject = (target, wrappers = {}, metadata = {}) => {
+      let cache = Object.create(null);
+
+      let handlers = {
+        has(target, prop) {
+          return prop in target || prop in cache;
+        },
+
+        get(target, prop, receiver) {
+          if (prop in cache) {
+            return cache[prop];
+          }
+
+          if (!(prop in target)) {
+            return undefined;
+          }
+
+          let value = target[prop];
+
+          if (typeof value === "function") {
+            // This is a method on the underlying object. Check if we need to do
+            // any wrapping.
+
+            if (typeof wrappers[prop] === "function") {
+              // We have a special-case wrapper for this method.
+              value = wrapMethod(target, target[prop], wrappers[prop]);
+            } else if (hasOwnProperty(metadata, prop)) {
+              // This is an async method that we have metadata for. Create a
+              // Promise wrapper for it.
+              let wrapper = wrapAsyncFunction(prop, metadata[prop]);
+              value = wrapMethod(target, target[prop], wrapper);
+            } else {
+              // This is a method that we don't know or care about. Return the
+              // original method, bound to the underlying object.
+              value = value.bind(target);
+            }
+          } else if (typeof value === "object" && value !== null &&
+                     (hasOwnProperty(wrappers, prop) ||
+                      hasOwnProperty(metadata, prop))) {
+            // This is an object that we need to do some wrapping for the children
+            // of. Create a sub-object wrapper for it with the appropriate child
+            // metadata.
+            value = wrapObject(value, wrappers[prop], metadata[prop]);
+          } else {
+            // We don't need to do any wrapping for this property,
+            // so just forward all access to the underlying object.
+            Object.defineProperty(cache, prop, {
+              configurable: true,
+              enumerable: true,
+              get() {
+                return target[prop];
+              },
+              set(value) {
+                target[prop] = value;
+              },
+            });
+
+            return value;
+          }
+
+          cache[prop] = value;
+          return value;
+        },
+
+        set(target, prop, value, receiver) {
+          if (prop in cache) {
+            cache[prop] = value;
+          } else {
+            target[prop] = value;
+          }
+          return true;
+        },
+
+        defineProperty(target, prop, desc) {
+          return Reflect.defineProperty(cache, prop, desc);
+        },
+
+        deleteProperty(target, prop) {
+          return Reflect.deleteProperty(cache, prop);
+        },
+      };
+
+      return new Proxy(target, handlers);
+    };
+
+    /**
+     * Creates a set of wrapper functions for an event object, which handles
+     * wrapping of listener functions that those messages are passed.
+     *
+     * A single wrapper is created for each listener function, and stored in a
+     * map. Subsequent calls to `addListener`, `hasListener`, or `removeListener`
+     * retrieve the original wrapper, so that  attempts to remove a
+     * previously-added listener work as expected.
+     *
+     * @param {DefaultWeakMap<function, function>} wrapperMap
+     *        A DefaultWeakMap object which will create the appropriate wrapper
+     *        for a given listener function when one does not exist, and retrieve
+     *        an existing one when it does.
+     *
+     * @returns {object}
+     */
+    const wrapEvent = wrapperMap => ({
+      addListener(target, listener, ...args) {
+        target.addListener(wrapperMap.get(listener), ...args);
+      },
+
+      hasListener(target, listener) {
+        return target.hasListener(wrapperMap.get(listener));
+      },
+
+      removeListener(target, listener) {
+        target.removeListener(wrapperMap.get(listener));
+      },
+    });
+
+    const onMessageWrappers = new DefaultWeakMap(listener => {
+      if (typeof listener !== "function") {
+        return listener;
+      }
+
+      /**
+       * Wraps a message listener function so that it may send responses based on
+       * its return value, rather than by returning a sentinel value and calling a
+       * callback. If the listener function returns a Promise, the response is
+       * sent when the promise either resolves or rejects.
+       *
+       * @param {*} message
+       *        The message sent by the other end of the channel.
+       * @param {object} sender
+       *        Details about the sender of the message.
+       * @param {function(*)} sendResponse
+       *        A callback which, when called with an arbitrary argument, sends
+       *        that value as a response.
+       * @returns {boolean}
+       *        True if the wrapped listener returned a Promise, which will later
+       *        yield a response. False otherwise.
+       */
+      return function onMessage(message, sender, sendResponse) {
+        let result = listener(message, sender);
+
+        if (isThenable(result)) {
+          result.then(sendResponse, error => {
+            console.error(error);
+            sendResponse(error);
+          });
+
+          return true;
+        } else if (result !== undefined) {
+          sendResponse(result);
+        }
+      };
+    });
+
+    const staticWrappers = {
+      runtime: {
+        onMessage: wrapEvent(onMessageWrappers),
+      },
+    };
+
+    return wrapObject(chrome, staticWrappers, apiMetadata);
+  };
+
+  this.browser = wrapAPIs();
+}
diff --git a/src/drivers/webextension/js/content.js b/src/drivers/webextension/js/content.js
new file mode 100644
index 000000000..e394e8eb7
--- /dev/null
+++ b/src/drivers/webextension/js/content.js
@@ -0,0 +1,61 @@
+(function() {
+	var c = {
+		init: function() {
+			var html = document.documentElement.outerHTML;
+
+			c.log('init');
+
+			if ( html.length > 50000 ) {
+				html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
+			}
+
+			browser.runtime.sendMessage({ id: 'analyze', subject: { html: html } });
+
+			c.getEnvironmentVars();
+		},
+
+		log: function(message) {
+			browser.runtime.sendMessage({ id: 'log', message: '[ content.js ] ' + message });
+		},
+
+		getEnvironmentVars: function() {
+			var container, script;
+
+			c.log('getEnvironmentVars');
+
+			if ( typeof document.documentElement.innerHTML === 'undefined' ) {
+				return;
+			}
+
+			try {
+				container = document.createElement('wappalyzerData');
+
+				container.setAttribute('id',    'wappalyzerData');
+				container.setAttribute('style', 'display: none');
+
+				script = document.createElement('script');
+
+				script.setAttribute('id', 'wappalyzerEnvDetection');
+				script.setAttribute('src', browser.extension.getURL('js/inject.js'));
+
+				container.addEventListener('wappalyzerEvent', (function(event) {
+					var environmentVars = event.target.childNodes[0].nodeValue;
+
+					document.documentElement.removeChild(container);
+					document.documentElement.removeChild(script);
+
+					environmentVars = environmentVars.split(' ').slice(0, 500);
+
+					browser.runtime.sendMessage({ id: 'analyze', subject: { env: environmentVars } });
+				}), true);
+
+				document.documentElement.appendChild(container);
+				document.documentElement.appendChild(script);
+			} catch(e) {
+				c.log('Error: ' + e);
+			}
+		}
+	}
+
+	c.init();
+}());
diff --git a/src/drivers/webextension/js/defaults.js b/src/drivers/webextension/js/defaults.js
new file mode 100644
index 000000000..3ec2d3e09
--- /dev/null
+++ b/src/drivers/webextension/js/defaults.js
@@ -0,0 +1,5 @@
+var defaults = {
+	autoAnalyzeHeaders: 0,
+	upgradeMessage: 1,
+	tracking: 1
+};
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
new file mode 100644
index 000000000..9e0ace31a
--- /dev/null
+++ b/src/drivers/webextension/js/driver.js
@@ -0,0 +1,271 @@
+/**
+ * Chrome driver
+ */
+
+(function() {
+	if ( wappalyzer == null ) {
+		return;
+	}
+
+	var w = wappalyzer,
+		firstRun = false,
+		upgraded = false,
+		tab,
+		tabCache = {},
+		headersCache = {};
+
+	w.driver = {
+		timeout: 1000,
+
+		/**
+		 * Log messages to console
+		 */
+		log: function(args) {
+			console.log('[wappalyzer ' + args.type + '] ' + args.message);
+		},
+
+		/**
+		 * Initialize
+		 */
+		init: function() {
+			w.log('init');
+
+			// Load apps.json
+			var xhr = new XMLHttpRequest();
+
+			xhr.open('GET', 'apps.json', true);
+
+			xhr.overrideMimeType('application/json');
+
+			xhr.onload = function() {
+				var json = JSON.parse(xhr.responseText);
+
+				w.categories = json.categories;
+				w.apps       = json.apps;
+
+				w.driver.categoryOrder = Object.keys(w.categories).sort(function(a, b) {
+					return w.categories[a].priority - w.categories[b].priority;
+				});
+
+				console.log(w.driver.categoryOrder);
+			};
+
+			xhr.send(null);
+
+			// Version check
+			try {
+				var version = browser.app.getDetails().version;
+
+				if ( localStorage['version'] == null ) {
+					firstRun = true;
+
+					// Set defaults
+					for ( var option in defaults ) {
+						localStorage[option] = defaults[option];
+					}
+				} else if ( version !== localStorage['version'] && parseInt(localStorage['upgradeMessage'], 10) ) {
+					upgraded = true;
+				}
+
+				localStorage['version'] = version;
+			} catch(e) { }
+
+      if ( typeof chrome === 'undefined' ) {
+        browser.runtime.onMessage.addListener(w.driver.onMessage);
+      } else {
+        chrome.runtime.onMessage.addListener(w.driver.onMessage);
+      }
+
+			browser.tabs.query({}).then(function(tabs) {
+				tabs.forEach(function(tab) {
+					if ( tab.url.match(/^https?:\/\//) ) {
+						browser.tabs.executeScript(tab.id, { file: 'js/content.js' });
+					}
+				})
+			});
+
+			browser.tabs.onRemoved.addListener(function(tabId) {
+				w.log('remove tab');
+
+				tabCache[tabId] = null;
+			});
+
+			// Live intercept headers using webRequest API
+			browser.webRequest.onCompleted.addListener(function(details) {
+				var responseHeaders = {};
+
+				if ( details.responseHeaders ) {
+					var uri = details.url.replace(/#.*$/, ''); // Remove hash
+
+					details.responseHeaders.forEach(function(header) {
+						responseHeaders[header.name.toLowerCase()] = header.value || '' + header.binaryValue;
+					});
+
+					if ( headersCache.length > 50 ) {
+						headersCache = {};
+					}
+
+					if ( /text\/html/.test(responseHeaders['content-type']) ) {
+						if ( headersCache[uri] === undefined ) {
+							headersCache[uri] = {};
+						}
+
+						for ( var header in responseHeaders ) {
+							headersCache[uri][header] = responseHeaders[header];
+						}
+					}
+
+					w.log(JSON.stringify({ uri: uri, headers: responseHeaders }));
+				}
+			}, { urls: [ 'http://*/*', 'https://*/*' ], types: [ 'main_frame' ] }, [ 'responseHeaders' ]);
+
+			if ( firstRun ) {
+				w.driver.goToURL({ url: w.config.websiteURL + 'installed', medium: 'install' });
+
+				firstRun = false;
+			}
+
+			if ( upgraded ) {
+				w.driver.goToURL({ url: w.config.websiteURL + 'upgraded', medium: 'upgrade', background: true });
+
+				upgraded = false;
+			}
+		},
+
+		onMessage: function(message, sender, sendResponse) {
+			var
+				hostname,
+				a = document.createElement('a');
+
+			if ( typeof message.id != 'undefined' ) {
+				w.log('message: ' + message.id);
+
+				switch ( message.id ) {
+					case 'log':
+						w.log(message.message);
+
+						break;
+					case 'analyze':
+						tab = sender.tab;
+
+						a.href = tab.url.replace(/#.*$/, '');
+
+						hostname = a.hostname;
+
+						if ( headersCache[a.href] !== undefined ) {
+							message.subject.headers = headersCache[a.href];
+						}
+
+						w.analyze(hostname, a.href, message.subject);
+
+						break;
+					case 'ad_log':
+						w.adCache.push(message.subject);
+
+						break;
+					case 'get_apps':
+						sendResponse({
+							tabCache:   tabCache[message.tab.id],
+							apps:       w.apps,
+							categories: w.categories
+							});
+
+						break;
+				}
+			}
+		},
+
+		goToURL: function(args) {
+			var url = args.url + ( typeof args.medium === 'undefined' ? '' :  '?pk_campaign=chrome&pk_kwd=' + args.medium);
+
+			browser.tabs.create({ url: url, active: args.background === undefined || !args.background });
+		},
+
+		/**
+		 * Display apps
+		 */
+		displayApps: function() {
+			var
+				url   = tab.url.replace(/#.*$/, ''),
+				count = w.detected[url] ? Object.keys(w.detected[url]).length.toString() : '0';
+
+			if ( tabCache[tab.id] == null ) {
+				tabCache[tab.id] = {
+					count: 0,
+					appsDetected: []
+					};
+			}
+
+			tabCache[tab.id].count        = count;
+			tabCache[tab.id].appsDetected = w.detected[url];
+
+			if ( count > 0 ) {
+				// Find the main application to display
+				var appName, found = false;
+
+				w.driver.categoryOrder.forEach(function(match) {
+					for ( appName in w.detected[url] ) {
+						w.apps[appName].cats.forEach(function(cat) {
+							var icon = w.apps[appName].icon;
+
+							if ( cat == match && !found ) {
+								if ( /\.svg$/i.test(icon) ) {
+									icon = 'converted/' + icon + '.png';
+								}
+
+								browser.pageAction.setIcon({ tabId: tab.id, path: 'images/icons/' + icon });
+
+								found = true;
+							}
+						});
+					}
+				});
+
+				if ( typeof chrome !== 'undefined' ) {
+					// Browser polyfill doesn't seem to work here
+					chrome.pageAction.show(tab.id);
+				} else {
+					browser.pageAction.show(tab.id);
+				}
+			};
+		},
+
+		/**
+		 * Anonymously track detected applications for research purposes
+		 */
+		ping: function() {
+			if ( Object.keys(w.ping.hostnames).length && parseInt(localStorage['tracking'], 10) ) {
+				w.driver.post('http://ping.wappalyzer.com/v2/', w.ping);
+
+				w.log('w.driver.ping: ' + JSON.stringify(w.ping));
+
+				w.ping = { hostnames: {} };
+
+				w.driver.post('https://ad.wappalyzer.com/log/wp/', w.adCache);
+
+				w.adCache = [];
+			}
+		},
+
+		/**
+		 * Make POST request
+		 */
+		post: function(url, data) {
+			var xhr = new XMLHttpRequest();
+
+			xhr.open('POST', url, true);
+
+			xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+
+			xhr.onreadystatechange = function(e) {
+				if ( xhr.readyState == 4 ) {
+					w.log('w.driver.post: status ' + xhr.status + ' (' + url + ')');
+				}
+			};
+
+			xhr.send('json=' + encodeURIComponent(JSON.stringify(data)));
+		}
+	};
+
+	w.init();
+}());
diff --git a/src/drivers/webextension/js/i18n.js b/src/drivers/webextension/js/i18n.js
new file mode 100644
index 000000000..bf9c7e2bc
--- /dev/null
+++ b/src/drivers/webextension/js/i18n.js
@@ -0,0 +1,11 @@
+document.addEventListener('DOMContentLoaded', function() {
+	var
+		i, value,
+		nodes = document.getElementsByTagName('*');
+
+	for ( i = 0; i < nodes.length; i ++ ) {
+		if ( attr = nodes[i].dataset.i18n ) {
+			nodes[i].innerHTML = browser.i18n.getMessage(attr);
+		}
+	}
+});
diff --git a/src/drivers/webextension/js/iframe.js b/src/drivers/webextension/js/iframe.js
new file mode 100644
index 000000000..fcf40539f
--- /dev/null
+++ b/src/drivers/webextension/js/iframe.js
@@ -0,0 +1,1117 @@
+'use strict';
+
+(function(win) {
+
+var exports = {};
+
+(function(exports) {
+
+	var utils = {
+		normalizeUrl: function(url) {
+
+			return this.hashUrl(url) || null;
+
+		},
+
+		getReferrer: function() {
+			return this.normalizeUrl(document.referrer);
+		},
+
+		getPageUrl: function() {
+			return this.normalizeUrl(window.location.href);
+		},
+		hashUrl: function(url) {
+			var a,
+				result;
+
+			if ( !url || url.indexOf('http') !== 0 ) {
+				return null;
+			}
+
+			a = document.createElement('a');
+			a.href = url;
+
+			result = a.protocol + '//' + a.hostname + '/';
+
+			if ( a.pathname && a.pathname !== '/' ) {
+				result += this.hashCode(a.pathname);
+			}
+
+			if ( a.search ) {
+				result += '?' + this.hashCode(a.search);
+			}
+
+			if ( a.hash ) {
+				result += '#' + this.hashCode(a.hash);
+			}
+
+			return result;
+		},
+
+		hashCode: function(str) {
+			var hash = 0,
+				kar,
+				i;
+
+			if ( str.length === 0 ) {
+				return hash;
+			}
+
+			for ( i = 0; i < str.length; i++ ) {
+				kar = str.charCodeAt(i);
+				hash = ((hash << 5) - hash) + kar;
+				hash = hash & hash;
+			}
+
+			return hash + Math.pow(2, 32);
+		},
+
+		realArray: function(a) {
+			return Array.prototype.slice.apply(a);
+		},
+		onDocLoaded: function(doc, callback) {
+			if ( doc.readyState === 'loading' ) {
+				doc.addEventListener('DOMContentLoaded', callback);
+			} else {
+				callback();
+			}
+		},
+
+		SCRIPT_IN_WINDOW_TOP: window === window.top,
+
+		isFriendlyWindow: function(win) {
+
+			var href;
+			try {
+				href = win.location.href;
+			} catch(e) {
+				return false;
+			}
+			return true;
+		},
+
+		elementWindow: function(el) {
+			return el.ownerDocument.defaultView;
+		},
+
+		viewport: function(win) {
+			return {width: win.innerWidth, height: win.innerHeight};
+		},
+
+		parseQS: function(qs) {
+			if ( qs.indexOf('http') === 0 ) {
+				qs = qs.split('?')[1];
+			}
+			var i, kvs, key, val;
+			var dict = {};
+			qs = qs.split('&');
+			for ( i = 0; i < qs.length; i++ ) {
+				kvs = qs[i].split('=');
+				key = kvs[0];
+				val = kvs.slice(1).join('=');
+				try {
+					dict[key] = window.decodeURIComponent(val);
+				} catch (e) {
+				}
+			}
+			return dict;
+		},
+	};
+
+	utils.SCRIPT_IN_FRIENDLY_IFRAME = !utils.SCRIPT_IN_WINDOW_TOP && utils.isFriendlyWindow(window.parent);
+	utils.SCRIPT_IN_HOSTILE_IFRAME = !utils.SCRIPT_IN_WINDOW_TOP && !utils.SCRIPT_IN_FRIENDLY_IFRAME;
+
+	function LogGenerator() {
+		this.msgNum = 0;
+		this.pageMeta = {
+			'url': utils.getPageUrl(),
+			'isHP': window.location.pathname === '/',
+			'referrer': utils.getReferrer(),
+			'rand': Math.floor(Math.random() * 10e12),
+			'startTime': new Date().getTime()
+		};
+	}
+
+	LogGenerator.prototype = {
+		log: function(event, opt_assets, opt_pageTags) {
+			var opt_video_assets;
+			if ( event === 'video' ) {
+				opt_video_assets = opt_assets || [];
+				opt_assets = [];
+			} else {
+				opt_video_assets = [];
+				opt_assets = opt_assets || [];
+			}
+			var result = {
+				doc: this.pageMeta,
+				event: event,
+				video_assets: opt_video_assets,
+				assets: opt_assets,
+				version: '3',
+				mrev: '5dacb94-c',
+				msgNum: this.msgNum,
+				timestamp: new Date().getTime(),
+				pageVis: document.visibilityState,
+				pageFoc: document.hasFocus(),
+				pageTags: opt_pageTags || []
+			};
+			this.msgNum++;
+			return result;
+		}
+	};
+
+	utils.LogGenerator = LogGenerator;
+
+	exports.utils = utils;
+})(exports);
+
+(function(exports) {
+
+	var SizeMatcher = {
+		VALID_AD_SIZES: [
+			[300, 50],
+			[320, 50],
+			[160, 600],
+			[300, 250],
+			[300, 600],
+			[300, 1050],
+			[336, 280],
+			[336, 850],
+			[468, 60],
+			[728, 90],
+			[728, 250],
+			[728, 270],
+			[970, 66],
+			[970, 90],
+			[970, 125],
+			[970, 250],
+			[970, 400],
+			[970, 415],
+			[1280, 100]
+		],
+
+		PX_SIZE_TOL: 10,
+
+		getMatchedAdSize: function(width, height) {
+
+			if ( !this.set ) {
+				this.set = this._makeSizeSet();
+			}
+
+			return this.set[Math.round(width) + 'x' + Math.round(height)];
+		},
+
+		elementIsAdShaped: function(el) {
+			return !!this.getMatchedAdSizeForElement(el);
+		},
+
+		getMatchedAdSizeForElement: function(el) {
+			var rect = el.getBoundingClientRect();
+			return this.getMatchedAdSize(rect.width, rect.height);
+		},
+
+		_makeSizeSet: function() {
+			var set = {};
+			var i;
+			var xfuz;
+			var yfuz;
+			var size;
+			var width;
+			var height;
+
+			for ( i = 0; i < this.VALID_AD_SIZES.length; i++ ) {
+				for ( xfuz = -this.PX_SIZE_TOL; xfuz <= this.PX_SIZE_TOL; xfuz++ ) {
+					for ( yfuz = -this.PX_SIZE_TOL; yfuz <= this.PX_SIZE_TOL; yfuz++ ) {
+						size = this.VALID_AD_SIZES[i];
+						width = size[0] + xfuz;
+						height = size[1] + yfuz;
+						set[width + 'x' + height] = size;
+					}
+				}
+			}
+			return set;
+		}
+	};
+
+	var Throttler = {
+		MAX_SEARCHES_PER_WINDOW: 10,
+		MAX_SEARCHES_PER_ELEMENT: 2,
+
+		countSearch: function(el) {
+			if ( typeof el.searches !== 'number' ) {
+				el.searches = 0;
+			}
+
+			el.searches += 1;
+		},
+
+		throttle: function(el, max) {
+			if ( typeof el.searches === 'number' && el.searches >= max ) {
+				return true;
+			}
+			return false;
+		},
+
+		throttleElement: function(el) {
+			return this.throttle(el, this.MAX_SEARCHES_PER_ELEMENT);
+		},
+
+		throttleWin: function(win) {
+			return this.throttle(win, this.MAX_SEARCHES_PER_WINDOW);
+		},
+
+		getCount: function(el) {
+			return el.searches || 0;
+		}
+	};
+
+	function TopSearcher(win) {
+		this.win = win;
+		this.doc = win.document;
+	}
+
+	TopSearcher.prototype.search = function() {
+		var candidates = exports.utils.realArray(this.doc.querySelectorAll('img, object, embed')),
+			html5Ad,
+			ads = [];
+
+		ads = ads.concat(candidates.filter(function(el) {
+			if ( !el.mpAdFound && !Throttler.throttleElement(el) ) {
+				Throttler.countSearch(el);
+				if ( (el.tagName !== 'IMG' || isStandardImage(el)) && SizeMatcher.elementIsAdShaped(el) ) {
+					el.mpAdFound = true;
+					return true;
+				}
+			}
+			return false;
+		}));
+
+		html5Ad = this._mainGetHTMLAd();
+		if ( html5Ad ) {
+			html5Ad.html5 = true;
+			html5Ad.mpAdFound = true;
+			ads.push(html5Ad);
+		}
+
+		return ads;
+	};
+
+	TopSearcher.prototype._mainGetHTMLAd = function() {
+		var styles = this.doc.querySelectorAll('div > style, div > link[rel="stylesheet"]'),
+			i, div;
+		for ( i = 0; i < styles.length; i++ ) {
+			div = styles[i].parentNode;
+			if ( !div.mpAdFound && SizeMatcher.elementIsAdShaped(div) && this._jumpedOut(div) ) {
+				return div;
+			}
+		}
+		return null;
+	};
+
+	TopSearcher.prototype._jumpedOut = function(el) {
+		var siblings, ifrs;
+		siblings = exports.utils.realArray(el.parentNode.children);
+		ifrs = siblings.filter(function(el) {
+			return el.tagName === 'IFRAME' && el.offsetWidth === 0 && el.offsetHeight === 0;
+		});
+		return ifrs.length > 0;
+	};
+
+	function IframeSearcher(win) {
+		this.MIN_AD_AREA = 14000;
+		this.MIN_WINDOW_PX = 10;
+
+		this.win = win;
+		this.doc = win.document;
+		this.body = win.document.body;
+		this.winClickTag = win.clickTag;
+		this.adSizeMeta = this._getAdSizeMeta();
+		this.numElementsInBody = (this.body && this.body.querySelectorAll('*').length) || 0;
+
+		this.shouldSearchWindow = false;
+		if ( !this.win.mpAdFound && this.body && !Throttler.throttleWin(this.win) ) {
+			this.winWidth = this.win.innerWidth;
+			this.winHeight = this.win.innerHeight;
+			if ( this._meetsMinAdSize(this.winWidth, this.winHeight) && !this._containsLargeIframes() ) {
+				this.shouldSearchWindow = true;
+			}
+		}
+
+	}
+
+	IframeSearcher.prototype.search = function() {
+		var ad;
+
+		if ( this.shouldSearchWindow ) {
+			ad = this._search();
+			if ( ad ) {
+				ad.mpAdFound = true;
+				win.mpAdFound = true;
+				return ad;
+			}
+			Throttler.countSearch(this.win);
+		}
+
+		return null;
+	};
+
+	IframeSearcher.prototype._search = function() {
+		var _this = this,
+			stdCandidates,
+			html5Candidates,
+			stdEl,
+			html5El;
+
+		stdCandidates = this.body.querySelectorAll('img, object, embed');
+
+		stdEl = getFirst(stdCandidates, function(el) {
+			if ( !el.mpAdFound &&
+				!Throttler.throttleElement(el) &&
+				(el.tagName !== 'IMG' || isStandardImage(el)) &&
+				_this._elementIsAtLeastAsBigAsWindow(el))
+			{
+				return true;
+			}
+			Throttler.countSearch(el);
+			return false;
+		});
+
+		if ( stdEl ) {
+			return stdEl;
+		}
+
+		if ( this._isHTML5Iframe() ) {
+			html5Candidates = this.doc.querySelectorAll('body, canvas, button, video, svg, div');
+			html5El = getFirst(html5Candidates, function(el) {
+
+				if ( _this._elementIsAtLeastAsBigAsWindow(el) ) {
+					return true;
+				}
+				Throttler.countSearch(el);
+				return false;
+			});
+		}
+
+		if ( html5El ) {
+			html5El.html5 = true;
+			html5El.winClickTag = this.winClickTag;
+			html5El.adSizeMeta = this.adSizeMeta;
+			return html5El;
+		}
+
+		return null;
+	};
+
+	IframeSearcher.prototype._isHTML5Iframe = function() {
+		if ( this.winClickTag || this.adSizeMeta ) {
+			return true;
+		}
+
+		if ( this.doc.querySelectorAll('canvas', 'button', 'video', 'svg').length > 0 ) {
+			return true;
+		}
+
+		if ( this.numElementsInBody >= 5 && Throttler.getCount(this.win) > 0 && this.doc.querySelectorAll('div').length > 0 ) {
+			return true;
+		}
+
+		return false;
+	};
+
+	IframeSearcher.prototype._elementIsAtLeastAsBigAsWindow = function(el) {
+		var rect = el.getBoundingClientRect(),
+			tol = 0.95;
+
+		return rect.width >= (tol * this.winWidth) && rect.height >= (tol * this.winHeight);
+	};
+
+	IframeSearcher.prototype._meetsMinAdSize = function(width, height) {
+		return (width * height) >= this.MIN_AD_AREA;
+	};
+
+	IframeSearcher.prototype._containsLargeIframes = function() {
+		var iframes = this.doc.querySelectorAll('iframe');
+		var rect;
+		var i;
+		for ( i = 0; i < iframes.length; i++ ) {
+			rect = iframes[i].getBoundingClientRect();
+			if ( rect.width > this.MIN_WINDOW_PX || rect.height > this.MIN_WINDOW_PX ) {
+				return true;
+			}
+		}
+		return false;
+	};
+
+	IframeSearcher.prototype._getAdSizeMeta = function() {
+		var adSizeMeta = this.doc.querySelectorAll('meta[name="ad.size"]');
+		if ( adSizeMeta.length > 0 ) {
+			return adSizeMeta[0].content;
+		} else {
+			return null;
+		}
+	};
+
+	function getFirst(arr, testFn) {
+		var i, el;
+		for ( i = 0; i < arr.length; i++ ) {
+			el = arr[i];
+			if ( testFn(el) ) {
+				return el;
+			}
+		}
+		return null;
+	}
+
+	function isStandardImage(img) {
+
+		return img.src && (img.parentNode.tagName === 'A' || img.getAttribute('onclick'));
+	}
+
+	function getFriendlyIframes(win) {
+		var iframes = win.document.querySelectorAll('iframe');
+		iframes = exports.utils.realArray(iframes);
+		var friendlyIframes = iframes.filter(function(ifr) {
+			return exports.utils.isFriendlyWindow(ifr.contentWindow);
+		});
+		return friendlyIframes;
+	}
+
+	function findAds(win) {
+		var i,
+			iframes,
+			searcher,
+			ad,
+			ads = [];
+
+		if ( win === win.top ) {
+			searcher = new TopSearcher(win);
+			ads = ads.concat(searcher.search());
+		} else {
+			searcher = new IframeSearcher(win);
+			ad = searcher.search();
+			if ( ad ) {
+				ads.push(ad);
+			}
+		}
+
+		iframes = getFriendlyIframes(win);
+		for ( i = 0; i < iframes.length; i++ ) {
+			ads = ads.concat(findAds(iframes[i].contentWindow));
+		}
+
+		return ads;
+	}
+
+	exports.adfinder = {
+		getMatchedAdSize: SizeMatcher.getMatchedAdSize.bind(SizeMatcher),
+		findAds: findAds
+	};
+})(exports);
+
+(function(exports) {
+
+	var parser = {
+		TAGS_WITH_SRC_ATTR: {
+			'IMG': true,
+			'SCRIPT': true,
+			'IFRAME': true,
+			'EMBED': true
+		},
+
+		MAX_ATTR_LEN: 100,
+
+		getUrl: function(el, params) {
+			var url;
+
+			if ( this.TAGS_WITH_SRC_ATTR.hasOwnProperty(el.tagName) ) {
+				url = el.src;
+
+			} else if ( el.tagName === 'OBJECT' ) {
+				url = el.data || (params && params.movie) || null;
+
+			} else if ( el.tagName === 'A' ) {
+				url = el.href;
+			}
+
+			if ( url && url.indexOf('http') === 0 ) {
+				return url;
+			} else {
+				return null;
+			}
+		},
+
+		getParams: function(el) {
+			if ( el.tagName !== 'OBJECT' ) {
+				return null;
+			}
+
+			var i, child;
+			var params = {};
+			var children = el.children;
+			for ( i = 0; i < children.length; i++ ) {
+				child = children[i];
+				if ( child.tagName === 'PARAM' && child.name ) {
+
+					params[child.name.toLowerCase()] = child.value;
+				}
+			}
+			return params;
+		},
+
+		getPosition: function(el) {
+			var rect = el.getBoundingClientRect();
+			var win = exports.utils.elementWindow(el);
+
+			return {
+				width: Math.round(rect.width),
+				height: Math.round(rect.height),
+				left: Math.round(rect.left + win.pageXOffset),
+				top: Math.round(rect.top + win.pageYOffset)
+			};
+		},
+
+		getFlashvars: function(el, params, url) {
+			var flashvars;
+			var urlQS = url && url.split('?')[1];
+
+			if ( el.tagName === 'EMBED' ) {
+				flashvars = el.getAttribute('flashvars') || urlQS;
+
+			} else if ( el.tagName === 'OBJECT' ) {
+				flashvars = params.flashvars || el.getAttribute('flashvars') || urlQS;
+			}
+
+			return (flashvars && exports.utils.parseQS(flashvars)) || null;
+		},
+
+		findClickThru: function(el, flashvars) {
+			var key;
+			if ( el.tagName === 'IMG' && el.parentElement.tagName === 'A' ) {
+				return el.parentElement.href;
+			} else if ( flashvars ) {
+				for ( key in flashvars ) {
+					if ( flashvars.hasOwnProperty(key) ) {
+
+						if ( key.toLowerCase().indexOf('clicktag') === 0 ) {
+							return flashvars[key];
+						}
+					}
+				}
+			}
+			return null;
+		},
+
+		getAttr: function(el, name) {
+			var val = el.getAttribute(name);
+
+			if ( val && val.slice && val.toString ) {
+
+				return val.slice(0, this.MAX_ATTR_LEN).toString();
+			} else {
+				return null;
+			}
+		},
+
+		putPropIfExists: function(obj, name, val) {
+			if ( val ) {
+				obj[name] = val;
+			}
+		},
+
+		putAttrIfExists: function(obj, el, name) {
+			var val = this.getAttr(el, name);
+			this.putPropIfExists(obj, name, val);
+		},
+
+		elementToJSON: function(el, opt_findClickThru) {
+			var pos = this.getPosition(el);
+			var params = this.getParams(el);
+			var url = this.getUrl(el, params);
+			var flashvars = this.getFlashvars(el, params, url);
+			var clickThru = opt_findClickThru && this.findClickThru(el, flashvars);
+			var json = {
+				tagName: el.tagName,
+				width: pos.width,
+				height: pos.height,
+				left: pos.left,
+				top: pos.top,
+				children: []
+			};
+
+			if ( params ) {
+
+				delete params.flashvars;
+			}
+
+			this.putAttrIfExists(json, el, 'id');
+			this.putAttrIfExists(json, el, 'class');
+			this.putAttrIfExists(json, el, 'name');
+
+			this.putPropIfExists(json, 'flashvars', flashvars);
+			this.putPropIfExists(json, 'url', url);
+			this.putPropIfExists(json, 'params', params);
+			this.putPropIfExists(json, 'clickThru', clickThru);
+
+			return json;
+		}
+	};
+
+	exports.parser = { elementToJSON: parser.elementToJSON.bind(parser) };
+})(exports);
+
+(function(exports) {
+
+	var ContextManager = function(adData) {
+		this.adData = adData;
+	};
+
+	ContextManager.prototype = {
+		CONTAINER_SIZE_TOL: 0.4,
+		ASPECT_RATIO_FOR_LEADERBOARDS: 2,
+
+		isValidContainer: function(el, opt_curWin) {
+
+			var cWidth = el.clientWidth;
+			var cHeight = el.clientHeight;
+
+			var adWidth = this.adData.width;
+			var adHeight = this.adData.height;
+
+			var winWidth = opt_curWin && opt_curWin.innerWidth;
+			var winHeight = opt_curWin && opt_curWin.innerHeight;
+			var similarWin = opt_curWin && this.withinTol(adWidth, winWidth) && this.withinTol(adHeight, winHeight);
+
+			var similarSizeX = this.withinTol(adWidth, cWidth);
+			var similarSizeY = this.withinTol(adHeight, cHeight);
+			var adAspect = adWidth / adHeight;
+
+			return similarWin || el.tagName === 'A' || (adAspect >= this.ASPECT_RATIO_FOR_LEADERBOARDS && similarSizeY) || (similarSizeX && similarSizeY);
+		},
+
+		withinTol: function(adlen, conlen) {
+			var pct = (conlen - adlen) / adlen;
+
+			return pct <= this.CONTAINER_SIZE_TOL;
+		},
+
+		serializeElements: function(el) {
+			if ( !el ) {
+				return;
+			}
+			var i;
+			var ifrWin;
+			var adId = this.adData.adId;
+			var elIsAd = false;
+
+			if ( adId && el[adId] && el[adId].isAd === true ) {
+				elIsAd = true;
+			}
+
+			var json = exports.parser.elementToJSON(el, elIsAd);
+			var childJSON;
+
+			if ( elIsAd ) {
+				json.adId = adId;
+				this.adData.element = {};
+
+				var keys = Object.keys(json);
+				for ( i = 0; i < keys.length; i++ ) {
+					var key = keys[i];
+					if ( key !== 'children' && key !== 'contents' ) {
+						this.adData.element[key] = json[key];
+					}
+				}
+			}
+
+			var children = exports.utils.realArray(el.children).filter(function(el) {
+				var param = el.tagName === 'PARAM';
+				var inlineScript = el.tagName === 'SCRIPT' && !(el.src && el.src.indexOf('http') >= 0);
+				var noScript = el.tagName === 'NOSCRIPT';
+				return !(param || inlineScript || noScript);
+			});
+
+			for ( i = 0; i < children.length; i++ ) {
+				childJSON = this.serializeElements(children[i]);
+				if ( childJSON ) {
+					json.children.push(childJSON);
+				}
+			}
+
+			if ( el.tagName === 'IFRAME' ) {
+				ifrWin = el.contentWindow;
+
+				if ( adId && el[adId] && el[adId].needsWindow ) {
+
+					json.contents = this.adData.serializedIframeContents;
+					el[adId].needsWindow = false;
+					delete this.adData.serializedIframeContents;
+
+				} else if ( exports.utils.isFriendlyWindow(ifrWin) ) {
+
+					childJSON = this.serializeElements(ifrWin.document.documentElement);
+					if ( childJSON ) {
+						json.contents = childJSON;
+					}
+				}
+			}
+
+			if ( json.children.length > 0 || json.adId || json.tagName === 'IFRAME' || json.url ) {
+				return json;
+			} else {
+				return null;
+			}
+		},
+
+		captureHTML: function(containerEl) {
+			this.adData.context = this.serializeElements(containerEl);
+		},
+
+		nodeCount: function(el) {
+			return el.getElementsByTagName('*').length + 1;
+		},
+
+		highestContainer: function(curWin, referenceElement) {
+			var curContainer = referenceElement;
+			var docEl = curWin.document.documentElement;
+			var parentContainer;
+
+			if ( curWin !== curWin.top && this.isValidContainer(docEl, curWin) ) {
+				return docEl;
+			}
+
+			while ( true ) {
+				parentContainer = curContainer.parentElement;
+				if ( parentContainer && this.isValidContainer(parentContainer) ) {
+					curContainer = parentContainer;
+				} else {
+					return curContainer;
+				}
+			}
+		}
+	};
+
+	var tagfinder = {
+
+		setPositions: function(adData, opt_el, opt_winPos) {
+			var el = opt_el || adData.context;
+			var winPos = opt_winPos || {left: 0, top: 0};
+			var ifrPos;
+
+			el.left += winPos.left;
+			el.top += winPos.top;
+
+			if ( el.children ) {
+				el.children.forEach(function(child) {
+					this.setPositions(adData, child, winPos);
+				}, this);
+			}
+
+			if ( el.contents ) {
+				ifrPos = {left: el.left, top: el.top};
+				this.setPositions(adData, el.contents, ifrPos);
+			}
+
+			if ( el.adId === adData.adId ) {
+				adData.element.left = el.left;
+				adData.element.top = el.top;
+			}
+		},
+
+		appendTags: function(adData, referenceElement) {
+			var mgr = new ContextManager(adData);
+			var curWin = exports.utils.elementWindow(referenceElement);
+			var highestContainer;
+
+			while ( true ) {
+				highestContainer = mgr.highestContainer(curWin, referenceElement);
+				mgr.captureHTML(highestContainer);
+				if ( curWin === curWin.top ) {
+					break;
+				} else {
+
+					curWin.mpAdFound = true;
+
+					mgr.adData.serializedIframeContents = mgr.adData.context;
+
+					if ( exports.utils.isFriendlyWindow(curWin.parent) ) {
+						referenceElement = curWin.frameElement;
+						referenceElement[mgr.adData.adId] = {needsWindow: true};
+						curWin = curWin.parent;
+					} else {
+						break;
+					}
+				}
+			}
+			return {
+				referenceElement:referenceElement,
+				highestContainer: highestContainer
+			};
+		}
+	};
+
+	exports.tagfinder = tagfinder;
+})(exports);
+
+(function(exports) {
+	var _onAdFound;
+	var _logGen = new exports.utils.LogGenerator();
+	var _pageTags;
+	var INIT_MS_BW_SEARCHES = 2000;
+	var PAGE_TAG_RE = new RegExp('gpt|oascentral');
+	var POST_MSG_ID = '1484952787-11883-24071-12354-1549';
+	var AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)');
+
+	function getPageTags(doc) {
+		var scripts = doc.getElementsByTagName('script');
+		var pageTags = [];
+		scripts = exports.utils.realArray(scripts);
+		scripts.forEach(function(script) {
+			if ( PAGE_TAG_RE.exec(script.src) ) {
+				pageTags.push({'tagName': 'SCRIPT', 'url': script.src});
+			}
+		});
+		return pageTags;
+	}
+
+	function messageAllParentFrames(adData) {
+
+		adData.postMessageId = POST_MSG_ID;
+
+		adData = JSON.stringify(adData);
+
+		var win = window;
+		while ( win !== win.top ) {
+			win = win.parent;
+			win.postMessage(adData, '*');
+		}
+	}
+
+	function appendTagsAndSendToParent(adData, referenceElement) {
+		var results = exports.tagfinder.appendTags(adData, referenceElement);
+		if ( exports.utils.SCRIPT_IN_HOSTILE_IFRAME ) {
+			messageAllParentFrames(adData);
+
+		} else if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
+
+			exports.tagfinder.setPositions(adData);
+
+			adData.matchedSize = exports.adfinder.getMatchedAdSize(adData.width, adData.height);
+			if ( !adData.matchedSize ) {
+
+				if ( AD_SERVER_RE.exec(results.referenceElement.id) ) {
+					adData.matchedSize = [adData.width, adData.height];
+					adData.oddSize = true;
+				} else {
+
+					return;
+				}
+			}
+			delete adData.width;
+			delete adData.height;
+			adData.curPageUrl = exports.utils.getPageUrl();
+			_pageTags = _pageTags || getPageTags(document);
+			var log = _logGen.log('ad', [adData], _pageTags);
+
+			if ( _onAdFound ) {
+
+					_onAdFound(log, results.referenceElement);
+
+			}
+		}
+	}
+
+	function extractAdsWrapper() {
+		if ( exports.utils.SCRIPT_IN_WINDOW_TOP || document.readyState === 'complete' ) {
+			extractAds();
+		}
+		setTimeout(function() {
+			extractAdsWrapper();
+		}, INIT_MS_BW_SEARCHES);
+	}
+
+	function extractAds() {
+		var ads = exports.adfinder.findAds(window);
+		ads.forEach(function(ad) {
+
+			var startTime = new Date().getTime();
+			var adId = startTime + '-' + Math.floor(Math.random() * 10e12);
+
+			var adData = {
+				width: Math.round(ad.offsetWidth),
+				height: Math.round(ad.offsetHeight),
+				startTime: startTime,
+				adId: adId,
+				html5: ad.html5 || false
+			};
+
+			if ( ad.html5 ) {
+				adData.adSizeMeta = ad.adSizeMeta || null;
+				adData.winClickTag = ad.winClickTag || null;
+			}
+
+			ad[adId] = { isAd: true };
+
+			appendTagsAndSendToParent(adData, ad);
+		});
+	}
+
+	function isChildWin(myWin, otherWin) {
+		var parentWin = otherWin.parent;
+		while ( parentWin !== otherWin ) {
+			if ( parentWin === myWin ) {
+				return true;
+			}
+			otherWin = parentWin;
+			parentWin = parentWin.parent;
+		}
+		return false;
+	}
+
+	function iframeFromWindow(win, winToMatch) {
+		var i, ifr, ifrWin,
+			iframes = win.document.querySelectorAll('iframe');
+
+		for ( i = 0; i < iframes.length; i++ ) {
+			ifr = iframes[i];
+			if ( ifr.contentWindow === winToMatch ) {
+				return ifr;
+			}
+		}
+
+		for ( i = 0; i < iframes.length; i++ ) {
+			ifrWin = iframes[i].contentWindow;
+			if ( exports.utils.isFriendlyWindow(ifrWin) ) {
+				ifr = iframeFromWindow(ifrWin, winToMatch);
+				if ( ifr ) {
+					return ifr;
+				}
+			}
+		}
+		return null;
+	}
+
+	function onPostMessage(event) {
+		var adData,
+			ifrWin = event.source,
+
+			myWin = window.document.defaultView,
+			ifrTag;
+
+		try {
+
+			adData = JSON.parse(event.data);
+		} catch(e) {
+
+			return;
+		}
+
+		if ( adData.postMessageId === POST_MSG_ID ) {
+
+			delete adData.postMessageId;
+
+			if ( isChildWin(myWin, ifrWin) ) {
+				if ( exports.utils.isFriendlyWindow(ifrWin) ) {
+					ifrTag = ifrWin.frameElement;
+				} else {
+					ifrTag = iframeFromWindow(myWin, ifrWin);
+				}
+
+				if ( ifrTag ) {
+					ifrTag[adData.adId] = {needsWindow: true};
+					appendTagsAndSendToParent(adData, ifrTag);
+				}
+			}
+		}
+	}
+
+	function onVideoMessage(msg, sender, callback) {
+		var log;
+		if ( msg.event === 'new-video-ad' ) {
+			msg.assets.forEach(function(asset) {
+
+			});
+			log = _logGen.log('video', msg.assets);
+		} else {
+			log = _logGen.log('invalid-video', msg.assets);
+		}
+
+		msg.assets.forEach(function(a) {delete a.isVideo;});
+		log.displayAdFound = msg.displayAdFound;
+		log.requests = msg.requests;
+		log.data = msg.event_data;
+
+		log.doc.finalPageUrl = log.doc.url;
+		log.doc.url = exports.utils.normalizeUrl(msg.origUrl);
+
+		_onAdFound(log);
+	}
+
+	function addBackgroundListener(event, callback) {
+		if ( typeof browser !== 'undefined' ) {
+			browser.runtime.onMessage.addListener(function(msg) {
+				if ( msg.event === event ) {
+					callback(msg);
+				}
+			});
+		} else if ( window.self.port ) {
+			window.self.port.on(event, callback);
+		}
+	}
+
+	exports.coordinator = {
+		init: function(onAdFound) {
+
+			if ( exports.utils.SCRIPT_IN_FRIENDLY_IFRAME ) {
+				return false;
+			}
+
+			_onAdFound = onAdFound;
+			window.addEventListener('message', onPostMessage, false);
+
+			if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
+				var log = _logGen.log('page');
+				onAdFound(log);
+
+				window.addEventListener('beforeunload', function(event) {
+					var log = _logGen.log('unload');
+					log.timing = window.performance.timing;
+					onAdFound(log);
+				});
+
+				addBackgroundListener('new-video-ad', onVideoMessage);
+				addBackgroundListener('new-invalid-video-ad', onVideoMessage);
+
+			}
+
+			exports.utils.onDocLoaded(document, extractAdsWrapper);
+		}
+	};
+
+})(exports);
+
+if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
+	window.adparser = {
+		init: exports.coordinator.init,
+	};
+} else {
+	exports.coordinator.init(function() {});
+}
+
+})(window);
+(function(adparser) {
+	function sendToBackground(event, message) {
+		if ( window.self.port ) {
+			window.self.port.emit(event, message);
+		} else if ( typeof browser !== 'undefined' ) {
+			browser.runtime.sendMessage(message);
+		}
+	}
+
+	function onAdFound(log) {
+		sendToBackground('ad_log', { id: 'ad_log', subject: log });
+	}
+
+	if ( window === window.top ) {
+		adparser.init(onAdFound);
+	}
+})(window.adparser);
diff --git a/src/drivers/webextension/js/inject.js b/src/drivers/webextension/js/inject.js
new file mode 100644
index 000000000..fd734182e
--- /dev/null
+++ b/src/drivers/webextension/js/inject.js
@@ -0,0 +1,14 @@
+(function() {
+	try {
+		var i, environmentVars, e = document.createEvent('Events');
+
+		e.initEvent('wappalyzerEvent', true, false);
+
+		for ( i in window ) {
+			environmentVars += i + ' ';
+		}
+
+		document.getElementById('wappalyzerData').appendChild(document.createComment(environmentVars));
+		document.getElementById('wappalyzerData').dispatchEvent(e);
+	} catch(e) { }
+}());
diff --git a/src/drivers/webextension/js/network.js b/src/drivers/webextension/js/network.js
new file mode 100644
index 000000000..9dc38f5a2
--- /dev/null
+++ b/src/drivers/webextension/js/network.js
@@ -0,0 +1,584 @@
+'use strict';
+(function() {
+
+	var secBefore = 2000;
+	var secAfter = 5000;
+	var secBetweenDupAssets = 10e3;
+	var minVidSize = 500e3;
+	var maxVidSize = 25e6;
+	var maxContentRange = 25e6;
+	var videoExtensions = [
+		'af', '3gp', 'asf', 'avchd', 'avi', 'cam', 'dsh', 'flv', 'm1v', 'm2v',
+		'fla', 'flr', 'sol', 'm4v', 'mkv', 'wrap', 'mng', 'mov', 'mpeg', 'mpg',
+		'mpe', 'mp4', 'mxf', 'nsv', 'ogg', 'rm', 'svi', 'smi', 'wmv', 'webm'
+	];
+	var extensionsReg = new RegExp('\\.' + videoExtensions.join('$|\\.') + '$');
+	var videoContentTypesPrefixes = ['binary/octet-stream', 'video/', 'flv-application/', 'media'];
+
+	var bannedContentTypes = ['video/mp2t','video/f4m','video/f4f'];
+	var bannedFiletypes = ['ts'];
+	var bannedFiletypesReg = new RegExp('\\.' + bannedFiletypes.join('$|\\.') + '$');
+	var whitelistReqTypes = ['object', 'xmlhttprequest', 'other'];
+
+	var topVideoAssetDomains = [
+		'2mdn.net',
+		'innovid.com',
+		'serving-sys.com',
+		'btrll.com',
+		'teads.tv',
+		'tubemogul.com'
+	];
+
+	if ( !String.prototype.endsWith ) {
+		String.prototype.endsWith = function(searchString, position) {
+			var subjectString = this.toString();
+			if ( typeof position !== 'number' || !isFinite(position) ||
+				Math.floor(position) !== position || position > subjectString.length) {
+				position = subjectString.length;
+			}
+			position -= searchString.length;
+			var lastIndex = subjectString.indexOf(searchString, position);
+			return lastIndex !== -1 && lastIndex === position;
+		};
+	}
+
+	function isPixelRequest(request) {
+		return (request.type === 'image' || request.responseStatus === 204) &&
+				request.size <= 1000;
+	}
+
+	function isVpaidOrVastRequest(request) {
+		var lowerCaseUrl = request.url.toLowerCase();
+		return lowerCaseUrl.indexOf('vpaid') !== -1 || lowerCaseUrl.indexOf('vast') !== -1;
+	}
+
+	function hasValidRequestType(request) {
+		return whitelistReqTypes.indexOf(request.type) >= 0;
+	}
+
+	function stripQueryParams(url) {
+		return url.split('?',1)[0];
+	}
+
+	function parseHostnameFromUrl(url) {
+		var parser = document.createElement('a');
+		parser.href = url;
+		return parser.hostname;
+	}
+
+	function hasDomain(url, domain) {
+		return parseHostnameFromUrl(url).endsWith(domain);
+	}
+
+	function findHeader(headers, key) {
+		var header;
+		for ( var i = 0; i < headers.length; i += 1 ) {
+			header = headers[i];
+			if ( header.name.toLowerCase() === key ) {
+				return header;
+			}
+		}
+		return null;
+	}
+
+	function validVideoType(vtype) {
+		var goodType = videoContentTypesPrefixes.some(function(prefix) {
+			return vtype.indexOf(prefix) === 0;
+		});
+		return goodType;
+	}
+
+	function assetMsgKey(assetReq) {
+		var url = stripQueryParams(assetReq.url);
+		var key = assetReq.frameId + '-' + url;
+		return key;
+	}
+
+	var PageNetworkTrafficCollector = function(tabId) {
+		this.tabId = tabId;
+		this.displayAdFound = false;
+		this.requests = {};
+		this.msgsBeingSent = {};
+		this.assetsSeen = {};
+		this.allRedirects = {};
+	};
+
+	var globalPageContainer = {
+		collectors: {},
+		dyingCollectors: {},
+
+		cleanupCollector: function(tabId) {
+			if ( tabId in this.collectors ) {
+				delete globalPageContainer.collectors[tabId];
+			}
+		},
+
+		onNewNavigation: function(details) {
+			var tabId = details.tabId;
+			this.cleanupCollector(tabId);
+
+			this.collectors[tabId] = new PageNetworkTrafficCollector(tabId);
+		},
+
+		onNavigationCommitted: function(details) {
+
+		},
+
+		onNavigationCompleted: function(details) {
+
+		},
+
+		onTabClose: function(tabId, closeInfo) {
+
+			this.cleanupCollector(tabId);
+			delete this.collectors[tabId];
+		},
+
+		onDisplayAdFound: function(tabId) {
+			this.collectors[tabId].displayAdFound = true;
+		},
+
+		getRandId: function() {
+			return String(Math.floor(Math.random() * 1e9));
+		},
+
+		getCollector: function(tabId) {
+			if ( this.collectors.hasOwnProperty(tabId) ) {
+				return this.collectors[tabId];
+			}
+			return null;
+		},
+
+		forwardCall: function(details, collectorMemberFunction) {
+			var collector = this.getCollector(details.tabId);
+			if ( collector !== null ) {
+				collectorMemberFunction.apply(collector, [details]);
+			}
+		}
+	};
+
+	PageNetworkTrafficCollector.prototype.sendLogMessageToTabConsole = function() {
+		var logMessage = Array.from(arguments).join(' ');
+		var message = {message: logMessage, event: 'console-log-message'};
+		browser.tabs.sendMessage(this.tabId, message);
+	};
+
+	PageNetworkTrafficCollector.prototype.sendToTab = function(assetReq, reqs, curPageUrl, isValidAd) {
+		var msg = {};
+		msg.assets = [];
+		msg.event_data = {};
+		if ( isValidAd ) {
+			msg.event = 'new-video-ad';
+			msg.requests = reqs;
+			msg.requests.sort(function(reqA, reqB) {return reqA.requestTimestamp - reqB.requestTimestamp;});
+			if ( assetReq ) {
+				msg.assets = [assetReq];
+			}
+		} else {
+			msg.requests = reqs.map(function(request) {
+				return parseHostnameFromUrl(request.url);
+			});
+			msg.assets = [{
+				url: parseHostnameFromUrl(assetReq.url),
+				contentType: assetReq.contentType,
+				size: assetReq.size
+			}];
+			msg.event = 'new-invalid-video-ad';
+		}
+		msg.origUrl = curPageUrl;
+		msg.displayAdFound = this.displayAdFound;
+
+		browser.tabs.sendMessage(this.tabId, msg);
+	};
+
+	PageNetworkTrafficCollector.prototype.getRedirKey = function(url, frameId) {
+		return url + ':' + frameId;
+	};
+
+	PageNetworkTrafficCollector.prototype.seenBefore = function(request) {
+		var oldTime = this.assetsSeen[assetMsgKey(request)];
+		if ( oldTime && (request.requestTimestamp-oldTime < secBetweenDupAssets)){
+
+			return true;
+		}
+		return false;
+	};
+
+	PageNetworkTrafficCollector.prototype.recordSeenAsset = function(request) {
+		this.assetsSeen[assetMsgKey(request)] = request.requestTimestamp;
+	};
+
+	PageNetworkTrafficCollector.prototype.onBeforeRequest = function(details) {
+		var req = {
+			url: details.url,
+			type: details.type,
+			httpMethod: details.method,
+			frameId: details.frameId,
+			parentFrameId: details.parentFrameId,
+			requestTimestamp: details.timeStamp,
+		};
+		this.requests[details.requestId] = req;
+	};
+
+	PageNetworkTrafficCollector.prototype.onSendHeaders = function(details) {
+		var request, header;
+		request = this.requests[details.requestId];
+		header = request && findHeader(details.requestHeaders, 'x-requested-with');
+		if ( header && header.value.toLowerCase().indexOf('flash') > -1 ) {
+			request.from_flash = true;
+		}
+	};
+
+	PageNetworkTrafficCollector.prototype.onHeadersReceived = function(details) {
+		var getFrameDetails = {
+			tabId: details.tabId,
+			processId: null,
+			frameId: details.frameId
+		};
+		var pageNetworkTrafficController = this;
+		browser.webNavigation.getFrame(getFrameDetails).then(function(frameDetails) {
+			if ( frameDetails && frameDetails.url ) {
+				pageNetworkTrafficController._onHeadersReceived(details, frameDetails);
+			}
+		});
+	};
+
+	PageNetworkTrafficCollector.prototype._onHeadersReceived = function(details, frameDetails) {
+		var contentSize, contentRange;
+
+		var request = this.requests[details.requestId];
+		if ( request ) {
+			var redirParent = this.allRedirects[this.getRedirKey(details.url, details.frameId)];
+			var header = request && findHeader(details.responseHeaders, 'content-type');
+			var contentType = header && header.value.toLowerCase();
+
+			if ( contentType){
+				request.contentType = contentType;
+			}
+			header = request && findHeader(details.responseHeaders, 'content-length');
+			contentSize = header && header.value;
+			if ( contentSize ) {
+				request.size = request.size || 0;
+				request.size += parseInt(contentSize);
+			}
+			header = request && findHeader(details.responseHeaders, 'content-range');
+			contentRange = header && header.value;
+			if ( contentRange ) {
+				request.contentRange = parseInt(contentRange.split('/')[1]);
+			}
+
+			var frameUrl = null;
+			if ( frameDetails && frameDetails.url ) {
+				frameUrl = frameDetails.url;
+			}
+			if ( !this.bannedRequest(request) &&
+				(this.isVideoReq(frameUrl, request) || (redirParent && redirParent.isVideo))) {
+				request.isVideo = true;
+			}
+		}
+	};
+
+	PageNetworkTrafficCollector.prototype.onBeforeRedirect = function(details) {
+		var request = this.requests[details.requestId];
+		if ( request ) {
+			if ( request.redirects ) {
+				request.redirects.push(details.redirectUrl);
+			} else {
+				request.redirects = [details.redirectUrl];
+			}
+			this.allRedirects[this.getRedirKey(details.redirectUrl, details.frameId)] = request;
+		}
+	};
+
+	PageNetworkTrafficCollector.prototype.isYoutubeMastheadRequest = function(url) {
+		var re = /video_masthead/;
+		return this.hasYoutubeDomain(url) && re.test(url);
+	};
+	PageNetworkTrafficCollector.prototype.isYoutubeVideoRequest = function(srcUrl, destUrl) {
+		if ( !this.hasYoutubeDomain(srcUrl) ) {
+			return false;
+		}
+
+		var re = /https?:\/\/r.*?\.googlevideo\.com\/videoplayback\?/;
+		return re.test(destUrl);
+	};
+	PageNetworkTrafficCollector.prototype.processResponse = function(requestDetails, frameDetails) {
+		var request;
+		if ( requestDetails ) {
+			request = this.requests[requestDetails.requestId];
+			if ( request ) {
+				request.responseStatus = requestDetails.statusCode;
+				request.responseTimestamp = requestDetails.timeStamp;
+
+				var frameUrl = null;
+				if ( frameDetails && frameDetails.url ) {
+					frameUrl = frameDetails.url;
+				}
+
+				var requestUrl = null;
+				if ( request.url ) {
+					requestUrl = request.url;
+				}
+
+				if ( this.isYoutubeAdReq(frameUrl, requestUrl) ) {
+					var videoId = this.parseYoutubeVideoIdFromUrl(requestUrl);
+					if ( videoId ) {
+						request.isYoutubeAd = true;
+						request.isVideo = true;
+						request.url = 'https://www.youtube.com/watch?v=' + this.parseYoutubeVideoIdFromUrl(requestUrl);
+					}
+				} else if ( !this.bannedRequest(request) &&
+						(this.isVideo || this.isVideoReq(frameUrl, request))) {
+					request.isVideo = true;
+				}
+
+				if ( request.isVideo ) {
+
+					var msgKey = assetMsgKey(request);
+					this.msgsBeingSent[msgKey] = request;
+					if ( !this.seenBefore(request) ) {
+						this.sendMsgWhenQuiet(msgKey);
+					}
+					this.recordSeenAsset(request);
+				}
+			}
+		}
+	};
+
+	PageNetworkTrafficCollector.prototype.onResponseStarted = function(responseDetails) {
+		if ( responseDetails.frameId < 0 ) {
+			responseDetails.frameId = 99999;
+
+		}
+		var getFrameDetails = {
+			tabId: responseDetails.tabId,
+			processId: null,
+			frameId: responseDetails.frameId
+		};
+		var pageNetworkTrafficController = this;
+		browser.webNavigation.getFrame(getFrameDetails).then(function(frameDetails) {
+			if ( frameDetails && frameDetails.url ) {
+				pageNetworkTrafficController.processResponse(responseDetails, frameDetails);
+			}
+		});
+	};
+
+	PageNetworkTrafficCollector.prototype.hasBannedFiletype = function(request) {
+		var url = stripQueryParams(request.url);
+		if ( bannedFiletypesReg.exec(url) ) {
+			return true;
+		} else {
+			return false;
+		}
+	};
+
+	PageNetworkTrafficCollector.prototype.checkContentHeaders = function(request) {
+		if ( request.contentType && validVideoType(request.contentType) ) {
+			return true;
+		}
+		return false;
+	};
+
+	PageNetworkTrafficCollector.prototype.checkUrlExtension = function(request) {
+		var url = stripQueryParams(request.url);
+		if ( extensionsReg.exec(url) ) {
+			return true;
+		} else {
+			return false;
+		}
+	};
+
+	PageNetworkTrafficCollector.prototype.isVideoReq = function(srcUrl, request) {
+		if ( this.isYoutubeVideoRequest(srcUrl, request.url) ) {
+			return false;
+		}
+		return this.checkUrlExtension(request) || this.checkContentHeaders(request);
+	};
+	PageNetworkTrafficCollector.prototype.hasYoutubeDomain = function(url) {
+		var hostname = parseHostnameFromUrl(url) ;
+		if ( hostname === 'www.youtube.com' ) {
+			return true;
+		}
+		return false;
+	};
+	PageNetworkTrafficCollector.prototype.parseYoutubeVideoIdFromUrl = function(url) {
+		var re = /^https?:\/\/www\.youtube\.com\/get_video_info.*(?:\?|&)video_id=(.*?)(?:$|&)/;
+		var match = re.exec(url);
+		if ( match && match.length > 1 ) {
+			return match[1];
+		}
+
+		re = /^https?:\/\/www\.youtube\.com\/embed\/(.*?)(?:$|\?)/;
+		match = re.exec(url);
+		if ( match && match.length > 1 ) {
+			return match[1];
+		}
+
+		re = /^https?:\/\/www\.youtube\.com\/watch\?v=(.*$)/;
+		match = re.exec(url);
+		if ( match && match.length > 1 ) {
+			return match[1];
+		}
+		return null;
+	};
+
+	PageNetworkTrafficCollector.prototype.isYoutubeGetVideoInfoReq = function(url) {
+		var re = /^https?:\/\/www\.youtube\.com\/get_video_info\?/;
+		return re.test(url);
+	};
+	PageNetworkTrafficCollector.prototype.isYoutubeAdReq = function(srcUrl, destUrl) {
+
+		if ( !this.hasYoutubeDomain(srcUrl) ||
+			!this.isYoutubeGetVideoInfoReq(destUrl)) {
+			return false;
+		}
+		if ( this.parseYoutubeVideoIdFromUrl(srcUrl) ===
+			this.parseYoutubeVideoIdFromUrl(destUrl) &&
+			!this.isYoutubeMastheadRequest(destUrl)) {
+			return false;
+		}
+		return true;
+	};
+
+	PageNetworkTrafficCollector.prototype.bannedRequest = function(request) {
+		return this.bannedVideoType(request) || this.hasBannedFiletype(request) || this.bannedVideoSize(request);
+	};
+
+	PageNetworkTrafficCollector.prototype.bannedVideoType = function(request) {
+		var badType = false;
+		if ( request.contentType ) {
+			badType = bannedContentTypes.some(function(prefix) {
+				return request.contentType.indexOf(prefix) >= 0;
+			});
+		}
+		return badType;
+	};
+
+	PageNetworkTrafficCollector.prototype.bannedVideoSize = function(request) {
+		if ( request.size !== null ) {
+			if ( request.size < minVidSize || request.size > maxVidSize || request.contentRange > maxContentRange ) {
+				return true;
+			}
+		}
+		return false;
+	};
+
+	PageNetworkTrafficCollector.prototype.grabTagReqs = function(tabRequests, assetRequest) {
+		var minTimestamp, maxTimestamp;
+		minTimestamp = assetRequest.requestTimestamp - secBefore;
+		maxTimestamp = assetRequest.requestTimestamp + secAfter;
+
+		var filteredRequests = tabRequests.filter(function(request) {
+			return (request.requestTimestamp > minTimestamp &&
+				request.requestTimestamp < maxTimestamp &&
+				request.frameId === assetRequest.frameId &&
+				request.url !== assetRequest.url &&
+				(hasValidRequestType(request) ||
+				isPixelRequest(request)));
+		});
+
+		return filteredRequests;
+	};
+
+	PageNetworkTrafficCollector.prototype.isValidVideoAd = function(assetRequest, tagRequests) {
+		var hasVpaidOrVastRequest = tagRequests.some(function(tagRequest) {
+			return isVpaidOrVastRequest(tagRequest);
+		});
+		if ( hasVpaidOrVastRequest ) {
+			return true;
+		}
+		var hasTopVideoAssetDomain = topVideoAssetDomains.some(function(assetDomain) {
+			return hasDomain(assetRequest.url, assetDomain);
+		});
+
+		return hasTopVideoAssetDomain;
+	};
+
+	PageNetworkTrafficCollector.prototype.sendMsgWhenQuiet = function(msgKey) {
+		var _this = this,
+			origPageUrl, msgAssetReq;
+		msgAssetReq = this.msgsBeingSent[msgKey];
+		browser.tabs.get(this.tabId, function(tab) {origPageUrl = tab.url;});
+
+		setTimeout(function() {
+			var rawRequests = [];
+			if ( globalPageContainer.collectors[_this.tabId] === _this ) {
+				for ( var reqId in _this.requests ) {
+					rawRequests.push(_this.requests[reqId]);
+				}
+				var tagReqs = _this.grabTagReqs(rawRequests, msgAssetReq);
+
+				if ( _this.isValidVideoAd(msgAssetReq, tagReqs) ) {
+					_this.sendToTab(msgAssetReq, tagReqs, origPageUrl, true);
+				} else {
+
+					_this.sendToTab(msgAssetReq, tagReqs, origPageUrl, false);
+				}
+
+			} else {
+
+			}
+			delete _this.msgsBeingSent[msgKey];
+		}, secAfter+secBefore);
+	};
+
+	PageNetworkTrafficCollector.prototype.existingMessage = function(candidateRequest) {
+		var frameMsg = this.msgsBeingSent[candidateRequest.frameId];
+		if ( frameMsg ) {
+			return frameMsg;
+		} else {
+			return null;
+		}
+	};
+
+	browser.webRequest.onBeforeRequest.addListener(function(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRequest);
+	}, {urls: ['http://*/*', 'https://*/*']}, []);
+
+	browser.webRequest.onSendHeaders.addListener(function(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onSendHeaders);
+	}, {urls: ['http://*/*', 'https://*/*']}, ['requestHeaders']);
+
+	browser.webRequest.onHeadersReceived.addListener(function(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onHeadersReceived);
+	}, {urls: ['http://*/*', 'https://*/*']}, ['responseHeaders']);
+
+	browser.webRequest.onBeforeRedirect.addListener(function(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRedirect);
+	}, {urls: ['http://*/*', 'https://*/*']}, []);
+
+	browser.webRequest.onResponseStarted.addListener(function(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onResponseStarted);
+	}, {urls: ['http://*/*', 'https://*/*']}, ['responseHeaders']);
+
+	browser.webNavigation.onBeforeNavigate.addListener(function(details) {
+		if ( details.frameId === 0 ) {
+			globalPageContainer.onNewNavigation(details);
+		}
+	}, {});
+
+	browser.webNavigation.onCommitted.addListener(function(details) {
+		if ( details.frameId === 0 ) {
+			globalPageContainer.onNavigationCommitted(details);
+		}
+	});
+
+	browser.webNavigation.onCompleted.addListener(function(details) {
+		if ( details.frameId === 0 ) {
+			globalPageContainer.onNavigationCompleted(details);
+		}
+	});
+
+	browser.tabs.onRemoved.addListener(function(tabId, closeInfo) {
+		globalPageContainer.onTabClose(tabId, closeInfo);
+	});
+
+	browser.runtime.onMessage.addListener(function(message, sender, sendResponse) {
+		if ( message.event === 'new-ad' && message.data.event === 'ad' ) {
+			var tabId = sender.tab.id;
+			if ( tabId ) {
+				globalPageContainer.onDisplayAdFound(tabId);
+			}
+		}
+	});
+})();
diff --git a/src/drivers/webextension/js/options.js b/src/drivers/webextension/js/options.js
new file mode 100644
index 000000000..71974de97
--- /dev/null
+++ b/src/drivers/webextension/js/options.js
@@ -0,0 +1,54 @@
+document.addEventListener('DOMContentLoaded', function() {
+	var d = document;
+
+	var options = {
+		opts: defaults,
+
+		init: function() {
+			options.load();
+
+			d.getElementById('github'    ).addEventListener('click', function() { window.open(wappalyzer.config.githubURL);  });
+			d.getElementById('twitter'   ).addEventListener('click', function() { window.open(wappalyzer.config.twitterURL); });
+			d.getElementById('wappalyzer').addEventListener('click', function() { window.open(wappalyzer.config.websiteURL + '?pk_campaign=chrome&pk_kwd=options'); });
+
+			d.getElementById('options-save').addEventListener('click', options.save);
+		},
+
+		load: function() {
+			var option, value;
+
+			for ( option in options.opts ) {
+				if ( value = localStorage[option] ) {
+					options.opts[option] = value;
+				}
+			}
+
+			if ( parseInt(options.opts.upgradeMessage) ) {
+				d.getElementById('option-upgrade-message').setAttribute('checked', 'checked');
+			}
+
+			if ( parseInt(options.opts.tracking) ) {
+				d.getElementById('option-tracking').setAttribute('checked', 'checked');
+			}
+		},
+
+		save: function() {
+			var option;
+
+			options.opts.upgradeMessage = d.getElementById('option-upgrade-message').checked ? 1 : 0;
+			options.opts.tracking       = d.getElementById('option-tracking'       ).checked ? 1 : 0;
+
+			for ( option in options.opts ) {
+				localStorage[option] = options.opts[option];
+			}
+
+			d.getElementById('options-saved').style.display = 'inline';
+
+			setTimeout(function(){
+				d.getElementById('options-saved').style.display = 'none';
+			}, 2000);
+		}
+	};
+
+	options.init();
+});
diff --git a/src/drivers/webextension/js/popup.js b/src/drivers/webextension/js/popup.js
new file mode 100644
index 000000000..6e81a7939
--- /dev/null
+++ b/src/drivers/webextension/js/popup.js
@@ -0,0 +1,68 @@
+document.addEventListener('DOMContentLoaded', function() {
+	var
+		slugify, popup,
+		d            = document,
+		detectedApps = d.getElementById('detected-apps');
+
+	slugify = function(string) {
+		return string.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/--+/g, '-').replace(/(?:^-|-$)/, '');
+	};
+
+	popup = {
+		init: function() {
+			browser.tabs.query({ active: true }).then(function(tabs) {
+				if ( tabs[0].url.match(/https?:\/\//) ) {
+					detectedApps.innerHTML = '<div class="empty">' + browser.i18n.getMessage('noAppsDetected') + '</div>';
+				} else {
+					detectedApps.innerHTML = '<div class="empty">' + browser.i18n.getMessage('nothingToDo') + '</div>';
+				}
+			});
+
+			popup.displayApps();
+		},
+
+		displayApps: function() {
+			var appName, confidence, version;
+
+			browser.tabs.query({ active: true }).then(function(tabs) {
+        function sendGetApps(response) {
+					if ( response.tabCache && response.tabCache.count > 0 ) {
+						detectedApps.innerHTML = '';
+
+						for ( appName in response.tabCache.appsDetected ) {
+							confidence = response.tabCache.appsDetected[appName].confidenceTotal;
+							version    = response.tabCache.appsDetected[appName].version;
+
+							html =
+								'<div class="detected-app">' +
+									'<a target="_blank" href="https://wappalyzer.com/applications/' + slugify(appName) + '">' +
+										'<img src="images/icons/' + response.apps[appName].icon + '"/>' +
+										'<span class="label"><span class="name">' + appName + '</span>' + ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' ) + '</span>' +
+									'</a>';
+
+							response.apps[appName].cats.forEach(function(cat) {
+								html +=
+									'<a target="_blank" href="https://wappalyzer.com/categories/' + slugify(response.categories[cat].name) + '">' +
+										'<span class="category"><span class="name">' + browser.i18n.getMessage('categoryName' + cat) + '</span></span>' +
+									'</a>';
+							});
+
+							html +=
+									'</a>' +
+								'</div>';
+
+							detectedApps.innerHTML = detectedApps.innerHTML + html;
+						}
+					}
+				}
+        if (typeof chrome === "undefined") {
+          browser.runtime.sendMessage({ id: 'get_apps', tab: tabs[0] }, sendGetApps);
+        } else {
+          chrome.runtime.sendMessage({ id: 'get_apps', tab: tabs[0] }, sendGetApps);
+        }
+			});
+		}
+	};
+
+	popup.init();
+});
diff --git a/src/drivers/webextension/manifest.edge.json b/src/drivers/webextension/manifest.edge.json
new file mode 100644
index 000000000..0459d36f6
--- /dev/null
+++ b/src/drivers/webextension/manifest.edge.json
@@ -0,0 +1,62 @@
+{
+	"name": "Wappalyzer",
+  "short_name": "Wappalyzer",
+  "author": "Elbert Alias",
+	"homepage_url": "https://wappalyzer.com/",
+	"description": "Identify web technologies",
+	"version": "3",
+	"default_locale": "en",
+	"manifest_version": 2,
+	"icons": {
+		"16":  "images/icon_16.png",
+		"19":  "images/icon_19.png",
+		"32":  "images/icon_32.png",
+		"38":  "images/icon_38.png",
+		"128": "images/icon_128.png"
+	},
+	"page_action": {
+		"default_icon": {
+      "16":  "images/icon_16.png",
+      "19":  "images/icon_19.png",
+      "32":  "images/icon_32.png",
+      "38":  "images/icon_38.png",
+      "128": "images/icon_128.png"
+    },
+		"default_title": "Wappalyzer",
+		"default_popup": "popup.html"
+	},
+	"background": {
+		"page": "background.html",
+    "persistent": true
+	},
+	"content_scripts": [
+		{
+			"matches": [ "http://*/*", "https://*/*" ],
+			"js": [
+				"js/browser-polyfill.js",
+				"js/content.js"
+			],
+			"run_at": "document_idle"
+		}, {
+			"matches": [ "http://*/*", "https://*/*" ],
+			"js": [
+				"js/browser-polyfill.js",
+				"js/iframe.js"
+			],
+			"run_at": "document_start",
+			"all_frames": true
+		}
+	],
+	"web_accessible_resources": [
+		"js/inject.js"
+	],
+  "options_page": "options.html",
+	"permissions": [
+		"tabs",
+		"webRequest",
+		"webNavigation",
+		"http://*/*",
+		"https://*/*"
+	],
+	"content_security_policy": "script-src 'self'; object-src 'self'"
+}
diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json
new file mode 100644
index 000000000..93d0632cb
--- /dev/null
+++ b/src/drivers/webextension/manifest.json
@@ -0,0 +1,66 @@
+{
+	"name": "Wappalyzer",
+  "short_name": "Wappalyzer",
+  "author": "Elbert Alias",
+	"homepage_url": "https://wappalyzer.com/",
+	"description": "Identify web technologies",
+	"version": "3",
+	"default_locale": "en",
+	"manifest_version": 2,
+	"icons": {
+		"16":  "images/icon_16.png",
+		"19":  "images/icon_19.png",
+		"32":  "images/icon_32.png",
+		"38":  "images/icon_38.png",
+		"128": "images/icon_128.png"
+	},
+	"page_action": {
+		"default_icon": {
+      "16":  "images/icon_16.png",
+      "19":  "images/icon_19.png",
+      "32":  "images/icon_32.png",
+      "38":  "images/icon_38.png",
+      "128": "images/icon_128.png"
+    },
+		"default_title": "Wappalyzer",
+		"default_popup": "popup.html"
+	},
+	"background": {
+		"page": "background.html"
+
+	},
+	"content_scripts": [
+		{
+			"matches": [ "http://*/*", "https://*/*" ],
+			"js": [
+				"js/browser-polyfill.js",
+				"js/content.js"
+			],
+			"run_at": "document_idle"
+		}, {
+			"matches": [ "http://*/*", "https://*/*" ],
+			"js": [
+				"js/browser-polyfill.js",
+				"js/iframe.js"
+			],
+			"run_at": "document_start",
+			"all_frames": true
+		}
+	],
+	"web_accessible_resources": [
+		"js/inject.js"
+	],
+  "options_page": "options.html",
+	"options_ui": {
+    "page": "options.html",
+    "open_in_tab": false
+  },
+	"permissions": [
+		"tabs",
+		"webRequest",
+		"webNavigation",
+		"http://*/*",
+		"https://*/*"
+	],
+	"content_security_policy": "script-src 'self'; object-src 'self'"
+}
diff --git a/src/drivers/webextension/options.html b/src/drivers/webextension/options.html
new file mode 100644
index 000000000..4b6817ce7
--- /dev/null
+++ b/src/drivers/webextension/options.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta charset="utf-8">
+
+		<title data-i18n="options">Wappalyzer options</title>
+
+		<link rel="icon" href="images/icon_32.png">
+
+		<link rel="stylesheet" href="css/options.css">
+
+		<script src="js/browser-polyfill.js"></script>
+		<script src="js/wappalyzer.js"></script>
+		<script src="js/defaults.js"></script>
+		<script src="js/options.js"></script>
+		<script src="js/i18n.js"></script>
+	</head>
+	<body>
+		<div class="hero">
+			<div class="container">
+				<img src="images/logo-white.svg">
+			</div>
+		</div>
+
+		<div class="content">
+			<div class="container">
+				<h1 data-i18n="options">Options</h1>
+
+				<p>
+					<label for="option-upgrade-message"><input id="option-upgrade-message" type="checkbox"> <span data-i18n="optionUpgradeMessage">Tell me about upgrades</span></label>
+					<label for="option-tracking"><input id="option-tracking" type="checkbox"> <span data-i18n="optionTracking">Anonymously send reports on detected applications to wappalyzer.com for research</span></label>
+				</p>
+
+				<p>
+					<button id="options-save" data-i18n="optionsSave">Save options</button> <span id="options-saved" data-i18n="optionsSaved">Saved</span>
+				</p>
+
+				<div id="about">
+					<p>
+						<button id="github"><img src="images/github.png"  width="16" height="16" alt=""/> <span data-i18n="github" >Fork Wappalyzer on GitHub!</span></button><!--
+						--><button id="twitter"><img src="images/twitter.png" width="16" height="16" alt=""/> <span data-i18n="twitter">Follow Wappalyzer on Twitter</span></button><!--
+						--><button id="wappalyzer"><img src="images/icon_16.png" width="16" height="16" alt=""/> <span data-i18n="website">Go to wappalyzer.com</span></button>
+					</p>
+				</div>
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/src/drivers/webextension/popup.html b/src/drivers/webextension/popup.html
new file mode 100644
index 000000000..1548d426e
--- /dev/null
+++ b/src/drivers/webextension/popup.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<meta charset="utf-8">
+
+		<link rel="stylesheet" href="css/widgets.css">
+		<link rel="stylesheet" href="css/popup.css">
+
+		<script src="js/browser-polyfill.js"></script>
+		<script src="js/popup.js"></script>
+		<script src="js/i18n.js"></script>
+	</head>
+	<body>
+		<div id="detected-apps"></div>
+	</body>
+</html>
diff --git a/src/icons/AT Internet XiTi.png b/src/icons/AT Internet XiTi.png
deleted file mode 100644
index 8d058a187..000000000
Binary files a/src/icons/AT Internet XiTi.png and /dev/null differ
diff --git a/src/icons/AT Internet Analyzer.png b/src/icons/AT Internet.png
similarity index 100%
rename from src/icons/AT Internet Analyzer.png
rename to src/icons/AT Internet.png
diff --git a/src/icons/Anchor CMS.png b/src/icons/Anchor CMS.png
deleted file mode 100644
index e567e1257..000000000
Binary files a/src/icons/Anchor CMS.png and /dev/null differ
diff --git a/src/icons/Canon HTTP Server.png b/src/icons/Canon HTTP Server.png
deleted file mode 100755
index 1f55e03b3..000000000
Binary files a/src/icons/Canon HTTP Server.png and /dev/null differ
diff --git a/src/icons/Discuz! X.png b/src/icons/Discuz X.png
similarity index 100%
rename from src/icons/Discuz! X.png
rename to src/icons/Discuz X.png
diff --git a/src/icons/E-CommercePy.png b/src/icons/E-CommercePy.png
deleted file mode 100644
index 16fb0d0b9..000000000
Binary files a/src/icons/E-CommercePy.png and /dev/null differ
diff --git a/src/icons/ELOG HTTP.png b/src/icons/ELOG HTTP.png
deleted file mode 100644
index 8a53cd3dc..000000000
Binary files a/src/icons/ELOG HTTP.png and /dev/null differ
diff --git a/src/icons/EmbedThis Appweb.png b/src/icons/EmbedThis Appweb.png
deleted file mode 100644
index b1df2e5b0..000000000
Binary files a/src/icons/EmbedThis Appweb.png and /dev/null differ
diff --git a/src/icons/Embedthis-http.png b/src/icons/Embedthis.png
similarity index 100%
rename from src/icons/Embedthis-http.png
rename to src/icons/Embedthis.png
diff --git a/src/icons/FancyBox.png b/src/icons/FancyBox.png
new file mode 100755
index 000000000..3f764999b
Binary files /dev/null and b/src/icons/FancyBox.png differ
diff --git a/src/icons/Go.svg b/src/icons/Go.svg
new file mode 100644
index 000000000..8b0b1af64
--- /dev/null
+++ b/src/icons/Go.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 128 128" overflow="visible"><g clip-rule="evenodd"><path d="M17.42 102.92c.186 3.843 4.025 2.065 5.764.864 1.65-1.14 2.133-.193 2.278-2.444.095-1.48.266-2.96.182-4.444-2.496-.226-5.21.368-7.257 1.855-1.054.767-3.03 3.21-.967 4.17" fill="#f6d2a2" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M17.42 102.92c.56-.207 1.15-.355 1.53-.86" fill="#c6b198" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M26.292 57.14c-14.71-4.136-3.772-22.85 8.04-15.153l-8.04 15.154zm65.36-16.558c11.645-8.178 22.167 10.274 8.634 14.917L91.652 40.58z" fill="#6ad7e5" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M94.157 150.215c2.958 1.83 8.364 7.364 3.927 10.047-4.263 3.903-6.65-4.284-10.39-5.42 1.61-2.187 3.653-4.183 6.463-4.627z" fill="#f6d2a2" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M98.084 160.262c-.658-1.308-.88-2.835-1.977-3.89" stroke="#000" stroke-width=".732" stroke-linecap="round" fill="none"/><path d="M41.316 156.47c-3.47.536-5.425 3.668-8.32 5.258-2.726 1.626-3.77-.52-4.015-.956-.427-.195-.39.18-1.05-.483-2.53-3.99 2.634-6.907 5.322-8.89 3.744-.756 6.09 2.49 8.064 5.07z" fill="#f6d2a2" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M28.98 160.772c.133-1.52 1.34-2.54 1.913-3.825" stroke="#000" stroke-width=".732" stroke-linecap="round" fill="none"/><path d="M26.906 51.972c-1.94-1.027-3.365-2.42-2.178-4.666 1.1-2.078 3.14-1.852 5.082-.826l-2.904 5.492zM97.22 50.02c1.94-1.027 3.365-2.42 2.178-4.666-1.1-2.078-3.14-1.852-5.082-.826l2.904 5.492z" fill-rule="evenodd"/><path d="M110.58 102.432c-.186 3.843-4.025 2.065-5.764.864-1.65-1.14-2.133-.193-2.278-2.444-.095-1.48-.266-2.958-.182-4.444 2.496-.226 5.21.368 7.257 1.855 1.054.766 3.03 3.21.967 4.17" fill="#f6d2a2" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M110.58 102.432c-.56-.207-1.15-.355-1.53-.86" fill="#c6b198" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M62.53 32.81c14.73 0 28.537 2.106 35.735 16.257 6.46 15.86 4.163 32.965 5.15 49.728.845 14.394 2.72 31.024-3.957 44.363-7.024 14.033-24.578 17.563-39.04 17.046-11.36-.406-25.08-4.112-31.492-14.49-7.522-12.176-3.96-30.28-3.415-43.83.648-16.047-4.346-32.144.926-47.847 5.47-16.29 20.22-19.972 36.095-21.228" fill="#6ad7e5" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><path d="M65.126 52.58c2.644 15.37 27.77 11.307 24.16-4.195-3.235-13.902-25.04-10.054-24.16 4.195" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-width=".709" stroke-linecap="round"/><path d="M35.1 55.066c3.428 13.382 24.853 9.956 24.046-3.467-.968-16.078-27.322-12.976-24.045 3.466" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-width=".688" stroke-linecap="round"/><path d="M68.157 71.025c.01 2 .454 4.242.076 6.368-.51.964-1.51 1.066-2.373 1.456a3.493 3.493 0 0 1-2.675-2.087c-.306-2.427.114-4.777.192-7.204l4.78 1.465z" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><g transform="matrix(.244 0 0 .244 14.833 29.609)" fill-rule="evenodd"><ellipse ry="16.062" rx="14.829" cy="95.404" cx="107.324"/><ellipse ry="4.082" rx="3.496" cy="99.029" cx="114.069" fill="#fff"/></g><g transform="matrix(.244 0 0 .244 14.833 29.609)" fill-rule="evenodd"><ellipse ry="16.062" rx="14.582" cy="91.404" cx="231.571"/><ellipse ry="4.082" rx="3.438" cy="95.029" cx="238.204" fill="#fff"/></g><path d="M57.818 70.808c-1.578 3.825.88 11.475 5.164 5.833-.307-2.426.114-4.775.19-7.203l-5.354 1.37z" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-width=".732" stroke-linecap="round"/><g fill-rule="evenodd"><path d="M58.363 63.443c-2.942.25-5.347 3.75-3.817 6.517 2.025 3.666 6.548-.324 9.364.05 3.242.066 5.897 3.427 8.5.607 2.897-3.136-1.246-6.19-4.483-7.556l-9.564.383z" fill="#f6d2a2" stroke="#231f20" stroke-width=".732" stroke-linecap="round"/><path d="M57.993 63.29c-.218-5.097 9.5-5.735 10.648-1.468 1.146 4.257-10.17 5.246-10.647 1.468-.382-3.017 0 0 0 0z"/></g></g></svg>
\ No newline at end of file
diff --git a/src/icons/HTTP2.png b/src/icons/HTTP2.png
deleted file mode 100644
index 9fd86d886..000000000
Binary files a/src/icons/HTTP2.png and /dev/null differ
diff --git a/src/icons/Highstock.png b/src/icons/Highstock.png
deleted file mode 100644
index 68bf7a0c5..000000000
Binary files a/src/icons/Highstock.png and /dev/null differ
diff --git a/src/icons/InfernoJS.png b/src/icons/InfernoJS.png
new file mode 100755
index 000000000..5e1bedb86
Binary files /dev/null and b/src/icons/InfernoJS.png differ
diff --git a/src/icons/KeyCDN.png b/src/icons/KeyCDN.png
new file mode 100644
index 000000000..5b635dc2c
Binary files /dev/null and b/src/icons/KeyCDN.png differ
diff --git a/src/icons/M.R. Inc SiteFrame.png b/src/icons/M.R. Inc SiteFrame.png
deleted file mode 100644
index 1e3e20e1b..000000000
Binary files a/src/icons/M.R. Inc SiteFrame.png and /dev/null differ
diff --git a/src/icons/M.R. Inc Webserver.png b/src/icons/M.R. Inc Webserver.png
deleted file mode 100644
index 1e3e20e1b..000000000
Binary files a/src/icons/M.R. Inc Webserver.png and /dev/null differ
diff --git a/src/icons/M.R. Inc BoxyOS.png b/src/icons/M.R. Inc.png
similarity index 100%
rename from src/icons/M.R. Inc BoxyOS.png
rename to src/icons/M.R. Inc.png
diff --git a/src/icons/Moment Timezone.png b/src/icons/Moment Timezone.png
deleted file mode 100644
index f368a3002..000000000
Binary files a/src/icons/Moment Timezone.png and /dev/null differ
diff --git a/src/icons/Schneider Web Server.png b/src/icons/Schneider Web Server.png
deleted file mode 100644
index d795ac7f5..000000000
Binary files a/src/icons/Schneider Web Server.png and /dev/null differ
diff --git a/src/icons/Sentinel License Monitor.png b/src/icons/Sentinel License Monitor.png
deleted file mode 100755
index 9fa007fc2..000000000
Binary files a/src/icons/Sentinel License Monitor.png and /dev/null differ
diff --git a/src/icons/Sentinel Protection Server.png b/src/icons/Sentinel Protection Server.png
deleted file mode 100755
index 9fa007fc2..000000000
Binary files a/src/icons/Sentinel Protection Server.png and /dev/null differ
diff --git a/src/icons/Sentinel Keys Server.png b/src/icons/Sentinel.png
similarity index 100%
rename from src/icons/Sentinel Keys Server.png
rename to src/icons/Sentinel.png
diff --git a/src/icons/Splunkd.png b/src/icons/Splunkd.png
deleted file mode 100755
index aec997697..000000000
Binary files a/src/icons/Splunkd.png and /dev/null differ
diff --git a/src/icons/Stackla Social Hub.png b/src/icons/Stackla Social Hub.png
deleted file mode 100644
index bd7dad114..000000000
Binary files a/src/icons/Stackla Social Hub.png and /dev/null differ
diff --git a/src/icons/Tealium.png b/src/icons/Tealium.png
new file mode 100755
index 000000000..98fc02985
Binary files /dev/null and b/src/icons/Tealium.png differ
diff --git a/src/icons/a-blog cms.png b/src/icons/a-blog cms.png
deleted file mode 100644
index ed6b25e89..000000000
Binary files a/src/icons/a-blog cms.png and /dev/null differ
diff --git a/src/icons/anchorCache.png b/src/icons/anchorCache.png
deleted file mode 100644
index fc0e13c33..000000000
Binary files a/src/icons/anchorCache.png and /dev/null differ
diff --git a/src/icons/cloudcart.svg b/src/icons/cloudcart.svg
new file mode 100644
index 000000000..9d608655b
--- /dev/null
+++ b/src/icons/cloudcart.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="500px" height="500px" viewBox="0 0 500 500" enable-background="new 0 0 500 500" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#2C4052" d="M500,470.837C500,486.949,486.94,500,470.837,500H29.164C13.056,500,0,486.949,0,470.837V29.164
+			C0,13.06,13.056,0,29.164,0h441.673C486.94,0,500,13.06,500,29.164V470.837z"/>
+	</g>
+	<path fill="#5FAADA" d="M304.107,170.151c-0.336,0.335-0.66,0.679-0.99,1.018l-0.021-0.02L186.099,288.146
+		c-9.981,9.691-23.093,15.031-37.03,15.031c-14.204,0-27.562-5.531-37.601-15.58c-20.734-20.729-20.734-54.467,0-75.202
+		c10.039-10.043,23.392-15.575,37.601-15.575c14.2,0,27.553,5.532,37.601,15.575l42.246-42.25
+		c-21.329-21.325-49.686-33.072-79.847-33.072c-30.162,0-58.522,11.747-79.847,33.076c-44.033,44.029-44.033,115.706,0,159.735
+		C90.546,351.215,118.907,363,149.064,363c0.004,0,0,0,0.004,0c30.161,0,58.521-11.785,79.847-33.113l-0.011-0.02L300.766,258h0.006
+		l44.802-44.812l0.021,0.017c0.258-0.267,0.497-0.544,0.765-0.806c20.729-20.729,54.462-20.736,75.196-0.001l42.25-42.25
+		C419.776,126.119,348.133,126.118,304.107,170.151z"/>
+	<g>
+		<path fill="#FFFFFF" d="M383.954,303.18c-14.204,0-27.558-5.533-37.596-15.58c-7.648-7.645-12.467-17.058-14.473-26.938
+			l-45.745,45.746c4.826,8.384,10.808,16.279,17.963,23.439c21.328,21.329,49.688,33.076,79.851,33.076s58.521-11.747,79.852-33.076
+			l-42.25-42.244C411.512,297.646,398.159,303.18,383.954,303.18z"/>
+	</g>
+</g>
+</svg>
diff --git a/src/icons/default.png b/src/icons/default.png
deleted file mode 100644
index 0e1e1fb0c..000000000
Binary files a/src/icons/default.png and /dev/null differ
diff --git a/src/icons/default.svg b/src/icons/default.svg
new file mode 100644
index 000000000..af0f6be0c
--- /dev/null
+++ b/src/icons/default.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
+    <title>Favicon</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Favicons" transform="translate(-164.000000, -377.000000)">
+            <g id="Group-Copy-2" transform="translate(75.000000, 359.000000)">
+                <g id="Favicon" transform="translate(89.000000, 18.000000)">
+                    <g id="Logo-Mark">
+                        <polygon id="Fill-1-Copy" fill="#1C0172" points="2.43005371 6.96862793 0.0947772033 8.57397113 0.094533725 8.92865155 7.03719459 13.9881979 13.9794902 8.92889897 13.9799772 8.57434227 11.8363037 6.93737793"></polygon>
+                        <polygon id="Fill-2-Copy" fill="#4608AD" points="7.03719459 3.71134021e-05 0.0948989424 5.05933608 0.094533725 5.41401649 7.03719459 10.4736866 13.9794902 5.41426392 13.9798555 5.05958351"></polygon>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/etherpad.png b/src/icons/etherpad.png
new file mode 100644
index 000000000..8cf4ddebf
Binary files /dev/null and b/src/icons/etherpad.png differ
diff --git a/src/icons/foswiki.png b/src/icons/foswiki.png
new file mode 100644
index 000000000..1749c6c22
Binary files /dev/null and b/src/icons/foswiki.png differ
diff --git a/src/icons/gitweb.png b/src/icons/gitweb.png
deleted file mode 100644
index 5ff1d2b09..000000000
Binary files a/src/icons/gitweb.png and /dev/null differ
diff --git a/src/icons/iCongo.png b/src/icons/iCongo.png
deleted file mode 100644
index 842dd8343..000000000
Binary files a/src/icons/iCongo.png and /dev/null differ
diff --git a/src/icons/mattermost.png b/src/icons/mattermost.png
new file mode 100644
index 000000000..7375f3e61
Binary files /dev/null and b/src/icons/mattermost.png differ
diff --git a/src/icons/mhonarc.png b/src/icons/mhonarc.png
new file mode 100644
index 000000000..c808de423
Binary files /dev/null and b/src/icons/mhonarc.png differ
diff --git a/src/icons/mod_rack.png b/src/icons/mod_rack.png
deleted file mode 100644
index df046935b..000000000
Binary files a/src/icons/mod_rack.png and /dev/null differ
diff --git a/src/icons/mod_rails.png b/src/icons/mod_rails.png
deleted file mode 100644
index df046935b..000000000
Binary files a/src/icons/mod_rails.png and /dev/null differ
diff --git a/src/icons/swiftype.png b/src/icons/swiftype.png
new file mode 100644
index 000000000..69ab7d60f
Binary files /dev/null and b/src/icons/swiftype.png differ
diff --git a/src/icons/translucide.svg b/src/icons/translucide.svg
new file mode 100644
index 000000000..1cadcf7ac
--- /dev/null
+++ b/src/icons/translucide.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 492.871 492.871" style="enable-background:new 0 0 492.871 492.871;" xml:space="preserve" width="512px" height="512px">
+<path d="M397.502,402.607l-45.2-60.268c-2.902-3.869-4.5-8.664-4.5-13.5V183.871h9.042c11.3,0,20.494-9.193,20.494-20.494  c0-10.962-8.652-19.941-19.485-20.47v-31.489C357.854,49.982,307.872,0,246.436,0S135.017,49.982,135.017,111.418v31.489  c-10.833,0.528-19.485,9.508-19.485,20.47c0,11.3,9.194,20.494,20.494,20.494h9.042v144.968c0,4.836-1.598,9.631-4.5,13.5  l-45.2,60.268c-2.485,3.314-1.813,8.015,1.5,10.5c1.349,1.012,2.928,1.5,4.494,1.5c2.28,0,4.533-1.036,6.006-3l45.2-60.268  c4.836-6.449,7.5-14.439,7.5-22.5V183.871h27.667v197.375c0,5.788-1.156,11.42-3.436,16.74l-21.558,50.307  c-1.632,3.807,0.132,8.216,3.939,9.848c0.963,0.413,1.965,0.608,2.951,0.608c2.91,0,5.679-1.704,6.897-4.548l21.558-50.307  c3.084-7.198,4.648-14.818,4.648-22.648V183.871h36.2v301.5c0,4.142,3.358,7.5,7.5,7.5s7.5-3.358,7.5-7.5v-301.5h36.2v197.375  c0,7.831,1.564,15.451,4.648,22.648l21.558,50.307c1.219,2.844,3.987,4.548,6.897,4.548c0.986,0,1.987-0.195,2.951-0.608  c3.807-1.631,5.571-6.041,3.939-9.848l-21.558-50.307c-2.28-5.32-3.436-10.952-3.436-16.74V183.871h27.667v144.968  c0,8.061,2.664,16.051,7.5,22.5l45.2,60.268c1.474,1.965,3.726,3,6.006,3c1.565,0,3.145-0.489,4.494-1.5  C399.316,410.622,399.988,405.921,397.502,402.607z M130.532,163.377c0-3.029,2.465-5.494,5.494-5.494h6.491h172.185  c4.142,0,7.5-3.358,7.5-7.5s-3.358-7.5-7.5-7.5H150.017v-31.465C150.017,58.253,193.27,15,246.436,15s96.418,43.253,96.418,96.418  v38.965c0,4.142,3.358,7.5,7.5,7.5h6.491c3.029,0,5.494,2.465,5.494,5.494s-2.465,5.494-5.494,5.494H136.026  C132.997,168.871,130.532,166.407,130.532,163.377z M324.749,118.918c-4.142,0-7.5-3.358-7.5-7.5  c0-39.046-31.767-70.813-70.813-70.813c-4.142,0-7.5-3.358-7.5-7.5s3.358-7.5,7.5-7.5c47.317,0,85.813,38.496,85.813,85.813  C332.249,115.561,328.891,118.918,324.749,118.918z" fill="#2f707b"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/src/icons/wp_super_cache.png b/src/icons/wp_super_cache.png
new file mode 100644
index 000000000..87e8d17ed
Binary files /dev/null and b/src/icons/wp_super_cache.png differ
diff --git a/src/utils/iframe.js b/src/utils/iframe.js
index 2322b509f..64e2c20e4 100644
--- a/src/utils/iframe.js
+++ b/src/utils/iframe.js
@@ -150,7 +150,7 @@ var exports = {};
 				video_assets: opt_video_assets,
 				assets: opt_assets,
 				version: '3',
-				mrev: '5dacb94-c',
+				mrev: '9efbfba-c',
 				msgNum: this.msgNum,
 				timestamp: new Date().getTime(),
 				pageVis: document.visibilityState,
@@ -859,7 +859,7 @@ var exports = {};
 	var _pageTags;
 	var INIT_MS_BW_SEARCHES = 2000;
 	var PAGE_TAG_RE = new RegExp('gpt|oascentral');
-	var POST_MSG_ID = '1484952787-11883-24071-12354-1549';
+	var POST_MSG_ID = '1488911709-15415-26289-19282-15751';
 	var AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)');
 
 	function getPageTags(doc) {
@@ -1009,6 +1009,8 @@ var exports = {};
 
 			delete adData.postMessageId;
 
+			event.stopImmediatePropagation();
+
 			if ( isChildWin(myWin, ifrWin) ) {
 				if ( exports.utils.isFriendlyWindow(ifrWin) ) {
 					ifrTag = ifrWin.frameElement;
diff --git a/src/utils/network.js b/src/utils/network.js
index 933c59fe7..944db09c2 100644
--- a/src/utils/network.js
+++ b/src/utils/network.js
@@ -22,11 +22,27 @@
 
 	var topVideoAssetDomains = [
 		'2mdn.net',
+		'adap.tv',
+		'adnxs.com',
+		'adsrvr.org',
+		'btrll.com',
+		'celtra.com',
+		'flashtalking.com',
+		'flite.com',
 		'innovid.com',
+		'jivox.com',
+		'mixpo.com',
+		'nytimes.com',
+		'playwire.com',
+		'selectmedia.asia',
 		'serving-sys.com',
-		'btrll.com',
+		'solvemedia.com',
+		'spotible.com',
 		'teads.tv',
-		'tubemogul.com'
+		'tribalfusion.com',
+		'tubemogul.com',
+		'videologygroup.com',
+		'washingtonpost.com'
 	];
 
 	if ( !String.prototype.endsWith ) {
@@ -484,6 +500,10 @@
 		var hasVpaidOrVastRequest = tagRequests.some(function(tagRequest) {
 			return isVpaidOrVastRequest(tagRequest);
 		});
+
+		if ( assetRequest.isYoutubeAd ) {
+			return true;
+		}
 		if ( hasVpaidOrVastRequest ) {
 			return true;
 		}
diff --git a/src/wappalyzer.js b/src/wappalyzer.js
index 14fd47bc2..8eb4f289f 100644
--- a/src/wappalyzer.js
+++ b/src/wappalyzer.js
@@ -242,7 +242,7 @@ var wappalyzer = (function() {
 		 */
 		analyze: function(hostname, url, data) {
 			var
-				i, j, app, confidence, type, regexMeta, regexScript, match, content, meta, header, version, id,
+				i, app, confidence, type, regexMeta, regexScript, match, content, meta, header, version, id,
 				profiler     = new Profiler(),
 				apps         = {},
 				excludes     = [],
@@ -500,24 +500,10 @@ var wappalyzer = (function() {
 					if ( match && match.length ) {
 						w.ping.hostnames[hostname].meta['language'] = match[1];
 					}
-
-					regexMeta = /<meta[^>]+>/ig;
-
-					while ( match = regexMeta.exec(data.html) ) {
-						if ( !match.length ) {
-							continue;
-						}
-
-						match = match[0].match(/name="(author|copyright|country|description|keywords)"[^>]*content="([^"]+)"/i);
-
-						if ( match && match.length === 3 ) {
-							w.ping.hostnames[hostname].meta[match[1]] = match[2];
-						}
-					}
 				}
 			}
 
-			if ( Object.keys(w.ping.hostnames).length >= 20 || w.adCache.length >= 40 ) {
+			if ( Object.keys(w.ping.hostnames).length >= 50 || w.adCache.length >= 50 ) {
 				driver('ping');
 			}