diff --git a/.gitignore b/.gitignore
index af6546711..19de018bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,11 @@
 .vagrant
 
 build/*
-
-drivers/npm/node_modules
-drivers/npm/npm-debug.log
-
 src/icons/converted/*
 
-package.json
-node_modules/
+node_modules
 npm-debug.log
 
-Thumbs.db
-ehthumbs.db
-Desktop.ini
-$RECYCLE.BIN/
+tags
 
 !.gitkeep
diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build
index 24e0f788c..6a18d6bb6 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/* $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..."
 
@@ -50,10 +50,6 @@ node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src
 
 wappalyzer links
 
-# Npm Module
-mkdir -p $WAPPALYZER_ROOT/build/wappalyzer_npm/
-cp -R $WAPPALYZER_ROOT/src/drivers/npm/* $WAPPALYZER_ROOT/build/wappalyzer_npm/
-
 # Mozilla Firefox
 echo "Building Firefox driver..."
 
@@ -70,17 +66,13 @@ pushd $WAPPALYZER_ROOT/src/drivers/chrome > /dev/null
 
 zip -qr $WAPPALYZER_ROOT/build/wappalyzer_chrome.zip .
 
-popd > /dev/null
-
-# Bookmarklet
-echo "Building Bookmarklet driver..."
-
-echo "var json =" > /tmp/bookmarklet
+# Google Chrome
+echo "Building WebExtension driver..."
 
-cat $WAPPALYZER_ROOT/src/apps.json >> /tmp/bookmarklet
+pushd $WAPPALYZER_ROOT/src/drivers/webextension > /dev/null
 
-echo -e ";\n\nwappalyzer.apps = json.apps;\nwappalyzer.categories = json.categories;" >> /tmp/bookmarklet
+zip -qr $WAPPALYZER_ROOT/build/wappalyzer_webextension.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 1d033d908..dbb52a483 100755
--- a/bin/wappalyzer-links
+++ b/bin/wappalyzer-links
@@ -27,44 +27,34 @@ path="$path/src"
 
 echo "Creating hard links..."
 
-ln -f $path/wappalyzer.js $path/drivers/firefox/lib
-ln -f $path/apps.json     $path/drivers/firefox/data
-ln -f $path/icons/*.png   $path/drivers/firefox/data/images/icons
-ln -f $path/icons/*.svg   $path/drivers/firefox/data/images/icons
-ln -f $path/utils/*.js    $path/drivers/firefox/data/js
+ln -f $path/wappalyzer.js $path/drivers/phantomjs
+ln -f $path/apps.json     $path/drivers/phantomjs
+
+ln -f $path/wappalyzer.js   $path/drivers/firefox
+ln -f $path/apps.json       $path/drivers/firefox/data
+ln -f $path/icons/*.png     $path/drivers/firefox/data/images/icons
+ln -f $path/icons/*.svg     $path/drivers/firefox/data/images/icons
+ln -f $path/utils/iframe.js $path/drivers/firefox/data/js
 
 ln -f $path/wappalyzer.js $path/drivers/chrome/js
 ln -f $path/apps.json     $path/drivers/chrome
 ln -f $path/icons/*.png   $path/drivers/chrome/images/icons
+ln -f $path/icons/*.svg   $path/drivers/chrome/images/icons
 ln -f $path/utils/*.js    $path/drivers/chrome/js
 
-if [ compgen -G "$path/icons/converted/*.png" > /dev/null ]; then
+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/html/js
-ln -f $path/apps.json     $path/drivers/html
-ln -f $path/icons/*.png   $path/drivers/html/images/icons
-ln -f $path/icons/*.svg   $path/drivers/html/images/icons
-
-ln -f $path/wappalyzer.js $path/drivers/php/js
-ln -f $path/apps.json     $path/drivers/php
-
-ln -f $path/wappalyzer.js $path/drivers/python/js
-ln -f $path/apps.json     $path/drivers/python
+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
+ln -f $path/utils/*.js    $path/drivers/webextension/js
 
-ln -f $path/wappalyzer.js $path/drivers/phantomjs
-ln -f $path/apps.json     $path/drivers/phantomjs
-
-ln -f $path/wappalyzer.js $path/drivers/ruby/js
-ln -f $path/apps.json     $path/drivers/ruby
-
-ln -f $path/wappalyzer.js $path/drivers/npm
-ln -f $path/apps.json     $path/drivers/npm
+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/docker/Dockerfile b/docker/Dockerfile
index e4834db06..ec435c0bd 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -8,9 +8,10 @@ ENV WAPPALYZER_ROOT /home/wappalyzer/synced
 ENV WAPPALYZER_NODE_PATH /home/wappalyzer/node
 
 # Install packages
-RUN apt-get update && apt-get install -y sudo curl bzip2 zip libfreetype6 libfontconfig
+RUN sed -i 's/archive\.ubuntu\.com/au.archive.ubuntu.com/g' /etc/apt/sources.list
+RUN apt-get update && apt-get install -y sudo curl
 RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
-RUN apt-get install -y nodejs
+RUN apt-get install -y nodejs bzip2 zip libfreetype6 libfontconfig rsync
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 
@@ -39,7 +40,6 @@ RUN su wappalyzer -c "mkdir $WAPPALYZER_NODE_PATH"
 
 ADD node/package.json $WAPPALYZER_NODE_PATH/package.json
 
-RUN ln -s -f /usr/local/bin/npm /usr/bin/npm
 RUN su wappalyzer -c "cd $WAPPALYZER_NODE_PATH && npm i"
 
 
diff --git a/src/apps.json b/src/apps.json
index d934d779e..975530295 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -7,7 +7,7 @@
 			"icon": "1and1.svg",
 			"implies": "PHP",
 			"url": "/shop/catalog/browse\\?sessid=",
-			"website": "1and1.com"
+			"website": "http://1and1.com"
 		},
 		"1C-Bitrix": {
 			"cats": [
@@ -21,7 +21,7 @@
 			"icon": "1C-Bitrix.png",
 			"implies": "PHP",
 			"script": "1c-bitrix",
-			"website": "www.1c-bitrix.ru"
+			"website": "http://www.1c-bitrix.ru"
 		},
 		"2z Project": {
 			"cats": [
@@ -31,7 +31,7 @@
 			"meta": {
 				"generator": "2z project ([\\d.]+)\\;version:\\1"
 			},
-			"website": "2zproject-cms.ru"
+			"website": "http://2zproject-cms.ru"
 		},
 		"3DM": {
 			"cats": [
@@ -40,7 +40,7 @@
 			"html": "<title>3ware 3DM([\\d\\.]+)?\\;version:\\1",
 			"icon": "3DM.png",
 			"implies": "3ware",
-			"website": "www.3ware.com"
+			"website": "http://www.3ware.com"
 		},
 		"3dCart": {
 			"cats": [
@@ -53,7 +53,7 @@
 			},
 			"icon": "3dCart.png",
 			"script": "(?:twlh(?:track)?\\.asp|3d_upsell\\.js)",
-			"website": "www.3dcart.com"
+			"website": "http://www.3dcart.com"
 		},
 		"3ware": {
 			"cats": [
@@ -63,7 +63,20 @@
 				"Server": "3ware\\/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "3ware.png",
-			"website": "www.3ware.com"
+			"website": "http://www.3ware.com"
+		},
+		"AD EBiS": {
+			"cats": [
+				10
+			],
+			"html": [
+				"<!-- EBiS contents tag",
+				"<!--EBiS tag",
+				"<!-- Tag EBiS",
+				"<!-- EBiS common tag"
+			],
+			"icon": "ebis.png",
+			"website": "http://www.ebis.ne.jp"
 		},
 		"AMPcms": {
 			"cats": [
@@ -76,7 +89,7 @@
 			},
 			"icon": "AMPcms.png",
 			"implies": "PHP",
-			"website": "www.ampcms.org"
+			"website": "http://www.ampcms.org"
 		},
 		"AOLserver": {
 			"cats": [
@@ -86,24 +99,27 @@
 				"Server": "AOLserver/?([\\d.]+)?\\;version:\\1"
 			},
 			"icon": "AOLserver.png",
-			"website": "aolserver.com"
+			"website": "http://aolserver.com"
 		},
 		"AT Internet Analyzer": {
 			"cats": [
 				10
 			],
-			"env": "^xtsite$",
-			"icon": "AT Internet Analyzer.png",
-			"website": "atinternet.com/en"
+			"env": [
+				"^xtsite$",
+				"^ATInternet$"
+			],
+			"icon": "AT Internet.png",
+			"website": "http://atinternet.com/en"
 		},
 		"AT Internet XiTi": {
 			"cats": [
 				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": [
@@ -113,7 +129,7 @@
 				"Server": "ATEN HTTP Server(?:\\(?V?([\\d\\.]+)\\)?)?\\;version:\\1"
 			},
 			"icon": "ATEN.png",
-			"website": "www.aten.com"
+			"website": "http://www.aten.com"
 		},
 		"AWStats": {
 			"cats": [
@@ -124,7 +140,7 @@
 			"meta": {
 				"generator": "AWStats ([\\d.]+(?: \\(build [\\d.]+\\))?)\\;version:\\1"
 			},
-			"website": "awstats.sourceforge.net"
+			"website": "http://awstats.sourceforge.net"
 		},
 		"Accessible Portal": {
 			"cats": [
@@ -135,7 +151,15 @@
 			"meta": {
 				"generator": "Accessible Portal"
 			},
-			"website": "www.accessibleportal.com"
+			"website": "http://www.accessibleportal.com"
+		},
+		"Act-On": {
+			"cats": [
+				32
+			],
+			"env": "^ActOn$",
+			"icon": "ActOn.png",
+			"website": "http://act-on.com"
 		},
 		"AdInfinity": {
 			"cats": [
@@ -143,7 +167,7 @@
 			],
 			"icon": "AdInfinity.png",
 			"script": "adinfinity\\.com\\.au",
-			"website": "adinfinity.com.au"
+			"website": "http://adinfinity.com.au"
 		},
 		"AdRiver": {
 			"cats": [
@@ -153,7 +177,7 @@
 			"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": [
@@ -162,7 +186,7 @@
 			"env": "^adroll_",
 			"icon": "AdRoll.svg",
 			"script": "(?:a|s)\\.adroll\\.com",
-			"website": "adroll.com"
+			"website": "http://adroll.com"
 		},
 		"Adcash": {
 			"cats": [
@@ -172,7 +196,7 @@
 			"icon": "Adcash.svg",
 			"script": "^[^\\/]*//(?:[^\\/]+\\.)?adcash\\.com/(?:script|ad)/",
 			"url": "^https?://(?:[^\\/]+\\.)?adcash\\.com/script/pop_",
-			"website": "adcash.com"
+			"website": "http://adcash.com"
 		},
 		"AddShoppers": {
 			"cats": [
@@ -180,7 +204,7 @@
 			],
 			"icon": "AddShoppers.png",
 			"script": "cdn\\.shop\\.pe/widget/",
-			"website": "www.addshoppers.com"
+			"website": "http://www.addshoppers.com"
 		},
 		"AddThis": {
 			"cats": [
@@ -189,7 +213,7 @@
 			"env": "^addthis",
 			"icon": "AddThis.svg",
 			"script": "addthis\\.com/js/",
-			"website": "www.addthis.com"
+			"website": "http://www.addthis.com"
 		},
 		"AddToAny": {
 			"cats": [
@@ -198,7 +222,29 @@
 			"env": "^a2apage_init$",
 			"icon": "AddToAny.png",
 			"script": "addtoany\\.com/menu/page\\.js",
-			"website": "www.addtoany.com"
+			"website": "http://www.addtoany.com"
+		},
+		"Adminer": {
+			"cats": [
+				3
+			],
+			"html": [
+				"Adminer</a> <span class=\"version\">([\\d.]+)</span>\\;version:\\1",
+				"onclick=\"bodyClick\\(event\\);\" onload=\"verifyVersion\\('([\\d.]+)'\\);\">\\;version:\\1"
+			],
+			"icon": "adminer.png",
+			"implies": "PHP",
+			"website": "http://www.adminer.org"
+		},
+		"Adnegah": {
+			"cats": [
+				36
+			],
+			"env": "^ados(?:Results)?$",
+			"html": "<iframe [^>]*src=\"[^\"]+adnegah\\.net",
+			"icon": "adnegah.png",
+			"script": "[^a-z]adnegah.*\\.js",
+			"website": "http://Adnegah.net"
 		},
 		"Adobe ColdFusion": {
 			"cats": [
@@ -213,7 +259,7 @@
 			"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": [
@@ -226,7 +272,7 @@
 			"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": [
@@ -236,7 +282,7 @@
 			"meta": {
 				"generator": "Adobe GoLive(?:\\s([\\d.]+))?\\;version:\\1"
 			},
-			"website": "www.adobe.com/products/golive"
+			"website": "http://www.adobe.com/products/golive"
 		},
 		"Adobe Muse": {
 			"cats": [
@@ -246,7 +292,7 @@
 			"meta": {
 				"generator": "^Muse(?:$| ?/?(\\d[\\d.]+))\\;version:\\1"
 			},
-			"website": "muse.adobe.com"
+			"website": "http://muse.adobe.com"
 		},
 		"Adobe RoboHelp": {
 			"cats": [
@@ -258,7 +304,7 @@
 				"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": [
@@ -267,7 +313,7 @@
 			"html": "aws\\.src = [^<]+caphyon-analytics",
 			"icon": "Advanced Web Stats.png",
 			"implies": "Java",
-			"website": "www.advancedwebstats.com"
+			"website": "http://www.advancedwebstats.com"
 		},
 		"Advert Stream": {
 			"cats": [
@@ -276,7 +322,7 @@
 			"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": [
@@ -286,7 +332,7 @@
 			"html": "<iframe [^>]*src=\"[^\"]+adzerk\\.net",
 			"icon": "Adzerk.png",
 			"script": "adzerk\\.net/ados\\.js",
-			"website": "adzerk.com"
+			"website": "http://adzerk.com"
 		},
 		"Aegea": {
 			"cats": [
@@ -300,7 +346,7 @@
 				"PHP",
 				"jQuery"
 			],
-			"website": "blogengine.ru"
+			"website": "http://blogengine.ru"
 		},
 		"AfterBuy": {
 			"cats": [
@@ -311,7 +357,15 @@
 			],
 			"icon": "after-buy.png",
 			"script": "shop-static\\.afterbuy\\.de",
-			"website": "www.afterbuy.de"
+			"website": "http://www.afterbuy.de"
+		},
+		"Aircall": {
+			"cats": [
+				52
+			],
+			"icon": "aircall.png",
+			"script": "^https?://cdn\\.aircall\\.io/",
+			"website": "http://aircall.io"
 		},
 		"Airee": {
 			"cats": [
@@ -321,7 +375,7 @@
 				"Server": "Airee"
 			},
 			"icon": "Airee.png",
-			"website": "xn--80aqc2a.xn--p1ai"
+			"website": "http://xn--80aqc2a.xn--p1ai"
 		},
 		"Akamai": {
 			"cats": [
@@ -331,7 +385,18 @@
 				"X-Akamai-Transformed": ""
 			},
 			"icon": "Akamai.png",
-			"website": "akamai.com"
+			"website": "http://akamai.com"
+		},
+		"Akka HTTP": {
+			"cats": [
+				18,
+				22
+			],
+			"headers": {
+				"Server": "akka-http(?:/([\\d.]+))?\\;version:\\1"
+			},
+			"icon": "akka-http.png",
+			"website": "http://akka.io"
 		},
 		"Algolia Realtime Search": {
 			"cats": [
@@ -339,7 +404,7 @@
 			],
 			"env": "^AlgoliaSearch$",
 			"icon": "Algolia Realtime Search.svg",
-			"website": "www.algolia.com"
+			"website": "http://www.algolia.com"
 		},
 		"Allegro RomPager": {
 			"cats": [
@@ -349,7 +414,7 @@
 				"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": [
@@ -362,7 +427,7 @@
 				"YUI"
 			],
 			"script": "^https?://cdn\\.alloyui\\.com/",
-			"website": "www.alloyui.com"
+			"website": "http://www.alloyui.com"
 		},
 		"Amaya": {
 			"cats": [
@@ -372,7 +437,37 @@
 			"meta": {
 				"generator": "Amaya(?: V?([\\d.]+[a-z]))?\\;version:\\1"
 			},
-			"website": "www.w3.org/Amaya"
+			"website": "http://www.w3.org/Amaya"
+		},
+		"Amazon Cloudfront": {
+			"cats": [
+				31
+			],
+			"headers": {
+				"X-Amz-Cf-Id": ""
+			},
+			"icon": "Amazon-Cloudfront.svg",
+			"website": "http://aws.amazon.com/cloudfront/"
+		},
+		"Amazon EC2": {
+			"cats": [
+				22
+			],
+			"headers": {
+				"Server": "\\(Amazon\\)"
+			},
+			"icon": "aws-ec2.svg",
+			"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": [
@@ -384,7 +479,7 @@
 				"generator": "(?:Ametys|Anyware Technologies)"
 			},
 			"script": "ametys\\.js",
-			"website": "ametys.org"
+			"website": "http://ametys.org"
 		},
 		"Amiro.CMS": {
 			"cats": [
@@ -395,37 +490,20 @@
 			"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
 			],
-			"env": "^angular$",
+			"env": "^ngMaterial$",
 			"icon": "Angular.svg",
-			"implies": [
-				"AngularJS"
-			],
+			"implies": "AngularJS",
 			"script": [
 				"/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular-material(?:\\.min)?\\.js\\;version:\\1",
 				"angular-material.*\\.js"
 			],
-			"website": "material.angularjs.org"
+			"website": "http://material.angularjs.org"
 		},
 		"AngularJS": {
 			"cats": [
@@ -438,7 +516,7 @@
 				"/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular(?:\\.min)?\\.js\\;version:\\1",
 				"angular.*\\.js"
 			],
-			"website": "angularjs.org"
+			"website": "http://angularjs.org"
 		},
 		"Apache": {
 			"cats": [
@@ -448,7 +526,7 @@
 				"Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\b)HTTPD)\\;version:\\1"
 			},
 			"icon": "Apache.svg",
-			"website": "apache.org"
+			"website": "http://apache.org"
 		},
 		"Apache HBase": {
 			"cats": [
@@ -456,7 +534,8 @@
 			],
 			"html": "<style[^>]+static/hbase",
 			"icon": "Apache HBase.png",
-			"website": "hbase.apache.org"
+			"implies": "Java",
+			"website": "http://hbase.apache.org"
 		},
 		"Apache Hadoop": {
 			"cats": [
@@ -464,7 +543,7 @@
 			],
 			"html": "<style[^>]+static/hadoop",
 			"icon": "Apache Hadoop.svg",
-			"website": "hadoop.apache.org"
+			"website": "http://hadoop.apache.org"
 		},
 		"Apache JSPWiki": {
 			"cats": [
@@ -472,9 +551,10 @@
 			],
 			"html": "<html[^>]* xmlns:jspwiki=",
 			"icon": "Apache JSPWiki.png",
+			"implies": "Apache Tomcat",
 			"script": "jspwiki",
 			"url": "wiki\\.jsp",
-			"website": "jspwiki.org"
+			"website": "http://jspwiki.org"
 		},
 		"Apache Tomcat": {
 			"cats": [
@@ -485,7 +565,8 @@
 				"X-Powered-By": "\bTomcat\b(?:-([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Apache Tomcat.svg",
-			"website": "tomcat.apache.org"
+			"implies": "Java",
+			"website": "http://tomcat.apache.org"
 		},
 		"Apache Traffic Server": {
 			"cats": [
@@ -495,7 +576,7 @@
 				"Server": "ATS/?([\\d.]+)?\\;version:\\1"
 			},
 			"icon": "Apache Traffic Server.png",
-			"website": "trafficserver.apache.org/"
+			"website": "http://trafficserver.apache.org/"
 		},
 		"Apache Wicket": {
 			"cats": [
@@ -504,7 +585,7 @@
 			"env": "^Wicket",
 			"icon": "Apache Wicket.svg",
 			"implies": "Java",
-			"website": "wicket.apache.org"
+			"website": "http://wicket.apache.org"
 		},
 		"AppNexus": {
 			"cats": [
@@ -513,7 +594,7 @@
 			"html": "<(?:iframe|img)[^>]+adnxs\\.(?:net|com)",
 			"icon": "AppNexus.svg",
 			"script": "adnxs\\.(?:net|com)",
-			"website": "appnexus.com"
+			"website": "http://appnexus.com"
 		},
 		"Arastta": {
 			"cats": [
@@ -528,7 +609,7 @@
 			"icon": "Arastta.svg",
 			"implies": "PHP",
 			"script": "arastta\\.js",
-			"website": "arastta.org"
+			"website": "http://arastta.org"
 		},
 		"Arc Forum": {
 			"cats": [
@@ -536,7 +617,7 @@
 			],
 			"html": "ping\\.src = node\\.href;\\s+[^>]+\\s+}\\s+</script>",
 			"icon": "Arc Forum.png",
-			"website": "arclanguage.org"
+			"website": "http://arclanguage.org"
 		},
 		"Artifactory": {
 			"cats": [
@@ -550,7 +631,7 @@
 			"script": [
 				"wicket/resource/org\\.artifactory\\."
 			],
-			"website": "jfrog.com/open-source/#os-arti"
+			"website": "http://jfrog.com/open-source/#os-arti"
 		},
 		"Artifactory Web Server": {
 			"cats": [
@@ -563,7 +644,7 @@
 			"implies": [
 				"Artifactory"
 			],
-			"website": "jfrog.com/open-source/#os-arti"
+			"website": "http://jfrog.com/open-source/#os-arti"
 		},
 		"ArvanCloud": {
 			"cats": [
@@ -574,7 +655,7 @@
 				"AR-PoweredBy": "Arvan Cloud \\(arvancloud.com\\)"
 			},
 			"icon": "ArvanCloud.png",
-			"website": "www.ArvanCloud.com"
+			"website": "http://www.ArvanCloud.com"
 		},
 		"AsciiDoc": {
 			"cats": [
@@ -587,7 +668,7 @@
 			"meta": {
 				"generator": "^AsciiDoc ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.methods.co.nz/asciidoc"
+			"website": "http://www.methods.co.nz/asciidoc"
 		},
 		"Asymptix PHP Framework": {
 			"cats": [
@@ -600,10 +681,8 @@
 				"Powered by <a href=\"http://www.asymptix.com/\" rel=\"external\">Asymptix PHP Framework</a>"
 			],
 			"icon": "Asymptix PHP Framework.png",
-			"implies": [
-				"PHP"
-			],
-			"website": "github.com/Asymptix/Framework"
+			"implies": "PHP",
+			"website": "http://github.com/Asymptix/Framework"
 		},
 		"Atlassian Bitbucket": {
 			"cats": [
@@ -611,10 +690,11 @@
 			],
 			"env": "^bitbucket$",
 			"icon": "Atlassian Bitbucket.svg",
+			"implies": "Python",
 			"meta": {
 				"application-name": "Bitbucket"
 			},
-			"website": "www.atlassian.com/software/bitbucket/overview/"
+			"website": "http://www.atlassian.com/software/bitbucket/overview/"
 		},
 		"Atlassian Confluence": {
 			"cats": [
@@ -629,7 +709,7 @@
 			"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": [
@@ -640,7 +720,7 @@
 			},
 			"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": [
@@ -654,7 +734,7 @@
 				"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": [
@@ -666,7 +746,22 @@
 				"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
+			],
+			"html": [
+				"<[^>]+aurelia-app=[^>]",
+				"<[^>]+data-main=[^>]aurelia-bootstrapper",
+				"<[^>]+au-target-id=[^>]\\d"
+			],
+			"icon": "Aurelia.svg",
+			"script": [
+				"aurelia(?:\\.min)?\\.js"
+			],
+			"website": "http://aurelia.io"
 		},
 		"Avangate": {
 			"cats": [
@@ -676,7 +771,7 @@
 			"html": "<link[^>]* href=\"^https?://edge\\.avangate\\.net/",
 			"icon": "Avangate.svg",
 			"script": "^https?://edge\\.avangate\\.net/",
-			"website": "avangate.com"
+			"website": "http://avangate.com"
 		},
 		"BEM": {
 			"cats": [
@@ -684,7 +779,7 @@
 			],
 			"html": "<[^>]+data-bem",
 			"icon": "BEM.png",
-			"website": "en.bem.info"
+			"website": "http://en.bem.info"
 		},
 		"BIGACE": {
 			"cats": [
@@ -696,7 +791,7 @@
 			"meta": {
 				"generator": "BIGACE ([\\d.]+)\\;version:\\1"
 			},
-			"website": "bigace.de"
+			"website": "http://bigace.de"
 		},
 		"Backbone.js": {
 			"cats": [
@@ -706,7 +801,7 @@
 			"icon": "Backbone.js.png",
 			"implies": "Underscore.js",
 			"script": "backbone.*\\.js",
-			"website": "backbonejs.org"
+			"website": "http://backbonejs.org"
 		},
 		"Backdrop": {
 			"cats": [
@@ -719,7 +814,7 @@
 			"meta": {
 				"generator": "Backdrop CMS(?: (\\d))?\\;version:\\1"
 			},
-			"website": "backdropcms.org"
+			"website": "http://backdropcms.org"
 		},
 		"Banshee": {
 			"cats": [
@@ -732,7 +827,7 @@
 			"meta": {
 				"generator": "Banshee PHP"
 			},
-			"website": "www.banshee-php.org"
+			"website": "http://www.banshee-php.org"
 		},
 		"BaseHTTP": {
 			"cats": [
@@ -743,30 +838,29 @@
 			},
 			"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
 			],
 			"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
 			],
-			"env": "^compareProducts$",
-			"html": "<link href=[^>]+cdn\\d+\\.bigcommerce\\.com/v",
-			"icon": "Bigcommerce.svg",
-			"script": "cdn\\d+\\.bigcommerce\\.com/v",
+			"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": [
@@ -779,7 +873,7 @@
 			"icon": "Bigware.png",
 			"implies": "PHP",
 			"url": "(?:\\?|&)bigWAdminID=",
-			"website": "bigware.de"
+			"website": "http://bigware.de"
 		},
 		"BittAds": {
 			"cats": [
@@ -788,7 +882,7 @@
 			"env": "^bitt$",
 			"icon": "BittAds.png",
 			"script": "bittads\\.com/js/bitt\\.js$",
-			"website": "bittads.com"
+			"website": "http://bittads.com"
 		},
 		"Blesta": {
 			"cats": [
@@ -798,7 +892,7 @@
 				"Set-Cookie": "blesta_sid"
 			},
 			"icon": "Blesta.png",
-			"website": "www.blesta.com"
+			"website": "http://www.blesta.com"
 		},
 		"Blip.tv": {
 			"cats": [
@@ -806,7 +900,7 @@
 			],
 			"html": "<(?:param|embed|iframe)[^>]+blip\\.tv/play",
 			"icon": "Blip.tv.png",
-			"website": "blip.tv"
+			"website": "http://blip.tv"
 		},
 		"Blogger": {
 			"cats": [
@@ -817,7 +911,7 @@
 				"generator": "blogger"
 			},
 			"url": "\\.blogspot\\.com",
-			"website": "www.blogger.com"
+			"website": "http://www.blogger.com"
 		},
 		"Bluefish": {
 			"cats": [
@@ -827,7 +921,7 @@
 			"meta": {
 				"generator": "Bluefish(?:\\s([\\d.]+))?\\;version:\\1"
 			},
-			"website": "sourceforge.net/projects/bluefish"
+			"website": "http://sourceforge.net/projects/bluefish"
 		},
 		"Boa": {
 			"cats": [
@@ -836,17 +930,17 @@
 			"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
 			],
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "Google Analytics",
 			"script": "boba(?:\\.min)?\\.js",
-			"website": "boba.space150.com"
+			"website": "http://boba.space150.com"
 		},
 		"Bolt": {
 			"cats": [
@@ -857,7 +951,7 @@
 			"meta": {
 				"generator": "Bolt"
 			},
-			"website": "bolt.cm"
+			"website": "http://bolt.cm"
 		},
 		"Bonfire": {
 			"cats": [
@@ -869,7 +963,7 @@
 			"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": [
@@ -879,14 +973,18 @@
 			"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
 			],
+			"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": [
@@ -897,7 +995,19 @@
 			"meta": {
 				"generator": "BrowserCMS ([\\d.]+)\\;version:\\1"
 			},
-			"website": "browsercms.org"
+			"website": "http://browsercms.org"
+		},
+		"Bubble": {
+			"cats": [
+				1,
+				3,
+				18,
+				22
+			],
+			"env": "^appquery$",
+			"icon": "bubble.png",
+			"implies": "Node.js",
+			"website": "http://bubble.is"
 		},
 		"BugSense": {
 			"cats": [
@@ -906,7 +1016,7 @@
 			"env": "^BugSense$",
 			"icon": "BugSense.png",
 			"script": "bugsense\\.js",
-			"website": "bugsense.com"
+			"website": "http://bugsense.com"
 		},
 		"BugSnag": {
 			"cats": [
@@ -915,7 +1025,7 @@
 			"env": "^BugSnag$",
 			"icon": "BugSnag.png",
 			"script": "bugsnag.*\\.js",
-			"website": "bugsnag.com"
+			"website": "http://bugsnag.com"
 		},
 		"Bugzilla": {
 			"cats": [
@@ -924,7 +1034,7 @@
 			"html": "href=\"enter_bug\\.cgi\">",
 			"icon": "Bugzilla.png",
 			"implies": "Perl",
-			"website": "www.bugzilla.org"
+			"website": "http://www.bugzilla.org"
 		},
 		"Burning Board": {
 			"cats": [
@@ -936,7 +1046,7 @@
 				"PHP",
 				"Woltlab Community Framework"
 			],
-			"website": "www.woltlab.com"
+			"website": "http://www.woltlab.com"
 		},
 		"Business Catalyst": {
 			"cats": [
@@ -945,7 +1055,7 @@
 			"html": "<!-- BC_OBNW -->",
 			"icon": "Business Catalyst.png",
 			"script": "CatalystScripts",
-			"website": "businesscatalyst.com"
+			"website": "http://businesscatalyst.com"
 		},
 		"BuySellAds": {
 			"cats": [
@@ -955,21 +1065,21 @@
 			"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
 			],
 			"icon": "C++.png",
-			"website": "isocpp.org"
+			"website": "http://isocpp.org"
 		},
 		"CFML": {
 			"cats": [
 				27
 			],
 			"icon": "CFML.png",
-			"website": "adobe.com/products/coldfusion-family.html"
+			"website": "http://adobe.com/products/coldfusion-family.html"
 		},
 		"CKEditor": {
 			"cats": [
@@ -977,7 +1087,7 @@
 			],
 			"env": "^CKEDITOR$",
 			"icon": "CKEditor.png",
-			"website": "ckeditor.com"
+			"website": "http://ckeditor.com"
 		},
 		"CMS Made Simple": {
 			"cats": [
@@ -991,18 +1101,18 @@
 			"meta": {
 				"generator": "CMS Made Simple"
 			},
-			"website": "cmsmadesimple.org"
+			"website": "http://cmsmadesimple.org"
 		},
 		"CMSimple": {
 			"cats": [
 				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": [
@@ -1010,7 +1120,7 @@
 			],
 			"html": "src=[^>]+co2stats\\.com/propres\\.php",
 			"icon": "CO2Stats.png",
-			"website": "co2stats.com"
+			"website": "http://co2stats.com"
 		},
 		"CPG Dragonfly": {
 			"cats": [
@@ -1024,7 +1134,7 @@
 			"meta": {
 				"generator": "CPG Dragonfly"
 			},
-			"website": "dragonflycms.org"
+			"website": "http://dragonflycms.org"
 		},
 		"CS Cart": {
 			"cats": [
@@ -1037,7 +1147,7 @@
 			],
 			"icon": "CS Cart.png",
 			"implies": "PHP",
-			"website": "www.cs-cart.com"
+			"website": "http://www.cs-cart.com"
 		},
 		"CacheFly": {
 			"cats": [
@@ -1049,7 +1159,7 @@
 				"X-CF2": ""
 			},
 			"icon": "CacheFly.png",
-			"website": "www.cachefly.com"
+			"website": "http://www.cachefly.com"
 		},
 		"Caddy": {
 			"cats": [
@@ -1059,7 +1169,8 @@
 				"Server": "^Caddy$"
 			},
 			"icon": "caddy.svg",
-			"website": "caddyserver.com"
+			"implies": "Go",
+			"website": "http://caddyserver.com"
 		},
 		"CakePHP": {
 			"cats": [
@@ -1073,14 +1184,14 @@
 			"meta": {
 				"application-name": "CakePHP"
 			},
-			"website": "cakephp.org"
+			"website": "http://cakephp.org"
 		},
 		"Canon": {
 			"cats": [
 				40
 			],
 			"icon": "Canon.png",
-			"website": "www.canon.com"
+			"website": "http://www.canon.com"
 		},
 		"Canon HTTP Server": {
 			"cats": [
@@ -1089,11 +1200,9 @@
 			"headers": {
 				"Server": "CANON HTTP Server(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "Canon HTTP Server.png",
-			"implies": [
-				"Canon"
-			],
-			"website": "www.canon.com"
+			"icon": "Canon.png",
+			"implies": "Canon",
+			"website": "http://www.canon.com"
 		},
 		"Captch Me": {
 			"cats": [
@@ -1103,7 +1212,7 @@
 			"env": "^Captchme",
 			"icon": "Captch Me.svg",
 			"script": "^https?://api\\.captchme\\.net/",
-			"website": "captchme.com"
+			"website": "http://captchme.com"
 		},
 		"Carbon Ads": {
 			"cats": [
@@ -1113,7 +1222,7 @@
 			"html": "<[a-z]+ [^>]*id=\"carbonads-container\"",
 			"icon": "Carbon Ads.png",
 			"script": "[^\\/]*\\/\\/(?:engine|srv)\\.carbonads\\.com\\/",
-			"website": "carbonads.net"
+			"website": "http://carbonads.net"
 		},
 		"Cargo": {
 			"cats": [
@@ -1126,7 +1235,7 @@
 				"cargo_title": ""
 			},
 			"script": "/cargo\\.",
-			"website": "cargocollective.com"
+			"website": "http://cargocollective.com"
 		},
 		"Catberry.js": {
 			"cats": [
@@ -1139,7 +1248,7 @@
 			},
 			"icon": "Catberry.js.png",
 			"implies": "Node.js",
-			"website": "catberry.org"
+			"website": "http://catberry.org"
 		},
 		"Catwalk": {
 			"cats": [
@@ -1150,7 +1259,7 @@
 			},
 			"icon": "Catwalk.png",
 			"implies": "Canon",
-			"website": "www.canon.com"
+			"website": "http://www.canon.com"
 		},
 		"CentOS": {
 			"cats": [
@@ -1161,7 +1270,7 @@
 				"X-Powered-By": "CentOS"
 			},
 			"icon": "CentOS.png",
-			"website": "centos.org"
+			"website": "http://centos.org"
 		},
 		"CenteHTTPd": {
 			"cats": [
@@ -1171,7 +1280,7 @@
 				"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": [
@@ -1185,7 +1294,7 @@
 			"meta": {
 				"generator": "chameleon-cms"
 			},
-			"website": "chameleon-system.de"
+			"website": "http://chameleon-system.de"
 		},
 		"Chamilo": {
 			"cats": [
@@ -1200,7 +1309,7 @@
 			"meta": {
 				"generator": "Chamilo ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.chamilo.org"
+			"website": "http://www.chamilo.org"
 		},
 		"Chartbeat": {
 			"cats": [
@@ -1209,7 +1318,7 @@
 			"env": "^_sf_(?:endpt|async_config)$",
 			"icon": "Chartbeat.png",
 			"script": "chartbeat\\.js",
-			"website": "chartbeat.com"
+			"website": "http://chartbeat.com"
 		},
 		"Cherokee": {
 			"cats": [
@@ -1219,7 +1328,7 @@
 				"Server": "Cherokee/([\\d.]+)\\;version:\\1"
 			},
 			"icon": "Cherokee.png",
-			"website": "www.cherokee-project.com"
+			"website": "http://www.cherokee-project.com"
 		},
 		"CherryPy": {
 			"cats": [
@@ -1231,7 +1340,7 @@
 			},
 			"icon": "CherryPy.png",
 			"implies": "Python",
-			"website": "www.cherrypy.org"
+			"website": "http://www.cherrypy.org"
 		},
 		"Chitika": {
 			"cats": [
@@ -1240,7 +1349,7 @@
 			"env": "ch_c(?:lient|olor_site_link)",
 			"icon": "Chitika.png",
 			"script": "scripts\\.chitika\\.net/",
-			"website": "chitika.com"
+			"website": "http://chitika.com"
 		},
 		"Ckan": {
 			"cats": [
@@ -1257,7 +1366,7 @@
 				"Java",
 				"PostgreSQL\\;confidence:80"
 			],
-			"website": "ckan.org/"
+			"website": "http://ckan.org/"
 		},
 		"ClickHeat": {
 			"cats": [
@@ -1267,7 +1376,7 @@
 			"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": [
@@ -1275,7 +1384,7 @@
 			],
 			"env": "^ClickTale",
 			"icon": "ClickTale.png",
-			"website": "www.clicktale.com"
+			"website": "http://www.clicktale.com"
 		},
 		"Clicky": {
 			"cats": [
@@ -1284,7 +1393,7 @@
 			"env": "^clicky$",
 			"icon": "Clicky.png",
 			"script": "static\\.getclicky\\.com",
-			"website": "getclicky.com"
+			"website": "http://getclicky.com"
 		},
 		"Clientexec": {
 			"cats": [
@@ -1292,7 +1401,18 @@
 			],
 			"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": [
@@ -1303,7 +1423,7 @@
 				"Server": "cloudflare"
 			},
 			"icon": "CloudFlare.svg",
-			"website": "www.cloudflare.com"
+			"website": "http://www.cloudflare.com"
 		},
 		"Cloudera": {
 			"cats": [
@@ -1313,7 +1433,7 @@
 				"Server": "cloudera"
 			},
 			"icon": "Cloudera.png",
-			"website": "www.cloudera.com"
+			"website": "http://www.cloudera.com"
 		},
 		"CodeIgniter": {
 			"cats": [
@@ -1325,7 +1445,7 @@
 			"html": "<input[^>]+name=\"ci_csrf_token\"\\;version:2+",
 			"icon": "CodeIgniter.png",
 			"implies": "PHP",
-			"website": "codeigniter.com"
+			"website": "http://codeigniter.com"
 		},
 		"CodeMirror": {
 			"cats": [
@@ -1333,7 +1453,16 @@
 			],
 			"env": "^CodeMirror$",
 			"icon": "CodeMirror.png",
-			"website": "codemirror.net"
+			"website": "http://codemirror.net"
+		},
+		"Comandia": {
+			"cats": [
+				6
+			],
+			"env": "^Comandia$",
+			"html": "<link[^>]+=['\"]//cdn\\.mycomandia\\.com",
+			"icon": "Comandia.svg",
+			"website": "http://comandia.com"
 		},
 		"Commerce Server": {
 			"cats": [
@@ -1344,7 +1473,7 @@
 			},
 			"icon": "Commerce Server.png",
 			"implies": "Microsoft ASP.NET",
-			"website": "commerceserver.net"
+			"website": "http://commerceserver.net"
 		},
 		"CompaqHTTPServer": {
 			"cats": [
@@ -1354,7 +1483,7 @@
 				"Server": "CompaqHTTPServer\\/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "HP.svg",
-			"website": "www.hp.com"
+			"website": "http://www.hp.com"
 		},
 		"Concrete5": {
 			"cats": [
@@ -1367,7 +1496,7 @@
 				"generator": "concrete5 - ([\\d.ab]+)\\;version:\\1"
 			},
 			"script": "concrete/js/",
-			"website": "concrete5.org"
+			"website": "http://concrete5.org"
 		},
 		"Connect": {
 			"cats": [
@@ -1378,7 +1507,7 @@
 			},
 			"icon": "Connect.png",
 			"implies": "Node.js",
-			"website": "www.senchalabs.org/connect"
+			"website": "http://www.senchalabs.org/connect"
 		},
 		"Contao": {
 			"cats": [
@@ -1393,7 +1522,7 @@
 			"meta": {
 				"generator": "^Contao Open Source CMS$"
 			},
-			"website": "contao.org"
+			"website": "http://contao.org"
 		},
 		"Contenido": {
 			"cats": [
@@ -1404,7 +1533,7 @@
 			"meta": {
 				"generator": "Contenido ([\\d.]+)\\;version:\\1"
 			},
-			"website": "contenido.org/en"
+			"website": "http://contenido.org/en"
 		},
 		"Contens": {
 			"cats": [
@@ -1418,7 +1547,7 @@
 			"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": [
@@ -1430,7 +1559,7 @@
 			"meta": {
 				"generator": "ContentBox powered by ColdBox"
 			},
-			"website": "www.gocontentbox.org"
+			"website": "http://www.gocontentbox.org"
 		},
 		"ConversionLab": {
 			"cats": [
@@ -1438,7 +1567,7 @@
 			],
 			"icon": "ConversionLab.png",
 			"script": "conversionlab\\.trackset\\.com/track/tsend\\.js",
-			"website": "www.trackset.it/conversionlab"
+			"website": "http://www.trackset.it/conversionlab"
 		},
 		"Coppermine": {
 			"cats": [
@@ -1447,7 +1576,7 @@
 			"html": "<!--Coppermine Photo Gallery ([\\d.]+)\\;version:\\1",
 			"icon": "Coppermine.png",
 			"implies": "PHP",
-			"website": "coppermine-gallery.net"
+			"website": "http://coppermine-gallery.net"
 		},
 		"Cosmoshop": {
 			"cats": [
@@ -1455,7 +1584,7 @@
 			],
 			"icon": "Cosmoshop.png",
 			"script": "cosmoshop_functions\\.js",
-			"website": "cosmoshop.de"
+			"website": "http://cosmoshop.de"
 		},
 		"Cotonti": {
 			"cats": [
@@ -1466,7 +1595,7 @@
 			"meta": {
 				"generator": "Cotonti"
 			},
-			"website": "www.cotonti.com"
+			"website": "http://www.cotonti.com"
 		},
 		"CouchDB": {
 			"cats": [
@@ -1476,7 +1605,7 @@
 				"Server": "CouchDB/([\\d.]+)\\;version:\\1"
 			},
 			"icon": "CouchDB.png",
-			"website": "couchdb.apache.org"
+			"website": "http://couchdb.apache.org"
 		},
 		"Cowboy": {
 			"cats": [
@@ -1488,7 +1617,7 @@
 			},
 			"icon": "Cowboy.png",
 			"implies": "Erlang",
-			"website": "ninenines.eu"
+			"website": "http://ninenines.eu"
 		},
 		"CppCMS": {
 			"cats": [
@@ -1499,7 +1628,7 @@
 			},
 			"icon": "CppCMS.png",
 			"implies": "C++",
-			"website": "cppcms.com"
+			"website": "http://cppcms.com"
 		},
 		"Craft CMS": {
 			"cats": [
@@ -1510,8 +1639,8 @@
 				"X-Powered-By": "Craft CMS"
 			},
 			"icon": "Craft CMS.png",
-			"implies": "PHP",
-			"website": "buildwithcraft.com"
+			"implies": "Yii",
+			"website": "http://buildwithcraft.com"
 		},
 		"Crazy Egg": {
 			"cats": [
@@ -1520,7 +1649,7 @@
 			"env": "^CE2$",
 			"icon": "Crazy Egg.png",
 			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js",
-			"website": "crazyegg.com"
+			"website": "http://crazyegg.com"
 		},
 		"Criteo": {
 			"cats": [
@@ -1529,7 +1658,7 @@
 			"env": "^criteo",
 			"icon": "Criteo.svg",
 			"script": "[^/]*//(?:cas\\.criteo\\.com|(?:[^/]\\.)?criteo\\.net)/",
-			"website": "criteo.com"
+			"website": "http://criteo.com"
 		},
 		"Cross Pixel": {
 			"cats": [
@@ -1538,7 +1667,7 @@
 			"env": "^crsspxl$",
 			"icon": "Cross Pixel.png",
 			"script": "tag\\.crsspxl\\.com/s1\\.js",
-			"website": "datadesk.crsspxl.com"
+			"website": "http://datadesk.crsspxl.com"
 		},
 		"CubeCart": {
 			"cats": [
@@ -1550,7 +1679,7 @@
 			"meta": {
 				"generator": "cubecart"
 			},
-			"website": "www.cubecart.com"
+			"website": "http://www.cubecart.com"
 		},
 		"Cufon": {
 			"cats": [
@@ -1559,7 +1688,7 @@
 			"env": "^Cufon$",
 			"icon": "Cufon.png",
 			"script": "cufon-yui\\.js",
-			"website": "cufon.shoqolate.com"
+			"website": "http://cufon.shoqolate.com"
 		},
 		"D3": {
 			"cats": [
@@ -1568,7 +1697,7 @@
 			"env": "^d3$",
 			"icon": "D3.png",
 			"script": "d3(?:\\. v\\d+)?(?:\\.min)?\\.js",
-			"website": "d3js.org"
+			"website": "http://d3js.org"
 		},
 		"DHTMLX": {
 			"cats": [
@@ -1576,7 +1705,7 @@
 			],
 			"icon": "DHTMLX.png",
 			"script": "dhtmlxcommon\\.js",
-			"website": "dhtmlx.com"
+			"website": "http://dhtmlx.com"
 		},
 		"DM Polopoly": {
 			"cats": [
@@ -1585,7 +1714,7 @@
 			"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": [
@@ -1611,7 +1740,7 @@
 				"/js/dnncore\\.js",
 				"/js/dnn\\.js"
 			],
-			"website": "dnnsoftware.com"
+			"website": "http://dnnsoftware.com"
 		},
 		"DTG": {
 			"cats": [
@@ -1622,7 +1751,7 @@
 			],
 			"icon": "DTG.png",
 			"implies": "Mono.net",
-			"website": "www.dtg.nl"
+			"website": "http://www.dtg.nl"
 		},
 		"Dancer": {
 			"cats": [
@@ -1634,7 +1763,7 @@
 			},
 			"icon": "Dancer.png",
 			"implies": "Perl",
-			"website": "perldancer.org"
+			"website": "http://perldancer.org"
 		},
 		"Danneo CMS": {
 			"cats": [
@@ -1651,7 +1780,7 @@
 			"meta": {
 				"generator": "Danneo CMS ([\\d.]+)\\;version:\\1"
 			},
-			"website": "danneo.com"
+			"website": "http://danneo.com"
 		},
 		"Darwin": {
 			"cats": [
@@ -1662,7 +1791,7 @@
 				"X-Powered-By": "Darwin"
 			},
 			"icon": "Darwin.png",
-			"website": "opensource.apple.com"
+			"website": "http://opensource.apple.com"
 		},
 		"DataLife Engine": {
 			"cats": [
@@ -1677,7 +1806,7 @@
 			"meta": {
 				"generator": "DataLife Engine"
 			},
-			"website": "dle-news.ru"
+			"website": "http://dle-news.ru"
 		},
 		"DataTables": {
 			"cats": [
@@ -1686,7 +1815,7 @@
 			"icon": "DataTables.png",
 			"implies": "jQuery",
 			"script": "dataTables.*\\.js",
-			"website": "datatables.net"
+			"website": "http://datatables.net"
 		},
 		"David Webbox": {
 			"cats": [
@@ -1696,7 +1825,7 @@
 				"Server": "David-WebBox/([\\d.a]+ \\(\\d+\\))\\;version:\\1"
 			},
 			"icon": "David Webbox.png",
-			"website": "www.tobit.com"
+			"website": "http://www.tobit.com"
 		},
 		"Debian": {
 			"cats": [
@@ -1704,10 +1833,10 @@
 			],
 			"headers": {
 				"Server": "Debian",
-				"X-Powered-By": "(?:Debian|dotdeb|(sarge|etch|lenny|squeeze|wheezy|jessie))\\;version:\\1"
+				"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": [
@@ -1716,8 +1845,8 @@
 			"headers": {
 				"Server": "DECORUM(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"DedeCMS": {
 			"cats": [
@@ -1727,14 +1856,14 @@
 			"icon": "DedeCMS.png",
 			"implies": "PHP",
 			"script": "dedeajax",
-			"website": "dedecms.com"
+			"website": "http://dedecms.com"
 		},
 		"Dell": {
 			"cats": [
 				40
 			],
 			"icon": "Dell.png",
-			"website": "dell.com"
+			"website": "http://dell.com"
 		},
 		"Demandware": {
 			"cats": [
@@ -1746,7 +1875,7 @@
 			},
 			"html": "<[^>]+demandware\\.edgesuite",
 			"icon": "Demandware.png",
-			"website": "demandware.com"
+			"website": "http://demandware.com"
 		},
 		"Deployd": {
 			"cats": [
@@ -1755,7 +1884,7 @@
 			"env": "^dpd$",
 			"icon": "Deployd.png",
 			"script": "dpd\\.js",
-			"website": "deployd.com"
+			"website": "http://deployd.com"
 		},
 		"DirectAdmin": {
 			"cats": [
@@ -1770,7 +1899,7 @@
 				"PHP",
 				"Apache"
 			],
-			"website": "www.directadmin.com"
+			"website": "http://www.directadmin.com"
 		},
 		"Discourse": {
 			"cats": [
@@ -1778,13 +1907,11 @@
 			],
 			"env": "Discourse",
 			"icon": "Discourse.png",
-			"implies": [
-				"Ruby on Rails"
-			],
+			"implies": "Ruby on Rails",
 			"meta": {
 				"generator": "Discourse(?: ?/?([\\d.]+\\d))?\\;version:\\1"
 			},
-			"website": "discourse.org"
+			"website": "http://discourse.org"
 		},
 		"Discuz! X": {
 			"cats": [
@@ -1799,7 +1926,7 @@
 			"meta": {
 				"generator": "Discuz! X([\\d\\.]+)?\\;version:\\1"
 			},
-			"website": "discuz.com"
+			"website": "http://discuz.com"
 		},
 		"Disqus": {
 			"cats": [
@@ -1809,7 +1936,7 @@
 			"html": "<div[^>]+id=\"disqus_thread\"",
 			"icon": "Disqus.svg",
 			"script": "disqus_url",
-			"website": "disqus.com"
+			"website": "http://disqus.com"
 		},
 		"Django": {
 			"cats": [
@@ -1819,7 +1946,7 @@
 			"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": [
@@ -1827,7 +1954,7 @@
 			],
 			"icon": "Django CMS.png",
 			"implies": "Django",
-			"website": "django-cms.org"
+			"website": "http://django-cms.org"
 		},
 		"Dojo": {
 			"cats": [
@@ -1836,7 +1963,7 @@
 			"env": "^dojo$",
 			"icon": "Dojo.png",
 			"script": "([\\d.]+)/dojo/dojo(?:\\.xd)?\\.js\\;version:\\1",
-			"website": "dojotoolkit.org"
+			"website": "http://dojotoolkit.org"
 		},
 		"Dokeos": {
 			"cats": [
@@ -1856,7 +1983,7 @@
 			"meta": {
 				"generator": "Dokeos"
 			},
-			"website": "dokeos.com"
+			"website": "http://dokeos.com"
 		},
 		"DokuWiki": {
 			"cats": [
@@ -1870,7 +1997,7 @@
 			"meta": {
 				"generator": "DokuWiki( Release [\\-\\d]+)?\\;version:\\1"
 			},
-			"website": "www.dokuwiki.org"
+			"website": "http://www.dokuwiki.org"
 		},
 		"Dotclear": {
 			"cats": [
@@ -1878,7 +2005,7 @@
 			],
 			"icon": "Dotclear.png",
 			"implies": "PHP",
-			"website": "dotclear.org"
+			"website": "http://dotclear.org"
 		},
 		"DoubleClick Ad Exchange (AdX)": {
 			"cats": [
@@ -1890,7 +2017,7 @@
 				"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": [
@@ -1898,7 +2025,7 @@
 			],
 			"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": [
@@ -1906,7 +2033,7 @@
 			],
 			"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": [
@@ -1914,7 +2041,17 @@
 			],
 			"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
+			],
+			"html": "<link[^>]* href=\"\\/DovetailWRP\\/",
+			"icon": "DovetailWRP.png",
+			"implies": "ASP.NET",
+			"script": "\\/DovetailWRP\\/",
+			"website": "http://www.dovetailinternet.com"
 		},
 		"Doxygen": {
 			"cats": [
@@ -1925,7 +2062,7 @@
 			"meta": {
 				"generator": "Doxygen ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.stack.nl/~dimitri/doxygen/"
+			"website": "http://www.stack.nl/~dimitri/doxygen/"
 		},
 		"DreamWeaver": {
 			"cats": [
@@ -1933,7 +2070,7 @@
 			],
 			"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": [
@@ -1952,7 +2089,7 @@
 				"generator": "Drupal(?:\\s([\\d.]+))?\\;version:\\1"
 			},
 			"script": "drupal\\.js",
-			"website": "drupal.org"
+			"website": "http://drupal.org"
 		},
 		"Drupal Commerce": {
 			"cats": [
@@ -1961,7 +2098,7 @@
 			"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": [
@@ -1977,7 +2114,7 @@
 			"meta": {
 				"generator": "Dynamicweb ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.dynamicweb.dk"
+			"website": "http://www.dynamicweb.dk"
 		},
 		"Dynatrace": {
 			"cats": [
@@ -1985,7 +2122,15 @@
 			],
 			"icon": "Dynatrace.png",
 			"script": "dtagent.*\\.js",
-			"website": "dynatrace.com"
+			"website": "http://dynatrace.com"
+		},
+		"E-Commerce Paraguay": {
+			"cats": [
+				6
+			],
+			"icon": "eCommercePy.png",
+			"script": "cdn\\.e-commerceparaguay\\.com",
+			"website": "http://e-commerceparaguay.com"
 		},
 		"E-Merchant": {
 			"cats": [
@@ -1993,7 +2138,19 @@
 			],
 			"icon": "E-Merchant.png",
 			"script": "cdn\\.e-merchant\\.com",
-			"website": "e-merchant.com"
+			"website": "http://e-merchant.com"
+		},
+		"EC-CUBE": {
+			"cats": [
+				6
+			],
+			"icon": "ec-cube.png",
+			"implies": "PHP",
+			"script": [
+				"eccube\\.js",
+				"win_op\\.js"
+			],
+			"website": "http://www.ec-cube.net"
 		},
 		"ELOG": {
 			"cats": [
@@ -2001,7 +2158,7 @@
 			],
 			"html": "<title>ELOG Logbook Selection</title>",
 			"icon": "ELOG.png",
-			"website": "midas.psi.ch/elog"
+			"website": "http://midas.psi.ch/elog"
 		},
 		"ELOG HTTP": {
 			"cats": [
@@ -2010,9 +2167,9 @@
 			"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": [
@@ -2023,7 +2180,7 @@
 			},
 			"html": "<div class=\"BoxContainer\">",
 			"icon": "epages.png",
-			"website": "www.epages.com/"
+			"website": "http://www.epages.com/"
 		},
 		"EPiServer": {
 			"cats": [
@@ -2037,7 +2194,7 @@
 			"meta": {
 				"generator": "EPiServer"
 			},
-			"website": "episerver.com"
+			"website": "http://episerver.com"
 		},
 		"EPrints": {
 			"cats": [
@@ -2049,7 +2206,7 @@
 			"meta": {
 				"generator": "EPrints ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.eprints.org"
+			"website": "http://www.eprints.org"
 		},
 		"ESERV-10": {
 			"cats": [
@@ -2059,7 +2216,24 @@
 				"Server": "ESERV-10(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "ESERV-10.png",
-			"website": "www.violasystems.com"
+			"website": "http://www.violasystems.com"
+		},
+		"Etherpad": {
+			"cats": [
+				24
+			],
+			"headers": {
+				"Server": "^Etherpad"
+			},
+			"env": [
+				"^pad(?:editbar|impexp)$"
+			],
+			"script": [
+				"/ep_etherpad-lite/"
+			],
+			"icon": "etherpad.png",
+			"implies": "Node.js",
+			"website": "https://etherpad.org"
 		},
 		"EWS-NIC4": {
 			"cats": [
@@ -2070,18 +2244,18 @@
 			},
 			"icon": "EWS-NIC4.png",
 			"implies": "Dell",
-			"website": "dell.com"
+			"website": "http://dell.com"
 		},
 		"EdgeCast": {
 			"cats": [
 				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": [
@@ -2095,7 +2269,7 @@
 				"PHP",
 				"Symfony"
 			],
-			"website": "elcodi.io"
+			"website": "http://elcodi.io"
 		},
 		"Eleanor CMS": {
 			"cats": [
@@ -2106,7 +2280,7 @@
 			"meta": {
 				"generator": "Eleanor"
 			},
-			"website": "eleanor-cms.ru"
+			"website": "http://eleanor-cms.ru"
 		},
 		"Elm": {
 			"cats": [
@@ -2115,7 +2289,7 @@
 			],
 			"env": "^Elm$",
 			"icon": "Elm.png",
-			"website": "elm-lang.org"
+			"website": "http://elm-lang.org"
 		},
 		"Eloqua": {
 			"cats": [
@@ -2124,7 +2298,7 @@
 			"env": "^elq(?:SiteID|Load|CurESite)$",
 			"icon": "Oracle.png",
 			"script": "elqCfg\\.js",
-			"website": "eloqua.com"
+			"website": "http://eloqua.com"
 		},
 		"EmbedThis Appweb": {
 			"cats": [
@@ -2133,8 +2307,8 @@
 			"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": [
@@ -2143,8 +2317,8 @@
 			"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": [
@@ -2153,7 +2327,7 @@
 			"env": "^Ember$",
 			"icon": "Ember.js.png",
 			"implies": "Handlebars",
-			"website": "emberjs.com"
+			"website": "http://emberjs.com"
 		},
 		"Enyo": {
 			"cats": [
@@ -2163,17 +2337,17 @@
 			"env": "^enyo$",
 			"icon": "Enyo.png",
 			"script": "\benyo\\.js",
-			"website": "enyojs.com"
+			"website": "http://enyojs.com"
 		},
 		"Epoch": {
 			"cats": [
 				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": [
@@ -2182,7 +2356,7 @@
 			"env": "^Epom",
 			"icon": "Epom.png",
 			"url": "^https?://(?:[^/]+\\.)?ad(?:op)?shost1\\.com/",
-			"website": "epom.com"
+			"website": "http://epom.com"
 		},
 		"Erlang": {
 			"cats": [
@@ -2192,7 +2366,7 @@
 				"Server": "Erlang( OTP/(?:[\\-\\d\\.ABR]+))?\\;version:\\1"
 			},
 			"icon": "Erlang.png",
-			"website": "www.erlang.org"
+			"website": "http://www.erlang.org"
 		},
 		"Exagon Concept": {
 			"cats": [
@@ -2202,7 +2376,7 @@
 				"Server": "Exagon Server"
 			},
 			"icon": "ExagonConcept.svg",
-			"website": "www.exagon-concept.com"
+			"website": "http://www.exagon-concept.com"
 		},
 		"Exhibit": {
 			"cats": [
@@ -2211,7 +2385,7 @@
 			"env": "^Exhibit$",
 			"icon": "Exhibit.png",
 			"script": "exhibit.*\\.js",
-			"website": "simile-widgets.org/exhibit/"
+			"website": "http://simile-widgets.org/exhibit/"
 		},
 		"Express": {
 			"cats": [
@@ -2223,7 +2397,7 @@
 			},
 			"icon": "Express.png",
 			"implies": "Node.js",
-			"website": "expressjs.com"
+			"website": "http://expressjs.com"
 		},
 		"ExpressionEngine": {
 			"cats": [
@@ -2234,7 +2408,7 @@
 			},
 			"icon": "ExpressionEngine.png",
 			"implies": "PHP",
-			"website": "expressionengine.com"
+			"website": "http://expressionengine.com"
 		},
 		"ExtJS": {
 			"cats": [
@@ -2243,7 +2417,7 @@
 			"env": "^Ext$",
 			"icon": "ExtJS.png",
 			"script": "ext-base\\.js",
-			"website": "www.extjs.com"
+			"website": "http://www.extjs.com"
 		},
 		"FAST ESP": {
 			"cats": [
@@ -2251,7 +2425,7 @@
 			],
 			"html": "<form[^>]+id=\"fastsearch\"",
 			"icon": "FAST ESP.png",
-			"website": "microsoft.com/enterprisesearch"
+			"website": "http://microsoft.com/enterprisesearch"
 		},
 		"FAST Search for SharePoint": {
 			"cats": [
@@ -2264,7 +2438,7 @@
 				"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": [
@@ -2275,7 +2449,15 @@
 			"meta": {
 				"generator": "FWP Shop"
 			},
-			"website": "fwpshop.org"
+			"website": "http://fwpshop.org"
+		},
+		"Facebook": {
+			"cats": [
+				5
+			],
+			"icon": "Facebook.svg",
+			"script": "//connect\\.facebook\\.net/[^/]*/[a-z]*\\.js",
+			"website": "http://facebook.com"
 		},
 		"Fact Finder": {
 			"cats": [
@@ -2285,7 +2467,16 @@
 			"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": [
@@ -2296,7 +2487,7 @@
 			},
 			"icon": "Fat-Free Framework.png",
 			"implies": "PHP",
-			"website": "fatfreeframework.com"
+			"website": "http://fatfreeframework.com"
 		},
 		"Fedora": {
 			"cats": [
@@ -2306,7 +2497,7 @@
 				"Server": "Fedora"
 			},
 			"icon": "Fedora.png",
-			"website": "fedoraproject.org"
+			"website": "http://fedoraproject.org"
 		},
 		"Firebase": {
 			"cats": [
@@ -2314,7 +2505,7 @@
 			],
 			"icon": "Firebase.png",
 			"script": "firebase.*\\.js",
-			"website": "firebase.com"
+			"website": "http://firebase.com"
 		},
 		"Fireblade": {
 			"cats": [
@@ -2324,7 +2515,7 @@
 				"Server": "fbs"
 			},
 			"icon": "Fireblade.png",
-			"website": "fireblade.com"
+			"website": "http://fireblade.com"
 		},
 		"FlashCom": {
 			"cats": [
@@ -2333,8 +2524,8 @@
 			"headers": {
 				"Server": "FlashCom/?([\\d\\.]+)?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"Flask": {
 			"cats": [
@@ -2346,7 +2537,7 @@
 			},
 			"icon": "Flask.png",
 			"implies": "Python",
-			"website": "flask.pocoo.org"
+			"website": "http://flask.pocoo.org"
 		},
 		"FlexCMP": {
 			"cats": [
@@ -2361,7 +2552,7 @@
 			"meta": {
 				"generator": "FlexCMP"
 			},
-			"website": "www.flexcmp.com/cms/home"
+			"website": "http://www.flexcmp.com/cms/home"
 		},
 		"FluxBB": {
 			"cats": [
@@ -2369,7 +2560,8 @@
 			],
 			"html": "Powered by (?:<strong>)?<a href=\"[^>]+fluxbb",
 			"icon": "FluxBB.png",
-			"website": "fluxbb.org"
+			"implies": "PHP",
+			"website": "http://fluxbb.org"
 		},
 		"Flyspray": {
 			"cats": [
@@ -2380,15 +2572,19 @@
 			},
 			"html": "(?:<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform)",
 			"icon": "Flyspray.png",
-			"website": "flyspray.org"
+			"implies": "PHP",
+			"website": "http://flyspray.org"
 		},
 		"Font Awesome": {
 			"cats": [
 				17
 			],
-			"html": "<link[^>]* href=[^>]+font-awesome(?:\\.min)?\\.css",
+			"html": [
+				"<link[^>]* href=[^>]+font-awesome(?:\\.min)?\\.css",
+				"<script[^>]* src=[^>]+fontawesome(?:\\.js)?"
+			],
 			"icon": "Font Awesome.png",
-			"website": "fontawesome.io"
+			"website": "http://fontawesome.io"
 		},
 		"Fortune3": {
 			"cats": [
@@ -2397,7 +2593,28 @@
 			"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": [
@@ -2407,7 +2624,7 @@
 				"Server": "FreeBSD(?: ([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "FreeBSD.png",
-			"website": "freebsd.org"
+			"website": "http://freebsd.org"
 		},
 		"FreeTextBox": {
 			"cats": [
@@ -2417,7 +2634,17 @@
 			"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
+			],
+			"icon": "Froala.svg",
+			"implies": [
+				"jQuery"
+			],
+			"website": "http://froala.com/wysiwyg-editor"
 		},
 		"FrontPage": {
 			"cats": [
@@ -2428,7 +2655,7 @@
 			"meta": {
 				"generator": "Microsoft FrontPage(?:\\s((?:Express )?[\\d.]+))?\\;version:\\1"
 			},
-			"website": "office.microsoft.com/frontpage"
+			"website": "http://office.microsoft.com/frontpage"
 		},
 		"Fusion Ads": {
 			"cats": [
@@ -2437,7 +2664,7 @@
 			"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": [
@@ -2447,7 +2674,7 @@
 				"Server": "G-WAN"
 			},
 			"icon": "G-WAN.png",
-			"website": "gwan.com"
+			"website": "http://gwan.com"
 		},
 		"GX WebManager": {
 			"cats": [
@@ -2458,7 +2685,7 @@
 			"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": [
@@ -2467,7 +2694,7 @@
 			"env": "^galleryAuthToken$",
 			"html": "<div id=\"gsNavBar\" class=\"gcBorder1\">",
 			"icon": "Gallery.png",
-			"website": "gallery.menalto.com"
+			"website": "http://gallery.menalto.com"
 		},
 		"Gambio": {
 			"cats": [
@@ -2478,7 +2705,7 @@
 			"icon": "Gambio.png",
 			"implies": "PHP",
 			"script": "gm_javascript\\.js\\.php",
-			"website": "gambio.de"
+			"website": "http://gambio.de"
 		},
 		"Gauges": {
 			"cats": [
@@ -2489,7 +2716,7 @@
 				"Set-Cookie": "_gauges_[^;]+="
 			},
 			"icon": "Gauges.png",
-			"website": "get.gaug.es"
+			"website": "http://get.gaug.es"
 		},
 		"Gentoo": {
 			"cats": [
@@ -2499,7 +2726,24 @@
 				"X-Powered-By": "gentoo"
 			},
 			"icon": "Gentoo.png",
-			"website": "www.gentoo.org"
+			"website": "http://www.gentoo.org"
+		},
+		"Gerrit": {
+			"cats": [
+				47
+			],
+			"env": "^gerrit_",
+			"html": "<(?:div|style) id=\"gerrit_",
+			"icon": "gerrit.svg",
+			"implies": [
+				"Java",
+				"git"
+			],
+			"meta": {
+				"title": "^Gerrit Code Review$"
+			},
+			"script": "^gerrit_ui/gerrit_ui",
+			"website": "http://www.gerritcodereview.com"
 		},
 		"Get Satisfaction": {
 			"cats": [
@@ -2507,7 +2751,7 @@
 			],
 			"env": "^GSFN",
 			"icon": "Get Satisfaction.png",
-			"website": "getsatisfaction.com"
+			"website": "http://getsatisfaction.com"
 		},
 		"GetSimple CMS": {
 			"cats": [
@@ -2518,7 +2762,7 @@
 			"meta": {
 				"generator": "GetSimple"
 			},
-			"website": "get-simple.info"
+			"website": "http://get-simple.info"
 		},
 		"Ghost": {
 			"cats": [
@@ -2528,10 +2772,11 @@
 				"X-Ghost-Cache-Status": ""
 			},
 			"icon": "Ghost.png",
+			"implies": "Node.js",
 			"meta": {
 				"generator": "Ghost(?:\\s([\\d.]+))?\\;version:\\1"
 			},
-			"website": "ghost.org"
+			"website": "http://ghost.org"
 		},
 		"GitBook": {
 			"cats": [
@@ -2541,22 +2786,29 @@
 			"meta": {
 				"generator": "GitBook(?:.([\\d.]+))?\\;version:\\1"
 			},
-			"website": "gitbook.io"
+			"website": "http://gitbook.io"
 		},
 		"GitLab": {
 			"cats": [
 				13,
 				47
 			],
+			"env": "^GitLab$",
 			"headers": {
 				"Set-cookie": "_gitlab_session"
 			},
-			"icon": "GitLab.svg",
-			"implies": [
-				"Ruby",
-				"Ruby on Rails"
+			"html": [
+				"<meta content=\"https?://[^/]+/assets/gitlab_logo-",
+				"GitLab</title>",
+				"<header class=\"navbar navbar-fixed-top navbar-gitlab with-horizontal-nav\">"
 			],
-			"website": "about.gitlab.com"
+			"icon": "GitLab.svg",
+			"implies": "Ruby on Rails",
+			"meta": {
+				"description": "^GitLab",
+				"og:site_name": "^GitLab$"
+			},
+			"website": "http://about.gitlab.com"
 		},
 		"GitLab CI": {
 			"cats": [
@@ -2564,14 +2816,35 @@
 				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
+			],
+			"html": [
+				"<!-- gitphp web interface ([\\d.]+)\\;version:\\1",
+				"<a href=\"http://www.gitphp.org/\" target=\"_blank\">GitPHP by Chris Han"
+			],
+			"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": [
@@ -2584,7 +2857,7 @@
 			"implies": [
 				"Java"
 			],
-			"website": "glassfish.java.net"
+			"website": "http://glassfish.java.net"
 		},
 		"Glyphicons": {
 			"cats": [
@@ -2592,7 +2865,7 @@
 			],
 			"html": "(?:<link[^>]* href=[^>]+glyphicons(?:\\.min)?\\.css|<img[^>]* src=[^>]+glyphicons)",
 			"icon": "Glyphicons.png",
-			"website": "glyphicons.com"
+			"website": "http://glyphicons.com"
 		},
 		"GoAhead": {
 			"cats": [
@@ -2602,7 +2875,7 @@
 				"Server": "GoAhead"
 			},
 			"icon": "GoAhead.png",
-			"website": "embedthis.com/products/goahead/index.html"
+			"website": "http://embedthis.com/products/goahead/index.html"
 		},
 		"GoStats": {
 			"cats": [
@@ -2610,7 +2883,25 @@
 			],
 			"env": "^_go(?:stats|_track)",
 			"icon": "GoStats.png",
-			"website": "gostats.com"
+			"website": "http://gostats.com"
+		},
+		"Gogs": {
+			"cats": [
+				47
+			],
+			"headers": {
+				"Set-Cookie": "i_like_gogits="
+			},
+			"html": [
+				"<div class=\"ui left\">\n\\s+© \\d{4} Gogs Version: ([\\d.]+) Page:\\;version:\\1",
+				"<button class=\"ui basic clone button\" id=\"repo-clone-ssh\" data-link=\"gogs@"
+			],
+			"icon": "gogs.png",
+			"meta": {
+				"keywords": "go, git, self-hosted, gogs"
+			},
+			"script": "js/gogs\\.js",
+			"website": "http://gogs.io"
 		},
 		"Google AdSense": {
 			"cats": [
@@ -2628,7 +2919,7 @@
 				"2mdn\\.net",
 				"ad\\.ca\\.doubleclick\\.net"
 			],
-			"website": "google.com/adsense"
+			"website": "http://google.com/adsense"
 		},
 		"Google Analytics": {
 			"cats": [
@@ -2639,8 +2930,8 @@
 				"Set-Cookie": "__utma"
 			},
 			"icon": "Google Analytics.svg",
-			"script": "^https?://[^\\/]+\\.google-analytics\\.com\\/(?:ga|urchin|(analytics))\\.js\\;version:\\1?UA:",
-			"website": "google.com/analytics"
+			"script": "google-analytics\\.com\\/(?:ga|urchin|(analytics))\\.js\\;version:\\1?UA:",
+			"website": "http://google.com/analytics"
 		},
 		"Google App Engine": {
 			"cats": [
@@ -2650,7 +2941,7 @@
 				"Server": "Google Frontend"
 			},
 			"icon": "Google App Engine.png",
-			"website": "code.google.com/appengine"
+			"website": "http://code.google.com/appengine"
 		},
 		"Google Charts": {
 			"cats": [
@@ -2658,7 +2949,7 @@
 			],
 			"env": "^__g(?:oogleVisualizationAbstractRendererElementsCount|vizguard)__$",
 			"icon": "Google Charts.png",
-			"website": "developers.google.com/chart/"
+			"website": "http://developers.google.com/chart/"
 		},
 		"Google Code Prettify": {
 			"cats": [
@@ -2666,7 +2957,7 @@
 			],
 			"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": [
@@ -2676,7 +2967,7 @@
 			"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": [
@@ -2687,7 +2978,7 @@
 				"(?: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": [
@@ -2699,7 +2990,15 @@
 				"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
+			],
+			"icon": "Google Plus.svg",
+			"script": "apis\\.google\\.com/js/[a-z]*\\.js",
+			"website": "http://plus.google.com"
 		},
 		"Google Sites": {
 			"cats": [
@@ -2707,16 +3006,19 @@
 			],
 			"icon": "Google Sites.png",
 			"url": "sites\\.google\\.com",
-			"website": "sites.google.com"
+			"website": "http://sites.google.com"
 		},
 		"Google Tag Manager": {
 			"cats": [
 				42
 			],
-			"env": "^googletag$",
+			"env": [
+				"^googletag$",
+				"^google_tag_manager$"
+			],
 			"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": [
@@ -2727,7 +3029,7 @@
 				"checkout\\.google\\.com",
 				"wallet\\.google\\.com"
 			],
-			"website": "wallet.google.com"
+			"website": "http://wallet.google.com"
 		},
 		"Google Web Server": {
 			"cats": [
@@ -2737,7 +3039,7 @@
 				"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": [
@@ -2749,7 +3051,7 @@
 			"meta": {
 				"gwt:property": ""
 			},
-			"website": "developers.google.com/web-toolkit"
+			"website": "http://developers.google.com/web-toolkit"
 		},
 		"Graffiti CMS": {
 			"cats": [
@@ -2759,11 +3061,12 @@
 				"Set-Cookie": "graffitibot[^;]="
 			},
 			"icon": "Graffiti CMS.png",
+			"implies": "Microsoft ASP.NET",
 			"meta": {
 				"generator": "Graffiti CMS ([^\"]+)\\;version:\\1"
 			},
 			"script": "/graffiti\\.js",
-			"website": "graffiticms.codeplex.com"
+			"website": "http://graffiticms.codeplex.com"
 		},
 		"Grandstream": {
 			"cats": [
@@ -2774,20 +3077,18 @@
 				"Server": "Grandstream\\/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "Grandstream.png",
-			"website": "www.grandstream.com"
+			"website": "http://www.grandstream.com"
 		},
 		"Grav": {
 			"cats": [
 				1
 			],
 			"icon": "Grav.png",
-			"implies": [
-				"PHP"
-			],
+			"implies": "PHP",
 			"meta": {
 				"generator": "GravCMS(?:\\s([\\d.]+))?\\;version:\\1"
 			},
-			"website": "getgrav.org"
+			"website": "http://getgrav.org"
 		},
 		"Gravatar": {
 			"cats": [
@@ -2796,7 +3097,21 @@
 			"env": "^Gravatar$",
 			"html": "<[^>]+gravatar\\.com/avatar/",
 			"icon": "Gravatar.png",
-			"website": "gravatar.com"
+			"website": "http://gravatar.com"
+		},
+		"Gravity Forms": {
+			"cats": [
+				19
+			],
+			"html": [
+				"<div class=(?:\"|')[^>]*gform_wrapper",
+				"<div class=(?:\"|')[^>]*gform_body",
+				"<ul [^>]*class=(?:\"|')[^>]*gform_fields",
+				"<link [^>]*href=(?:\"|')[^>]*wp-content/plugins/gravityforms/css/"
+			],
+			"icon": "gravityforms.svg",
+			"implies": "WordPress",
+			"website": "http://gravityforms.com"
 		},
 		"Gravity Insights": {
 			"cats": [
@@ -2804,7 +3119,7 @@
 			],
 			"env": "^GravityInsights$",
 			"icon": "Gravity Insights.png",
-			"website": "insights.gravity.com"
+			"website": "http://insights.gravity.com"
 		},
 		"Green Valley CMS": {
 			"cats": [
@@ -2812,10 +3127,11 @@
 			],
 			"html": "<img[^>]+/dsresource\\?objectid=",
 			"icon": "Green Valley CMS.png",
+			"implies": "Apache Tomcat",
 			"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": [
@@ -2823,7 +3139,7 @@
 			],
 			"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": [
@@ -2834,14 +3150,14 @@
 			},
 			"icon": "HHVM.png",
 			"implies": "PHP\\;confidence:50",
-			"website": "hhvm.com"
+			"website": "http://hhvm.com"
 		},
 		"HP": {
 			"cats": [
 				40
 			],
 			"icon": "HP.svg",
-			"website": "hp.com"
+			"website": "http://hp.com"
 		},
 		"HP ChaiServer": {
 			"cats": [
@@ -2851,10 +3167,8 @@
 				"Server": "HP-Chai(?:Server|SOE)(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "HP.svg",
-			"implies": [
-				"HP"
-			],
-			"website": "hp.com"
+			"implies": "HP",
+			"website": "http://hp.com"
 		},
 		"HP Compact Server": {
 			"cats": [
@@ -2864,14 +3178,14 @@
 				"Server": "HP_Compact_Server(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "HP.svg",
-			"website": "hp.com"
+			"website": "http://hp.com"
 		},
 		"HP ProCurve": {
 			"cats": [
 				37
 			],
 			"icon": "HP.svg",
-			"website": "hp.com/networking"
+			"website": "http://hp.com/networking"
 		},
 		"HP System Management": {
 			"cats": [
@@ -2881,7 +3195,7 @@
 				"Server": "HP System Management"
 			},
 			"icon": "HP.svg",
-			"website": "hp.com"
+			"website": "http://hp.com"
 		},
 		"HP iLO": {
 			"cats": [
@@ -2892,7 +3206,7 @@
 				"Server": "HP-iLO-Server(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "HP.svg",
-			"website": "hp.com"
+			"website": "http://hp.com"
 		},
 		"HTTP Kit": {
 			"cats": [
@@ -2901,9 +3215,9 @@
 			"headers": {
 				"Server": "^http-kit"
 			},
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "Java",
-			"website": "http-kit.org"
+			"website": "http://http-kit.org"
 		},
 		"HTTP-Server": {
 			"cats": [
@@ -2912,8 +3226,8 @@
 			"headers": {
 				"Server": "(?:^|[^-])\bHTTP-Server(?: ?/?V?([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"HTTP/2": {
 			"cats": [
@@ -2923,8 +3237,17 @@
 			"headers": {
 				"X-Firefox-Spdy": "h2"
 			},
-			"icon": "default.png",
-			"website": "http2.github.io"
+			"icon": "http2.png",
+			"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": [
@@ -2933,7 +3256,7 @@
 			"env": "^Hammer$",
 			"icon": "Hammer.js.png",
 			"script": "hammer(?:\\.min)?\\.js",
-			"website": "hammerjs.github.io"
+			"website": "http://hammerjs.github.io"
 		},
 		"Handlebars": {
 			"cats": [
@@ -2943,7 +3266,7 @@
 			"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": [
@@ -2952,16 +3275,16 @@
 			"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
 			],
 			"icon": "Haskell.png",
-			"website": "wiki.haskell.org/Haskell"
+			"website": "http://wiki.haskell.org/Haskell"
 		},
 		"HeadJS": {
 			"cats": [
@@ -2971,7 +3294,7 @@
 			"html": "<[^>]*data-headjs-load",
 			"icon": "HeadJS.png",
 			"script": "head\\.(?:core|load)(?:\\.min)?\\.js",
-			"website": "headjs.com"
+			"website": "http://headjs.com"
 		},
 		"Heap": {
 			"cats": [
@@ -2980,7 +3303,7 @@
 			"env": "^heap$",
 			"icon": "Heap.png",
 			"script": "heap-\\d+.js",
-			"website": "heapanalytics.com"
+			"website": "http://heapanalytics.com"
 		},
 		"Hello Bar": {
 			"cats": [
@@ -2989,7 +3312,7 @@
 			"env": "^HelloBar$",
 			"icon": "Hello Bar.png",
 			"script": "hellobar\\.js",
-			"website": "hellobar.com"
+			"website": "http://hellobar.com"
 		},
 		"Hiawatha": {
 			"cats": [
@@ -2999,7 +3322,7 @@
 				"Server": "Hiawatha v([\\d.]+)\\;version:\\1"
 			},
 			"icon": "Hiawatha.png",
-			"website": "hiawatha-webserver.org"
+			"website": "http://hiawatha-webserver.org"
 		},
 		"Highcharts": {
 			"cats": [
@@ -3009,16 +3332,16 @@
 			"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
 			],
 			"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": [
@@ -3026,7 +3349,7 @@
 			],
 			"html": "<[^>]+/binaries/(?:[^/]+/)*content/gallery/",
 			"icon": "Hippo.png",
-			"website": "onehippo.org"
+			"website": "http://onehippo.org"
 		},
 		"Hogan.js": {
 			"cats": [
@@ -3038,7 +3361,7 @@
 				"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": [
@@ -3048,10 +3371,11 @@
 				"Set-Cookie": "hotaru_mobile="
 			},
 			"icon": "Hotaru CMS.png",
+			"implies": "PHP",
 			"meta": {
 				"generator": "Hotaru CMS"
 			},
-			"website": "hotarucms.org"
+			"website": "http://hotarucms.org"
 		},
 		"HubSpot": {
 			"cats": [
@@ -3060,7 +3384,7 @@
 			"env": "^(?:_hsq|hubspot)$",
 			"html": "<!-- Start of Async HubSpot",
 			"icon": "HubSpot.png",
-			"website": "hubspot.com"
+			"website": "http://hubspot.com"
 		},
 		"Hugo": {
 			"cats": [
@@ -3071,7 +3395,7 @@
 			"meta": {
 				"generator": "Hugo ([\\d.]+)?\\;version:\\1"
 			},
-			"website": "gohugo.io"
+			"website": "http://gohugo.io"
 		},
 		"Hybris": {
 			"cats": [
@@ -3083,7 +3407,7 @@
 			"html": "<[^>]+(?:/sys_master/|/hybr/|/_ui/desktop/)",
 			"icon": "Hybris.png",
 			"implies": "Java",
-			"website": "hybris.com"
+			"website": "http://hybris.com"
 		},
 		"IBM Coremetrics": {
 			"cats": [
@@ -3091,7 +3415,7 @@
 			],
 			"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": [
@@ -3101,7 +3425,7 @@
 				"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": [
@@ -3111,16 +3435,17 @@
 				"Server": "TSM_HTTP(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "IBM.svg",
-			"website": "ibm.com"
+			"website": "http://ibm.com"
 		},
 		"IBM WebSphere Commerce": {
 			"cats": [
 				6
 			],
+			"html": "href=\"(?:\\/|[^>]+)webapp\\/wcs\\/",
 			"icon": "IBM.svg",
 			"implies": "Java",
 			"url": "/wcs/",
-			"website": "ibm.com/software/genservers/commerceproductline"
+			"website": "http://ibm.com/software/genservers/commerceproductline"
 		},
 		"IBM WebSphere Portal": {
 			"cats": [
@@ -3133,7 +3458,7 @@
 			"icon": "IBM.svg",
 			"implies": "Java",
 			"url": "/wps/",
-			"website": "ibm.com/software/websphere/portal"
+			"website": "http://ibm.com/software/websphere/portal"
 		},
 		"IIS": {
 			"cats": [
@@ -3144,7 +3469,7 @@
 			},
 			"icon": "IIS.png",
 			"implies": "Windows Server",
-			"website": "www.iis.net"
+			"website": "http://www.iis.net"
 		},
 		"INFOnline": {
 			"cats": [
@@ -3156,7 +3481,7 @@
 			],
 			"icon": "INFOnline.png",
 			"script": "^https?://(?:[^/]+\\.)?i(?:oam|v)wbox\\.de/",
-			"website": "infonline.de"
+			"website": "http://infonline.de"
 		},
 		"IPB": {
 			"cats": [
@@ -3165,8 +3490,12 @@
 			"env": "^(?:IPBoard$|ipb_var|ipsSettings)",
 			"html": "<link[^>]+ipb_[^>]+\\.css",
 			"icon": "IPB.png",
+			"implies": [
+				"PHP",
+				"MySQL"
+			],
 			"script": "jscripts/ips_",
-			"website": "www.invisionpower.com"
+			"website": "http://www.invisionpower.com"
 		},
 		"Immutable.js": {
 			"cats": [
@@ -3175,7 +3504,7 @@
 			"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": [
@@ -3191,7 +3520,7 @@
 				"generator": "ImpressCMS"
 			},
 			"script": "include/linkexternal\\.js",
-			"website": "www.impresscms.org"
+			"website": "http://www.impresscms.org"
 		},
 		"ImpressPages": {
 			"cats": [
@@ -3202,7 +3531,7 @@
 			"meta": {
 				"generator": "ImpressPages(?: CMS)?( [\\d.]*)\\;version:\\1"
 			},
-			"website": "impresspages.org"
+			"website": "http://impresspages.org"
 		},
 		"InProces": {
 			"cats": [
@@ -3211,7 +3540,7 @@
 			"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": [
@@ -3221,14 +3550,14 @@
 				"X-CDN": "Incapsula"
 			},
 			"icon": "Incapsula.png",
-			"website": "www.incapsula.com"
+			"website": "http://www.incapsula.com"
 		},
 		"Indexhibit": {
 			"cats": [
 				1
 			],
 			"html": "<(?:link|a href) [^>]+ndxz-studio",
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": [
 				"PHP",
 				"Apache",
@@ -3237,7 +3566,7 @@
 			"meta": {
 				"generator": "Indexhibit"
 			},
-			"website": "www.indexhibit.org"
+			"website": "http://www.indexhibit.org"
 		},
 		"Indico": {
 			"cats": [
@@ -3248,7 +3577,7 @@
 			},
 			"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": [
@@ -3257,17 +3586,19 @@
 			"headers": {
 				"Server": "Indy(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "indyproject.org"
+			"icon": "default.svg",
+			"website": "http://indyproject.org"
 		},
-		"Ink": {
+		"Infusionsoft": {
 			"cats": [
-				18
+				32
 			],
-			"html": "<link [^>]*href=\"[^\"]+ink(?:\\.min)?\\.css",
-			"icon": "Ink.png",
-			"script": "ink.*\\.js",
-			"website": "ink.sapo.pt"
+			"html": [
+				"<input [^>]*name=\"infusionsoft_version\" [^>]*value=\"([^>]*)\" [^>]*\\/>\\;version:\\1",
+				"<input [^>]*value=\"([^>]*)\" [^>]*name=\"infusionsoft_version\" [^>]*\\/>\\;version:\\1"
+			],
+			"icon": "infusionsoft.svg",
+			"website": "http://infusionsoft.com"
 		},
 		"InstantCMS": {
 			"cats": [
@@ -3277,10 +3608,11 @@
 				"Set-Cookie": "InstantCMS\\[logdate\\]="
 			},
 			"icon": "InstantCMS.png",
+			"implies": "PHP",
 			"meta": {
 				"generator": "InstantCMS"
 			},
-			"website": "www.instantcms.ru"
+			"website": "http://www.instantcms.ru"
 		},
 		"Intel Active Management Technology": {
 			"cats": [
@@ -3291,7 +3623,7 @@
 				"Server": "Intel\\(R\\) Active Management Technology(?: ([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Intel Active Management Technology.png",
-			"website": "intel.com"
+			"website": "http://intel.com"
 		},
 		"IntenseDebate": {
 			"cats": [
@@ -3299,7 +3631,7 @@
 			],
 			"icon": "IntenseDebate.png",
 			"script": "intensedebate\\.com",
-			"website": "intensedebate.com"
+			"website": "http://intensedebate.com"
 		},
 		"Intercom": {
 			"cats": [
@@ -3308,7 +3640,7 @@
 			"env": "^Intercom$",
 			"icon": "Intercom.png",
 			"script": "(?:api\\.intercom\\.io/api|static\\.intercomcdn\\.com/intercom\\.v1)",
-			"website": "intercom.io"
+			"website": "http://intercom.io"
 		},
 		"Intershop": {
 			"cats": [
@@ -3316,7 +3648,7 @@
 			],
 			"icon": "Intershop.png",
 			"script": "(?:is-bin|INTERSHOP)",
-			"website": "intershop.com"
+			"website": "http://intershop.com"
 		},
 		"Invenio": {
 			"cats": [
@@ -3327,7 +3659,7 @@
 			},
 			"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": [
@@ -3335,7 +3667,7 @@
 			],
 			"html": "<link[^>]* href=[^>]+ionicons(?:\\.min)?\\.css",
 			"icon": "Ionicons.png",
-			"website": "ionicons.com"
+			"website": "http://ionicons.com"
 		},
 		"JAlbum": {
 			"cats": [
@@ -3346,7 +3678,7 @@
 			"meta": {
 				"generator": "JAlbum( [\\d.]+)?\\;version:\\1"
 			},
-			"website": "jalbum.net/en"
+			"website": "http://jalbum.net/en"
 		},
 		"JBoss Application Server": {
 			"cats": [
@@ -3356,7 +3688,7 @@
 				"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": [
@@ -3368,7 +3700,7 @@
 			},
 			"icon": "JBoss Web.png",
 			"implies": "JBoss Application Server",
-			"website": "jboss.org/jbossweb"
+			"website": "http://jboss.org/jbossweb"
 		},
 		"JC-HTTPD": {
 			"cats": [
@@ -3379,10 +3711,8 @@
 				"Server": "JC-HTTPD(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "JC-HTTPD.png",
-			"implies": [
-				"Canon"
-			],
-			"website": "canon.com"
+			"implies": "Canon",
+			"website": "http://canon.com"
 		},
 		"JS Charts": {
 			"cats": [
@@ -3391,7 +3721,7 @@
 			"env": "^JSChart$",
 			"icon": "JS Charts.png",
 			"script": "jscharts.*\\.js",
-			"website": "www.jscharts.com"
+			"website": "http://www.jscharts.com"
 		},
 		"JTL Shop": {
 			"cats": [
@@ -3402,7 +3732,7 @@
 			},
 			"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": [
@@ -3412,7 +3742,7 @@
 			"meta": {
 				"generator": "Jalios"
 			},
-			"website": "www.jalios.com"
+			"website": "http://www.jalios.com"
 		},
 		"Java": {
 			"cats": [
@@ -3422,7 +3752,7 @@
 				"Set-Cookie": "JSESSIONID"
 			},
 			"icon": "Java.png",
-			"website": "java.com"
+			"website": "http://java.com"
 		},
 		"Java Servlet": {
 			"cats": [
@@ -3433,7 +3763,16 @@
 			},
 			"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": [
@@ -3444,7 +3783,7 @@
 			},
 			"icon": "JavaServer Faces.png",
 			"implies": "Java",
-			"website": "javaserverfaces.java.net"
+			"website": "http://javaserverfaces.java.net"
 		},
 		"JavaServer Pages": {
 			"cats": [
@@ -3455,16 +3794,7 @@
 			},
 			"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": [
@@ -3475,7 +3805,7 @@
 			"meta": {
 				"generator": "Jekyll (v[\\d.]+)?\\;version:\\1"
 			},
-			"website": "jekyllrb.com"
+			"website": "http://jekyllrb.com"
 		},
 		"Jenkins": {
 			"cats": [
@@ -3485,7 +3815,8 @@
 				"X-Jenkins": "([\\d\\.]+)\\;version:\\1"
 			},
 			"icon": "Jenkins.png",
-			"website": "jenkins-ci.org"
+			"implies": "Java",
+			"website": "http://jenkins-ci.org"
 		},
 		"Jetty": {
 			"cats": [
@@ -3496,7 +3827,19 @@
 			},
 			"icon": "Jetty.png",
 			"implies": "Java",
-			"website": "www.eclipse.org/jetty"
+			"website": "http://www.eclipse.org/jetty"
+		},
+		"Jimdo": {
+			"cats": [
+				1
+			],
+			"env": "^jimdo_(?:Data|Gen\\d+)$",
+			"headers": {
+				"X-Jimdo-Instance": "",
+				"X-Jimdo-Wid": ""
+			},
+			"icon": "jimdo.png",
+			"website": "http://www.jimdo.com/"
 		},
 		"Jirafe": {
 			"cats": [
@@ -3506,7 +3849,21 @@
 			"env": "^jirafe$",
 			"icon": "Jirafe.png",
 			"script": "/jirafe\\.js",
-			"website": "jirafe.com"
+			"website": "http://jirafe.com"
+		},
+		"Jive": {
+			"cats": [
+				19
+			],
+			"headers": {
+				"X-JIVE-USER-ID": "",
+				"X-JSL": "",
+				"X-Jive-Flow-Id": "",
+				"X-Jive-Request-Id": "",
+				"x-jive-chrome-wrapped": ""
+			},
+			"icon": "Jive.png",
+			"website": "http://www.jivesoftware.com"
 		},
 		"Jo": {
 			"cats": [
@@ -3515,7 +3872,7 @@
 			],
 			"env": "^jo(?:Cache|DOM|Event)$",
 			"icon": "Jo.png",
-			"website": "joapp.com"
+			"website": "http://joapp.com"
 		},
 		"JobberBase": {
 			"cats": [
@@ -3523,10 +3880,11 @@
 			],
 			"env": "^Jobber$",
 			"icon": "JobberBase.png",
+			"implies": "PHP",
 			"meta": {
 				"generator": "Jobberbase"
 			},
-			"website": "jobberbase.com"
+			"website": "http://jobberbase.com"
 		},
 		"Joomla": {
 			"cats": [
@@ -3543,7 +3901,7 @@
 				"generator": "Joomla!(?: ([\\d.]+))?\\;version:\\1"
 			},
 			"url": "option=com_",
-			"website": "joomla.org"
+			"website": "http://joomla.org"
 		},
 		"K2": {
 			"cats": [
@@ -3553,7 +3911,7 @@
 			"html": "<!--(?: JoomlaWorks \"K2\"| Start K2)",
 			"icon": "K2.png",
 			"implies": "Joomla",
-			"website": "getk2.org"
+			"website": "http://getk2.org"
 		},
 		"KISSmetrics": {
 			"cats": [
@@ -3561,7 +3919,7 @@
 			],
 			"env": "^KM_COOKIE_DOMAIN$",
 			"icon": "KISSmetrics.png",
-			"website": "www.kissmetrics.com"
+			"website": "http://www.kissmetrics.com"
 		},
 		"KS_HTTP": {
 			"cats": [
@@ -3572,7 +3930,7 @@
 			},
 			"icon": "KS_HTTP.png",
 			"implies": "Canon",
-			"website": "www.canon.com"
+			"website": "http://www.canon.com"
 		},
 		"Kampyle": {
 			"cats": [
@@ -3585,7 +3943,19 @@
 			},
 			"icon": "Kampyle.png",
 			"script": "cf\\.kampyle\\.com/k_button\\.js",
-			"website": "www.kampyle.com"
+			"website": "http://www.kampyle.com"
+		},
+		"Kamva": {
+			"cats": [
+				6
+			],
+			"env": "^Kamva$",
+			"icon": "Kamva.svg",
+			"meta": {
+				"generator": "[CK]amva"
+			},
+			"script": "cdn\\.mykamva\\.ir",
+			"website": "http://kamva.ir"
 		},
 		"Kendo UI": {
 			"cats": [
@@ -3595,7 +3965,7 @@
 			"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": [
@@ -3608,7 +3978,32 @@
 			"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
+			],
+			"headers": {
+				"kbn-name": "kibana",
+				"kbn-version": "^([\\d.]+)$\\;version:\\1"
+			},
+			"html": "<title>Kibana</title>",
+			"icon": "kibana.svg",
+			"implies": "Node.js",
+			"url": "kibana#/dashboard/",
+			"website": "http://www.elastic.co/products/kibana"
 		},
 		"KineticJS": {
 			"cats": [
@@ -3617,7 +4012,17 @@
 			"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
+			],
+			"env": "^_klarnaCheckout$",
+			"icon": "Klarna.svg",
+			"website": "http://klarna.com"
 		},
 		"Knockout.js": {
 			"cats": [
@@ -3625,7 +4030,7 @@
 			],
 			"env": "^ko$",
 			"icon": "Knockout.js.png",
-			"website": "knockoutjs.com"
+			"website": "http://knockoutjs.com"
 		},
 		"Koa": {
 			"cats": [
@@ -3637,7 +4042,7 @@
 			},
 			"icon": "Koa.png",
 			"implies": "Node.js",
-			"website": "koajs.com"
+			"website": "http://koajs.com"
 		},
 		"Koala Framework": {
 			"cats": [
@@ -3650,7 +4055,7 @@
 			"meta": {
 				"generator": "^Koala Web Framework CMS"
 			},
-			"website": "koala-framework.org"
+			"website": "http://koala-framework.org"
 		},
 		"Koego": {
 			"cats": [
@@ -3659,7 +4064,7 @@
 			"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": [
@@ -3671,7 +4076,7 @@
 			},
 			"icon": "Kohana.png",
 			"implies": "PHP",
-			"website": "kohanaframework.org"
+			"website": "http://kohanaframework.org"
 		},
 		"Koken": {
 			"cats": [
@@ -3693,7 +4098,7 @@
 				"generator": "Koken ([\\d.]+)\\;version:\\1"
 			},
 			"script": "koken(?:\\.js\\?([\\d.]+)|/storage)\\;version:\\1",
-			"website": "koken.me"
+			"website": "http://koken.me"
 		},
 		"Kolibri CMS": {
 			"cats": [
@@ -3702,11 +4107,11 @@
 			"headers": {
 				"X-Powered-By": "Kolibri"
 			},
-			"icon": "default.png",
+			"icon": "default.svg",
 			"meta": {
 				"generator": "Kolibri"
 			},
-			"website": "alias.io"
+			"website": "http://alias.io"
 		},
 		"Komodo CMS": {
 			"cats": [
@@ -3717,7 +4122,7 @@
 			"meta": {
 				"generator": "^Komodo CMS"
 			},
-			"website": "www.komodocms.com"
+			"website": "http://www.komodocms.com"
 		},
 		"Koobi": {
 			"cats": [
@@ -3728,7 +4133,7 @@
 			"meta": {
 				"generator": "Koobi"
 			},
-			"website": "dream4.de/cms"
+			"website": "http://dream4.de/cms"
 		},
 		"Kooboo CMS": {
 			"cats": [
@@ -3740,7 +4145,7 @@
 			"icon": "Kooboo CMS.png",
 			"implies": "Microsoft ASP.NET",
 			"script": "/Kooboo",
-			"website": "kooboo.com"
+			"website": "http://kooboo.com"
 		},
 		"Kotisivukone": {
 			"cats": [
@@ -3748,7 +4153,7 @@
 			],
 			"icon": "Kotisivukone.png",
 			"script": "kotisivukone(?:\\.min)?\\.js",
-			"website": "www.kotisivukone.fi"
+			"website": "http://www.kotisivukone.fi"
 		},
 		"LEPTON": {
 			"cats": [
@@ -3762,7 +4167,7 @@
 			"meta": {
 				"generator": "LEPTON"
 			},
-			"website": "www.lepton-cms.org"
+			"website": "http://www.lepton-cms.org"
 		},
 		"LabVIEW": {
 			"cats": [
@@ -3772,7 +4177,7 @@
 				"Server": "LabVIEW(?:/([\\d\\.]+))?\\;version:\\1"
 			},
 			"icon": "LabVIEW.png",
-			"website": "ni.com/labview"
+			"website": "http://ni.com/labview"
 		},
 		"Laravel": {
 			"cats": [
@@ -3783,15 +4188,15 @@
 			},
 			"icon": "Laravel.png",
 			"implies": "PHP",
-			"website": "laravel.com"
+			"website": "http://laravel.com"
 		},
 		"Lazy.js": {
 			"cats": [
 				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": [
@@ -3799,7 +4204,7 @@
 			],
 			"icon": "Leaflet.png",
 			"script": "leaflet.*\\.js",
-			"website": "leafletjs.com"
+			"website": "http://leafletjs.com"
 		},
 		"Less": {
 			"cats": [
@@ -3807,7 +4212,7 @@
 			],
 			"html": "<link[^>]+ rel=\"stylesheet/less\"",
 			"icon": "Less.png",
-			"website": "lesscss.org"
+			"website": "http://lesscss.org"
 		},
 		"Liferay": {
 			"cats": [
@@ -3818,7 +4223,7 @@
 				"Liferay-Portal": "[a-z\\s]+([\\d.]+)\\;version:\\1"
 			},
 			"icon": "Liferay.png",
-			"website": "www.liferay.com"
+			"website": "http://www.liferay.com"
 		},
 		"Lift": {
 			"cats": [
@@ -3829,7 +4234,7 @@
 			},
 			"icon": "Lift.png",
 			"implies": "Scala",
-			"website": "liftweb.net"
+			"website": "http://liftweb.net"
 		},
 		"LightMon Engine": {
 			"cats": [
@@ -3840,13 +4245,11 @@
 			},
 			"html": "<!-- Lightmon Engine Copyright Lightmon",
 			"icon": "LightMon Engine.png",
-			"implies": [
-				"PHP"
-			],
+			"implies": "PHP",
 			"meta": {
 				"generator": "LightMon Engine"
 			},
-			"website": "lightmon.ru"
+			"website": "http://lightmon.ru"
 		},
 		"Lightbox": {
 			"cats": [
@@ -3856,7 +4259,7 @@
 			"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": [
@@ -3866,7 +4269,7 @@
 			"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": [
@@ -3877,7 +4280,7 @@
 			},
 			"icon": "Lighty.png",
 			"implies": "PHP",
-			"website": "gitlab.com/lighty/framework"
+			"website": "http://gitlab.com/lighty/framework"
 		},
 		"LimeSurvey": {
 			"cats": [
@@ -3887,7 +4290,7 @@
 				"generator": "LimeSurvey"
 			},
 			"icon": "LimeSurvey.png",
-			"website": "limesurvey.org/"
+			"website": "http://limesurvey.org/"
 		},
 		"LinkSmart": {
 			"cats": [
@@ -3896,7 +4299,15 @@
 			"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
+			],
+			"icon": "Linkedin.svg",
+			"script": "//platform\\.linkedin\\.com/in\\.js",
+			"website": "http://linkedin.com"
 		},
 		"List.js": {
 			"cats": [
@@ -3905,7 +4316,7 @@
 			"env": "^List$",
 			"icon": "List.js.png",
 			"script": "^list\\.(?:min\\.)?js$",
-			"website": "www.listjs.com"
+			"website": "http://www.listjs.com"
 		},
 		"LiteSpeed": {
 			"cats": [
@@ -3915,7 +4326,7 @@
 				"Server": "^LiteSpeed$"
 			},
 			"icon": "LiteSpeed.png",
-			"website": "litespeedtech.com"
+			"website": "http://litespeedtech.com"
 		},
 		"Lithium": {
 			"cats": [
@@ -3930,7 +4341,23 @@
 			"html": " <a [^>]+Powered by Lithium",
 			"icon": "Lithium.png",
 			"implies": "PHP",
-			"website": "www.lithium.com"
+			"website": "http://www.lithium.com"
+		},
+		"LiveAgent": {
+			"cats": [
+				52
+			],
+			"env": "^LiveAgent$",
+			"icon": "LiveAgent.png",
+			"website": "http://www.ladesk.com"
+		},
+		"LiveChat": {
+			"cats": [
+				52
+			],
+			"icon": "LiveChat.png",
+			"script": "cdn\\.livechatinc\\.com/.*tracking\\.js",
+			"website": "http://livechatinc.com"
 		},
 		"LiveJournal": {
 			"cats": [
@@ -3938,7 +4365,7 @@
 			],
 			"icon": "LiveJournal.png",
 			"url": "\\.livejournal\\.com",
-			"website": "www.livejournal.com"
+			"website": "http://www.livejournal.com"
 		},
 		"LiveStreet CMS": {
 			"cats": [
@@ -3949,7 +4376,8 @@
 				"X-Powered-By": "LiveStreet CMS"
 			},
 			"icon": "LiveStreet CMS.png",
-			"website": "livestreetcms.com"
+			"implies": "PHP",
+			"website": "http://livestreetcms.com"
 		},
 		"Livefyre": {
 			"cats": [
@@ -3962,7 +4390,7 @@
 			"html": "<[^>]+(?:id|class)=\"livefyre",
 			"icon": "Livefyre.png",
 			"script": "livefyre_init\\.js",
-			"website": "livefyre.com"
+			"website": "http://livefyre.com"
 		},
 		"Liveinternet": {
 			"cats": [
@@ -3976,7 +4404,7 @@
 			],
 			"icon": "Liveinternet.png",
 			"script": "/js/al/common.js\\?[0-9_]+",
-			"website": "liveinternet.ru/rating/"
+			"website": "http://liveinternet.ru/rating/"
 		},
 		"Lo-dash": {
 			"cats": [
@@ -3984,7 +4412,7 @@
 			],
 			"icon": "Lo-dash.png",
 			"script": "lodash.*\\.js",
-			"website": "www.lodash.com"
+			"website": "http://www.lodash.com"
 		},
 		"Locomotive": {
 			"cats": [
@@ -3996,7 +4424,7 @@
 				"Ruby on Rails",
 				"MongoDB"
 			],
-			"website": "www.locomotivecms.com"
+			"website": "http://www.locomotivecms.com"
 		},
 		"Logitech Media Server": {
 			"cats": [
@@ -4007,7 +4435,7 @@
 				"Server": "Logitech Media Server(?: \\(([\\d\\.]+))?\\;version:\\1"
 			},
 			"icon": "Logitech Media Server.png",
-			"website": "www.mysqueezebox.com"
+			"website": "http://www.mysqueezebox.com"
 		},
 		"Lotus Domino": {
 			"cats": [
@@ -4017,7 +4445,8 @@
 				"Server": "Lotus-Domino"
 			},
 			"icon": "Lotus Domino.png",
-			"website": "www-01.ibm.com/software/lotus/products/domino"
+			"implies": "Java",
+			"website": "http://www-01.ibm.com/software/lotus/products/domino"
 		},
 		"Lua": {
 			"cats": [
@@ -4027,21 +4456,22 @@
 				"X-Powered-By": "\bLua(?: ([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Lua.png",
-			"website": "www.lua.org"
+			"website": "http://www.lua.org"
 		},
 		"Lucene": {
 			"cats": [
 				34
 			],
 			"icon": "Lucene.png",
-			"website": "lucene.apache.org/core/"
+			"implies": "Java",
+			"website": "http://lucene.apache.org/core/"
 		},
 		"M.R. Inc BoxyOS": {
 			"cats": [
 				28
 			],
-			"icon": "M.R. Inc BoxyOS.png",
-			"website": "mrincworld.com"
+			"icon": "M.R. Inc.png",
+			"website": "http://mrincworld.com"
 		},
 		"M.R. Inc SiteFrame": {
 			"cats": [
@@ -4050,8 +4480,8 @@
 			"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": [
@@ -4060,11 +4490,19 @@
 			"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": [
@@ -4077,24 +4515,26 @@
 				"publisher": "MOBOTIX AG\\;confidence:40"
 			},
 			"url": "control/userimage\\.html\\;confidence:70",
-			"website": "mobotix.com"
+			"website": "http://mobotix.com"
 		},
-		"MODx": {
+		"MODX": {
 			"cats": [
 				1
 			],
 			"env": "^MODX_MEDIA_PATH$",
 			"headers": {
-				"Set-Cookie": "SN4[a-f\\d]{12}",
-				"X-Powered-By": "^MODx"
+				"Set-Cookie": "SN5[a-f\\d]{12}",
+				"X-Powered-By": "^MODX"
 			},
 			"html": [
-				"<a[^>]+>Powered by MODx</a>",
-				"<(?:link|script)[^>]+assets/snippets/\\;confidence:20"
+				"<a[^>]+>Powered by MODX</a>",
+				"<(?:link|script)[^>]+assets/snippets/\\;confidence:20",
+				"<form[^>]+id=\"ajaxSearch_form\\;confidence:20",
+				"<input[^>]+id=\"ajaxSearch_input\\;confidence:20"
 			],
-			"icon": "MODx.png",
+			"icon": "MODX.png",
 			"implies": "PHP",
-			"website": "modxcms.com"
+			"website": "http://modx.com"
 		},
 		"MadAdsMedia": {
 			"cats": [
@@ -4103,7 +4543,7 @@
 			"env": "^setM(?:Iframe|RefURL)$",
 			"icon": "MadAdsMedia.png",
 			"script": "^https?://(?:ads-by|pixel)\\.madadsmedia.com/",
-			"website": "madadsmedia.com"
+			"website": "http://madadsmedia.com"
 		},
 		"Magento": {
 			"cats": [
@@ -4127,7 +4567,25 @@
 				"static/_requirejs\\;confidence:50\\;version:2",
 				"static/frontend\\;confidence:20\\;version:2"
 			],
-			"website": "www.magentocommerce.com"
+			"website": "http://www.magentocommerce.com"
+		},
+		"Mailchimp": {
+			"cats": [
+				32
+			],
+			"html": [
+				"<form [^>]*data-mailchimp-url",
+				"<form [^>]*id=\"mc-embedded-subscribe-form\"",
+				"<form [^>]*name=\"mc-embedded-subscribe-form\"",
+				"<input [^>]*id=\"mc-email\"\\;confidence:20",
+				"<!-- Begin MailChimp Signup Form -->"
+			],
+			"icon": "mailchimp.svg",
+			"script": [
+				"s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js",
+				"cdn-images.mailchimp.com/[^>]*.css"
+			],
+			"website": "http://mailchimp.com"
 		},
 		"Mambo": {
 			"cats": [
@@ -4138,7 +4596,7 @@
 			"meta": {
 				"generator": "Mambo"
 			},
-			"website": "mambo-foundation.org"
+			"website": "http://mambo-foundation.org"
 		},
 		"MantisBT": {
 			"cats": [
@@ -4146,7 +4604,8 @@
 			],
 			"html": "<img[^>]+ alt=\"Powered by Mantis Bugtracker",
 			"icon": "MantisBT.png",
-			"website": "www.mantisbt.org"
+			"implies": "PHP",
+			"website": "http://www.mantisbt.org"
 		},
 		"ManyContacts": {
 			"cats": [
@@ -4154,7 +4613,7 @@
 			],
 			"icon": "ManyContacts.png",
 			"script": "\\/assets\\/js\\/manycontacts\\.min\\.js",
-			"website": "www.manycontacts.com"
+			"website": "http://www.manycontacts.com"
 		},
 		"Marionette.js": {
 			"cats": [
@@ -4167,7 +4626,7 @@
 				"Backbone.js"
 			],
 			"script": "backbone\\.marionette.*\\.js",
-			"website": "marionettejs.com"
+			"website": "http://marionettejs.com"
 		},
 		"Marketo": {
 			"cats": [
@@ -4176,7 +4635,7 @@
 			"env": "^Munchkin$",
 			"icon": "Marketo.png",
 			"script": "munchkin\\.marketo\\.net/munchkin\\.js",
-			"website": "www.marketo.com"
+			"website": "http://www.marketo.com"
 		},
 		"Materialize CSS": {
 			"cats": [
@@ -4186,7 +4645,7 @@
 			"icon": "Materialize CSS.png",
 			"implies": "jQuery",
 			"script": "materialize(?:\\.min)?\\.js",
-			"website": "materializecss.com"
+			"website": "http://materializecss.com"
 		},
 		"MathJax": {
 			"cats": [
@@ -4195,27 +4654,44 @@
 			"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
 			],
 			"headers": {
-				"Server": "NetDNA"
+				"Server": "^NetDNA",
+				"X-CDN-Forward": "^maxcdn$"
 			},
 			"icon": "MaxCDN.png",
-			"website": "www.maxcdn.com"
+			"website": "http://www.maxcdn.com"
 		},
 		"MaxSite CMS": {
 			"cats": [
 				1
 			],
 			"icon": "MaxSite CMS.png",
+			"implies": "PHP",
 			"meta": {
 				"generator": "MaxSite CMS"
 			},
-			"website": "max-3000.com"
+			"website": "http://max-3000.com"
 		},
 		"Mean.io": {
 			"cats": [
@@ -4231,7 +4707,7 @@
 				"AngularJS",
 				"Node.js"
 			],
-			"website": "mean.io"
+			"website": "http://mean.io"
 		},
 		"MediaElement.js": {
 			"cats": [
@@ -4239,7 +4715,7 @@
 			],
 			"env": "^mejs$",
 			"icon": "MediaElement.js.png",
-			"website": "mediaelementjs.com"
+			"website": "http://mediaelementjs.com"
 		},
 		"MediaTomb": {
 			"cats": [
@@ -4249,7 +4725,7 @@
 				"Server": "MediaTomb(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "MediaTomb.png",
-			"website": "mediatomb.cc"
+			"website": "http://mediatomb.cc"
 		},
 		"MediaWiki": {
 			"cats": [
@@ -4257,10 +4733,11 @@
 			],
 			"html": "(?:<a[^>]+>Powered by MediaWiki</a>|<[^>]+id=\"t-specialpages)",
 			"icon": "MediaWiki.png",
+			"implies": "PHP",
 			"meta": {
 				"generator": "MediaWiki"
 			},
-			"website": "www.mediawiki.org"
+			"website": "http://www.mediawiki.org"
 		},
 		"Meebo": {
 			"cats": [
@@ -4268,7 +4745,19 @@
 			],
 			"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
+			],
+			"html": "<!-- Rendered with Melics CMS V2",
+			"icon": "meliscmsv2.png",
+			"meta": {
+				"powered-by": "^Melis CMS"
+			},
+			"website": "http://www.melistechnology.com/"
 		},
 		"Meteor": {
 			"cats": [
@@ -4277,13 +4766,13 @@
 			"env": "^Meteor$",
 			"html": "<link[^>]+__meteor-css__",
 			"icon": "Meteor.png",
-			"website": "meteor.com"
+			"website": "http://meteor.com"
 		},
 		"Methode": {
 			"cats": [
 				1
 			],
-			"env": "^eidosBase$\\;confidence:99",
+			"env": "^eidosBase$",
 			"html": "<!-- Methode uuid: \"[a-f\\d]+\" ?-->",
 			"icon": "Methode.png",
 			"meta": {
@@ -4293,7 +4782,7 @@
 				"eomportal-loid": "[\\d.]+",
 				"eomportal-uuid": "[a-f\\d]+"
 			},
-			"website": "www.eidosmedia.com/solutions"
+			"website": "http://www.eidosmedia.com/solutions"
 		},
 		"Microsoft ASP.NET": {
 			"cats": [
@@ -4308,7 +4797,7 @@
 			"icon": "Microsoft ASP.NET.png",
 			"implies": "IIS\\;confidence:50",
 			"url": "\\.aspx(?:$|\\?)",
-			"website": "www.asp.net"
+			"website": "http://www.asp.net"
 		},
 		"Microsoft HTTPAPI": {
 			"cats": [
@@ -4318,7 +4807,7 @@
 				"Server": "Microsoft-HTTPAPI(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Microsoft.svg",
-			"website": "microsoft.com"
+			"website": "http://microsoft.com"
 		},
 		"Microsoft SharePoint": {
 			"cats": [
@@ -4335,7 +4824,7 @@
 			"meta": {
 				"generator": "Microsoft SharePoint"
 			},
-			"website": "sharepoint.microsoft.com"
+			"website": "http://sharepoint.microsoft.com"
 		},
 		"Mietshop": {
 			"cats": [
@@ -4346,7 +4835,7 @@
 			"meta": {
 				"generator": "Mietshop"
 			},
-			"website": "www.mietshop.de/"
+			"website": "http://www.mietshop.de/"
 		},
 		"Milligram": {
 			"cats": [
@@ -4356,7 +4845,7 @@
 				"<link[^>]+?href=\"[^\"]+milligram(?:\\.min)?\\.css"
 			],
 			"icon": "Milligram.png",
-			"website": "milligram.github.io"
+			"website": "http://milligram.github.io"
 		},
 		"MiniBB": {
 			"cats": [
@@ -4364,7 +4853,7 @@
 			],
 			"html": "<a href=\"[^\"]+minibb[^<]+</a>[^<]+\n<!--End of copyright link",
 			"icon": "MiniBB.png",
-			"website": "www.minibb.com"
+			"website": "http://www.minibb.com"
 		},
 		"MiniServ": {
 			"cats": [
@@ -4373,8 +4862,8 @@
 			"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": [
@@ -4383,7 +4872,7 @@
 			"env": "^Mint$",
 			"icon": "Mint.png",
 			"script": "mint/\\?js",
-			"website": "haveamint.com"
+			"website": "http://haveamint.com"
 		},
 		"Mixpanel": {
 			"cats": [
@@ -4392,7 +4881,7 @@
 			"env": "^Mixpanel$",
 			"icon": "Mixpanel.png",
 			"script": "api\\.mixpanel\\.com/track",
-			"website": "mixpanel.com"
+			"website": "http://mixpanel.com"
 		},
 		"Mobify": {
 			"cats": [
@@ -4401,7 +4890,7 @@
 			"env": "^Mobify$",
 			"icon": "Mobify.png",
 			"script": "mobify\\.com",
-			"website": "www.mobify.com"
+			"website": "http://www.mobify.com"
 		},
 		"MochiKit": {
 			"cats": [
@@ -4410,7 +4899,7 @@
 			"env": "^MochiKit$",
 			"icon": "MochiKit.png",
 			"script": "MochiKit(?:\\.min)?\\.js",
-			"website": "mochikit.com"
+			"website": "http://mochikit.com"
 		},
 		"MochiWeb": {
 			"cats": [
@@ -4419,8 +4908,8 @@
 			"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": [
@@ -4429,7 +4918,7 @@
 			"env": "^Modernizr$",
 			"icon": "Modernizr.png",
 			"script": "modernizr(?:-([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
-			"website": "www.modernizr.com"
+			"website": "http://www.modernizr.com"
 		},
 		"Modified": {
 			"cats": [
@@ -4439,7 +4928,7 @@
 			"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": [
@@ -4449,7 +4938,7 @@
 			"html": "(?:<script|link)[^>]*mg-(?:core|plugins|templates)",
 			"icon": "Moguta.CMS.png",
 			"implies": "PHP",
-			"website": "moguta.ru"
+			"website": "http://moguta.ru"
 		},
 		"MoinMoin": {
 			"cats": [
@@ -4459,7 +4948,7 @@
 			"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": [
@@ -4470,7 +4959,7 @@
 			},
 			"icon": "Mojolicious.png",
 			"implies": "Perl",
-			"website": "mojolicio.us"
+			"website": "http://mojolicio.us"
 		},
 		"Mollom": {
 			"cats": [
@@ -4479,16 +4968,16 @@
 			"html": "<img[^>]+\\.mollom\\.com",
 			"icon": "Mollom.png",
 			"script": "mollom(?:\\.min)?\\.js",
-			"website": "mollom.com"
+			"website": "http://mollom.com"
 		},
 		"Moment Timezone": {
 			"cats": [
 				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": [
@@ -4497,7 +4986,7 @@
 			"env": "^moment$",
 			"icon": "Moment.js.png",
 			"script": "moment(?:\\.min)?\\.js",
-			"website": "momentjs.com"
+			"website": "http://momentjs.com"
 		},
 		"Mondo Media": {
 			"cats": [
@@ -4507,14 +4996,14 @@
 			"meta": {
 				"generator": "Mondo Shop"
 			},
-			"website": "mondo-media.de"
+			"website": "http://mondo-media.de"
 		},
 		"MongoDB": {
 			"cats": [
 				34
 			],
 			"icon": "MongoDB.png",
-			"website": "www.mongodb.org"
+			"website": "http://www.mongodb.org"
 		},
 		"Mongrel": {
 			"cats": [
@@ -4525,7 +5014,7 @@
 			},
 			"icon": "Mongrel.png",
 			"implies": "Ruby",
-			"website": "mongrel2.org"
+			"website": "http://mongrel2.org"
 		},
 		"Monkey HTTP Server": {
 			"cats": [
@@ -4535,7 +5024,7 @@
 				"Server": "Monkey/?([\\d.]+)?\\;version:\\1"
 			},
 			"icon": "Monkey HTTP Server.png",
-			"website": "monkey-project.com"
+			"website": "http://monkey-project.com"
 		},
 		"Mono": {
 			"cats": [
@@ -4545,7 +5034,7 @@
 				"X-Powered-By": "Mono"
 			},
 			"icon": "Mono.png",
-			"website": "mono-project.com"
+			"website": "http://mono-project.com"
 		},
 		"Mono.net": {
 			"cats": [
@@ -4555,7 +5044,7 @@
 			"icon": "Mono.net.png",
 			"implies": "Piwik",
 			"script": "monotracker(?:\\.min)?\\.js",
-			"website": "www.mono.net"
+			"website": "http://www.mono.net"
 		},
 		"MooTools": {
 			"cats": [
@@ -4564,7 +5053,7 @@
 			"env": "^MooTools$",
 			"icon": "MooTools.png",
 			"script": "mootools.*\\.js",
-			"website": "mootools.net"
+			"website": "http://mootools.net"
 		},
 		"Moodle": {
 			"cats": [
@@ -4572,12 +5061,15 @@
 			],
 			"env": "^moodle",
 			"headers": {
-				"Set-Cookie": "MoodleSession"
+				"Set-Cookie": "(?:MoodleSession|MOODLEID_)"
 			},
 			"html": "<img[^>]+moodlelogo",
 			"icon": "Moodle.png",
 			"implies": "PHP",
-			"website": "moodle.org"
+			"meta": {
+				"keywords": "^moodle"
+			},
+			"website": "http://moodle.org"
 		},
 		"Motion-httpd": {
 			"cats": [
@@ -4587,8 +5079,8 @@
 			"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": [
@@ -4602,7 +5094,7 @@
 				"jQuery"
 			],
 			"script": ".*\\/mt-includes\\/[asetj]{2,6}\\/.*\\.js.*",
-			"website": "motocms.com"
+			"website": "http://motocms.com"
 		},
 		"Movable Type": {
 			"cats": [
@@ -4612,7 +5104,7 @@
 			"meta": {
 				"generator": "Movable Type"
 			},
-			"website": "movabletype.org"
+			"website": "http://movabletype.org"
 		},
 		"Moxa": {
 			"cats": [
@@ -4622,7 +5114,7 @@
 				"Server": "MoxaHttp(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Moxa.png",
-			"website": "moxa.com"
+			"website": "http://moxa.com"
 		},
 		"Mozard Suite": {
 			"cats": [
@@ -4633,7 +5125,7 @@
 				"author": "Mozard"
 			},
 			"url": "/mozard/!suite",
-			"website": "mozard.nl"
+			"website": "http://mozard.nl"
 		},
 		"Mura CMS": {
 			"cats": [
@@ -4645,7 +5137,7 @@
 			"meta": {
 				"generator": "Mura CMS ([\\d]+)\\;version:\\1"
 			},
-			"website": "www.getmura.com"
+			"website": "http://www.getmura.com"
 		},
 		"Mustache": {
 			"cats": [
@@ -4654,7 +5146,7 @@
 			"env": "^Mustache$",
 			"icon": "Mustache.png",
 			"script": "mustache(?:\\.min)?\\.js",
-			"website": "mustache.github.com"
+			"website": "http://mustache.github.com"
 		},
 		"MyBB": {
 			"cats": [
@@ -4667,7 +5159,7 @@
 				"PHP",
 				"MySQL"
 			],
-			"website": "www.mybb.com"
+			"website": "http://www.mybb.com"
 		},
 		"MyBlogLog": {
 			"cats": [
@@ -4675,14 +5167,14 @@
 			],
 			"icon": "MyBlogLog.png",
 			"script": "pub\\.mybloglog\\.com",
-			"website": "www.mybloglog.com"
+			"website": "http://www.mybloglog.com"
 		},
 		"MySQL": {
 			"cats": [
 				34
 			],
 			"icon": "MySQL.svg",
-			"website": "mysql.com"
+			"website": "http://mysql.com"
 		},
 		"Mynetcap": {
 			"cats": [
@@ -4692,7 +5184,7 @@
 			"meta": {
 				"generator": "Mynetcap"
 			},
-			"website": "www.netcap-creation.fr"
+			"website": "http://www.netcap-creation.fr"
 		},
 		"NOIX": {
 			"cats": [
@@ -4700,7 +5192,7 @@
 			],
 			"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": [
@@ -4711,15 +5203,40 @@
 			"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": "http://www.nedstat.com"
+		},
+		"Neos CMS": {
+			"cats": [
+				1
+			],
+			"excludes": "TYPO3 CMS",
+			"headers": {
+				"X-Flow-Powered": "Neos/?(.+)?$\\;version:\\1"
+			},
+			"icon": "Neos.svg",
+			"implies": "Neos Flow",
+			"url": "/neos/",
+			"website": "http://neos.io"
+		},
+		"Neos Flow": {
+			"cats": [
+				18
 			],
-			"env": "^sitestat$",
-			"icon": "Nedstat.png",
-			"website": "www.nedstat.com"
+			"excludes": "TYPO3 CMS",
+			"headers": {
+				"X-Flow-Powered": "Flow/?(.+)?$\\;version:\\1"
+			},
+			"icon": "Neos.svg",
+			"implies": "PHP",
+			"website": "http://flow.neos.io"
 		},
 		"Nepso": {
 			"cats": [
@@ -4729,13 +5246,7 @@
 				"X-Powered-CMS": "Nepso"
 			},
 			"icon": "Nepso.png",
-			"implies": [
-				"Python",
-				"Perl",
-				"Java",
-				"PHP"
-			],
-			"website": "nepso.com"
+			"website": "http://nepso.com"
 		},
 		"Netmonitor": {
 			"cats": [
@@ -4744,7 +5255,16 @@
 			"env": "^netmonitor$",
 			"icon": "Netmonitor.png",
 			"script": "netmonitor\\.fi/nmtracker\\.js",
-			"website": "netmonitor.fi/en"
+			"website": "http://netmonitor.fi/en"
+		},
+		"Neto": {
+			"cats": [
+				6
+			],
+			"env": "^NETO$",
+			"icon": "Neto.svg",
+			"script": "jquery\\.neto.*\\.js",
+			"website": "http://www.neto.com.au"
 		},
 		"Netsuite": {
 			"cats": [
@@ -4754,18 +5274,25 @@
 				"Set-Cookie": "NS_VER="
 			},
 			"icon": "Netsuite.png",
-			"website": "netsuite.com"
+			"website": "http://netsuite.com"
 		},
 		"Nette Framework": {
 			"cats": [
 				18
 			],
+			"env": "Nette",
 			"headers": {
+				"Set-Cookie": "nette-browser=",
 				"X-Powered-By": "Nette Framework"
 			},
+			"html": [
+				"<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": [
@@ -4773,7 +5300,7 @@
 			],
 			"env": "^NREUM",
 			"icon": "New Relic.png",
-			"website": "newrelic.com"
+			"website": "http://newrelic.com"
 		},
 		"Nginx": {
 			"cats": [
@@ -4783,14 +5310,14 @@
 				"Server": "nginx(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Nginx.svg",
-			"website": "nginx.org"
+			"website": "http://nginx.org/en"
 		},
 		"Node.js": {
 			"cats": [
 				27
 			],
 			"icon": "node.js.png",
-			"website": "nodejs.org"
+			"website": "http://nodejs.org"
 		},
 		"OWL Carousel": {
 			"cats": [
@@ -4801,7 +5328,7 @@
 			"icon": "OWL Carousel.png",
 			"implies": "jQuery",
 			"script": "owl.carousel.*\\.js",
-			"website": "owlgraphic.com/owlcarousel"
+			"website": "http://owlgraphic.com/owlcarousel"
 		},
 		"OXID eShop": {
 			"cats": [
@@ -4810,7 +5337,7 @@
 			"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": [
@@ -4821,7 +5348,20 @@
 			},
 			"icon": "October CMS.png",
 			"implies": "Laravel",
-			"website": "octobercms.com"
+			"website": "http://octobercms.com"
+		},
+		"Octopress": {
+			"cats": [
+				1,
+				11
+			],
+			"html": "Powered by <a href=\"http://octopress.org\">",
+			"icon": "octopress.png",
+			"implies": "Jekyll",
+			"meta": {
+				"generator": "Octopress"
+			},
+			"website": "http://octopress.org"
 		},
 		"Odoo": {
 			"cats": [
@@ -4840,14 +5380,14 @@
 				"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
 			],
 			"icon": "OmniTouch 8660 My Teamwork.png",
-			"website": "enterprise.alcatel-lucent.com"
+			"website": "http://enterprise.alcatel-lucent.com"
 		},
 		"OneAPM": {
 			"cats": [
@@ -4855,7 +5395,7 @@
 			],
 			"env": "^BWEUM",
 			"icon": "OneAPM.png",
-			"website": "www.oneapm.com"
+			"website": "http://www.oneapm.com"
 		},
 		"OneStat": {
 			"cats": [
@@ -4863,7 +5403,7 @@
 			],
 			"env": "^OneStat",
 			"icon": "OneStat.png",
-			"website": "www.onestat.com"
+			"website": "http://www.onestat.com"
 		},
 		"Open AdStream": {
 			"cats": [
@@ -4871,7 +5411,7 @@
 			],
 			"env": "^OAS_AD$",
 			"icon": "Open AdStream.png",
-			"website": "xaxis.com"
+			"website": "http://xaxis.com"
 		},
 		"Open Classifieds": {
 			"cats": [
@@ -4882,7 +5422,7 @@
 				"author": "open-classifieds\\.com",
 				"copyright": "Open Classifieds ?([0-9.]+)?\\;version:\\1"
 			},
-			"website": "open-classifieds.com"
+			"website": "http://open-classifieds.com"
 		},
 		"Open Journal Systems": {
 			"cats": [
@@ -4892,13 +5432,11 @@
 				"Set-Cookie": "\bOJSSID\b"
 			},
 			"icon": "Open Journal Systems.png",
-			"implies": [
-				"PHP"
-			],
+			"implies": "PHP",
 			"meta": {
 				"generator": "Open Journal Systems(?: ([\\d.]+))?\\;version:\\1"
 			},
-			"website": "pkp.sfu.ca/ojs"
+			"website": "http://pkp.sfu.ca/ojs"
 		},
 		"Open Web Analytics": {
 			"cats": [
@@ -4907,18 +5445,19 @@
 			"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
 			],
 			"icon": "Open eShop.png",
+			"implies": "PHP",
 			"meta": {
 				"author": "open-eshop\\.com",
 				"copyright": "Open eShop ?([0-9.]+)?\\;version:\\1"
 			},
-			"website": "open-eshop.com/"
+			"website": "http://open-eshop.com/"
 		},
 		"OpenCart": {
 			"cats": [
@@ -4927,7 +5466,7 @@
 			"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": [
@@ -4940,7 +5479,7 @@
 			"icon": "OpenCms.png",
 			"implies": "Java",
 			"script": "opencms",
-			"website": "www.opencms.org"
+			"website": "http://www.opencms.org"
 		},
 		"OpenGSE": {
 			"cats": [
@@ -4951,7 +5490,7 @@
 			},
 			"icon": "OpenGSE.png",
 			"implies": "Java",
-			"website": "code.google.com/p/opengse"
+			"website": "http://code.google.com/p/opengse"
 		},
 		"OpenGrok": {
 			"cats": [
@@ -4965,7 +5504,7 @@
 			"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": [
@@ -4974,7 +5513,7 @@
 			"env": "^OpenLayers$",
 			"icon": "OpenLayers.png",
 			"script": "openlayers",
-			"website": "openlayers.org"
+			"website": "http://openlayers.org"
 		},
 		"OpenNemas": {
 			"cats": [
@@ -4987,7 +5526,7 @@
 			"meta": {
 				"generator": "OpenNemas"
 			},
-			"website": "www.opennemas.com"
+			"website": "http://www.opennemas.com"
 		},
 		"OpenResty": {
 			"cats": [
@@ -5001,7 +5540,7 @@
 				"Nginx",
 				"Lua"
 			],
-			"website": "openresty.org"
+			"website": "http://openresty.org"
 		},
 		"OpenSSL": {
 			"cats": [
@@ -5011,7 +5550,7 @@
 				"Server": "OpenSSL(?:/([\\d.]+[a-z]?))?\\;version:\\1"
 			},
 			"icon": "OpenSSL.png",
-			"website": "openssl.org"
+			"website": "http://openssl.org"
 		},
 		"OpenText Web Solutions": {
 			"cats": [
@@ -5020,7 +5559,7 @@
 			"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": [
@@ -5031,7 +5570,7 @@
 				"https?://[^/]*\\.openx\\.net",
 				"https?://[^/]*\\.servedbyopenx\\.com"
 			],
-			"website": "openx.com"
+			"website": "http://openx.com"
 		},
 		"Ophal": {
 			"cats": [
@@ -5048,7 +5587,7 @@
 				"generator": "Ophal(?: (.*))? \\(ophal\\.org\\)\\;version:\\1"
 			},
 			"script": "ophal\\.js",
-			"website": "ophal.org"
+			"website": "http://ophal.org"
 		},
 		"Optimizely": {
 			"cats": [
@@ -5057,7 +5596,7 @@
 			"env": "^optimizely$",
 			"icon": "Optimizely.png",
 			"script": "optimizely\\.com.*\\.js",
-			"website": "optimizely.com"
+			"website": "http://optimizely.com"
 		},
 		"Oracle Application Server": {
 			"cats": [
@@ -5067,7 +5606,7 @@
 				"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": [
@@ -5078,7 +5617,7 @@
 			},
 			"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": [
@@ -5089,7 +5628,7 @@
 			},
 			"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": [
@@ -5099,7 +5638,7 @@
 				"x-oracle-dms-ecid": ""
 			},
 			"icon": "Oracle.png",
-			"website": "oracle.com"
+			"website": "http://oracle.com"
 		},
 		"Oracle HTTP Server": {
 			"cats": [
@@ -5109,7 +5648,7 @@
 				"Server": "Oracle-HTTP-Server(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Oracle.png",
-			"website": "oracle.com"
+			"website": "http://oracle.com"
 		},
 		"Oracle Recommendations On Demand": {
 			"cats": [
@@ -5117,7 +5656,7 @@
 			],
 			"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": [
@@ -5127,7 +5666,7 @@
 				"Server": "Oracle(?:AS)?[- ]Web[- ]Cache(?:[- /]([\\da-z./]+))?\\;version:\\1"
 			},
 			"icon": "Oracle.png",
-			"website": "oracle.com"
+			"website": "http://oracle.com"
 		},
 		"Orchard CMS": {
 			"cats": [
@@ -5138,7 +5677,7 @@
 			"meta": {
 				"generator": "Orchard"
 			},
-			"website": "orchardproject.net"
+			"website": "http://orchardproject.net"
 		},
 		"Outbrain": {
 			"cats": [
@@ -5147,18 +5686,18 @@
 			"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
 			],
-			"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": [
@@ -5168,7 +5707,7 @@
 			"meta": {
 				"generator": "PANSITE"
 			},
-			"website": "panvision.de/Produkte/Content_Management/index.asp"
+			"website": "http://panvision.de/Produkte/Content_Management/index.asp"
 		},
 		"PDF.js": {
 			"cats": [
@@ -5178,20 +5717,20 @@
 			"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
 			],
 			"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": [
@@ -5200,7 +5739,7 @@
 			"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": [
@@ -5212,7 +5751,7 @@
 			"meta": {
 				"generator": "PHP-Nuke"
 			},
-			"website": "phpnuke.org"
+			"website": "http://phpnuke.org"
 		},
 		"Pagekit": {
 			"cats": [
@@ -5222,15 +5761,20 @@
 			"meta": {
 				"generator": "Pagekit"
 			},
-			"website": "pagekit.com"
+			"website": "http://pagekit.com"
 		},
 		"Pardot": {
 			"cats": [
 				32
 			],
 			"env": "^pi(?:Tracker|Hostname|Protocol|CId|AId)$",
+			"headers": {
+				"X-Pardot-LB": "",
+				"X-Pardot-Route": "",
+				"X-Pardot-Rsp": ""
+			},
 			"icon": "Pardot.png",
-			"website": "pardot.com"
+			"website": "http://pardot.com"
 		},
 		"Parse.ly": {
 			"cats": [
@@ -5238,15 +5782,15 @@
 			],
 			"env": "^PARSELY$",
 			"icon": "Parse.ly.png",
-			"website": "parse.ly"
+			"website": "http://parse.ly"
 		},
 		"Paths.js": {
 			"cats": [
 				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": [
@@ -5256,7 +5800,7 @@
 			"html": "<input[^>]+_s-xclick",
 			"icon": "PayPal.png",
 			"script": "paypalobjects\\.com/js",
-			"website": "paypal.com"
+			"website": "http://paypal.com"
 		},
 		"PencilBlue": {
 			"cats": [
@@ -5267,7 +5811,8 @@
 				"X-Powered-By": "PencilBlue"
 			},
 			"icon": "PencilBlue.png",
-			"website": "pencilblue.org"
+			"implies": "Node.js",
+			"website": "http://pencilblue.org"
 		},
 		"Penguin": {
 			"cats": [
@@ -5277,7 +5822,7 @@
 			"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": [
@@ -5288,7 +5833,7 @@
 			"meta": {
 				"generator": "(?:Percussion|Rhythmyx)"
 			},
-			"website": "percussion.com"
+			"website": "http://percussion.com"
 		},
 		"PerfSONAR-PS": {
 			"cats": [
@@ -5298,7 +5843,7 @@
 				"User-agent": "perfSONAR-PS/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "PerfSONAR-PS.png",
-			"website": "psps.perfsonar.net"
+			"website": "http://psps.perfsonar.net"
 		},
 		"Perl": {
 			"cats": [
@@ -5309,7 +5854,7 @@
 			},
 			"icon": "Perl.png",
 			"url": "\\.pl(?:$|\\?)",
-			"website": "perl.org"
+			"website": "http://perl.org"
 		},
 		"Petrojs": {
 			"cats": [
@@ -5321,7 +5866,23 @@
 				"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
+			],
+			"headers": {
+				"Set-Cookie": "phsid="
+			},
+			"html": "<[^>]+(?:class|id)=\"phabricator-",
+			"icon": "Phabricator.png",
+			"implies": [
+				"PHP"
+			],
+			"script": "/phabricator/[a-f0-9]{8}/rsrc/js/phui/[a-z-]+\\.js$",
+			"website": "http://phacility.com"
 		},
 		"Phaser": {
 			"cats": [
@@ -5329,7 +5890,7 @@
 			],
 			"env": "Phaser",
 			"icon": "Phaser.png",
-			"website": "phaser.io"
+			"website": "http://phaser.io"
 		},
 		"Phusion Passenger": {
 			"cats": [
@@ -5339,7 +5900,7 @@
 				"X-Powered-By": "^Phusion Passenger"
 			},
 			"icon": "Phusion Passenger.png",
-			"website": "phusionpassenger.com"
+			"website": "http://phusionpassenger.com"
 		},
 		"Piano Solo": {
 			"cats": [
@@ -5350,7 +5911,7 @@
 				"Set-Cookie": "pianovisitkey"
 			},
 			"icon": "Piano Solo.png",
-			"website": "www.pianomedia.com/products"
+			"website": "http://www.pianomedia.com/products"
 		},
 		"Pimcore": {
 			"cats": [
@@ -5362,10 +5923,16 @@
 				"X-Powered-By": "pimcore"
 			},
 			"icon": "pimcore.svg",
-			"implies": [
-				"PHP"
+			"implies": "PHP",
+			"website": "http://pimcore.org"
+		},
+		"Pinterest": {
+			"cats": [
+				5
 			],
-			"website": "pimcore.org"
+			"icon": "Pinterest.svg",
+			"script": "//assets\\.pinterest\\.com/js/pinit\\.js",
+			"website": "http://pinterest.com"
 		},
 		"Piwik": {
 			"cats": [
@@ -5385,7 +5952,7 @@
 				"google-play-app": "app-id=org\\.piwik\\.mobile2"
 			},
 			"script": "piwik\\.js|piwik\\.php",
-			"website": "piwik.org"
+			"website": "http://piwik.org"
 		},
 		"Planet": {
 			"cats": [
@@ -5395,7 +5962,7 @@
 			"meta": {
 				"generator": "^Planet(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"website": "planetplanet.org"
+			"website": "http://planetplanet.org"
 		},
 		"Plentymarkets": {
 			"cats": [
@@ -5405,7 +5972,7 @@
 			"meta": {
 				"generator": "plentymarkets"
 			},
-			"website": "plentymarkets.eu"
+			"website": "http://plentymarkets.eu"
 		},
 		"Plesk": {
 			"cats": [
@@ -5417,7 +5984,7 @@
 			},
 			"icon": "Plesk.png",
 			"script": "common\\.js\\?plesk",
-			"website": "plesk.com"
+			"website": "http://plesk.com"
 		},
 		"Pligg": {
 			"cats": [
@@ -5429,7 +5996,7 @@
 			"meta": {
 				"generator": "Pligg"
 			},
-			"website": "pligg.com"
+			"website": "http://pligg.com"
 		},
 		"Plone": {
 			"cats": [
@@ -5440,7 +6007,17 @@
 			"meta": {
 				"generator": "Plone"
 			},
-			"website": "plone.org"
+			"website": "http://plone.org"
+		},
+		"Plotly": {
+			"cats": [
+				25
+			],
+			"env": "Plotly",
+			"icon": "Plotly.png",
+			"implies": "D3",
+			"script": "https?://cdn\\.plot\\.ly/plotly",
+			"website": "http://plot.ly/javascript/"
 		},
 		"Plura": {
 			"cats": [
@@ -5448,7 +6025,7 @@
 			],
 			"html": "<iframe src=\"[^>]+pluraserver\\.com",
 			"icon": "Plura.png",
-			"website": "www.pluraprocessing.com"
+			"website": "http://www.pluraprocessing.com"
 		},
 		"Po.st": {
 			"cats": [
@@ -5456,7 +6033,7 @@
 			],
 			"env": "^pwidget_config$",
 			"icon": "Po.st.png",
-			"website": "www.po.st/"
+			"website": "http://www.po.st/"
 		},
 		"Polymer": {
 			"cats": [
@@ -5466,7 +6043,7 @@
 			"html": "(?:<polymer-[^>]+|<link[^>]+rel=\"import\"[^>]+/polymer\\.html\")",
 			"icon": "Polymer.png",
 			"script": "polymer\\.js",
-			"website": "polymer-project.org"
+			"website": "http://polymer-project.org"
 		},
 		"Posterous": {
 			"cats": [
@@ -5476,14 +6053,14 @@
 			"env": "^Posterous",
 			"html": "<div class=\"posterous",
 			"icon": "Posterous.png",
-			"website": "posterous.com"
+			"website": "http://posterous.com"
 		},
 		"PostgreSQL": {
 			"cats": [
 				34
 			],
 			"icon": "PostgreSQL.png",
-			"website": "www.postgresql.org/"
+			"website": "http://www.postgresql.org/"
 		},
 		"Powergap": {
 			"cats": [
@@ -5494,7 +6071,7 @@
 				"<input type=\"hidden\" name=\"shopid\""
 			],
 			"icon": "Powergap.png",
-			"website": "powergap.de"
+			"website": "http://powergap.de"
 		},
 		"Prefix-Free": {
 			"cats": [
@@ -5503,7 +6080,7 @@
 			"env": "^PrefixFree$",
 			"icon": "Prefix-Free.png",
 			"script": "prefixfree\\.js",
-			"website": "leaverou.github.io/prefixfree/"
+			"website": "http://leaverou.github.io/prefixfree/"
 		},
 		"PrestaShop": {
 			"cats": [
@@ -5515,13 +6092,17 @@
 				"^priceDisplayMethod$\\;confidence:25",
 				"^priceDisplayPrecision$\\;confidence:25"
 			],
-			"html": "Powered by <a\\s+[^>]+>PrestaShop",
+			"html": [
+				"Powered by <a\\s+[^>]+>PrestaShop",
+				"<!-- /Block [a-z ]+ module (?:HEADER|TOP)?\\s?-->",
+				"<!-- /Module Block [a-z ]+ -->"
+			],
 			"icon": "PrestaShop.png",
 			"implies": "PHP",
 			"meta": {
 				"generator": "PrestaShop"
 			},
-			"website": "www.prestashop.com"
+			"website": "http://www.prestashop.com"
 		},
 		"Project Wonderful": {
 			"cats": [
@@ -5531,7 +6112,7 @@
 			"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": [
@@ -5540,7 +6121,7 @@
 			"html": "<[^>]+data-name=['\"]prospectscript",
 			"icon": "Prospector.png",
 			"script": "processprospector\\.js",
-			"website": "prospector.io"
+			"website": "http://prospector.io"
 		},
 		"Prototype": {
 			"cats": [
@@ -5549,16 +6130,33 @@
 			"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
 			],
 			"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
+			],
+			"env": "^__change$",
+			"html": "<html[^>]+data-ng-app=\"RbsChangeApp\"",
+			"icon": "Proximis Omnichannel.png",
+			"implies": [
+				"PHP",
+				"AngularJS"
+			],
+			"meta": {
+				"generator": "Proximis Omnichannel"
+			},
+			"website": "http://www.proximis.com"
 		},
 		"PubMatic": {
 			"cats": [
@@ -5566,7 +6164,7 @@
 			],
 			"icon": "PubMatic.png",
 			"script": "https?://[^/]*\\.pubmatic\\.com",
-			"website": "www.pubmatic.com/"
+			"website": "http://www.pubmatic.com/"
 		},
 		"Public CMS": {
 			"cats": [
@@ -5578,7 +6176,7 @@
 			},
 			"icon": "Public CMS.png",
 			"implies": "Java",
-			"website": "www.publiccms.com"
+			"website": "http://www.publiccms.com"
 		},
 		"Pure CSS": {
 			"cats": [
@@ -5586,7 +6184,15 @@
 			],
 			"html": "<link[^>]+(?:([\\d.])+/)?pure(?:-min)?\\.css\\;version:\\1",
 			"icon": "Pure CSS.png",
-			"website": "purecss.io"
+			"website": "http://purecss.io"
+		},
+		"Pygments": {
+			"cats": [
+				19
+			],
+			"html": "<link[^>]+pygments.css[\"']",
+			"icon": "pygments.png",
+			"website": "http://pygments.org"
 		},
 		"PyroCMS": {
 			"cats": [
@@ -5598,7 +6204,7 @@
 			},
 			"icon": "PyroCMS.png",
 			"implies": "Laravel",
-			"website": "pyrocms.com"
+			"website": "http://pyrocms.com"
 		},
 		"Python": {
 			"cats": [
@@ -5608,7 +6214,7 @@
 				"Server": "(?:^|\\s)Python(?:/([\\d.]+))?\\;confidence:50\\;version:\\1"
 			},
 			"icon": "Python.png",
-			"website": "python.org"
+			"website": "http://python.org"
 		},
 		"Quantcast": {
 			"cats": [
@@ -5617,7 +6223,7 @@
 			"env": "^quantserve$",
 			"icon": "Quantcast.png",
 			"script": "edge\\.quantserve\\.com/quant\\.js",
-			"website": "www.quantcast.com"
+			"website": "http://www.quantcast.com"
 		},
 		"Question2Answer": {
 			"cats": [
@@ -5627,7 +6233,7 @@
 			"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": [
@@ -5638,7 +6244,7 @@
 			"meta": {
 				"generator": "Quick\\.CMS(?: v([\\d.]+))?\\;version:\\1"
 			},
-			"website": "opensolution.org"
+			"website": "http://opensolution.org"
 		},
 		"Quick.Cart": {
 			"cats": [
@@ -5649,7 +6255,7 @@
 			"meta": {
 				"generator": "Quick\\.Cart(?: v([\\d.]+))?\\;version:\\1"
 			},
-			"website": "opensolution.org"
+			"website": "http://opensolution.org"
 		},
 		"Quill": {
 			"cats": [
@@ -5657,7 +6263,7 @@
 			],
 			"env": "^Quill$",
 			"icon": "Quill.png",
-			"website": "quilljs.com"
+			"website": "http://quilljs.com"
 		},
 		"RAID HTTPServer": {
 			"cats": [
@@ -5666,8 +6272,8 @@
 			"headers": {
 				"Server": "RAID HTTPServer(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"RBS Change": {
 			"cats": [
@@ -5680,7 +6286,7 @@
 			"meta": {
 				"generator": "RBS Change"
 			},
-			"website": "www.rbschange.fr"
+			"website": "http://www.rbschange.fr"
 		},
 		"RCMS": {
 			"cats": [
@@ -5690,7 +6296,7 @@
 			"meta": {
 				"generator": "^(?:RCMS|ReallyCMS)"
 			},
-			"website": "www.rcms.fi"
+			"website": "http://www.rcms.fi"
 		},
 		"RD Station": {
 			"cats": [
@@ -5699,7 +6305,7 @@
 			"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": [
@@ -5711,7 +6317,7 @@
 			],
 			"icon": "RDoc.png",
 			"implies": "Ruby",
-			"website": "github.com/RDoc/RDoc"
+			"website": "http://github.com/RDoc/RDoc"
 		},
 		"RackCache": {
 			"cats": [
@@ -5722,7 +6328,7 @@
 			},
 			"icon": "RackCache.png",
 			"implies": "Ruby",
-			"website": "github.com/rtomayko/rack-cache"
+			"website": "http://github.com/rtomayko/rack-cache"
 		},
 		"RainLoop": {
 			"cats": [
@@ -5739,7 +6345,18 @@
 			"icon": "RainLoop.png",
 			"implies": "PHP",
 			"script": "rainloop/v/([^/]+)\\;version:\\1",
-			"website": "rainloop.net"
+			"website": "http://rainloop.net"
+		},
+		"Rakuten DBCore": {
+			"cats": [
+				6
+			],
+			"icon": "Rakuten DBCore.png",
+			"meta": {
+				"generator": "Rakuten DBCore",
+				"generator:site": "http://ecservice.rakuten.com.br"
+			},
+			"website": "http://ecservice.rakuten.com.br"
 		},
 		"Ramda": {
 			"cats": [
@@ -5747,7 +6364,7 @@
 			],
 			"icon": "Ramda.png",
 			"script": "ramda.*\\.js",
-			"website": "ramdajs.com"
+			"website": "http://ramdajs.com"
 		},
 		"Raphael": {
 			"cats": [
@@ -5756,7 +6373,7 @@
 			"env": "^Raphael$",
 			"icon": "Raphael.png",
 			"script": "raphael.*\\.js",
-			"website": "raphaeljs.com"
+			"website": "http://raphaeljs.com"
 		},
 		"Rapid Logic": {
 			"cats": [
@@ -5765,8 +6382,8 @@
 			"headers": {
 				"Server": "Rapid Logic(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"React": {
 			"cats": [
@@ -5780,7 +6397,7 @@
 				"/([\\d.]+)/react(?:\\.min)?\\.js\\;version:\\1",
 				"react.*\\.js"
 			],
-			"website": "facebook.github.io/react"
+			"website": "http://facebook.github.io/react"
 		},
 		"Red Hat": {
 			"cats": [
@@ -5791,7 +6408,7 @@
 				"X-Powered-By": "Red Hat"
 			},
 			"icon": "Red Hat.png",
-			"website": "redhat.com"
+			"website": "http://redhat.com"
 		},
 		"Reddit": {
 			"cats": [
@@ -5802,7 +6419,7 @@
 			"icon": "Reddit.png",
 			"implies": "Python",
 			"url": "^(?:www\\.)?reddit\\.com",
-			"website": "code.reddit.com"
+			"website": "http://code.reddit.com"
 		},
 		"Redmine": {
 			"cats": [
@@ -5814,7 +6431,7 @@
 			"meta": {
 				"description": "Redmine"
 			},
-			"website": "www.redmine.org"
+			"website": "http://www.redmine.org"
 		},
 		"Reinvigorate": {
 			"cats": [
@@ -5822,7 +6439,7 @@
 			],
 			"env": "^reinvigorate$",
 			"icon": "Reinvigorate.png",
-			"website": "www.reinvigorate.net"
+			"website": "http://www.reinvigorate.net"
 		},
 		"RequireJS": {
 			"cats": [
@@ -5831,7 +6448,7 @@
 			"env": "^requirejs$",
 			"icon": "RequireJS.png",
 			"script": "require.*\\.js",
-			"website": "requirejs.org"
+			"website": "http://requirejs.org"
 		},
 		"Resin": {
 			"cats": [
@@ -5842,7 +6459,7 @@
 			},
 			"icon": "Resin.png",
 			"implies": "Java",
-			"website": "caucho.com"
+			"website": "http://caucho.com"
 		},
 		"Reveal.js": {
 			"cats": [
@@ -5851,17 +6468,28 @@
 			"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
+			],
+			"headers": {
+				"Set-Cookie": "^REVEL_(?:FLASH|SESSION)="
+			},
+			"icon": "Revel.png",
+			"implies": "Go",
+			"website": "http://revel.github.io"
 		},
 		"Rickshaw": {
 			"cats": [
 				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": [
@@ -5870,7 +6498,7 @@
 			"env": "^RightJS$",
 			"icon": "RightJS.png",
 			"script": "right\\.js",
-			"website": "rightjs.org"
+			"website": "http://rightjs.org"
 		},
 		"Riot": {
 			"cats": [
@@ -5879,7 +6507,7 @@
 			"env": "^riot$",
 			"icon": "Riot.png",
 			"script": "riot(?:\\+compiler)?(?:\\.min)?\\.js",
-			"website": "muut.com/riotjs"
+			"website": "http://muut.com/riotjs"
 		},
 		"RiteCMS": {
 			"cats": [
@@ -5893,19 +6521,25 @@
 			"meta": {
 				"generator": "^RiteCMS(?: (.+))?\\;version:\\1"
 			},
-			"website": "ritecms.com"
+			"website": "http://ritecms.com"
 		},
 		"Roadiz CMS": {
 			"cats": [
 				1,
 				11
 			],
+			"headers": {
+				"X-Powered-By": "Roadiz CMS"
+			},
 			"icon": "Roadiz CMS.png",
-			"implies": "PHP",
+			"implies": [
+				"PHP",
+				"Symfony"
+			],
 			"meta": {
 				"generator": "^Roadiz ([a-z0-9\\s\\.]+) - \\;version:\\1"
 			},
-			"website": "www.roadiz.io"
+			"website": "http://www.roadiz.io"
 		},
 		"Robin": {
 			"cats": [
@@ -5917,7 +6551,24 @@
 				"robin_storage_settings"
 			],
 			"icon": "Robin.png",
-			"website": "www.robinhq.com"
+			"website": "http://www.robinhq.com"
+		},
+		"RockRMS": {
+			"cats": [
+				1,
+				11,
+				32
+			],
+			"icon": "RockRMS.svg",
+			"implies": [
+				"Windows Server",
+				"IIS",
+				"Microsoft ASP.NET"
+			],
+			"meta": {
+				"generator": "^Rock v.*"
+			},
+			"website": "http://www.rockrms.com"
 		},
 		"RoundCube": {
 			"cats": [
@@ -5927,7 +6578,7 @@
 			"html": "<title>RoundCube",
 			"icon": "RoundCube.png",
 			"implies": "PHP",
-			"website": "roundcube.net"
+			"website": "http://roundcube.net"
 		},
 		"Rubicon Project": {
 			"cats": [
@@ -5935,7 +6586,7 @@
 			],
 			"icon": "Rubicon Project.png",
 			"script": "https?://[^/]*\\.rubiconproject\\.com",
-			"website": "rubiconproject.com/"
+			"website": "http://rubiconproject.com/"
 		},
 		"Ruby": {
 			"cats": [
@@ -5945,7 +6596,7 @@
 				"Server": "(?:Mongrel|WEBrick|Ruby)"
 			},
 			"icon": "Ruby.png",
-			"website": "ruby-lang.org"
+			"website": "http://ruby-lang.org"
 		},
 		"Ruby on Rails": {
 			"cats": [
@@ -5961,7 +6612,7 @@
 				"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": [
@@ -5969,7 +6620,7 @@
 			],
 			"icon": "Ruxit.png",
 			"script": "ruxitagentjs",
-			"website": "ruxit.com"
+			"website": "http://ruxit.com"
 		},
 		"RxJS": {
 			"cats": [
@@ -5978,7 +6629,7 @@
 			"env": "^Rx$\\;confidence:20",
 			"icon": "RxJS.png",
 			"script": "rx(?:\\.\\w+)?(?:\\.compat)?(?:\\.min)?\\.js",
-			"website": "reactivex.io"
+			"website": "http://reactivex.io"
 		},
 		"S.Builder": {
 			"cats": [
@@ -5988,7 +6639,7 @@
 			"meta": {
 				"generator": "S\\.Builder"
 			},
-			"website": "www.sbuilder.ru"
+			"website": "http://www.sbuilder.ru"
 		},
 		"SAP": {
 			"cats": [
@@ -5998,7 +6649,7 @@
 				"Server": "SAP NetWeaver Application Server"
 			},
 			"icon": "SAP.png",
-			"website": "sap.com"
+			"website": "http://sap.com"
 		},
 		"SDL Tridion": {
 			"cats": [
@@ -6006,7 +6657,7 @@
 			],
 			"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": [
@@ -6017,7 +6668,7 @@
 				"SIM.medium": ""
 			},
 			"script": "/sim(?:site|core)/js",
-			"website": "simgroep.nl/internet/portfolio-contentbeheer_41623/"
+			"website": "http://simgroep.nl/internet/portfolio-contentbeheer_41623/"
 		},
 		"SMF": {
 			"cats": [
@@ -6026,7 +6677,7 @@
 			"env": "^smf_",
 			"icon": "SMF.png",
 			"implies": "PHP",
-			"website": "www.simplemachines.org"
+			"website": "http://www.simplemachines.org"
 		},
 		"SOBI 2": {
 			"cats": [
@@ -6035,7 +6686,7 @@
 			"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": [
@@ -6046,7 +6697,7 @@
 				"X-Firefox-Spdy": "\\d\\.\\d"
 			},
 			"icon": "SPDY.png",
-			"website": "chromium.org/spdy"
+			"website": "http://chromium.org/spdy"
 		},
 		"SPIP": {
 			"cats": [
@@ -6056,10 +6707,11 @@
 				"X-Spip-Cache": ""
 			},
 			"icon": "SPIP.png",
+			"implies": "PHP",
 			"meta": {
 				"generator": "(?:^|\\s)SPIP(?:\\s([\\d.]+(?:\\s\\[\\d+\\])?))?\\;version:\\1"
 			},
-			"website": "www.spip.net"
+			"website": "http://www.spip.net"
 		},
 		"SQL Buddy": {
 			"cats": [
@@ -6067,14 +6719,15 @@
 			],
 			"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
 			],
 			"icon": "SQLite.png",
-			"website": "www.sqlite.org"
+			"website": "http://www.sqlite.org"
 		},
 		"SUSE": {
 			"cats": [
@@ -6085,7 +6738,7 @@
 				"X-Powered-By": "SUSE(?:/?\\s?-?([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "SUSE.png",
-			"website": "suse.com"
+			"website": "http://suse.com"
 		},
 		"SWFObject": {
 			"cats": [
@@ -6094,7 +6747,7 @@
 			"env": "^SWFObject$",
 			"icon": "SWFObject.png",
 			"script": "swfobject.*\\.js",
-			"website": "github.com/swfobject/swfobject"
+			"website": "http://github.com/swfobject/swfobject"
 		},
 		"Saia PCD": {
 			"cats": [
@@ -6104,7 +6757,7 @@
 				"Server": "Saia PCD(?:([/a-z\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Saia PCD.png",
-			"website": "saia-pcd.com"
+			"website": "http://saia-pcd.com"
 		},
 		"Sails.js": {
 			"cats": [
@@ -6119,7 +6772,7 @@
 				"Node.js",
 				"Express"
 			],
-			"website": "sailsjs.org"
+			"website": "http://sailsjs.org"
 		},
 		"Sarka-SPIP": {
 			"cats": [
@@ -6130,21 +6783,21 @@
 			"meta": {
 				"generator": "Sarka-SPIP(?:\\s([\\d.]+))?\\;version:\\1"
 			},
-			"website": "sarka-spip.net"
+			"website": "http://sarka-spip.net"
 		},
 		"Scala": {
 			"cats": [
 				27
 			],
 			"icon": "Scala.png",
-			"website": "www.scala-lang.org"
+			"website": "http://www.scala-lang.org"
 		},
 		"Schneider": {
 			"cats": [
 				45
 			],
 			"icon": "Schneider.png",
-			"website": "schneider-electric.com"
+			"website": "http://schneider-electric.com"
 		},
 		"Schneider Web Server": {
 			"cats": [
@@ -6153,11 +6806,11 @@
 			"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": [
@@ -6168,7 +6821,7 @@
 				"X-Powered-By": "Scientific Linux"
 			},
 			"icon": "Scientific Linux.png",
-			"website": "scientificlinux.org"
+			"website": "http://scientificlinux.org"
 		},
 		"Segment": {
 			"cats": [
@@ -6178,16 +6831,16 @@
 			"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
 			],
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "jQuery",
 			"script": "select2.*\\.js",
-			"website": "select2.github.io"
+			"website": "http://select2.github.io"
 		},
 		"Semantic-ui": {
 			"cats": [
@@ -6199,7 +6852,7 @@
 			],
 			"icon": "Semantic-ui.png",
 			"script": "(?:semantic(?:\\.js|\\.min\\.js))",
-			"website": "semantic-ui.com"
+			"website": "http://semantic-ui.com"
 		},
 		"Sencha Touch": {
 			"cats": [
@@ -6208,7 +6861,7 @@
 			],
 			"icon": "Sencha Touch.png",
 			"script": "sencha-touch.*\\.js",
-			"website": "sencha.com/products/touch"
+			"website": "http://sencha.com/products/touch"
 		},
 		"Sentinel Keys Server": {
 			"cats": [
@@ -6217,16 +6870,16 @@
 			"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
 			],
 			"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": [
@@ -6235,8 +6888,8 @@
 			"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": [
@@ -6249,7 +6902,7 @@
 				"Powered-By": "Serendipity v\\.(.+)\\;version:\\1",
 				"generator": "Serendipity"
 			},
-			"website": "s9y.org"
+			"website": "http://s9y.org"
 		},
 		"Shadow": {
 			"cats": [
@@ -6260,7 +6913,7 @@
 			},
 			"icon": "Shadow.png",
 			"implies": "PHP",
-			"website": "shadow-technologies.co.uk"
+			"website": "http://shadow-technologies.co.uk"
 		},
 		"ShareThis": {
 			"cats": [
@@ -6269,7 +6922,19 @@
 			"env": "^SHARETHIS$",
 			"icon": "ShareThis.png",
 			"script": "w\\.sharethis\\.com/",
-			"website": "sharethis.com"
+			"website": "http://sharethis.com"
+		},
+		"ShellInABox": {
+			"cats": [
+				46
+			],
+			"env": "^ShellInABox$",
+			"html": [
+				"<title>Shell In A Box</title>",
+				"must be enabled for ShellInABox</noscript>"
+			],
+			"icon": "ShellInABox.png",
+			"website": "http://shellinabox.com"
 		},
 		"ShinyStat": {
 			"cats": [
@@ -6279,7 +6944,7 @@
 			"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": [
@@ -6288,7 +6953,7 @@
 			],
 			"env": "^Shopalize$",
 			"icon": "Shopalize.png",
-			"website": "shopalize.com"
+			"website": "http://shopalize.com"
 		},
 		"Shopatron": {
 			"cats": [
@@ -6304,7 +6969,7 @@
 				"keywords": "Shopatron"
 			},
 			"script": "mediacdn\\.shopatron\\.com",
-			"website": "ecommerce.shopatron.com"
+			"website": "http://ecommerce.shopatron.com"
 		},
 		"Shopery": {
 			"cats": [
@@ -6319,7 +6984,7 @@
 				"Symfony",
 				"Elcodi"
 			],
-			"website": "shopery.com"
+			"website": "http://shopery.com"
 		},
 		"Shopify": {
 			"cats": [
@@ -6328,7 +6993,7 @@
 			"env": "^Shopify$",
 			"html": "<link[^>]+=['\"]//cdn\\.shopify\\.com",
 			"icon": "Shopify.svg",
-			"website": "shopify.com"
+			"website": "http://shopify.com"
 		},
 		"Shoptet": {
 			"cats": [
@@ -6344,13 +7009,13 @@
 			"script": [
 				"^https?://cdn\\.myshoptet\\.com/"
 			],
-			"website": "www.shoptet.cz"
+			"website": "http://www.shoptet.cz"
 		},
 		"Shopware": {
 			"cats": [
 				6
 			],
-			"html": "<title>Shopware ([\\d\\.]+) [^<]+\\;version:\\1\\;confidence:90",
+			"html": "<title>Shopware ([\\d\\.]+) [^<]+\\;version:\\1",
 			"icon": "Shopware.png",
 			"implies": [
 				"PHP",
@@ -6361,7 +7026,7 @@
 				"application-name": "Shopware"
 			},
 			"script": "(?:(shopware)|/web/cache/[0-9]{10}_.+)\\.js\\;version:\\1?4:5",
-			"website": "shopware.com"
+			"website": "http://shopware.com"
 		},
 		"Silva": {
 			"cats": [
@@ -6371,7 +7036,7 @@
 				"X-Powered-By": "SilvaCMS"
 			},
 			"icon": "Silva.png",
-			"website": "silvacms.org"
+			"website": "http://silvacms.org"
 		},
 		"SilverStripe": {
 			"cats": [
@@ -6382,7 +7047,7 @@
 			"meta": {
 				"generator": "SilverStripe"
 			},
-			"website": "www.silverstripe.org"
+			"website": "http://www.silverstripe.org"
 		},
 		"SimpleHTTP": {
 			"cats": [
@@ -6391,8 +7056,8 @@
 			"headers": {
 				"Server": "SimpleHTTP(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"Site Meter": {
 			"cats": [
@@ -6400,7 +7065,7 @@
 			],
 			"icon": "Site Meter.png",
 			"script": "sitemeter\\.com/js/counter\\.js\\?site=",
-			"website": "www.sitemeter.com"
+			"website": "http://www.sitemeter.com"
 		},
 		"SiteCatalyst": {
 			"cats": [
@@ -6409,7 +7074,7 @@
 			"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": [
@@ -6419,7 +7084,7 @@
 			"meta": {
 				"generator": "SiteEdit"
 			},
-			"website": "www.siteedit.ru"
+			"website": "http://www.siteedit.ru"
 		},
 		"Sitecore": {
 			"cats": [
@@ -6430,7 +7095,18 @@
 			},
 			"html": "<img[^>]+src=\"[^>]*/~/media/[^>]+\\.ashx",
 			"icon": "Sitecore.png",
-			"website": "sitecore.net"
+			"website": "http://sitecore.net"
+		},
+		"Sitefinity": {
+			"cats": [
+				1
+			],
+			"icon": "Sitefinity.svg",
+			"implies": "Microsoft ASP.NET",
+			"meta": {
+				"generator": "^Sitefinity (.+)$\\;version:\\1"
+			},
+			"website": "http://www.sitefinity.com"
 		},
 		"Sivuviidakko": {
 			"cats": [
@@ -6440,7 +7116,7 @@
 			"meta": {
 				"generator": "Sivuviidakko"
 			},
-			"website": "sivuviidakko.fi"
+			"website": "http://sivuviidakko.fi"
 		},
 		"Sizmek": {
 			"cats": [
@@ -6449,7 +7125,7 @@
 			"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": [
@@ -6460,7 +7136,7 @@
 			"icon": "Slimbox.png",
 			"implies": "MooTools",
 			"script": "slimbox\\.js",
-			"website": "www.digitalia.be/software/slimbox"
+			"website": "http://www.digitalia.be/software/slimbox"
 		},
 		"Slimbox 2": {
 			"cats": [
@@ -6471,7 +7147,7 @@
 			"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": [
@@ -6480,7 +7156,7 @@
 			"env": "^SmartAdServer$",
 			"html": "<img[^>]+smartadserver\\.com\\/call",
 			"icon": "Smart Ad Server.png",
-			"website": "smartadserver.com"
+			"website": "http://smartadserver.com"
 		},
 		"SmartSite": {
 			"cats": [
@@ -6491,7 +7167,7 @@
 			"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": [
@@ -6499,7 +7175,7 @@
 			],
 			"icon": "Smartstore.png",
 			"script": "smjslib\\.js",
-			"website": "smartstore.com"
+			"website": "http://smartstore.com"
 		},
 		"Snap": {
 			"cats": [
@@ -6511,7 +7187,7 @@
 			},
 			"icon": "Snap.png",
 			"implies": "Haskell",
-			"website": "snapframework.com"
+			"website": "http://snapframework.com"
 		},
 		"Snap.svg": {
 			"cats": [
@@ -6520,7 +7196,7 @@
 			"env": "^Snap$",
 			"icon": "Snap.svg.png",
 			"script": "snap\\.svg(?:-min)?\\.js",
-			"website": "snapsvg.io"
+			"website": "http://snapsvg.io"
 		},
 		"Snoobi": {
 			"cats": [
@@ -6529,7 +7205,7 @@
 			"env": "^snoobi$",
 			"icon": "Snoobi.png",
 			"script": "snoobi\\.com/snoop\\.php",
-			"website": "www.snoobi.com"
+			"website": "http://www.snoobi.com"
 		},
 		"SobiPro": {
 			"cats": [
@@ -6538,7 +7214,7 @@
 			"env": "^SobiProUrl$",
 			"icon": "SobiPro.png",
 			"implies": "Joomla",
-			"website": "sigsiu.net/sobipro.html"
+			"website": "http://sigsiu.net/sobipro.html"
 		},
 		"Socket.io": {
 			"cats": [
@@ -6548,7 +7224,7 @@
 			"icon": "Socket.io.png",
 			"implies": "Node.js",
 			"script": "socket.io.*\\.js",
-			"website": "socket.io"
+			"website": "http://socket.io"
 		},
 		"Solodev": {
 			"cats": [
@@ -6557,10 +7233,10 @@
 			"headers": {
 				"solodev_session": ""
 			},
-			"html": "<div class='dynamicDiv' id='dd\\.\\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": [
@@ -6568,7 +7244,7 @@
 			],
 			"icon": "Solr.png",
 			"implies": "Lucene",
-			"website": "lucene.apache.org/solr/"
+			"website": "http://lucene.apache.org/solr/"
 		},
 		"Solve Media": {
 			"cats": [
@@ -6578,7 +7254,7 @@
 			"env": "^(?:_?ACPuzzle|adcopy-puzzle-image-image$)",
 			"icon": "Solve Media.png",
 			"script": "^https?://api\\.solvemedia\\.com/",
-			"website": "solvemedia.com"
+			"website": "http://solvemedia.com"
 		},
 		"SoundManager": {
 			"cats": [
@@ -6586,7 +7262,7 @@
 			],
 			"env": "^(?:SoundManager|BaconPlayer)$",
 			"icon": "SoundManager.png",
-			"website": "www.schillmania.com/projects/soundmanager2"
+			"website": "http://www.schillmania.com/projects/soundmanager2"
 		},
 		"Sphinx": {
 			"cats": [
@@ -6595,7 +7271,7 @@
 			"env": "^DOCUMENTATION_OPTIONS$",
 			"icon": "Sphinx.png",
 			"implies": "Python",
-			"website": "sphinx.pocoo.org"
+			"website": "http://sphinx.pocoo.org"
 		},
 		"SpiderControl iniNet": {
 			"cats": [
@@ -6605,7 +7281,7 @@
 			"meta": {
 				"generator": "iniNet SpiderControl"
 			},
-			"website": "spidercontrol.net/ininet"
+			"website": "http://spidercontrol.net/ininet"
 		},
 		"Splunk": {
 			"cats": [
@@ -6616,7 +7292,7 @@
 			"meta": {
 				"author": "Splunk Inc\\;confidence:50"
 			},
-			"website": "splunk.com"
+			"website": "http://splunk.com"
 		},
 		"Splunkd": {
 			"cats": [
@@ -6625,8 +7301,8 @@
 			"headers": {
 				"Server": "Splunkd"
 			},
-			"icon": "Splunkd.png",
-			"website": "splunk.com"
+			"icon": "Splunk.png",
+			"website": "http://splunk.com"
 		},
 		"Spree": {
 			"cats": [
@@ -6635,7 +7311,7 @@
 			"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": [
@@ -6646,7 +7322,7 @@
 				"X-ServedBy": "squarespace"
 			},
 			"icon": "Squarespace.png",
-			"website": "www.squarespace.com"
+			"website": "http://www.squarespace.com"
 		},
 		"SquirrelMail": {
 			"cats": [
@@ -6657,7 +7333,7 @@
 			"icon": "SquirrelMail.png",
 			"implies": "PHP",
 			"url": "/src/webmail\\.php(?:$|\\?)",
-			"website": "squirrelmail.org"
+			"website": "http://squirrelmail.org"
 		},
 		"Squiz Matrix": {
 			"cats": [
@@ -6672,7 +7348,7 @@
 			"meta": {
 				"generator": "Squiz Matrix"
 			},
-			"website": "squiz.net"
+			"website": "http://squiz.net"
 		},
 		"Stackla": {
 			"cats": [
@@ -6681,15 +7357,15 @@
 			"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
 			],
 			"env": "^stacklaSocialHub$",
-			"icon": "Stackla Social Hub.png",
-			"website": "stackla.com/"
+			"icon": "Stackla.png",
+			"website": "http://stackla.com/"
 		},
 		"Stamplay": {
 			"cats": [
@@ -6701,7 +7377,7 @@
 			},
 			"icon": "Stamplay.png",
 			"script": "stamplay.*\\.js",
-			"website": "stamplay.com"
+			"website": "http://stamplay.com"
 		},
 		"Starlet": {
 			"cats": [
@@ -6712,7 +7388,7 @@
 			},
 			"icon": "Starlet.png",
 			"implies": "Perl",
-			"website": "metacpan.org/pod/Starlet"
+			"website": "http://metacpan.org/pod/Starlet"
 		},
 		"StatCounter": {
 			"cats": [
@@ -6720,7 +7396,7 @@
 			],
 			"icon": "StatCounter.png",
 			"script": "statcounter\\.com/counter/counter",
-			"website": "www.statcounter.com"
+			"website": "http://www.statcounter.com"
 		},
 		"Store Systems": {
 			"cats": [
@@ -6728,7 +7404,7 @@
 			],
 			"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": [
@@ -6740,7 +7416,7 @@
 				"Google Code Prettify"
 			],
 			"script": "strapdown\\.js",
-			"website": "strapdownjs.com"
+			"website": "http://strapdownjs.com"
 		},
 		"Strato": {
 			"cats": [
@@ -6748,7 +7424,7 @@
 			],
 			"html": "<a href=\"http://www.strato.de/\" target=\"_blank\">",
 			"icon": "strato.png",
-			"website": "shop.strato.com"
+			"website": "http://shop.strato.com"
 		},
 		"Stripe": {
 			"cats": [
@@ -6758,7 +7434,7 @@
 			"html": "<input[^>]+data-stripe",
 			"icon": "Stripe.png",
 			"script": "js\\.stripe\\.com",
-			"website": "stripe.com"
+			"website": "http://stripe.com"
 		},
 		"SublimeVideo": {
 			"cats": [
@@ -6767,7 +7443,7 @@
 			"env": "^sublimevideo$",
 			"icon": "SublimeVideo.png",
 			"script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
-			"website": "sublimevideo.net"
+			"website": "http://sublimevideo.net"
 		},
 		"Subrion": {
 			"cats": [
@@ -6781,7 +7457,7 @@
 			"meta": {
 				"generator": "^Subrion "
 			},
-			"website": "subrion.com"
+			"website": "http://subrion.com"
 		},
 		"Sulu": {
 			"cats": [
@@ -6791,24 +7467,17 @@
 				"X-Generator": "Sulu/?(.+)?$\\;version:\\1"
 			},
 			"icon": "Sulu.svg",
-			"implies": [
-				"PHP",
-				"Symfony"
-			],
-			"website": "sulu.io"
+			"implies": "Symfony",
+			"website": "http://sulu.io"
 		},
 		"SumoMe": {
 			"cats": [
 				5,
-				10,
-				32,
-				36,
-				47,
-				51
+				32
 			],
 			"icon": "SumoMe.png",
 			"script": "load\\.sumome\\.com",
-			"website": "sumome.com"
+			"website": "http://sumome.com"
 		},
 		"SunOS": {
 			"cats": [
@@ -6819,7 +7488,7 @@
 				"Servlet-engine": "SunOS( [\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "Oracle.png",
-			"website": "oracle.com/solaris"
+			"website": "http://oracle.com/solaris"
 		},
 		"Supersized": {
 			"cats": [
@@ -6828,7 +7497,7 @@
 			],
 			"icon": "Supersized.png",
 			"script": "supersized(?:\\.([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
-			"website": "buildinternet.com/project/supersized"
+			"website": "http://buildinternet.com/project/supersized"
 		},
 		"SweetAlert": {
 			"cats": [
@@ -6838,7 +7507,7 @@
 			"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": [
@@ -6855,7 +7524,16 @@
 			"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": [
@@ -6863,17 +7541,20 @@
 			],
 			"icon": "Symfony.png",
 			"implies": "PHP",
-			"website": "symfony.com"
+			"website": "http://symfony.com"
 		},
 		"Synology DiskStation": {
 			"cats": [
 				48
 			],
+			"html": "<noscript><div class='syno-no-script'",
 			"icon": "Synology DiskStation.png",
 			"meta": {
-				"application-name": "Synology DiskStation"
+				"application-name": "Synology DiskStation",
+				"description": "^DiskStation provides a full-featured network attached storage"
 			},
-			"website": "synology.com"
+			"script": "webapi/entry\\.cgi\\?api=SYNO\\.(?:Core|Filestation)\\.Desktop\\.",
+			"website": "http://synology.com"
 		},
 		"SyntaxHighlighter": {
 			"cats": [
@@ -6882,7 +7563,7 @@
 			"env": "^SyntaxHighlighter$",
 			"html": "<(?:script|link)[^>]*sh(?:Core|Brush|ThemeDefault)",
 			"icon": "SyntaxHighlighter.png",
-			"website": "github.com/syntaxhighlighter"
+			"website": "http://github.com/syntaxhighlighter"
 		},
 		"TWiki": {
 			"cats": [
@@ -6893,8 +7574,9 @@
 			},
 			"html": "<img [^>]*(?:title|alt)=\"This site is powered by the TWiki collaboration platform",
 			"icon": "TWiki.png",
+			"implies": "Perl",
 			"script": "(?:TWikiJavascripts|twikilib(?:\\.min)?\\.js)",
-			"website": "twiki.org"
+			"website": "http://twiki.org"
 		},
 		"TYPO3 CMS": {
 			"cats": [
@@ -6907,33 +7589,7 @@
 				"generator": "TYPO3\\s+(?:CMS\\s+)?([\\d.]+)?(?:\\s+CMS)?\\;version:\\1"
 			},
 			"url": "/typo3/",
-			"website": "www.typo3.org"
-		},
-		"TYPO3 Flow": {
-			"cats": [
-				18
-			],
-			"excludes": "TYPO3 CMS",
-			"headers": {
-				"X-Flow-Powered": "Flow/?(.+)?$\\;version:\\1"
-			},
-			"icon": "TYPO3.svg",
-			"implies": "PHP",
-			"website": "flow.typo3.org"
-		},
-		"TYPO3 Neos": {
-			"cats": [
-				1
-			],
-			"excludes": "TYPO3 CMS",
-			"html": "<html[^>]+xmlns:typo3=\"[^\"]+Flow/Packages/Neos/",
-			"icon": "TYPO3.svg",
-			"implies": [
-				"PHP",
-				"TYPO3 Flow"
-			],
-			"url": "/neos/",
-			"website": "neos.io"
+			"website": "http://www.typo3.org"
 		},
 		"Taiga": {
 			"cats": [
@@ -6945,7 +7601,15 @@
 				"Django",
 				"AngularJS"
 			],
-			"website": "taiga.io"
+			"website": "http://taiga.io"
+		},
+		"Tawk.to": {
+			"cats": [
+				52
+			],
+			"icon": "TawkTo.png",
+			"script": "//embed\\.tawk\\.to",
+			"website": "http://tawk.to"
 		},
 		"Tealeaf": {
 			"cats": [
@@ -6953,7 +7617,16 @@
 			],
 			"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": [
@@ -6968,7 +7641,7 @@
 			"meta": {
 				"application-name": "TeamCity"
 			},
-			"website": "jetbrains.com/teamcity"
+			"website": "http://jetbrains.com/teamcity"
 		},
 		"Telescope": {
 			"cats": [
@@ -6977,7 +7650,7 @@
 			"env": "Telescope",
 			"icon": "Telescope.png",
 			"implies": "Meteor",
-			"website": "telescopeapp.org"
+			"website": "http://telescopeapp.org"
 		},
 		"Tengine": {
 			"cats": [
@@ -6987,17 +7660,21 @@
 				"Server": "Tengine"
 			},
 			"icon": "Tengine.png",
-			"website": "tengine.taobao.org"
+			"website": "http://tengine.taobao.org"
 		},
 		"Textpattern CMS": {
 			"cats": [
 				1
 			],
 			"icon": "Textpattern CMS.png",
+			"implies": [
+				"PHP",
+				"MySQL"
+			],
 			"meta": {
 				"generator": "Textpattern"
 			},
-			"website": "textpattern.com"
+			"website": "http://textpattern.com"
 		},
 		"Thelia": {
 			"cats": [
@@ -7010,7 +7687,7 @@
 				"PHP",
 				"Symfony"
 			],
-			"website": "thelia.net"
+			"website": "http://thelia.net"
 		},
 		"ThinkPHP": {
 			"cats": [
@@ -7021,7 +7698,7 @@
 			},
 			"icon": "ThinkPHP.png",
 			"implies": "PHP",
-			"website": "www.thinkphp.cn"
+			"website": "http://www.thinkphp.cn"
 		},
 		"TiddlyWiki": {
 			"cats": [
@@ -7039,7 +7716,7 @@
 				"generator": "^TiddlyWiki$",
 				"tiddlywiki-version": "(.*)\\;version:\\1"
 			},
-			"website": "tiddlywiki.com"
+			"website": "http://tiddlywiki.com"
 		},
 		"Tiki Wiki CMS Groupware": {
 			"cats": [
@@ -7054,7 +7731,7 @@
 				"generator": "^Tiki"
 			},
 			"script": "(?:/|_)tiki",
-			"website": "tiki.org"
+			"website": "http://tiki.org"
 		},
 		"Timeplot": {
 			"cats": [
@@ -7063,7 +7740,7 @@
 			"env": "^Timeplot$",
 			"icon": "Timeplot.png",
 			"script": "timeplot.*\\.js",
-			"website": "www.simile-widgets.org/timeplot/"
+			"website": "http://www.simile-widgets.org/timeplot/"
 		},
 		"TinyMCE": {
 			"cats": [
@@ -7071,7 +7748,7 @@
 			],
 			"env": "^tinyMCE$",
 			"icon": "TinyMCE.png",
-			"website": "tinymce.com"
+			"website": "http://tinymce.com"
 		},
 		"Titan": {
 			"cats": [
@@ -7083,7 +7760,7 @@
 			],
 			"html": "<script[^>]+>var titan",
 			"icon": "Titan.png",
-			"website": "titan360.com"
+			"website": "http://titan360.com"
 		},
 		"TomatoCart": {
 			"cats": [
@@ -7094,7 +7771,7 @@
 			"meta": {
 				"generator": "TomatoCart"
 			},
-			"website": "tomatocart.com"
+			"website": "http://tomatocart.com"
 		},
 		"TornadoServer": {
 			"cats": [
@@ -7104,7 +7781,7 @@
 				"Server": "TornadoServer(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "TornadoServer.png",
-			"website": "tornadoweb.org"
+			"website": "http://tornadoweb.org"
 		},
 		"Trac": {
 			"cats": [
@@ -7116,7 +7793,7 @@
 			],
 			"icon": "Trac.png",
 			"implies": "Python",
-			"website": "trac.edgewall.org"
+			"website": "http://trac.edgewall.org"
 		},
 		"TrackJs": {
 			"cats": [
@@ -7125,7 +7802,7 @@
 			"env": "^TrackJs$",
 			"icon": "TrackJs.png",
 			"script": "tracker.js",
-			"website": "trackjs.com"
+			"website": "http://trackjs.com"
 		},
 		"Tumblr": {
 			"cats": [
@@ -7137,7 +7814,7 @@
 			"html": "<iframe src=\"[^>]+tumblr\\.com",
 			"icon": "Tumblr.png",
 			"url": "^https?://(?:www\\.)?[^/]+\\.tumblr\\.com/",
-			"website": "www.tumblr.com"
+			"website": "http://www.tumblr.com"
 		},
 		"TweenMax": {
 			"cats": [
@@ -7146,7 +7823,7 @@
 			"env": "^TweenMax$",
 			"icon": "TweenMax.png",
 			"script": "TweenMax(?:\\.min)?\\.js",
-			"website": "greensock.com/tweenmax"
+			"website": "http://greensock.com/tweenmax"
 		},
 		"Twilight CMS": {
 			"cats": [
@@ -7156,7 +7833,7 @@
 				"X-Powered-CMS": "Twilight CMS"
 			},
 			"icon": "Twilight CMS.png",
-			"website": "www.twilightcms.com"
+			"website": "http://www.twilightcms.com"
 		},
 		"TwistPHP": {
 			"cats": [
@@ -7167,7 +7844,7 @@
 			},
 			"icon": "TwistPHP.png",
 			"implies": "PHP",
-			"website": "twistphp.com"
+			"website": "http://twistphp.com"
 		},
 		"TwistedWeb": {
 			"cats": [
@@ -7177,7 +7854,15 @@
 				"Server": "TwistedWeb(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "TwistedWeb.png",
-			"website": "twistedmatrix.com/trac/wiki/TwistedWeb"
+			"website": "http://twistedmatrix.com/trac/wiki/TwistedWeb"
+		},
+		"Twitter": {
+			"cats": [
+				5
+			],
+			"icon": "Twitter.svg",
+			"script": "//platform\\.twitter\\.com/widgets\\.js",
+			"website": "http://twitter.com"
 		},
 		"Twitter Bootstrap": {
 			"cats": [
@@ -7187,20 +7872,20 @@
 			"html": [
 				"<style>/\\*!\\* Bootstrap v(\\d\\.\\d\\.\\d)\\;version:\\1",
 				"<link[^>]+?href=\"[^\"]+bootstrap(?:\\.min)?\\.css",
-				"<div [^>]*class=\"[^\"]*col-(?:xs|sm|md|lg)-\\d{1,2}"
+				"<div[^>]+class=\"[^\"]*col-(?:xs|sm|md|lg)-\\d{1,2}"
 			],
 			"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
 			],
 			"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": [
@@ -7209,7 +7894,7 @@
 			"env": "^flight$",
 			"icon": "Twitter Flight.png",
 			"implies": "jQuery",
-			"website": "flightjs.github.io/"
+			"website": "http://flightjs.github.io/"
 		},
 		"Twitter typeahead.js": {
 			"cats": [
@@ -7219,7 +7904,7 @@
 			"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": [
@@ -7230,7 +7915,7 @@
 				"generator": "typepad"
 			},
 			"url": "typepad\\.com",
-			"website": "www.typepad.com"
+			"website": "http://www.typepad.com"
 		},
 		"Typekit": {
 			"cats": [
@@ -7239,7 +7924,7 @@
 			"env": "^Typekit$",
 			"icon": "Typekit.png",
 			"script": "use\\.typekit\\.com",
-			"website": "typekit.com"
+			"website": "http://typekit.com"
 		},
 		"UIKit": {
 			"cats": [
@@ -7247,7 +7932,7 @@
 			],
 			"icon": "UIKit.png",
 			"script": "uikit.*\\.js",
-			"website": "getuikit.com"
+			"website": "http://getuikit.com"
 		},
 		"UNIX": {
 			"cats": [
@@ -7257,7 +7942,7 @@
 				"Server": "Unix"
 			},
 			"icon": "UNIX.png",
-			"website": "unix.org"
+			"website": "http://unix.org"
 		},
 		"Ubercart": {
 			"cats": [
@@ -7266,7 +7951,7 @@
 			"icon": "Ubercart.png",
 			"implies": "Drupal",
 			"script": "uc_cart/uc_cart_block\\.js",
-			"website": "www.ubercart.org"
+			"website": "http://www.ubercart.org"
 		},
 		"Ubuntu": {
 			"cats": [
@@ -7277,7 +7962,7 @@
 				"X-Powered-By": "Ubuntu"
 			},
 			"icon": "Ubuntu.png",
-			"website": "www.ubuntu.com/server"
+			"website": "http://www.ubuntu.com/server"
 		},
 		"UltraCart": {
 			"cats": [
@@ -7288,7 +7973,7 @@
 			"icon": "UltraCart.png",
 			"script": "cgi-bin\\/UCJavaScript\\?(?:[^\"]*&)?merchantid=.",
 			"url": "/cgi-bin/UCEditor\\?(?:.*&)?merchantid=.",
-			"website": "ultracart.com"
+			"website": "http://ultracart.com"
 		},
 		"Umbraco": {
 			"cats": [
@@ -7305,7 +7990,7 @@
 				"generator": "umbraco"
 			},
 			"url": "/umbraco/login\\.aspx(?:$|\\?)",
-			"website": "umbraco.com"
+			"website": "http://umbraco.com"
 		},
 		"Unbounce": {
 			"cats": [
@@ -7316,7 +8001,7 @@
 				"X-Unbounce-PageId": ""
 			},
 			"icon": "Unbounce.png",
-			"website": "unbounce.com"
+			"website": "http://unbounce.com"
 		},
 		"Underscore.js": {
 			"cats": [
@@ -7324,7 +8009,26 @@
 			],
 			"icon": "Underscore.js.png",
 			"script": "underscore.*\\.js",
-			"website": "underscorejs.org"
+			"website": "http://underscorejs.org"
+		},
+		"Usabilla": {
+			"cats": [
+				13
+			],
+			"env": "^usabilla_live$",
+			"icon": "Usabilla.svg",
+			"website": "http://usabilla.com"
+		},
+		"UserLike": {
+			"cats": [
+				52
+			],
+			"icon": "UserLike.svg",
+			"script": [
+				"userlike\\.min\\.js",
+				"userlikelib\\.min\\.js"
+			],
+			"website": "http://userlike.com"
 		},
 		"UserRules": {
 			"cats": [
@@ -7332,7 +8036,7 @@
 			],
 			"env": "^_usrp$",
 			"icon": "UserRules.png",
-			"website": "www.userrules.com"
+			"website": "http://www.userrules.com"
 		},
 		"UserVoice": {
 			"cats": [
@@ -7340,7 +8044,7 @@
 			],
 			"env": "^UserVoice$",
 			"icon": "UserVoice.png",
-			"website": "uservoice.com"
+			"website": "http://uservoice.com"
 		},
 		"Ushahidi": {
 			"cats": [
@@ -7358,7 +8062,7 @@
 				"OpenLayers"
 			],
 			"script": "/js/ushahidi\\.js$",
-			"website": "www.ushahidi.com"
+			"website": "http://www.ushahidi.com"
 		},
 		"VIVVO": {
 			"cats": [
@@ -7369,7 +8073,7 @@
 				"Set-Cookie": "VivvoSessionId"
 			},
 			"icon": "VIVVO.png",
-			"website": "vivvo.net"
+			"website": "http://vivvo.net"
 		},
 		"VP-ASP": {
 			"cats": [
@@ -7379,7 +8083,7 @@
 			"icon": "VP-ASP.png",
 			"implies": "Microsoft ASP.NET",
 			"script": "vs350\\.js",
-			"website": "www.vpasp.com"
+			"website": "http://www.vpasp.com"
 		},
 		"VTEX Enterprise": {
 			"cats": [
@@ -7389,7 +8093,7 @@
 				"powered": "vtex"
 			},
 			"icon": "VTEX Enterprise.png",
-			"website": "vtex.com"
+			"website": "http://vtex.com"
 		},
 		"VTEX Integrated Store": {
 			"cats": [
@@ -7399,7 +8103,7 @@
 				"X-Powered-By": "vtex-integrated-store"
 			},
 			"icon": "VTEX Integrated Store.png",
-			"website": "lojaintegrada.com.br"
+			"website": "http://lojaintegrada.com.br"
 		},
 		"Vanilla": {
 			"cats": [
@@ -7411,7 +8115,7 @@
 			"html": "<body id=\"(?:DiscussionsPage|vanilla)",
 			"icon": "Vanilla.png",
 			"implies": "PHP",
-			"website": "vanillaforums.org"
+			"website": "http://vanillaforums.org"
 		},
 		"Varnish": {
 			"cats": [
@@ -7426,7 +8130,7 @@
 				"X-Varnish-Hostname": ""
 			},
 			"icon": "Varnish.svg",
-			"website": "www.varnish-cache.org"
+			"website": "http://www.varnish-cache.org"
 		},
 		"Venda": {
 			"cats": [
@@ -7436,7 +8140,7 @@
 				"X-venda-hitid": ""
 			},
 			"icon": "Venda.png",
-			"website": "venda.com"
+			"website": "http://venda.com"
 		},
 		"Veoxa": {
 			"cats": [
@@ -7446,7 +8150,7 @@
 			"html": "<img [^>]*src=\"[^\"]+tracking\\.veoxa\\.com",
 			"icon": "Veoxa.png",
 			"script": "tracking\\.veoxa\\.com",
-			"website": "veoxa.com"
+			"website": "http://veoxa.com"
 		},
 		"VideoJS": {
 			"cats": [
@@ -7456,7 +8160,7 @@
 			"html": "<div[^>]+class=\"video-js+\">",
 			"icon": "VideoJS.png",
 			"script": "zencdn\\.net/c/video\\.js",
-			"website": "videojs.com"
+			"website": "http://videojs.com"
 		},
 		"VigLink": {
 			"cats": [
@@ -7465,7 +8169,7 @@
 			"env": "^(?:vglnk(?:$|_)|vl_(?:cB|disable)$)",
 			"icon": "VigLink.png",
 			"script": "(?:^[^/]*//[^/]*viglink\\.com/api/|vglnk\\.js)",
-			"website": "viglink.com"
+			"website": "http://viglink.com"
 		},
 		"Vignette": {
 			"cats": [
@@ -7473,7 +8177,7 @@
 			],
 			"html": "<[^>]+=\"vgn-?ext",
 			"icon": "Vignette.png",
-			"website": "www.vignette.com"
+			"website": "http://www.vignette.com"
 		},
 		"Vimeo": {
 			"cats": [
@@ -7481,7 +8185,7 @@
 			],
 			"html": "(?:<(?:param|embed)[^>]+vimeo\\.com/moogaloop|<iframe[^>]player\\.vimeo\\.com)",
 			"icon": "Vimeo.png",
-			"website": "vimeo.com"
+			"website": "http://vimeo.com"
 		},
 		"Virata EmWeb": {
 			"cats": [
@@ -7490,11 +8194,11 @@
 			"headers": {
 				"Server": "Virata-EmWeb(?:/(R?[\\d._]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": [
 				"HP"
 			],
-			"website": "???"
+			"website": "http://example.com"
 		},
 		"VirtueMart": {
 			"cats": [
@@ -7503,7 +8207,7 @@
 			"html": "<div id=\"vmMainPage",
 			"icon": "VirtueMart.png",
 			"implies": "Joomla",
-			"website": "virtuemart.net"
+			"website": "http://virtuemart.net"
 		},
 		"Visual WebGUI": {
 			"cats": [
@@ -7517,7 +8221,7 @@
 			},
 			"script": "\\.js\\.wgx$",
 			"url": "\\.wgx$",
-			"website": "www.gizmox.com/products/visual-web-gui/"
+			"website": "http://www.gizmox.com/products/visual-web-gui/"
 		},
 		"VisualPath": {
 			"cats": [
@@ -7525,7 +8229,7 @@
 			],
 			"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": [
@@ -7535,7 +8239,7 @@
 			"html": "<link [^>]*href=\"[^\"]*/vspfiles/",
 			"icon": "Volusion.png",
 			"script": "/volusion\\.js(?:\\?([\\d.]*))?\\;version:\\1",
-			"website": "volusion.com"
+			"website": "http://volusion.com"
 		},
 		"Vox": {
 			"cats": [
@@ -7543,7 +8247,7 @@
 			],
 			"icon": "Vox.png",
 			"url": "\\.vox\\.com",
-			"website": "www.vox.com"
+			"website": "http://www.vox.com"
 		},
 		"Vue.js": {
 			"cats": [
@@ -7556,7 +8260,7 @@
 				"/([\\d.]+)/vue(?:\\.min)?\\.js\\;version:\\1",
 				"vue.*\\.js\\;confidence:20"
 			],
-			"website": "vuejs.org"
+			"website": "http://vuejs.org"
 		},
 		"W3 Total Cache": {
 			"cats": [
@@ -7568,7 +8272,7 @@
 			"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": [
@@ -7576,7 +8280,7 @@
 			],
 			"icon": "W3Counter.png",
 			"script": "w3counter\\.com/tracker\\.js",
-			"website": "www.w3counter.com"
+			"website": "http://www.w3counter.com"
 		},
 		"WHMCS": {
 			"cats": [
@@ -7586,7 +8290,7 @@
 				"Set-Cookie": "^WHMCS.*"
 			},
 			"icon": "WHMCS.png",
-			"website": "www.whmcs.com"
+			"website": "http://www.whmcs.com"
 		},
 		"WP Rocket": {
 			"cats": [
@@ -7598,7 +8302,7 @@
 			"html": "<!--[^>]+WP Rocket",
 			"icon": "WP Rocket.png",
 			"implies": "WordPress",
-			"website": "wp-rocket.me"
+			"website": "http://wp-rocket.me"
 		},
 		"Warp": {
 			"cats": [
@@ -7609,7 +8313,7 @@
 			},
 			"icon": "Warp.png",
 			"implies": "Haskell",
-			"website": "www.stackage.org/package/warp"
+			"website": "http://www.stackage.org/package/warp"
 		},
 		"Web Optimizer": {
 			"cats": [
@@ -7617,7 +8321,7 @@
 			],
 			"html": "<title [^>]*lang=\"wo\">",
 			"icon": "Web Optimizer.png",
-			"website": "www.web-optimizer.us"
+			"website": "http://www.web-optimizer.us"
 		},
 		"Web2py": {
 			"cats": [
@@ -7635,7 +8339,7 @@
 				"generator": "^Web2py"
 			},
 			"script": "web2py\\.js",
-			"website": "web2py.com"
+			"website": "http://web2py.com"
 		},
 		"WebGUI": {
 			"cats": [
@@ -7649,7 +8353,7 @@
 			"meta": {
 				"generator": "^WebGUI ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.webgui.org"
+			"website": "http://www.webgui.org"
 		},
 		"WebPublisher": {
 			"cats": [
@@ -7659,7 +8363,7 @@
 			"meta": {
 				"generator": "WEB\\|Publisher"
 			},
-			"website": "scannet.dk"
+			"website": "http://scannet.dk"
 		},
 		"Webix": {
 			"cats": [
@@ -7668,7 +8372,7 @@
 			"env": "^webix$",
 			"icon": "Webix.png",
 			"script": "\bwebix\\.js",
-			"website": "webix.com"
+			"website": "http://webix.com"
 		},
 		"Webs": {
 			"cats": [
@@ -7678,7 +8382,7 @@
 				"Server": "Webs\\.com/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "Webs.png",
-			"website": "webs.com"
+			"website": "http://webs.com"
 		},
 		"WebsPlanet": {
 			"cats": [
@@ -7688,7 +8392,7 @@
 			"meta": {
 				"generator": "WebsPlanet"
 			},
-			"website": "websplanet.com"
+			"website": "http://websplanet.com"
 		},
 		"Websale": {
 			"cats": [
@@ -7696,7 +8400,7 @@
 			],
 			"icon": "Websale.png",
 			"url": "/websale7/",
-			"website": "websale.de"
+			"website": "http://websale.de"
 		},
 		"WebsiteBaker": {
 			"cats": [
@@ -7710,7 +8414,7 @@
 			"meta": {
 				"generator": "WebsiteBaker"
 			},
-			"website": "websitebaker2.org/en/home.php"
+			"website": "http://websitebaker2.org/en/home.php"
 		},
 		"Webtrekk": {
 			"cats": [
@@ -7718,7 +8422,7 @@
 			],
 			"env": "^webtrekk",
 			"icon": "Webtrekk.png",
-			"website": "www.webtrekk.com"
+			"website": "http://www.webtrekk.com"
 		},
 		"Webtrends": {
 			"cats": [
@@ -7727,7 +8431,7 @@
 			"env": "^(?:WTOptimize|WebTrends)",
 			"html": "<img[^>]+id=\"DCSIMG\"[^>]+webtrends",
 			"icon": "Webtrends.png",
-			"website": "worldwide.webtrends.com"
+			"website": "http://worldwide.webtrends.com"
 		},
 		"Weebly": {
 			"cats": [
@@ -7735,7 +8439,7 @@
 			],
 			"icon": "Weebly.png",
 			"script": "cdn\\d+\\.editmysite\\.com",
-			"website": "www.weebly.com"
+			"website": "http://www.weebly.com"
 		},
 		"Wikispaces": {
 			"cats": [
@@ -7746,7 +8450,7 @@
 				"<\\w+[^>]*\\s+class=\"[^\"]*WikispacesContent\\s+WikispacesBs3[^\"]*\""
 			],
 			"icon": "Wikispaces.png",
-			"website": "www.wikispaces.com"
+			"website": "http://www.wikispaces.com"
 		},
 		"WikkaWiki": {
 			"cats": [
@@ -7757,7 +8461,7 @@
 			"meta": {
 				"generator": "WikkaWiki"
 			},
-			"website": "wikkawiki.org"
+			"website": "http://wikkawiki.org"
 		},
 		"Windows CE": {
 			"cats": [
@@ -7767,7 +8471,7 @@
 				"Server": "\bWinCE\b"
 			},
 			"icon": "Microsoft.svg",
-			"website": "microsoft.com"
+			"website": "http://microsoft.com"
 		},
 		"Windows Server": {
 			"cats": [
@@ -7777,7 +8481,7 @@
 				"Server": "Win32|Win64"
 			},
 			"icon": "Microsoft.svg",
-			"website": "microsoft.com/windowsserver"
+			"website": "http://microsoft.com/windowsserver"
 		},
 		"Wink": {
 			"cats": [
@@ -7787,7 +8491,7 @@
 			"env": "^wink$",
 			"icon": "Wink.png",
 			"script": "(?:_base/js/base|wink).*\\.js",
-			"website": "winktoolkit.org"
+			"website": "http://winktoolkit.org"
 		},
 		"Winstone Servlet Container": {
 			"cats": [
@@ -7797,8 +8501,8 @@
 				"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": [
@@ -7810,8 +8514,11 @@
 				"X-Wix-Dispatcher-Cache-Hit": ""
 			},
 			"icon": "Wix.png",
+			"meta": {
+				"X-Wix-Renderer-Server": ""
+			},
 			"script": "static\\.wixstatic\\.com",
-			"website": "wix.com"
+			"website": "http://wix.com"
 		},
 		"Wolf CMS": {
 			"cats": [
@@ -7819,7 +8526,8 @@
 			],
 			"html": "(?:<a href=\"[^>]+wolfcms\\.org[^>]+>Wolf CMS(?:</a>)? inside|Thank you for using <a[^>]+>Wolf CMS)",
 			"icon": "Wolf CMS.png",
-			"website": "www.wolfcms.org"
+			"implies": "PHP",
+			"website": "http://www.wolfcms.org"
 		},
 		"Woltlab Community Framework": {
 			"cats": [
@@ -7829,7 +8537,7 @@
 			"icon": "Woltlab Community Framework.png",
 			"implies": "PHP",
 			"script": "WCF\\..*\\.js",
-			"website": "www.woltlab.com"
+			"website": "http://www.woltlab.com"
 		},
 		"WooCommerce": {
 			"cats": [
@@ -7838,15 +8546,12 @@
 			"env": "woocommerce",
 			"html": "<!-- WooCommerce",
 			"icon": "WooCommerce.png",
-			"implies": [
-				"WordPress",
-				"PHP"
-			],
+			"implies": "WordPress",
 			"meta": {
 				"generator": "WooCommerce ([\\d.]+)\\;version:\\1"
 			},
 			"script": "woocommerce",
-			"website": "www.woothemes.com/woocommerce"
+			"website": "http://www.woothemes.com/woocommerce"
 		},
 		"Woopra": {
 			"cats": [
@@ -7854,7 +8559,7 @@
 			],
 			"icon": "Woopra.png",
 			"script": "static\\.woopra\\.com",
-			"website": "www.woopra.com"
+			"website": "http://www.woopra.com"
 		},
 		"WordPress": {
 			"cats": [
@@ -7872,16 +8577,19 @@
 				"generator": "WordPress( [\\d.]+)?\\;version:\\1"
 			},
 			"script": "/wp-includes/",
-			"website": "wordpress.org"
+			"website": "http://wordpress.org"
 		},
 		"WordPress Super Cache": {
 			"cats": [
 				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": [
@@ -7889,7 +8597,7 @@
 			],
 			"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": [
@@ -7909,13 +8617,13 @@
 				"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
 			],
-			"html": "<title>XAMPP(?: Version ([\\d\\.]+))?</title>\\;version:\\1\\;confidence:90",
+			"html": "<title>XAMPP(?: Version ([\\d\\.]+))?</title>\\;version:\\1",
 			"icon": "XAMPP.png",
 			"implies": [
 				"Apache",
@@ -7926,7 +8634,7 @@
 			"meta": {
 				"author": "Kai Oswald Seidler\\;confidence:10"
 			},
-			"website": "www.apachefriends.org/en/xampp.html"
+			"website": "http://www.apachefriends.org/en/xampp.html"
 		},
 		"XMB": {
 			"cats": [
@@ -7934,7 +8642,7 @@
 			],
 			"html": "<!-- Powered by XMB",
 			"icon": "XMB.png",
-			"website": "www.xmbforum.com"
+			"website": "http://www.xmbforum.com"
 		},
 		"XOOPS": {
 			"cats": [
@@ -7946,7 +8654,7 @@
 			"meta": {
 				"generator": "XOOPS"
 			},
-			"website": "xoops.org"
+			"website": "http://xoops.org"
 		},
 		"XRegExp": {
 			"cats": [
@@ -7959,7 +8667,7 @@
 				"/([\\d.]+)/xregexp(?:\\.min)?\\.js\\;version:\\1",
 				"xregexp.*\\.js"
 			],
-			"website": "xregexp.com"
+			"website": "http://xregexp.com"
 		},
 		"Xajax": {
 			"cats": [
@@ -7967,7 +8675,7 @@
 			],
 			"icon": "Xajax.png",
 			"script": "xajax_core.*\\.js",
-			"website": "xajax-project.org"
+			"website": "http://xajax-project.org"
 		},
 		"Xanario": {
 			"cats": [
@@ -7977,7 +8685,7 @@
 			"meta": {
 				"generator": "xanario shopsoftware"
 			},
-			"website": "xanario.de"
+			"website": "http://xanario.de"
 		},
 		"XenForo": {
 			"cats": [
@@ -7985,7 +8693,7 @@
 			],
 			"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": [
@@ -7995,7 +8703,7 @@
 				"Server": "Xitami(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Xitami.png",
-			"website": "xitami.com"
+			"website": "http://xitami.com"
 		},
 		"Xonic": {
 			"cats": [
@@ -8009,7 +8717,7 @@
 				"keywords": "xonic-solutions"
 			},
 			"script": "core/jslib/jquery\\.xonic\\.js\\.php",
-			"website": "www.xonic-solutions.de"
+			"website": "http://www.xonic-solutions.de"
 		},
 		"XpressEngine": {
 			"cats": [
@@ -8019,7 +8727,7 @@
 			"meta": {
 				"generator": "XpressEngine"
 			},
-			"website": "www.xpressengine.com/"
+			"website": "http://www.xpressengine.com/"
 		},
 		"YUI": {
 			"cats": [
@@ -8028,15 +8736,15 @@
 			"env": "^YAHOO$",
 			"icon": "YUI.png",
 			"script": "(?:/yui/|yui\\.yahooapis\\.com)",
-			"website": "yuilibrary.com"
+			"website": "http://yuilibrary.com"
 		},
 		"YUI Doc": {
 			"cats": [
 				4
 			],
 			"html": "(?:<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf|<body[^>]+class=\"yui3-skin-sam)",
-			"icon": "YUI Doc.png",
-			"website": "developer.yahoo.com/yui/yuidoc"
+			"icon": "yahoo.png",
+			"website": "http://developer.yahoo.com/yui/yuidoc"
 		},
 		"YaBB": {
 			"cats": [
@@ -8044,7 +8752,7 @@
 			],
 			"html": "Powered by <a href=\"[^>]+yabbforum",
 			"icon": "YaBB.png",
-			"website": "www.yabbforum.com"
+			"website": "http://www.yabbforum.com"
 		},
 		"Yahoo Advertising": {
 			"cats": [
@@ -8055,9 +8763,9 @@
 				"<iframe[^>]+adserver\\.yahoo\\.com",
 				"<img[^>]+clicks\\.beap\\.bc\\.yahoo\\.com"
 			],
-			"icon": "Yahoo Advertising.png",
+			"icon": "yahoo.png",
 			"script": "adinterax\\.com",
-			"website": "advertising.yahoo.com"
+			"website": "http://advertising.yahoo.com"
 		},
 		"Yahoo! Ecommerce": {
 			"cats": [
@@ -8068,17 +8776,17 @@
 				"X-XRDS-Location": "/ystore/"
 			},
 			"html": "<link[^>]+store\\.yahoo\\.net",
-			"icon": "Yahoo! Ecommerce.png",
-			"website": "smallbusiness.yahoo.com/ecommerce"
+			"icon": "yahoo.png",
+			"website": "http://smallbusiness.yahoo.com/ecommerce"
 		},
 		"Yahoo! Web Analytics": {
 			"cats": [
 				10
 			],
 			"env": "^YWA$",
-			"icon": "Yahoo! Web Analytics.png",
+			"icon": "yahoo.png",
 			"script": "d\\.yimg\\.com/mi/ywa\\.js",
-			"website": "web.analytics.yahoo.com"
+			"website": "http://web.analytics.yahoo.com"
 		},
 		"Yandex.Direct": {
 			"cats": [
@@ -8092,7 +8800,7 @@
 			"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": [
@@ -8101,7 +8809,7 @@
 			"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": [
@@ -8114,7 +8822,7 @@
 			"implies": [
 				"Erlang"
 			],
-			"website": "yaws.hyber.org"
+			"website": "http://yaws.hyber.org"
 		},
 		"Yieldlab": {
 			"cats": [
@@ -8122,20 +8830,22 @@
 			],
 			"icon": "Yieldlab.png",
 			"script": "^https?://(?:[^/]+\\.)?yieldlab\\.net/",
-			"website": "yieldlab.de"
+			"website": "http://yieldlab.de"
 		},
 		"Yii": {
 			"cats": [
 				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": [
@@ -8145,7 +8855,19 @@
 				"<!-- This site is optimized with the Yoast"
 			],
 			"icon": "Yoast SEO.png",
-			"website": "yoast.com"
+			"website": "http://yoast.com"
+		},
+		"YouTrack": {
+			"cats": [
+				13
+			],
+			"html": [
+				"no-title=\"YouTrack\">",
+				"data-reactid=\"[^\"]+\">youTrack ([0-9.]+)<\\;version:\\1",
+				"type=\"application/opensearchdescription\\+xml\" title=\"YouTrack\"/>"
+			],
+			"icon": "YouTrack.png",
+			"website": "http://www.jetbrains.com/youtrack/"
 		},
 		"YouTube": {
 			"cats": [
@@ -8153,7 +8875,7 @@
 			],
 			"html": "<(?:param|embed|iframe)[^>]+youtube(?:-nocookie)?\\.com/(?:v|embed)",
 			"icon": "YouTube.png",
-			"website": "www.youtube.com"
+			"website": "http://www.youtube.com"
 		},
 		"ZK": {
 			"cats": [
@@ -8163,7 +8885,7 @@
 			"icon": "ZK.png",
 			"implies": "Java",
 			"script": "zkau/",
-			"website": "zkoss.org"
+			"website": "http://zkoss.org"
 		},
 		"ZURB Foundation": {
 			"cats": [
@@ -8174,7 +8896,7 @@
 				"<div [^>]*class=\"[^\"]*(?:small|medium|large)-\\d{1,2} columns"
 			],
 			"icon": "ZURB Foundation.png",
-			"website": "foundation.zurb.com"
+			"website": "http://foundation.zurb.com"
 		},
 		"Zabbix": {
 			"cats": [
@@ -8183,11 +8905,12 @@
 			"env": "^zbxCallPostScripts$",
 			"html": "<body[^>]+zbxCallPostScripts",
 			"icon": "Zabbix.png",
+			"implies": "PHP",
 			"meta": {
 				"Author": "ZABBIX SIA\\;confidence:70"
 			},
 			"url": "\\/zabbix\\/\\;confidence:30",
-			"website": "zabbix.com"
+			"website": "http://zabbix.com"
 		},
 		"Zanox": {
 			"cats": [
@@ -8197,7 +8920,7 @@
 			"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": [
@@ -8207,7 +8930,7 @@
 			"meta": {
 				"generator": "Zen Cart"
 			},
-			"website": "www.zen-cart.com"
+			"website": "http://www.zen-cart.com"
 		},
 		"Zend": {
 			"cats": [
@@ -8218,7 +8941,15 @@
 				"X-Powered-By": "Zend"
 			},
 			"icon": "Zend.png",
-			"website": "zend.com"
+			"website": "http://zend.com"
+		},
+		"Zendesk Chat": {
+			"cats": [
+				52
+			],
+			"icon": "Zendesk Chat.png",
+			"script": "v2\\.zopim\\.com",
+			"website": "http://zopim.com"
 		},
 		"Zepto": {
 			"cats": [
@@ -8227,7 +8958,7 @@
 			"env": "^Zepto$",
 			"icon": "Zepto.png",
 			"script": "zepto.*\\.js",
-			"website": "zeptojs.com"
+			"website": "http://zeptojs.com"
 		},
 		"Zeuscart": {
 			"cats": [
@@ -8237,7 +8968,7 @@
 			"icon": "Zeuscart.png",
 			"implies": "PHP",
 			"url": "\\?do=prodetail&action=show&prodid=\\d+",
-			"website": "zeuscart.com"
+			"website": "http://zeuscart.com"
 		},
 		"Zinnia": {
 			"cats": [
@@ -8248,7 +8979,7 @@
 			"meta": {
 				"generator": "Zinnia"
 			},
-			"website": "django-blog-zinnia.com"
+			"website": "http://django-blog-zinnia.com"
 		},
 		"Zope": {
 			"cats": [
@@ -8258,7 +8989,7 @@
 				"Server": "^Zope/"
 			},
 			"icon": "Zope.png",
-			"website": "zope.org"
+			"website": "http://zope.org"
 		},
 		"a-blog cms": {
 			"cats": [
@@ -8269,7 +9000,7 @@
 			"meta": {
 				"generator": "a-blog cms"
 			},
-			"website": "www.a-blogcms.jp"
+			"website": "http://www.a-blogcms.jp"
 		},
 		"actionhero.js": {
 			"cats": [
@@ -8284,7 +9015,7 @@
 			"icon": "actionhero.js.png",
 			"implies": "Node.js",
 			"script": "actionheroClient\\.js",
-			"website": "www.actionherojs.com"
+			"website": "http://www.actionherojs.com"
 		},
 		"amCharts": {
 			"cats": [
@@ -8293,7 +9024,7 @@
 			"env": "^AmCharts$",
 			"icon": "amCharts.png",
 			"script": "amcharts.*\\.js",
-			"website": "amcharts.com"
+			"website": "http://amcharts.com"
 		},
 		"basket.js": {
 			"cats": [
@@ -8302,7 +9033,7 @@
 			"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": [
@@ -8313,16 +9044,22 @@
 			},
 			"html": "<!-- cPanel",
 			"icon": "cPanel.png",
-			"website": "www.cpanel.net"
+			"website": "http://www.cpanel.net"
 		},
 		"cgit": {
 			"cats": [
 				19
 			],
-			"html": "<[^>]+id='cgit'",
+			"html": [
+				"<[^>]+id='cgit'",
+				"generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v([\\d.a-z-]+)</a>\\;version:\\1"
+			],
 			"icon": "cgit.png",
-			"implies": "Perl",
-			"website": "git.zx2c4.com/cgit"
+			"implies": "git",
+			"meta": {
+				"generator": "^cgit v([\\d.a-z-]+)$\\;version:\\1"
+			},
+			"website": "http://git.zx2c4.com/cgit"
 		},
 		"comScore": {
 			"cats": [
@@ -8332,7 +9069,7 @@
 			"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": [
@@ -8343,7 +9080,7 @@
 			},
 			"icon": "debut.png",
 			"implies": "Brother",
-			"website": "www.brother.com"
+			"website": "http://www.brother.com"
 		},
 		"dwhttpd": {
 			"cats": [
@@ -8352,8 +9089,8 @@
 			"headers": {
 				"Server": "dwhttpd\\/?([\\d\\.a-z]+)?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"e107": {
 			"cats": [
@@ -8366,7 +9103,7 @@
 			"icon": "e107.png",
 			"implies": "PHP",
 			"script": "[^a-z\\d]e107\\.js",
-			"website": "e107.org"
+			"website": "http://e107.org"
 		},
 		"eDevice SmartStack": {
 			"cats": [
@@ -8376,7 +9113,7 @@
 				"Server": "eDevice SmartStack(?: ?/?([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "eDevice SmartStack.png",
-			"website": "edevice.com"
+			"website": "http://edevice.com"
 		},
 		"eHTTP": {
 			"cats": [
@@ -8385,9 +9122,9 @@
 			"headers": {
 				"Server": "\beHTTP(?: v?([\\d\\.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "HP ProCurve",
-			"website": "???"
+			"website": "http://example.com"
 		},
 		"eSyndiCat": {
 			"cats": [
@@ -8402,7 +9139,7 @@
 			"meta": {
 				"generator": "^eSyndiCat "
 			},
-			"website": "esyndicat.com"
+			"website": "http://esyndicat.com"
 		},
 		"eZ Publish": {
 			"cats": [
@@ -8417,7 +9154,20 @@
 			"meta": {
 				"generator": "eZ Publish"
 			},
-			"website": "ez.no"
+			"website": "http://ez.no"
+		},
+		"enduro.js": {
+			"cats": [
+				1,
+				18,
+				47
+			],
+			"headers": {
+				"X-Powered-By": "^enduro.js$"
+			},
+			"icon": "enduro.js.svg",
+			"implies": "Node.js",
+			"website": "http://endurojs.com"
 		},
 		"git": {
 			"cats": [
@@ -8427,14 +9177,26 @@
 			"meta": {
 				"generator": "\bgit/([\\d.]+\\d)\\;version:\\1"
 			},
-			"website": "git-scm.com"
+			"website": "http://git-scm.com"
+		},
+		"gitlist": {
+			"cats": [
+				47
+			],
+			"html": "<p>Powered by <a[^>]+>GitList ([\\d.]+)\\;version:\\1",
+			"icon": "default.svg",
+			"implies": [
+				"PHP",
+				"git"
+			],
+			"website": "http://gitlist.org"
 		},
 		"gitweb": {
 			"cats": [
 				47
 			],
-			"html": "<!-- git web interface version",
-			"icon": "gitweb.png",
+			"html": "<!-- git web interface version ([\\d.]+)?\\;version:\\1",
+			"icon": "git.png",
 			"implies": [
 				"Perl",
 				"git"
@@ -8442,7 +9204,8 @@
 			"meta": {
 				"generator": "gitweb(?:/([\\d.]+\\d))?\\;version:\\1"
 			},
-			"website": "git-scm.com"
+			"script": "static/gitweb.js$",
+			"website": "http://git-scm.com"
 		},
 		"gunicorn": {
 			"cats": [
@@ -8452,10 +9215,8 @@
 				"Server": "gunicorn(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "gunicorn.png",
-			"implies": [
-				"Python"
-			],
-			"website": "gunicorn.org"
+			"implies": "Python",
+			"website": "http://gunicorn.org"
 		},
 		"hapi.js": {
 			"cats": [
@@ -8467,18 +9228,30 @@
 			},
 			"icon": "hapi.js.png",
 			"implies": "Node.js",
-			"website": "hapijs.com"
+			"website": "http://hapijs.com"
 		},
 		"iCongo": {
 			"cats": [
 				6
 			],
-			"icon": "iCongo.png",
+			"icon": "Hybris.png",
 			"implies": "Adobe ColdFusion",
 			"meta": {
 				"iCongo": ""
 			},
-			"website": "hybris.com/icongo"
+			"website": "http://hybris.com/icongo"
+		},
+		"iPresta": {
+			"cats": [
+				6
+			],
+			"excludes": "PrestaShop",
+			"icon": "iPresta.png",
+			"implies": "PHP",
+			"meta": {
+				"designer": "iPresta"
+			},
+			"website": "http://ipresta.ir"
 		},
 		"iWeb": {
 			"cats": [
@@ -8488,7 +9261,18 @@
 			"meta": {
 				"generator": "^iWeb( [\\d.]+)?\\;version:\\1"
 			},
-			"website": "apple.com/ilife/iweb"
+			"website": "http://apple.com/ilife/iweb"
+		},
+		"ikiwiki": {
+			"cats": [
+				8
+			],
+			"html": [
+				"<link rel=\"alternate\" type=\"application/x-wiki\" title=\"Edit this page\" href=\"/ikiwiki\\.cgi",
+				"<a href=\"/ikiwiki\\.cgi\\?do="
+			],
+			"icon": "ikiwiki.png",
+			"website": "http://ikiwiki.info"
 		},
 		"io4 CMS": {
 			"cats": [
@@ -8498,7 +9282,7 @@
 			"meta": {
 				"generator": "GO[ |]+CMS Enterprise"
 			},
-			"website": "notenbomer.nl/Producten/Content_management/io4_|_cms"
+			"website": "http://notenbomer.nl/Producten/Content_management/io4_|_cms"
 		},
 		"jQTouch": {
 			"cats": [
@@ -8507,7 +9291,7 @@
 			"env": "^jQT$",
 			"icon": "jQTouch.png",
 			"script": "jqtouch.*\\.js",
-			"website": "jqtouch.com"
+			"website": "http://jqtouch.com"
 		},
 		"jQuery": {
 			"cats": [
@@ -8520,7 +9304,7 @@
 				"/([\\d.]+)/jquery(?:\\.min)?\\.js\\;version:\\1",
 				"jquery.*\\.js"
 			],
-			"website": "jquery.com"
+			"website": "http://jquery.com"
 		},
 		"jQuery Mobile": {
 			"cats": [
@@ -8529,16 +9313,16 @@
 			"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
 			],
-			"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": [
@@ -8551,7 +9335,7 @@
 				"([\\d.]+)/jquery-ui(?:\\.min)?\\.js\\;version:\\1",
 				"jquery-ui.*\\.js"
 			],
-			"website": "jqueryui.com"
+			"website": "http://jqueryui.com"
 		},
 		"jqPlot": {
 			"cats": [
@@ -8560,7 +9344,7 @@
 			"icon": "jqPlot.png",
 			"implies": "jQuery",
 			"script": "jqplot.*\\.js",
-			"website": "www.jqplot.com"
+			"website": "http://www.jqplot.com"
 		},
 		"libwww-perl-daemon": {
 			"cats": [
@@ -8571,7 +9355,7 @@
 			},
 			"icon": "libwww-perl-daemon.png",
 			"implies": "Perl",
-			"website": "metacpan.org/pod/HTTP::Daemon"
+			"website": "http://metacpan.org/pod/HTTP::Daemon"
 		},
 		"lighttpd": {
 			"cats": [
@@ -8581,7 +9365,7 @@
 				"Server": "lighttpd(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "lighttpd.png",
-			"website": "www.lighttpd.net"
+			"website": "http://www.lighttpd.net"
 		},
 		"math.js": {
 			"cats": [
@@ -8590,7 +9374,7 @@
 			"env": "^mathjs$",
 			"icon": "math.js.png",
 			"script": "math(?:\\.min)?\\.js",
-			"website": "mathjs.org"
+			"website": "http://mathjs.org"
 		},
 		"mini_httpd": {
 			"cats": [
@@ -8600,7 +9384,7 @@
 				"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": [
@@ -8611,7 +9395,7 @@
 			},
 			"icon": "Apache.svg",
 			"implies": "Apache",
-			"website": "pam.sourceforge.net/mod_auth_pam"
+			"website": "http://pam.sourceforge.net/mod_auth_pam"
 		},
 		"mod_dav": {
 			"cats": [
@@ -8622,7 +9406,7 @@
 			},
 			"icon": "Apache.svg",
 			"implies": "Apache",
-			"website": "webdav.org/mod_dav"
+			"website": "http://webdav.org/mod_dav"
 		},
 		"mod_fastcgi": {
 			"cats": [
@@ -8633,7 +9417,7 @@
 			},
 			"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": [
@@ -8647,7 +9431,7 @@
 				"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": [
@@ -8661,7 +9445,7 @@
 				"Perl",
 				"Apache"
 			],
-			"website": "perl.apache.org"
+			"website": "http://perl.apache.org"
 		},
 		"mod_python": {
 			"cats": [
@@ -8675,7 +9459,7 @@
 				"Python",
 				"Apache"
 			],
-			"website": "www.modpython.org"
+			"website": "http://www.modpython.org"
 		},
 		"mod_rack": {
 			"cats": [
@@ -8685,12 +9469,12 @@
 				"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": [
@@ -8700,12 +9484,12 @@
 				"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": [
@@ -8716,7 +9500,7 @@
 			},
 			"icon": "mod_ssl.png",
 			"implies": "Apache",
-			"website": "modssl.org"
+			"website": "http://modssl.org"
 		},
 		"mod_wsgi": {
 			"cats": [
@@ -8731,7 +9515,7 @@
 				"Python\\;confidence:50",
 				"Apache"
 			],
-			"website": "code.google.com/p/modwsgi"
+			"website": "http://code.google.com/p/modwsgi"
 		},
 		"nopCommerce": {
 			"cats": [
@@ -8739,7 +9523,8 @@
 			],
 			"html": "(?:<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)",
 			"icon": "nopCommerce.png",
-			"website": "www.nopcommerce.com"
+			"implies": "Microsoft ASP.NET",
+			"website": "http://www.nopcommerce.com"
 		},
 		"openEngine": {
 			"cats": [
@@ -8749,7 +9534,7 @@
 			"meta": {
 				"openEngine": ""
 			},
-			"website": "openengine.de/html/pages/de/"
+			"website": "http://openengine.de/html/pages/de/"
 		},
 		"osCSS": {
 			"cats": [
@@ -8757,7 +9542,7 @@
 			],
 			"html": "<body onload=\"window\\.defaultStatus='oscss templates';\"",
 			"icon": "osCSS.png",
-			"website": "www.oscss.org"
+			"website": "http://www.oscss.org"
 		},
 		"osCommerce": {
 			"cats": [
@@ -8768,7 +9553,11 @@
 			},
 			"html": "(?:<a[^>]*(?:\\?|&)osCsid|Powered by (?:<[^>]+>)?osCommerce</a>|<[^>]+class=\"[^>]*infoBoxHeading)",
 			"icon": "osCommerce.png",
-			"website": "www.oscommerce.com"
+			"implies": [
+				"PHP",
+				"MySQL"
+			],
+			"website": "http://www.oscommerce.com"
 		},
 		"osTicket": {
 			"cats": [
@@ -8782,7 +9571,7 @@
 				"PHP",
 				"MySQL"
 			],
-			"website": "osticket.com"
+			"website": "http://osticket.com"
 		},
 		"ownCloud": {
 			"cats": [
@@ -8790,10 +9579,11 @@
 			],
 			"html": "<a href=\"https://owncloud.com\" target=\"_blank\">ownCloud Inc.</a><br/>Your Cloud, Your Data, Your Way!",
 			"icon": "ownCloud.png",
+			"implies": "PHP",
 			"meta": {
 				"apple-itunes-app": "app-id=543672169"
 			},
-			"website": "owncloud.org"
+			"website": "http://owncloud.org"
 		},
 		"papaya CMS": {
 			"cats": [
@@ -8801,7 +9591,8 @@
 			],
 			"html": "<link[^>]*/papaya-themes/",
 			"icon": "papaya CMS.png",
-			"website": "papaya-cms.com"
+			"implies": "PHP",
+			"website": "http://papaya-cms.com"
 		},
 		"phpAlbum": {
 			"cats": [
@@ -8810,7 +9601,7 @@
 			"html": "<!--phpalbum ([.\\d\\s]+)-->\\;version:\\1",
 			"icon": "phpAlbum.png",
 			"implies": "PHP",
-			"website": "phpalbum.net"
+			"website": "http://phpalbum.net"
 		},
 		"phpBB": {
 			"cats": [
@@ -8826,7 +9617,7 @@
 			"meta": {
 				"copyright": "phpBB Group"
 			},
-			"website": "phpbb.com"
+			"website": "http://phpbb.com"
 		},
 		"phpCMS": {
 			"cats": [
@@ -8835,7 +9626,7 @@
 			"env": "^phpcms",
 			"icon": "phpCMS.png",
 			"implies": "PHP",
-			"website": "phpcms.de"
+			"website": "http://phpcms.de"
 		},
 		"phpDocumentor": {
 			"cats": [
@@ -8844,7 +9635,7 @@
 			"html": "<!-- Generated by phpDocumentor",
 			"icon": "phpDocumentor.png",
 			"implies": "PHP",
-			"website": "www.phpdoc.org"
+			"website": "http://www.phpdoc.org"
 		},
 		"phpMyAdmin": {
 			"cats": [
@@ -8857,7 +9648,7 @@
 				"PHP",
 				"MySQL"
 			],
-			"website": "www.phpmyadmin.net"
+			"website": "http://www.phpmyadmin.net"
 		},
 		"phpPgAdmin": {
 			"cats": [
@@ -8866,7 +9657,7 @@
 			"html": "(?:<title>phpPgAdmin</title>|<span class=\"appname\">phpPgAdmin)",
 			"icon": "phpPgAdmin.png",
 			"implies": "PHP",
-			"website": "phppgadmin.sourceforge.net"
+			"website": "http://phppgadmin.sourceforge.net"
 		},
 		"phpSQLiteCMS": {
 			"cats": [
@@ -8875,12 +9666,28 @@
 			"icon": "phpSQLiteCMS.png",
 			"implies": [
 				"PHP",
-				"SQLite\\;confidence:50"
+				"SQLite"
 			],
 			"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": [
@@ -8893,7 +9700,7 @@
 			"meta": {
 				"generator": "^phpwind"
 			},
-			"website": "www.phpwind.net"
+			"website": "http://www.phpwind.net"
 		},
 		"prettyPhoto": {
 			"cats": [
@@ -8905,7 +9712,7 @@
 			"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": [
@@ -8914,7 +9721,7 @@
 			"html": "Powered by <a href=\"[^>]+punbb",
 			"icon": "punBB.png",
 			"implies": "PHP",
-			"website": "punbb.informer.com"
+			"website": "http://punbb.informer.com"
 		},
 		"reCAPTCHA": {
 			"cats": [
@@ -8924,7 +9731,7 @@
 			"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": [
@@ -8932,7 +9739,7 @@
 			],
 			"icon": "sIFR.png",
 			"script": "sifr\\.js",
-			"website": "www.mikeindustries.com/blog/sifr"
+			"website": "http://www.mikeindustries.com/blog/sifr"
 		},
 		"sNews": {
 			"cats": [
@@ -8942,7 +9749,7 @@
 			"meta": {
 				"generator": "sNews"
 			},
-			"website": "snewscms.com"
+			"website": "http://snewscms.com"
 		},
 		"script.aculo.us": {
 			"cats": [
@@ -8951,16 +9758,16 @@
 			"env": "^Scriptaculous$",
 			"icon": "script.aculo.us.png",
 			"script": "(?:scriptaculous|protoaculous)\\.js",
-			"website": "script.aculo.us"
+			"website": "http://script.aculo.us"
 		},
 		"shine.js": {
 			"cats": [
 				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": [
@@ -8970,7 +9777,7 @@
 			"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": [
@@ -8980,7 +9787,7 @@
 				"X-Powered-By": "swift\\.engine"
 			},
 			"icon": "swift.engine.png",
-			"website": "mittec.ru/default"
+			"website": "http://mittec.ru/default"
 		},
 		"three.js": {
 			"cats": [
@@ -8989,7 +9796,7 @@
 			"env": "^THREE$",
 			"icon": "three.js.png",
 			"script": "three(?:\\.min)?\\.js",
-			"website": "threejs.org"
+			"website": "http://threejs.org"
 		},
 		"thttpd": {
 			"cats": [
@@ -8999,7 +9806,7 @@
 				"Server": "\bthttpd(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "thttpd.png",
-			"website": "acme.com/software/thttpd"
+			"website": "http://acme.com/software/thttpd"
 		},
 		"total.js": {
 			"cats": [
@@ -9010,7 +9817,7 @@
 			},
 			"icon": "total.js.png",
 			"implies": "Node.js",
-			"website": "totaljs.com"
+			"website": "http://totaljs.com"
 		},
 		"uCore": {
 			"cats": [
@@ -9025,7 +9832,7 @@
 			"meta": {
 				"generator": "uCore PHP Framework"
 			},
-			"website": "ucore.io"
+			"website": "http://ucore.io"
 		},
 		"uKnowva": {
 			"cats": [
@@ -9044,7 +9851,7 @@
 				"generator": "uKnowva (?: ([\\d.]+))?\\;version:\\1"
 			},
 			"script": "/media/conv/js/jquery.js",
-			"website": "uknowva.com"
+			"website": "http://uknowva.com"
 		},
 		"vBulletin": {
 			"cats": [
@@ -9056,15 +9863,15 @@
 			"meta": {
 				"generator": "vBulletin"
 			},
-			"website": "www.vbulletin.com"
+			"website": "http://www.vbulletin.com"
 		},
 		"viennaCMS": {
 			"cats": [
 				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": [
@@ -9074,7 +9881,7 @@
 			"html": "<link[^>]+?href=\"[^\"]+vis(?:\\.min)?\\.css",
 			"icon": "vis.js.png",
 			"script": "vis(?:\\.min)?\\.js",
-			"website": "visjs.org"
+			"website": "http://visjs.org"
 		},
 		"webEdition": {
 			"cats": [
@@ -9085,7 +9892,7 @@
 				"DC.title": "webEdition",
 				"generator": "webEdition"
 			},
-			"website": "webedition.de/en"
+			"website": "http://webedition.de/en"
 		},
 		"webpack": {
 			"cats": [
@@ -9093,7 +9900,7 @@
 			],
 			"env": "^webpackJsonp$",
 			"icon": "webpack.svg",
-			"website": "webpack.github.io"
+			"website": "http://webpack.github.io"
 		},
 		"xCharts": {
 			"cats": [
@@ -9101,10 +9908,10 @@
 			],
 			"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": [
@@ -9115,7 +9922,7 @@
 			"meta": {
 				"generator": "xt:Commerce"
 			},
-			"website": "www.xt-commerce.com"
+			"website": "http://www.xt-commerce.com"
 		},
 		"xui": {
 			"cats": [
@@ -9125,7 +9932,7 @@
 			"env": "^xui$",
 			"icon": "xui.png",
 			"script": "[^a-z]xui.*\\.js",
-			"website": "xuijs.com"
+			"website": "http://xuijs.com"
 		}
 	},
 	"categories": {
@@ -9140,7 +9947,7 @@
 		"9": "Hosting Panels",
 		"10": "Analytics",
 		"11": "Blogs",
-		"12": "Javascript Frameworks",
+		"12": "JavaScript Frameworks",
 		"13": "Issue Trackers",
 		"14": "Video Players",
 		"15": "Comment Systems",
@@ -9153,7 +9960,7 @@
 		"22": "Web Servers",
 		"23": "Cache Tools",
 		"24": "Rich Text Editors",
-		"25": "Javascript Graphics",
+		"25": "JavaScript Graphics",
 		"26": "Mobile Frameworks",
 		"27": "Programming Languages",
 		"28": "Operating Systems",
@@ -9179,6 +9986,7 @@
 		"48": "Network Storage",
 		"49": "Feed Readers",
 		"50": "Document Management Systems",
-		"51": "Landing Page Builders"
+		"51": "Landing Page Builders",
+		"52": "Live Chat"
 	}
-}
\ 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 62%
rename from src/drivers/bookmarklet/js/driver.js
rename to src/drivers/bookmarklet/driver.js
index a40554b11..5c5f0f368 100644
--- a/src/drivers/bookmarklet/js/driver.js
+++ b/src/drivers/bookmarklet/driver.js
@@ -3,7 +3,9 @@
  */
 
 (function() {
-	if ( wappalyzer == null ) return;
+	if ( typeof wappalyzer === 'undefined' ) {
+		return;
+	}
 
 	var
 		w             = wappalyzer,
@@ -11,54 +13,12 @@
 		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,
+
 		/**
 		 * Log messages to console
 		 */
@@ -79,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 });
 		},
@@ -103,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;
 							}
 						});
 
@@ -126,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]];
+
+						html += '<a target="_blank" class="wappalyzer-category" href="' + w.config.websiteURL + 'categories/' + w.driver.slugify(category) + '">' + category + '</a>';
 					}
 
 					html += '</div>';
@@ -179,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/.gitignore b/src/drivers/chrome/.gitignore
index 60dc6455a..602df1590 100644
--- a/src/drivers/chrome/.gitignore
+++ b/src/drivers/chrome/.gitignore
@@ -1,5 +1,7 @@
 apps.json
+images/icons/converted/*.png
 images/icons/*.png
 images/icons/*.svg
 js/wappalyzer.js
 js/iframe.js
+js/network.js
diff --git a/src/drivers/chrome/_locales/el/messages.json b/src/drivers/chrome/_locales/el/messages.json
index bacd7cfa5..8b63568f5 100644
--- a/src/drivers/chrome/_locales/el/messages.json
+++ b/src/drivers/chrome/_locales/el/messages.json
@@ -16,7 +16,7 @@
 	"categoryName5":            { "message": "Widget" },
 	"categoryName10":           { "message": "Analytics" },
 	"categoryName11":           { "message": "Blog" },
-	"categoryName12":           { "message": "Framework της Javascript" },
+	"categoryName12":           { "message": "Framework της JavaScript" },
 	"categoryName13":           { "message": "Issue Tracker" },
 	"categoryName14":           { "message": "Πρόγραμμα αναπαραγωγής Βίντεο" },
 	"categoryName15":           { "message": "Σύστημα Σχολίων" },
@@ -29,7 +29,7 @@
 	"categoryName22":           { "message": "Διακομιστής Διαδικτύου" },
 	"categoryName23":           { "message": "Εργαλείο Μνήμης Cache" },
 	"categoryName24":           { "message": "Επεξεργαστής Εμπλουτισμένου Κειμένου" },
-	"categoryName25":           { "message": "Γραφικά Javascript" },
+	"categoryName25":           { "message": "Γραφικά JavaScript" },
 	"categoryName26":           { "message": "Framework για Κινητά" },
 	"categoryName27":           { "message": "Γλώσσα Προγραμματισμού" },
 	"categoryName28":           { "message": "Λειτουργικό Σύστημα" },
@@ -55,5 +55,6 @@
 	"categoryName48":           { "message": "Δικτυακός Αποθηκευτικός Χώρος" },
 	"categoryName49":           { "message": "Feed Readers" },
 	"categoryName50":           { "message": "Συστήματα Διαχειρίσης Εγγράφων" },
-	"categoryName51":           { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" }
+	"categoryName51":           { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" },
+	"categoryName52":           { "message": "Live Chat" }
 }
diff --git a/src/drivers/chrome/_locales/en/messages.json b/src/drivers/chrome/_locales/en/messages.json
index 1d8f78b02..f95251750 100644
--- a/src/drivers/chrome/_locales/en/messages.json
+++ b/src/drivers/chrome/_locales/en/messages.json
@@ -16,7 +16,7 @@
 	"categoryName5":            { "message": "Widget" },
 	"categoryName10":           { "message": "Analytics" },
 	"categoryName11":           { "message": "Blog" },
-	"categoryName12":           { "message": "Javascript Framework" },
+	"categoryName12":           { "message": "JavaScript Framework" },
 	"categoryName13":           { "message": "Issue Tracker" },
 	"categoryName14":           { "message": "Video Player" },
 	"categoryName15":           { "message": "Comment System" },
@@ -29,7 +29,7 @@
 	"categoryName22":           { "message": "Web Server" },
 	"categoryName23":           { "message": "Cache Tool" },
 	"categoryName24":           { "message": "Rich Text Editor" },
-	"categoryName25":           { "message": "Javascript Graphics" },
+	"categoryName25":           { "message": "JavaScript Graphics" },
 	"categoryName26":           { "message": "Mobile Framework" },
 	"categoryName27":           { "message": "Programming Language" },
 	"categoryName28":           { "message": "Operating System" },
@@ -55,5 +55,6 @@
 	"categoryName48":           { "message": "Network Storage" },
 	"categoryName49":           { "message": "Feed Readers" },
 	"categoryName50":           { "message": "Document Management Systems" },
-	"categoryName51":           { "message": "Landing Page Builder" }
+	"categoryName51":           { "message": "Landing Page Builder" },
+	"categoryName52":           { "message": "Live Chat" }
 }
diff --git a/src/drivers/chrome/_locales/es/messages.json b/src/drivers/chrome/_locales/es/messages.json
index 8e4c42490..2676f4671 100644
--- a/src/drivers/chrome/_locales/es/messages.json
+++ b/src/drivers/chrome/_locales/es/messages.json
@@ -20,7 +20,7 @@
 	"categoryName9":            { "message": "Panel de Hosting" },
 	"categoryName10":           { "message": "Analítica" },
 	"categoryName11":           { "message": "Blog" },
-	"categoryName12":           { "message": "Framework Javascript" },
+	"categoryName12":           { "message": "Framework JavaScript" },
 	"categoryName13":           { "message": "Gestor de Incidencias" },
 	"categoryName14":           { "message": "Reproductor de Vídeo" },
 	"categoryName15":           { "message": "Sistema de Comentarios" },
@@ -33,7 +33,7 @@
 	"categoryName22":           { "message": "Servidor Web" },
 	"categoryName23":           { "message": "Herramienta de Cache" },
 	"categoryName24":           { "message": "Editor de Texto Enriquecido" },
-	"categoryName25":           { "message": "Gráficos Javascript" },
+	"categoryName25":           { "message": "Gráficos JavaScript" },
 	"categoryName26":           { "message": "Framework Móvil" },
 	"categoryName27":           { "message": "Lenguaje de programación" },
 	"categoryName28":           { "message": "Sistema Operativo" },
@@ -59,5 +59,6 @@
 	"categoryName48":           { "message": "Network Storage" },
 	"categoryName49":           { "message": "Feed Readers" },
 	"categoryName50":           { "message": "Document Management Systems" },
-	"categoryName51":           { "message": "Landing Page Builder" }
+	"categoryName51":           { "message": "Landing Page Builder" },
+	"categoryName52":           { "message": "Live Chat" }
 }
diff --git a/src/drivers/chrome/_locales/fr/messages.json b/src/drivers/chrome/_locales/fr/messages.json
index b0b900f9a..52fabcef7 100644
--- a/src/drivers/chrome/_locales/fr/messages.json
+++ b/src/drivers/chrome/_locales/fr/messages.json
@@ -59,5 +59,6 @@
 	"categoryName48":       { "message": "Stockage réseau" },
 	"categoryName49":       { "message": "Lecteur RSS" },
 	"categoryName50":       { "message": "Système de gestion de documents" },
-	"categoryName51":       { "message": "Landing Page Builder" }
+	"categoryName51":       { "message": "Landing Page Builder" },
+	"categoryName52":       { "message": "Chat en direct" }
 }
diff --git a/src/drivers/chrome/_locales/gr/messages.json b/src/drivers/chrome/_locales/gr/messages.json
index bacd7cfa5..8b63568f5 100644
--- a/src/drivers/chrome/_locales/gr/messages.json
+++ b/src/drivers/chrome/_locales/gr/messages.json
@@ -16,7 +16,7 @@
 	"categoryName5":            { "message": "Widget" },
 	"categoryName10":           { "message": "Analytics" },
 	"categoryName11":           { "message": "Blog" },
-	"categoryName12":           { "message": "Framework της Javascript" },
+	"categoryName12":           { "message": "Framework της JavaScript" },
 	"categoryName13":           { "message": "Issue Tracker" },
 	"categoryName14":           { "message": "Πρόγραμμα αναπαραγωγής Βίντεο" },
 	"categoryName15":           { "message": "Σύστημα Σχολίων" },
@@ -29,7 +29,7 @@
 	"categoryName22":           { "message": "Διακομιστής Διαδικτύου" },
 	"categoryName23":           { "message": "Εργαλείο Μνήμης Cache" },
 	"categoryName24":           { "message": "Επεξεργαστής Εμπλουτισμένου Κειμένου" },
-	"categoryName25":           { "message": "Γραφικά Javascript" },
+	"categoryName25":           { "message": "Γραφικά JavaScript" },
 	"categoryName26":           { "message": "Framework για Κινητά" },
 	"categoryName27":           { "message": "Γλώσσα Προγραμματισμού" },
 	"categoryName28":           { "message": "Λειτουργικό Σύστημα" },
@@ -55,5 +55,6 @@
 	"categoryName48":           { "message": "Δικτυακός Αποθηκευτικός Χώρος" },
 	"categoryName49":           { "message": "Feed Readers" },
 	"categoryName50":           { "message": "Συστήματα Διαχειρίσης Εγγράφων" },
-	"categoryName51":           { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" }
+	"categoryName51":           { "message": "Σύστημα Κατασκευής Σελίδων Υποδοχής" },
+	"categoryName52":           { "message": "Live Chat" }
 }
diff --git a/src/drivers/chrome/_locales/it/messages.json b/src/drivers/chrome/_locales/it/messages.json
index 266ce5102..7be8c396b 100644
--- a/src/drivers/chrome/_locales/it/messages.json
+++ b/src/drivers/chrome/_locales/it/messages.json
@@ -20,7 +20,7 @@
 	"categoryName9":            { "message": "Pannello Hosting" },
 	"categoryName10":           { "message": "Analytics" },
 	"categoryName11":           { "message": "Blog" },
-	"categoryName12":           { "message": "Framework Javascript" },
+	"categoryName12":           { "message": "Framework JavaScript" },
 	"categoryName13":           { "message": "Issue Tracker" },
 	"categoryName14":           { "message": "Player Video" },
 	"categoryName15":           { "message": "Sistema di commenti" },
@@ -33,7 +33,7 @@
 	"categoryName22":           { "message": "Web Server" },
 	"categoryName23":           { "message": "Cache Tool" },
 	"categoryName24":           { "message": "Editor di Testo Ricco" },
-	"categoryName25":           { "message": "Javascript Graphics" },
+	"categoryName25":           { "message": "JavaScript Graphics" },
 	"categoryName26":           { "message": "Framework Mobile" },
 	"categoryName27":           { "message": "Linguaggio di programmazione" },
 	"categoryName28":           { "message": "Sistema Operativo" },
@@ -59,6 +59,7 @@
 	"categoryName48":           { "message": "Network Storage" },
 	"categoryName49":           { "message": "Lettore di Feed" },
 	"categoryName50":           { "message": "Sistema di Gestione Documenti" },
-	"categoryName51":           { "message": "Landing Page Builder" }
+	"categoryName51":           { "message": "Landing Page Builder" },
+	"categoryName52":           { "message": "Live Chat" }
 }
 
diff --git a/src/drivers/chrome/_locales/ro/messages.json b/src/drivers/chrome/_locales/ro/messages.json
index 66718fa93..851974d2b 100644
--- a/src/drivers/chrome/_locales/ro/messages.json
+++ b/src/drivers/chrome/_locales/ro/messages.json
@@ -55,5 +55,6 @@
 	"categoryName48":           { "message": "Network Storage" },
 	"categoryName49":           { "message": "Feed Readers" },
 	"categoryName50":           { "message": "Document Management Systems" },
-	"categoryName51":           { "message": "Landing Page Builder" }
+	"categoryName51":           { "message": "Landing Page Builder" },
+	"categoryName52":           { "message": "Live Chat" }
 }
diff --git a/src/drivers/chrome/_locales/ru/messages.json b/src/drivers/chrome/_locales/ru/messages.json
index b71511911..6338d320e 100644
--- a/src/drivers/chrome/_locales/ru/messages.json
+++ b/src/drivers/chrome/_locales/ru/messages.json
@@ -45,7 +45,8 @@
   "categoryName48" : { "message" : "Сетевое хранилище" },
   "categoryName49" : { "message" : "Граббер контента" },
   "categoryName50" : { "message" : "Управление документами" },
-  "categoryName51":  { "message": "Генератор лендингов" },
+  "categoryName51" : { "message": "Генератор лендингов" },
+  "categoryName52" : { "message": "Live Chat" },
   "github" : { "message" : "Форкнуть на GitHub!" },
   "noAppsDetected" : { "message" : "Нет данных о сайте" },
   "nothingToDo" : { "message" : "Тут нечего искать" },
diff --git a/src/drivers/chrome/background.html b/src/drivers/chrome/background.html
index 3abbe7968..3aaa6249f 100644
--- a/src/drivers/chrome/background.html
+++ b/src/drivers/chrome/background.html
@@ -8,6 +8,7 @@
 		<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>
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/images/icons/converted/Angular.svg.png b/src/drivers/chrome/images/icons/converted/Angular.svg.png
deleted file mode 100644
index ed9e10cd3..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Angular.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Apache.svg.png b/src/drivers/chrome/images/icons/converted/Apache.svg.png
deleted file mode 100644
index 09e3c24ad..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Apache.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Bigcommerce.svg.png b/src/drivers/chrome/images/icons/converted/Bigcommerce.svg.png
deleted file mode 100644
index b10abfa83..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Bigcommerce.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Bounce Exchange.svg.png b/src/drivers/chrome/images/icons/converted/Bounce Exchange.svg.png
deleted file mode 100644
index 6cb4d7494..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Bounce Exchange.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Captch Me.svg.png b/src/drivers/chrome/images/icons/converted/Captch Me.svg.png
deleted file mode 100644
index f82f3d8f0..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Captch Me.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/CloudFlare.svg.png b/src/drivers/chrome/images/icons/converted/CloudFlare.svg.png
deleted file mode 100644
index 1bb04bd94..000000000
Binary files a/src/drivers/chrome/images/icons/converted/CloudFlare.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Criteo.svg.png b/src/drivers/chrome/images/icons/converted/Criteo.svg.png
deleted file mode 100644
index a64f7cf0e..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Criteo.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Disqus.svg.png b/src/drivers/chrome/images/icons/converted/Disqus.svg.png
deleted file mode 100644
index 0c18bfcae..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Disqus.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/DoubleClick.svg.png b/src/drivers/chrome/images/icons/converted/DoubleClick.svg.png
deleted file mode 100644
index 0d63a3226..000000000
Binary files a/src/drivers/chrome/images/icons/converted/DoubleClick.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/ExagonConcept.svg.png b/src/drivers/chrome/images/icons/converted/ExagonConcept.svg.png
deleted file mode 100644
index 5942704b9..000000000
Binary files a/src/drivers/chrome/images/icons/converted/ExagonConcept.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/GitLab.svg.png b/src/drivers/chrome/images/icons/converted/GitLab.svg.png
deleted file mode 100644
index 27f76dd4f..000000000
Binary files a/src/drivers/chrome/images/icons/converted/GitLab.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Google AdSense.svg.png b/src/drivers/chrome/images/icons/converted/Google AdSense.svg.png
deleted file mode 100644
index 60003100b..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Google AdSense.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Google Analytics.svg.png b/src/drivers/chrome/images/icons/converted/Google Analytics.svg.png
deleted file mode 100644
index d93caf9fd..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Google Analytics.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/HP.svg.png b/src/drivers/chrome/images/icons/converted/HP.svg.png
deleted file mode 100644
index 351064ceb..000000000
Binary files a/src/drivers/chrome/images/icons/converted/HP.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/IBM.svg.png b/src/drivers/chrome/images/icons/converted/IBM.svg.png
deleted file mode 100644
index bd5634814..000000000
Binary files a/src/drivers/chrome/images/icons/converted/IBM.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Lightspeed.svg.png b/src/drivers/chrome/images/icons/converted/Lightspeed.svg.png
deleted file mode 100644
index 6035eb7c9..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Lightspeed.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Marionette.js.svg.png b/src/drivers/chrome/images/icons/converted/Marionette.js.svg.png
deleted file mode 100644
index 613c98ebc..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Marionette.js.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Microsoft.svg.png b/src/drivers/chrome/images/icons/converted/Microsoft.svg.png
deleted file mode 100644
index d5f68770d..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Microsoft.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/MotoCMS.svg.png b/src/drivers/chrome/images/icons/converted/MotoCMS.svg.png
deleted file mode 100644
index 07054ebbd..000000000
Binary files a/src/drivers/chrome/images/icons/converted/MotoCMS.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/MySQL.svg.png b/src/drivers/chrome/images/icons/converted/MySQL.svg.png
deleted file mode 100644
index c1b6bbf4a..000000000
Binary files a/src/drivers/chrome/images/icons/converted/MySQL.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Nginx.svg.png b/src/drivers/chrome/images/icons/converted/Nginx.svg.png
deleted file mode 100644
index c312c5cd5..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Nginx.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/PDF.js.svg.png b/src/drivers/chrome/images/icons/converted/PDF.js.svg.png
deleted file mode 100644
index 9d6209a79..000000000
Binary files a/src/drivers/chrome/images/icons/converted/PDF.js.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Penguin.svg.png b/src/drivers/chrome/images/icons/converted/Penguin.svg.png
deleted file mode 100644
index 2268f62f2..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Penguin.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Sails.js.svg.png b/src/drivers/chrome/images/icons/converted/Sails.js.svg.png
deleted file mode 100644
index 908d8d41a..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Sails.js.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Shopery.svg.png b/src/drivers/chrome/images/icons/converted/Shopery.svg.png
deleted file mode 100644
index 6dc81665b..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Shopery.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Shopify.svg.png b/src/drivers/chrome/images/icons/converted/Shopify.svg.png
deleted file mode 100644
index bc4cee791..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Shopify.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Shoptet.svg.png b/src/drivers/chrome/images/icons/converted/Shoptet.svg.png
deleted file mode 100644
index 19269bf2f..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Shoptet.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/SilverStripe.svg.png b/src/drivers/chrome/images/icons/converted/SilverStripe.svg.png
deleted file mode 100644
index 6dfa92ff1..000000000
Binary files a/src/drivers/chrome/images/icons/converted/SilverStripe.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Sulu.svg.png b/src/drivers/chrome/images/icons/converted/Sulu.svg.png
deleted file mode 100644
index e7b078b87..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Sulu.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/TYPO3.svg.png b/src/drivers/chrome/images/icons/converted/TYPO3.svg.png
deleted file mode 100644
index b239ee7e5..000000000
Binary files a/src/drivers/chrome/images/icons/converted/TYPO3.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/Varnish.svg.png b/src/drivers/chrome/images/icons/converted/Varnish.svg.png
deleted file mode 100644
index 21cc7439e..000000000
Binary files a/src/drivers/chrome/images/icons/converted/Varnish.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/WordPress.svg.png b/src/drivers/chrome/images/icons/converted/WordPress.svg.png
deleted file mode 100644
index a0116f367..000000000
Binary files a/src/drivers/chrome/images/icons/converted/WordPress.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/caddy.svg.png b/src/drivers/chrome/images/icons/converted/caddy.svg.png
deleted file mode 100644
index 6256fc495..000000000
Binary files a/src/drivers/chrome/images/icons/converted/caddy.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/jQuery Mobile.svg.png b/src/drivers/chrome/images/icons/converted/jQuery Mobile.svg.png
deleted file mode 100644
index 501839ca1..000000000
Binary files a/src/drivers/chrome/images/icons/converted/jQuery Mobile.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/jQuery UI.svg.png b/src/drivers/chrome/images/icons/converted/jQuery UI.svg.png
deleted file mode 100644
index 63fa6ac32..000000000
Binary files a/src/drivers/chrome/images/icons/converted/jQuery UI.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/jQuery.svg.png b/src/drivers/chrome/images/icons/converted/jQuery.svg.png
deleted file mode 100644
index 30f1e5330..000000000
Binary files a/src/drivers/chrome/images/icons/converted/jQuery.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/pimcore.svg.png b/src/drivers/chrome/images/icons/converted/pimcore.svg.png
deleted file mode 100644
index f91e8d9cf..000000000
Binary files a/src/drivers/chrome/images/icons/converted/pimcore.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icons/converted/webpack.svg.png b/src/drivers/chrome/images/icons/converted/webpack.svg.png
deleted file mode 100644
index 9aa2526f3..000000000
Binary files a/src/drivers/chrome/images/icons/converted/webpack.svg.png and /dev/null differ
diff --git a/src/drivers/chrome/js/driver.js b/src/drivers/chrome/js/driver.js
index 0ddfd9045..3b0fa13ff 100644
--- a/src/drivers/chrome/js/driver.js
+++ b/src/drivers/chrome/js/driver.js
@@ -15,6 +15,8 @@
 		headersCache = {};
 
 	w.driver = {
+		timeout: 1000,
+
 		/**
 		 * Log messages to console
 		 */
@@ -215,8 +217,8 @@
 		 * Anonymously track detected applications for research purposes
 		 */
 		ping: function() {
-			if ( Object.keys(w.ping.hostnames).length && localStorage['tracking'] ) {
-				w.driver.post(w.config.websiteURL + 'ping/v2/', w.ping);
+			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));
 
@@ -265,9 +267,9 @@
 			 4, // Documentation Tool
 			 9, // Hosting Panel
 			29, // Search Engine
-			12, // Javascript Framework
+			12, // JavaScript Framework
 			26, // Mobile Framework
-			25, // Javascript Graphics
+			25, // JavaScript Graphics
 			22, // Web Server
 			27, // Programming Language
 			28, // Operating System
diff --git a/src/drivers/chrome/manifest.json b/src/drivers/chrome/manifest.json
index 868d48120..95e7d2102 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.48",
+	"version": "2.51",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
@@ -29,6 +29,6 @@
 		"js/inject.js"
 	],
 	"options_page": "options.html",
-	"permissions": [ "tabs", "webRequest", "http://*/*", "https://*/*" ],
+	"permissions": [ "tabs", "webRequest", "webNavigation", "http://*/*", "https://*/*" ],
 	"content_security_policy": "script-src 'self' https://ssl.google-analytics.com; object-src 'self'"
 }
diff --git a/src/drivers/firefox/.gitignore b/src/drivers/firefox/.gitignore
index 871b16778..8484335b2 100644
--- a/src/drivers/firefox/.gitignore
+++ b/src/drivers/firefox/.gitignore
@@ -2,4 +2,4 @@ data/apps.json
 data/images/icons/*.png
 data/images/icons/*.svg
 data/js/iframe.js
-lib/wappalyzer.js
+wappalyzer.js
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/driver.js b/src/drivers/firefox/driver.js
index 71ef1a2d7..4eb7565c0 100644
--- a/src/drivers/firefox/driver.js
+++ b/src/drivers/firefox/driver.js
@@ -343,6 +343,8 @@
 	}
 
 	w.driver = {
+		timeout: 1000,
+
 		/**
 		 * Log messages to console
 		 */
@@ -448,13 +450,13 @@
 					}).post();
 				};
 
-				post(w.config.websiteURL + 'ping/v2/', w.ping);
+				post('http://ping.wappalyzer.com/v2/', w.ping);
 
 				w.log('w.driver.ping: ' + JSON.stringify(w.ping));
 
 				w.ping = { hostnames: {} };
 
-				post('http://ad.wappalyzer.com/log/wp/', w.adCache);
+				post('https://ad.wappalyzer.com/log/wp/', w.adCache);
 
 				w.adCache = [];
 			}
@@ -486,9 +488,9 @@
 			 4, // Documentation Tool
 			 9, // Hosting Panel
 			29, // Search Engine
-			12, // Javascript Framework
+			12, // JavaScript Framework
 			26, // Mobile Framework
-			25, // Javascript Graphics
+			25, // JavaScript Graphics
 			22, // Web Server
 			27, // Programming Language
 			28, // Operating System
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/lib b/src/drivers/firefox/lib
deleted file mode 100644
index b6bc25523..000000000
--- a/src/drivers/firefox/lib
+++ /dev/null
@@ -1,530 +0,0 @@
-/**
- * Wappalyzer v2
- *
- * Created by Elbert Alias <elbert@alias.io>
- *
- * License: GPLv3 http://www.gnu.org/licenses/gpl-3.0.txt
- */
-
-var wappalyzer = (function() {
-	//'use strict';
-
-	/**
-	 * Application class
-	 */
-	var Application = function(app, detected) {
-		this.app             = app;
-		this.confidence      = {};
-		this.confidenceTotal = 0;
-		this.detected        = Boolean(detected);
-		this.excludes        = [];
-		this.version         = '';
-		this.versions        = [];
-	};
-
-	Application.prototype = {
-		/**
-		 * Calculate confidence total
-		 */
-		getConfidence: function() {
-			var total = 0, id;
-
-			for ( id in this.confidence ) {
-				total += this.confidence[id];
-			}
-
-			return this.confidenceTotal = Math.min(total, 100);
-		},
-
-		/**
-		 * Resolve version number (find the longest version number that contains all shorter detected version numbers)
-		 */
-		getVersion: function() {
-			var i, resolved;
-
-			if ( !this.versions.length ) {
-				return;
-			}
-
-			this.versions.sort(function(a, b) {
-				return a.length - b.length;
-			});
-
-			resolved = this.versions[0];
-
-			for ( i = 1; i < this.versions.length; i++ ) {
-				if ( this.versions[i].indexOf(resolved) === -1 ) {
-					break;
-				}
-
-				resolved = this.versions[i];
-			}
-
-			return this.version = resolved;
-		},
-
-		setDetected: function(pattern, type, value, key) {
-			this.detected = true;
-
-			// Set confidence level
-			this.confidence[type + ' ' + ( key ? key + ' ' : '' ) + pattern.regex] = pattern.confidence ? pattern.confidence : 100;
-
-			// Detect version number
-			if ( pattern.version ) {
-				var
-					version = pattern.version,
-					matches = pattern.regex.exec(value);
-
-				if ( matches ) {
-					matches.forEach(function(match, i) {
-						// Parse ternary operator
-						var ternary = new RegExp('\\\\' + i + '\\?([^:]+):(.*)$').exec(version);
-
-						if ( ternary && ternary.length === 3 ) {
-							w.log({ match: match, i: i, ternary: ternary });
-
-							version = version.replace(ternary[0], match ? ternary[1] : ternary[2]);
-
-							w.log({ version: version });
-						}
-
-						// Replace back references
-						version = version.replace(new RegExp('\\\\' + i, 'g'), match ? match : '');
-					});
-
-					if ( version && this.versions.indexOf(version) < 0 ) {
-						this.versions.push(version);
-					}
-
-					this.getVersion();
-				}
-			}
-		}
-	};
-
-	var Profiler = function() {
-		this.regexCount = 0;
-		this.startTime  = new Date().getTime();
-		this.lastTime   = new Date().getTime();
-		this.slowest    = { duration: null, app: '', type: '', pattern: '' };
-		this.timedOut   = false;
-	};
-
-	Profiler.prototype = {
-		checkPoint: function(app, type, regex) {
-			var duration = new Date().getTime() - this.lastTime;
-
-			if ( !this.slowest.duration || duration > this.slowest.duration ) {
-				this.slowest.duration = duration;
-				this.slowest.app      = app;
-				this.slowest.type     = type;
-				this.slowest.regex    = regex;
-			}
-
-			this.regexCount++;
-
-			this.lastTime = new Date().getTime();
-
-			this.timedOut = this.lastTime - this.startTime > 1000;
-		}
-	};
-
-	/**
-	 * Call driver functions
-	 */
-	var driver = function(func, args) {
-		if ( typeof w.driver[func] !== 'function' ) {
-			w.log('not implemented: w.driver.' + func, 'warn');
-
-			return;
-		}
-
-		if ( func !== 'log' ) {
-			w.log('w.driver.' + func);
-		}
-
-		return w.driver[func](args);
-	};
-
-	/**
-	 * Parse apps.json patterns
-	 */
-	var parse = function(patterns) {
-		var
-			attrs,
-			parsed = [];
-
-		// Convert single patterns to an array
-		if ( typeof patterns === 'string' ) {
-			patterns = [ patterns ];
-		}
-
-		patterns.forEach(function(pattern) {
-			attrs = {};
-
-			pattern.split('\\;').forEach(function(attr, i) {
-				if ( i ) {
-					// Key value pairs
-					attr = attr.split(':');
-
-					if ( attr.length > 1 ) {
-						attrs[attr.shift()] = attr.join(':');
-					}
-				} else {
-					attrs.string = attr;
-
-					try {
-						attrs.regex = new RegExp(attr.replace('/', '\/'), 'i'); // Escape slashes in regular expression
-					} catch (e) {
-						attrs.regex = new RegExp();
-
-						w.log(e + ': ' + attr, 'error');
-					}
-				}
-			});
-
-			parsed.push(attrs);
-		});
-
-		return parsed;
-	};
-
-	/**
-	 * Main script
-	 */
-	var w = {
-		apps:     {},
-		cats:     null,
-		ping:     { hostnames: {} },
-		adCache:  [],
-		detected: {},
-
-		config: {
-			websiteURL: 'https://wappalyzer.com/',
-			twitterURL: 'https://twitter.com/Wappalyzer',
-			githubURL:  'https://github.com/AliasIO/Wappalyzer',
-		},
-
-		/**
-		 * Log messages to console
-		 */
-		log: function(message, type) {
-			if ( type === undefined ) {
-				type = 'debug';
-			}
-
-			if ( typeof message === 'object' ) {
-				message = JSON.stringify(message);
-			}
-
-			driver('log', { message: message, type: type });
-		},
-
-		/**
-		 * Initialize
-		 */
-		init: function() {
-			w.log('w.init');
-
-			// Checks
-			if ( w.driver === undefined ) {
-				w.log('no driver, exiting');
-
-				return;
-			}
-
-			// Initialize driver
-			driver('init');
-		},
-
-		/**
-		 * Analyze the request
-		 */
-		analyze: function(hostname, url, data) {
-			var
-				i, j, app, confidence, type, regexMeta, regexScript, match, content, meta, header, version, id,
-				profiler     = new Profiler(),
-				apps         = {},
-				excludes     = [],
-				checkImplies = true;
-
-			w.log('w.analyze');
-
-			// Remove hash from URL
-			data.url = url = url.split('#')[0];
-
-			if ( w.apps === undefined || w.categories === undefined ) {
-				w.log('apps.json not loaded, check for syntax errors');
-
-				return;
-			}
-
-			if ( w.detected[url] === undefined ) {
-				w.detected[url] = {};
-			}
-
-			for ( app in w.apps ) {
-				// Exit loop after one second to prevent CPU hogging
-				// Remaining patterns will not be evaluated
-				if ( profiler.timedOut ) {
-					w.log('Timeout, exiting loop');
-
-					break;
-				}
-
-				apps[app] = w.detected[url] && w.detected[url][app] ? w.detected[url][app] : new Application(app);
-
-				for ( type in w.apps[app] ) {
-					switch ( type ) {
-						case 'url':
-							parse(w.apps[app][type]).forEach(function(pattern) {
-								if ( pattern.regex.test(url) ) {
-									apps[app].setDetected(pattern, type, url);
-								}
-
-								profiler.checkPoint(app, type, pattern.regex);
-							});
-
-							break;
-						case 'html':
-							if ( typeof data[type] !== 'string' || !data.html ) {
-								break;
-							}
-
-							parse(w.apps[app][type]).forEach(function(pattern) {
-								if ( pattern.regex.test(data[type]) ) {
-									apps[app].setDetected(pattern, type, data[type]);
-								}
-
-								profiler.checkPoint(app, type, pattern.regex);
-							});
-
-							break;
-						case 'script':
-							if ( typeof data.html !== 'string' || !data.html ) {
-								break;
-							}
-
-							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
-
-							parse(w.apps[app][type]).forEach(function(pattern) {
-								while ( match = regexScript.exec(data.html) ) {
-									if ( pattern.regex.test(match[2]) ) {
-										apps[app].setDetected(pattern, type, match[2]);
-									}
-								}
-
-								profiler.checkPoint(app, type, pattern.regex);
-							});
-
-							break;
-						case 'meta':
-							if ( typeof data.html !== 'string' || !data.html ) {
-								break;
-							}
-
-							regexMeta = /<meta[^>]+>/ig;
-
-							while ( match = regexMeta.exec(data.html) ) {
-								for ( meta in w.apps[app][type] ) {
-									profiler.checkPoint(app, type, regexMeta);
-
-									if ( new RegExp('name=["\']' + meta + '["\']', 'i').test(match) ) {
-										content = match.toString().match(/content=("|')([^"']+)("|')/i);
-
-										parse(w.apps[app].meta[meta]).forEach(function(pattern) {
-											if ( content && content.length === 4 && pattern.regex.test(content[2]) ) {
-												apps[app].setDetected(pattern, type, content[2], meta);
-											}
-
-											profiler.checkPoint(app, type, pattern.regex);
-										});
-									}
-								}
-							}
-
-							break;
-						case 'headers':
-							if ( typeof data[type] !== 'object' || !data[type] ) {
-								break;
-							}
-
-							for ( header in w.apps[app].headers ) {
-								parse(w.apps[app][type][header]).forEach(function(pattern) {
-									if ( typeof data[type][header.toLowerCase()] === 'string' && pattern.regex.test(data[type][header.toLowerCase()]) ) {
-										apps[app].setDetected(pattern, type, data[type][header.toLowerCase()], header);
-									}
-
-									profiler.checkPoint(app, type, pattern.regex);
-								});
-							}
-
-							break;
-						case 'env':
-							if ( typeof data[type] !== 'object' || !data[type] ) {
-								break;
-							}
-
-							parse(w.apps[app][type]).forEach(function(pattern) {
-								for ( i in data[type] ) {
-
-									if ( pattern.regex.test(data[type][i]) ) {
-										apps[app].setDetected(pattern, type, data[type][i]);
-									}
-								}
-
-								profiler.checkPoint(app, type, pattern.regex);
-							});
-
-							break;
-					}
-				}
-			}
-
-			w.log('[ profiler ] Tested ' + profiler.regexCount + ' regular expressions in ' + ( (new Date().getTime() - profiler.startTime) / 1000 ) + 's');
-			w.log('[ profiler ] Slowest pattern took ' + ( profiler.slowest.duration / 1000 ) + 's: ' + profiler.slowest.app + ' | ' + profiler.slowest.type + ' | ' + profiler.slowest.regex);
-
-			for ( app in apps ) {
-				if ( !apps[app].detected ) {
-					delete apps[app];
-				}
-			}
-
-			// Exclude app in detected apps only
-			for ( app in apps ) {
-				if (w.apps[app].excludes ) {
-					if ( typeof w.apps[app].excludes === 'string' ) {
-						w.apps[app].excludes = [ w.apps[app].excludes ];
-					}
-
-					w.apps[app].excludes.forEach(function(excluded) {
-						excludes.push(excluded);
-					});
-				}
-			}
-
-			// Remove excluded applications
-			for ( app in apps ) {
-				if ( excludes.indexOf(app) !== -1 ) {
-					delete apps[app];
-				}
-			}
-
-			// Implied applications
-			// Run several passes as implied apps may imply other apps
-			while ( checkImplies ) {
-				checkImplies = false;
-
-				for ( app in apps ) {
-					confidence = apps[app].confidence;
-
-					if ( w.apps[app] && w.apps[app].implies ) {
-						// Cast strings to an array
-						if ( typeof w.apps[app].implies === 'string' ) {
-							w.apps[app].implies = [ w.apps[app].implies ];
-						}
-
-						w.apps[app].implies.forEach(function(implied) {
-							implied = parse(implied)[0];
-
-							if ( !w.apps[implied.string] ) {
-								w.log('Implied application ' + implied.string + ' does not exist', 'warn');
-
-								return;
-							}
-
-							if ( !apps.hasOwnProperty(implied.string) ) {
-								apps[implied.string] = w.detected[url] && w.detected[url][implied.string] ? w.detected[url][implied.string] : new Application(implied.string, true);
-
-								checkImplies = true;
-							}
-
-							// Apply app confidence to implied app
-							for ( id in confidence ) {
-								apps[implied.string].confidence[id + ' implied by ' + app] = confidence[id] * ( implied.confidence ? implied.confidence / 100 : 1 );
-							}
-						});
-					}
-				}
-			}
-
-			w.log(Object.keys(apps).length + ' apps detected: ' + Object.keys(apps).join(', ') + ' on ' + url);
-
-			// Keep history of detected apps
-			for ( app in apps ) {
-				confidence = apps[app].confidence;
-				version    = apps[app].version;
-
-				// Per URL
-				w.detected[url][app] = apps[app];
-
-				for ( id in confidence ) {
-					w.detected[url][app].confidence[id] = confidence[id];
-				}
-
-				if ( w.detected[url][app].getConfidence() >= 100 ) {
-					// Per hostname
-					if ( /(www.)?((.+?)\.(([a-z]{2,3}\.)?[a-z]{2,6}))$/.test(hostname) && !/((local|dev(elopment)?|stag(e|ing)?|test(ing)?|demo(shop)?|admin|google|cache)\.|\/admin|\.local)/.test(url) ) {
-						if ( !w.ping.hostnames.hasOwnProperty(hostname) ) {
-							w.ping.hostnames[hostname] = { applications: {}, meta: {} };
-						}
-
-						if ( !w.ping.hostnames[hostname].applications.hasOwnProperty(app) ) {
-							w.ping.hostnames[hostname].applications[app] = { hits: 0 };
-						}
-
-						w.ping.hostnames[hostname].applications[app].hits ++;
-
-						if ( version ) {
-							w.ping.hostnames[hostname].applications[app].version = version;
-						}
-					} else {
-						w.log('Ignoring hostname "' + hostname + '"');
-					}
-				}
-			}
-
-			// Additional information
-			if ( w.ping.hostnames.hasOwnProperty(hostname) ) {
-				if ( typeof data.html === 'string' && data.html ) {
-					match = data.html.match(/<html[^>]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"/i);
-
-					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 ) {
-				driver('ping');
-			}
-
-			apps = null;
-			data = null;
-
-			driver('displayApps');
-		}
-	};
-
-	return w;
-})();
-
-// CommonJS package
-// See http://wiki.commonjs.org/wiki/CommonJS
-if ( typeof exports === 'object' ) {
-	exports.wappalyzer = wappalyzer;
-}
diff --git a/src/drivers/firefox/locale/de-DE.properties b/src/drivers/firefox/locale/de-DE.properties
index 54780b3be..1de0e86e6 100755
--- a/src/drivers/firefox/locale/de-DE.properties
+++ b/src/drivers/firefox/locale/de-DE.properties
@@ -38,7 +38,7 @@ cat21                = LMS
 cat22                = Web-Server
 cat23                = Cache Tool
 cat24                = Rich Text Editor
-cat25                = Javascript Graphics
+cat25                = JavaScript Graphics
 cat26                = Mobile Framework
 cat27                = Programmiersprache
 cat28                = Betriebssystem
@@ -65,3 +65,4 @@ cat48                = Netzwerkspeicher
 cat49                = Feed-Leser
 cat50                = Document Management Systems
 cat51                = Landing Page Builder
+cat52                = Live Chat
diff --git a/src/drivers/firefox/locale/el-GR.properties b/src/drivers/firefox/locale/el-GR.properties
index 02222be90..626098c94 100644
--- a/src/drivers/firefox/locale/el-GR.properties
+++ b/src/drivers/firefox/locale/el-GR.properties
@@ -38,7 +38,7 @@ cat21                = LMS
 cat22                = Διακομιστής Διαδικτύου
 cat23                = Εργαλείο Μνήμης Cache
 cat24                = Επεξεργαστής Εμπλουτισμένου Κειμένου
-cat25                = Γραφικά Javascript
+cat25                = Γραφικά JavaScript
 cat26                = Framework για Κινητά
 cat27                = Γλώσσα Προγραμματισμού
 cat28                = Λειτουργικό Σύστημα
@@ -65,3 +65,4 @@ cat48                = Δικτυακός Αποθηκευτικός Χώρος
 cat49                = Feed Readers
 cat50                = Συστήματα Διαχειρίσης Εγγράφων
 cat51                = Σύστημα Κατασκευής Σελίδων Υποδοχής
+cat52                = Live Chat
diff --git a/src/drivers/firefox/locale/en-GB.properties b/src/drivers/firefox/locale/en-GB.properties
index 5f9ff5b18..0c2ec9d3d 100755
--- a/src/drivers/firefox/locale/en-GB.properties
+++ b/src/drivers/firefox/locale/en-GB.properties
@@ -38,7 +38,7 @@ cat21                = LMS
 cat22                = Web Server
 cat23                = Cache Tool
 cat24                = Rich Text Editor
-cat25                = Javascript Graphics
+cat25                = JavaScript Graphics
 cat26                = Mobile Framework
 cat27                = Programming Language
 cat28                = Operating System
@@ -65,3 +65,4 @@ cat48                = Network Storage
 cat49                = Feed Readers
 cat50                = Document Management Systems
 cat51                = Landing Page Builder
+cat52                = Live Chat
diff --git a/src/drivers/firefox/locale/en-US.properties b/src/drivers/firefox/locale/en-US.properties
index 5f9ff5b18..0c2ec9d3d 100755
--- a/src/drivers/firefox/locale/en-US.properties
+++ b/src/drivers/firefox/locale/en-US.properties
@@ -38,7 +38,7 @@ cat21                = LMS
 cat22                = Web Server
 cat23                = Cache Tool
 cat24                = Rich Text Editor
-cat25                = Javascript Graphics
+cat25                = JavaScript Graphics
 cat26                = Mobile Framework
 cat27                = Programming Language
 cat28                = Operating System
@@ -65,3 +65,4 @@ cat48                = Network Storage
 cat49                = Feed Readers
 cat50                = Document Management Systems
 cat51                = Landing Page Builder
+cat52                = Live Chat
diff --git a/src/drivers/firefox/locale/es-ES.properties b/src/drivers/firefox/locale/es-ES.properties
index 8f1e65477..503d472e8 100755
--- a/src/drivers/firefox/locale/es-ES.properties
+++ b/src/drivers/firefox/locale/es-ES.properties
@@ -38,7 +38,7 @@ cat21                = LMS
 cat22                = Servidor Web
 cat23                = Herramienta de Cache
 cat24                = Editor de Texto Enriquecido
-cat25                = Gráficos Javascript
+cat25                = Gráficos JavaScript
 cat26                = Framework Móvil
 cat27                = Lenguaje de programación
 cat28                = Sistema Operativo
@@ -65,3 +65,4 @@ cat48                = Network Storage
 cat49                = Feed Readers
 cat50                = Document Management Systems
 cat51                = Landing Page Builder
+cat52                = Live Chat
diff --git a/src/drivers/firefox/locale/fr-FR.properties b/src/drivers/firefox/locale/fr-FR.properties
index 42536e288..f65c5da0c 100644
--- a/src/drivers/firefox/locale/fr-FR.properties
+++ b/src/drivers/firefox/locale/fr-FR.properties
@@ -65,3 +65,4 @@ cat48                = Stockage réseau
 cat49                = Lecteur RSS
 cat50                = Système de gestion de documents
 cat51                = Landing Page Builder
+cat52                = Chat en direct
diff --git a/src/drivers/firefox/locale/it-IT.properties b/src/drivers/firefox/locale/it-IT.properties
index a205dc72a..aaaf8f5ef 100755
--- a/src/drivers/firefox/locale/it-IT.properties
+++ b/src/drivers/firefox/locale/it-IT.properties
@@ -38,7 +38,7 @@ cat21                = LMS
 cat22                = Web Server
 cat23                = Cache Tool
 cat24                = Editor di Testo Ricco
-cat25                = Javascript Graphics
+cat25                = JavaScript Graphics
 cat26                = Framework Mobile
 cat27                = Linguaggio di Programmazione
 cat28                = Sistema Operativo
@@ -65,3 +65,4 @@ cat48                = Network Storage
 cat49                = Lettore di Feed
 cat50                = Sistema di Gestione Documenti
 cat51                = Landing Page Builder
+cat52                = Live Chat
diff --git a/src/drivers/firefox/locale/nl-NL.properties b/src/drivers/firefox/locale/nl-NL.properties
index f72eabb62..9d2833f50 100755
--- a/src/drivers/firefox/locale/nl-NL.properties
+++ b/src/drivers/firefox/locale/nl-NL.properties
@@ -65,3 +65,4 @@ cat48                = Network Storage
 cat49                = Feed Readers
 cat50                = Document Management Systems
 cat51                = Landing Page Builder
+cat52                = Live Chat
diff --git a/src/drivers/firefox/locale/ro-RO.properties b/src/drivers/firefox/locale/ro-RO.properties
index 6ecb71a3e..61bf776f5 100644
--- a/src/drivers/firefox/locale/ro-RO.properties
+++ b/src/drivers/firefox/locale/ro-RO.properties
@@ -62,3 +62,4 @@ cat48                = Network Storage
 cat49                = Feed Readers
 cat50                = Document Management Systems
 cat51                = Landing Page Builder
+cat52                = Live Chat
diff --git a/src/drivers/firefox/locale/ru-RU.properties b/src/drivers/firefox/locale/ru-RU.properties
index 4f8bdffb4..5c820a05f 100644
--- a/src/drivers/firefox/locale/ru-RU.properties
+++ b/src/drivers/firefox/locale/ru-RU.properties
@@ -65,3 +65,4 @@ cat48                = Сетевое хранилище
 cat49                = Граббер контента
 cat50                = Управление документами
 cat51                = Генератор лендингов
+cat52                = Live Chat
diff --git a/src/drivers/firefox/package.json b/src/drivers/firefox/package.json
index c46c45a8a..b688d50d8 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.6",
+  "version": "3.2.10",
 	"main": "driver.js",
 	"preferences": [{
 		"name": "tracking",
diff --git a/src/drivers/firefox/wappalyzer.js b/src/drivers/firefox/wappalyzer.js
deleted file mode 100644
index 88ca749a7..000000000
--- a/src/drivers/firefox/wappalyzer.js
+++ /dev/null
@@ -1,530 +0,0 @@
-/**
- * Wappalyzer v2
- *
- * Created by Elbert Alias <elbert@alias.io>
- *
- * License: GPLv3 http://www.gnu.org/licenses/gpl-3.0.txt
- */
-
-var wappalyzer = (function() {
-	//'use strict';
-
-	/**
-	 * Application class
-	 */
-	var Application = function(app, detected) {
-		this.app             = app;
-		this.confidence      = {};
-		this.confidenceTotal = 0;
-		this.detected        = Boolean(detected);
-		this.excludes        = [];
-		this.version         = '';
-		this.versions        = [];
-	};
-
-	Application.prototype = {
-		/**
-		 * Calculate confidence total
-		 */
-		getConfidence: function() {
-			var total = 0, id;
-
-			for ( id in this.confidence ) {
-				total += this.confidence[id];
-			}
-
-			return this.confidenceTotal = Math.min(total, 100);
-		},
-
-		/**
-		 * Resolve version number (find the longest version number that contains all shorter detected version numbers)
-		 */
-		getVersion: function() {
-			var i, resolved;
-
-			if ( !this.versions.length ) {
-				return;
-			}
-
-			this.versions.sort(function(a, b) {
-				return a.length - b.length;
-			});
-
-			resolved = this.versions[0];
-
-			for ( i = 1; i < this.versions.length; i++ ) {
-				if ( this.versions[i].indexOf(resolved) === -1 ) {
-					break;
-				}
-
-				resolved = this.versions[i];
-			}
-
-			return this.version = resolved;
-		},
-
-		setDetected: function(pattern, type, value, key) {
-			this.detected = true;
-
-			// Set confidence level
-			this.confidence[type + ' ' + ( key ? key + ' ' : '' ) + pattern.regex] = pattern.confidence ? pattern.confidence : 100;
-
-			// Detect version number
-			if ( pattern.version ) {
-				var
-					version = pattern.version,
-					matches = pattern.regex.exec(value);
-
-				if ( matches ) {
-					matches.forEach(function(match, i) {
-						// Parse ternary operator
-						var ternary = new RegExp('\\\\' + i + '\\?([^:]+):(.*)$').exec(version);
-
-						if ( ternary && ternary.length === 3 ) {
-							w.log({ match: match, i: i, ternary: ternary });
-
-							version = version.replace(ternary[0], match ? ternary[1] : ternary[2]);
-
-							w.log({ version: version });
-						}
-
-						// Replace back references
-						version = version.replace(new RegExp('\\\\' + i, 'g'), match ? match : '');
-					});
-
-					if ( version && this.versions.indexOf(version) < 0 ) {
-						this.versions.push(version);
-					}
-
-					this.getVersion();
-				}
-			}
-		}
-	};
-
-	var Profiler = function() {
-		this.regexCount = 0;
-		this.startTime  = new Date().getTime();
-		this.lastTime   = new Date().getTime();
-		this.slowest    = { duration: null, app: '', type: '', pattern: '' };
-		this.timedOut   = false;
-	};
-
-	Profiler.prototype = {
-		checkPoint: function(app, type, regex) {
-			var duration = new Date().getTime() - this.lastTime;
-
-			if ( !this.slowest.duration || duration > this.slowest.duration ) {
-				this.slowest.duration = duration;
-				this.slowest.app      = app;
-				this.slowest.type     = type;
-				this.slowest.regex    = regex;
-			}
-
-			this.regexCount++;
-
-			this.lastTime = new Date().getTime();
-
-			this.timedOut = this.lastTime - this.startTime > 1000;
-		}
-	};
-
-	/**
-	 * Call driver functions
-	 */
-	var driver = function(func, args) {
-		if ( typeof w.driver[func] !== 'function' ) {
-			w.log('not implemented: w.driver.' + func, 'warn');
-
-			return;
-		}
-
-		if ( func !== 'log' ) {
-			w.log('w.driver.' + func);
-		}
-
-		return w.driver[func](args);
-	};
-
-	/**
-	 * Parse apps.json patterns
-	 */
-	var parse = function(patterns) {
-		var
-			attrs,
-			parsed = [];
-
-		// Convert single patterns to an array
-		if ( typeof patterns === 'string' ) {
-			patterns = [ patterns ];
-		}
-
-		patterns.forEach(function(pattern) {
-			attrs = {};
-
-			pattern.split('\\;').forEach(function(attr, i) {
-				if ( i ) {
-					// Key value pairs
-					attr = attr.split(':');
-
-					if ( attr.length > 1 ) {
-						attrs[attr.shift()] = attr.join(':');
-					}
-				} else {
-					attrs.string = attr;
-
-					try {
-						attrs.regex = new RegExp(attr.replace('/', '\/'), 'i'); // Escape slashes in regular expression
-					} catch (e) {
-						attrs.regex = new RegExp();
-
-						w.log(e + ': ' + attr, 'error');
-					}
-				}
-			});
-
-			parsed.push(attrs);
-		});
-
-		return parsed;
-	};
-
-	/**
-	 * Main script
-	 */
-	var w = {
-		apps:     {},
-		cats:     null,
-		ping:     { hostnames: {} },
-		detected: {},
-		adCache: [],
-
-		config: {
-			websiteURL: 'https://wappalyzer.com/',
-			twitterURL: 'https://twitter.com/Wappalyzer',
-			githubURL:  'https://github.com/AliasIO/Wappalyzer',
-		},
-
-		/**
-		 * Log messages to console
-		 */
-		log: function(message, type) {
-			if ( type === undefined ) {
-				type = 'debug';
-			}
-
-			if ( typeof message === 'object' ) {
-				message = JSON.stringify(message);
-			}
-
-			driver('log', { message: '[wappalyzer ' + type + '] ' + message, type: type });
-		},
-
-		/**
-		 * Initialize
-		 */
-		init: function() {
-			w.log('w.init');
-
-			// Checks
-			if ( w.driver === undefined ) {
-				w.log('no driver, exiting');
-
-				return;
-			}
-
-			// Initialize driver
-			driver('init');
-		},
-
-		/**
-		 * Analyze the request
-		 */
-		analyze: function(hostname, url, data) {
-			var
-				i, j, app, confidence, type, regexMeta, regexScript, match, content, meta, header, version, id,
-				profiler     = new Profiler(),
-				apps         = {},
-				excludes     = [],
-				checkImplies = true;
-
-			w.log('w.analyze');
-
-			// Remove hash from URL
-			data.url = url = url.split('#')[0];
-
-			if ( w.apps === undefined || w.categories === undefined ) {
-				w.log('apps.json not loaded, check for syntax errors');
-
-				return;
-			}
-
-			if ( w.detected[url] === undefined ) {
-				w.detected[url] = {};
-			}
-
-			for ( app in w.apps ) {
-				// Exit loop after one second to prevent CPU hogging
-				// Remaining patterns will not be evaluated
-				if ( profiler.timedOut ) {
-					w.log('Timeout, exiting loop');
-
-					break;
-				}
-
-				apps[app] = w.detected[url] && w.detected[url][app] ? w.detected[url][app] : new Application(app);
-
-				for ( type in w.apps[app] ) {
-					switch ( type ) {
-						case 'url':
-							parse(w.apps[app][type]).forEach(function(pattern) {
-								if ( pattern.regex.test(url) ) {
-									apps[app].setDetected(pattern, type, url);
-								}
-
-								profiler.checkPoint(app, type, pattern.regex);
-							});
-
-							break;
-						case 'html':
-							if ( typeof data[type] !== 'string' || !data.html ) {
-								break;
-							}
-
-							parse(w.apps[app][type]).forEach(function(pattern) {
-								if ( pattern.regex.test(data[type]) ) {
-									apps[app].setDetected(pattern, type, data[type]);
-								}
-
-								profiler.checkPoint(app, type, pattern.regex);
-							});
-
-							break;
-						case 'script':
-							if ( typeof data.html !== 'string' || !data.html ) {
-								break;
-							}
-
-							regexScript = new RegExp('<script[^>]+src=("|\')([^"\']+)', 'ig');
-
-							parse(w.apps[app][type]).forEach(function(pattern) {
-								while ( match = regexScript.exec(data.html) ) {
-									if ( pattern.regex.test(match[2]) ) {
-										apps[app].setDetected(pattern, type, match[2]);
-									}
-								}
-
-								profiler.checkPoint(app, type, pattern.regex);
-							});
-
-							break;
-						case 'meta':
-							if ( typeof data.html !== 'string' || !data.html ) {
-								break;
-							}
-
-							regexMeta = /<meta[^>]+>/ig;
-
-							while ( match = regexMeta.exec(data.html) ) {
-								for ( meta in w.apps[app][type] ) {
-									profiler.checkPoint(app, type, regexMeta);
-
-									if ( new RegExp('name=["\']' + meta + '["\']', 'i').test(match) ) {
-										content = match.toString().match(/content=("|')([^"']+)("|')/i);
-
-										parse(w.apps[app].meta[meta]).forEach(function(pattern) {
-											if ( content && content.length === 4 && pattern.regex.test(content[2]) ) {
-												apps[app].setDetected(pattern, type, content[2], meta);
-											}
-
-											profiler.checkPoint(app, type, pattern.regex);
-										});
-									}
-								}
-							}
-
-							break;
-						case 'headers':
-							if ( typeof data[type] !== 'object' || !data[type] ) {
-								break;
-							}
-
-							for ( header in w.apps[app].headers ) {
-								parse(w.apps[app][type][header]).forEach(function(pattern) {
-									if ( typeof data[type][header.toLowerCase()] === 'string' && pattern.regex.test(data[type][header.toLowerCase()]) ) {
-										apps[app].setDetected(pattern, type, data[type][header.toLowerCase()], header);
-									}
-
-									profiler.checkPoint(app, type, pattern.regex);
-								});
-							}
-
-							break;
-						case 'env':
-							if ( typeof data[type] !== 'object' || !data[type] ) {
-								break;
-							}
-
-							parse(w.apps[app][type]).forEach(function(pattern) {
-								for ( i in data[type] ) {
-
-									if ( pattern.regex.test(data[type][i]) ) {
-										apps[app].setDetected(pattern, type, data[type][i]);
-									}
-								}
-
-								profiler.checkPoint(app, type, pattern.regex);
-							});
-
-							break;
-					}
-				}
-			}
-
-			w.log('[ profiler ] Tested ' + profiler.regexCount + ' regular expressions in ' + ( (new Date().getTime() - profiler.startTime) / 1000 ) + 's');
-			w.log('[ profiler ] Slowest pattern took ' + ( profiler.slowest.duration / 1000 ) + 's: ' + profiler.slowest.app + ' | ' + profiler.slowest.type + ' | ' + profiler.slowest.regex);
-
-			for ( app in apps ) {
-				if ( !apps[app].detected ) {
-					delete apps[app];
-				}
-			}
-
-			// Exclude app in detected apps only
-			for ( app in apps ) {
-				if (w.apps[app].excludes ) {
-					if ( typeof w.apps[app].excludes === 'string' ) {
-						w.apps[app].excludes = [ w.apps[app].excludes ];
-					}
-
-					w.apps[app].excludes.forEach(function(excluded) {
-						excludes.push(excluded);
-					});
-				}
-			}
-
-			// Remove excluded applications
-			for ( app in apps ) {
-				if ( excludes.indexOf(app) !== -1 ) {
-					delete apps[app];
-				}
-			}
-
-			// Implied applications
-			// Run several passes as implied apps may imply other apps
-			while ( checkImplies ) {
-				checkImplies = false;
-
-				for ( app in apps ) {
-					confidence = apps[app].confidence;
-
-					if ( w.apps[app] && w.apps[app].implies ) {
-						// Cast strings to an array
-						if ( typeof w.apps[app].implies === 'string' ) {
-							w.apps[app].implies = [ w.apps[app].implies ];
-						}
-
-						w.apps[app].implies.forEach(function(implied) {
-							implied = parse(implied)[0];
-
-							if ( !w.apps[implied.string] ) {
-								w.log('Implied application ' + implied.string + ' does not exist', 'warn');
-
-								return;
-							}
-
-							if ( !apps.hasOwnProperty(implied.string) ) {
-								apps[implied.string] = w.detected[url] && w.detected[url][implied.string] ? w.detected[url][implied.string] : new Application(implied.string, true);
-
-								checkImplies = true;
-							}
-
-							// Apply app confidence to implied app
-							for ( id in confidence ) {
-								apps[implied.string].confidence[id + ' implied by ' + app] = confidence[id] * ( implied.confidence ? implied.confidence / 100 : 1 );
-							}
-						});
-					}
-				}
-			}
-
-			w.log(Object.keys(apps).length + ' apps detected: ' + Object.keys(apps).join(', ') + ' on ' + url);
-
-			// Keep history of detected apps
-			for ( app in apps ) {
-				confidence = apps[app].confidence;
-				version    = apps[app].version;
-
-				// Per URL
-				w.detected[url][app] = apps[app];
-
-				for ( id in confidence ) {
-					w.detected[url][app].confidence[id] = confidence[id];
-				}
-
-				if ( w.detected[url][app].getConfidence() >= 500 ) {
-					// Per hostname
-					if ( /(www.)?((.+?)\.(([a-z]{2,3}\.)?[a-z]{2,6}))$/.test(hostname) && !/((local|dev(elopment)?|stag(e|ing)?|test(ing)?|demo(shop)?|admin|google|cache)\.|\/admin|\.local)/.test(url) ) {
-						if ( !w.ping.hostnames.hasOwnProperty(hostname) ) {
-							w.ping.hostnames[hostname] = { applications: {}, meta: {} };
-						}
-
-						if ( !w.ping.hostnames[hostname].applications.hasOwnProperty(app) ) {
-							w.ping.hostnames[hostname].applications[app] = { hits: 0 };
-						}
-
-						w.ping.hostnames[hostname].applications[app].hits ++;
-
-						if ( version ) {
-							w.ping.hostnames[hostname].applications[app].version = version;
-						}
-					} else {
-						w.log('Ignoring hostname "' + hostname + '"');
-					}
-				}
-			}
-
-			// Additional information
-			if ( w.ping.hostnames.hasOwnProperty(hostname) ) {
-				if ( typeof data.html === 'string' && data.html ) {
-					match = data.html.match(/<html[^>]*[: ]lang="([a-z]{2}((-|_)[A-Z]{2})?)"/i);
-
-					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) {
-				driver('ping');
-			}
-
-			apps = null;
-			data = null;
-
-			driver('displayApps');
-		}
-	};
-
-	return w;
-})();
-
-// CommonJS package
-// See http://wiki.commonjs.org/wiki/CommonJS
-if ( typeof exports === 'object' ) {
-	exports.wappalyzer = wappalyzer;
-}
diff --git a/src/drivers/html/images/icon.png b/src/drivers/html/images/icon.png
deleted file mode 100644
index 0e1e1fb0c..000000000
Binary files a/src/drivers/html/images/icon.png and /dev/null differ
diff --git a/src/drivers/html/index.html b/src/drivers/html/index.html
deleted file mode 100644
index 32ec5f46a..000000000
--- a/src/drivers/html/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-	<head>
-		<title>Wappalyzer</title>
-
-		<link rel="icon" type="image/png" href="images/icon.png"/>
-
-		<script type="text/javascript" src="js/wappalyzer.js"></script>
-		<script type="text/javascript" src="js/driver.js"></script>
-
-		<style type="text/css">
-			body {
-				font-family: Verdana, Arial, sans-serif;
-				font-size: 12px;
-			}
-
-			#apps {
-				line-height: 20px;
-			}
-
-			#apps img {
-				vertical-align: middle;
-			}
-		</style>
-	</head>
-	<body>
-		<div id="apps"></div>
-	</body>
-</html>
diff --git a/src/drivers/html/js/driver.js b/src/drivers/html/js/driver.js
deleted file mode 100644
index 0e14f59af..000000000
--- a/src/drivers/html/js/driver.js
+++ /dev/null
@@ -1,67 +0,0 @@
-(function() {
-	if ( wappalyzer == null ) { return };
-
-	var w = wappalyzer;
-
-	w.driver = {
-		/**
-		 * Log messages to console
-		 */
-		log: function(args) {
-			if ( console != null ) { console[args.type](args.message) };
-		},
-
-		/**
-		 * Initialize
-		 */
-		init: function() {
-			// 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;
-
-				window.document.addEventListener('DOMContentLoaded', function() {
-					w.analyze('google.com', 'http://google.com', {
-						html:    '<script src="jquery.js"><meta name="generator" content="WordPress"/>',
-						headers: { 'Server': 'Apache' },
-						env:     [ 'Mootools' ]
-					});
-				});
-			};
-
-			xhr.send(null);
-		},
-
-		/**
-		 * Display apps
-		 */
-		displayApps: function() {
-			var
-				app,
-				url = Object.keys(w.detected)[0];
-
-			document.getElementById('apps').innerHTML = '';
-
-			for ( app in w.detected[url] ) {
-				document.getElementById('apps').innerHTML += '<img src="images/icons/' + w.apps[app].icon + '" width="16" height="16"/> ' + app + '<br/>';
-			};
-		},
-
-		/**
-		 * Go to URL
-		 */
-		goToURL: function(args) {
-			window.open(args.url);
-		}
-	};
-
-	w.init();
-})();
diff --git a/src/drivers/npm/.editorconfig b/src/drivers/npm/.editorconfig
deleted file mode 100644
index 92b1c978e..000000000
--- a/src/drivers/npm/.editorconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-root = true
-
-[*]
-indent_style = tab
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{js,py}]
-charset = utf-8
-
-[*.py]
-indent_style = space
-indent_size = 4
diff --git a/src/drivers/npm/.gitignore b/src/drivers/npm/.gitignore
deleted file mode 100644
index c7273df57..000000000
--- a/src/drivers/npm/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-wappalyzer.js
-apps.json
-node_modules/
diff --git a/src/drivers/npm/.jshintrc b/src/drivers/npm/.jshintrc
deleted file mode 100644
index 3152f17fc..000000000
--- a/src/drivers/npm/.jshintrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"node" : true,
-	"browser" : "false",
-  	"predef": []
-}
\ No newline at end of file
diff --git a/src/drivers/npm/README.md b/src/drivers/npm/README.md
deleted file mode 100644
index e7282dd61..000000000
--- a/src/drivers/npm/README.md
+++ /dev/null
@@ -1,172 +0,0 @@
-# Wappalyzer
-
-## Install
-
-Install wappalyzer from NPM with:
-
-```bash
-npm install wappalyzer
-```
-## Quickstart
-
-```javascript
-// load in the lib
-var wappalyzer = require("wappalyzer");
-
-// set our options
-var options={
-
-  url : "http://codelanka.github.io/Presentation-Engines",
-  hostname:"codelanka.github.io",
-  debug:false
-
-}
-
-// detect from the url directly, library will make a request
-wappalyzer.detectFromUrl(options,function  (err,apps,appInfo) {
-
-  // output for the test
-  console.dir(apps);
-  console.dir(appInfo);
-
-})
-
-// sample data
-var data = {
-
-  url: options.url,
-  headers: {
-
-    test: 1
-
-  },
-  html: '<p>HTML CONTENT OF PAGE HERE</p>'
-
-};
-
-// detect from content you have already
-wappalyzer.detectFromHTML(options,function  (err,apps,appInfo) {
-
-  // output for the test
-  console.dir(apps);
-  console.log(appInfo);
-
-})
-```
-### Output from QuickStart
-
-```javascript
-
-// Apps
-[ 
-  'CloudFlare',
-  'Font Awesome',
-  'Google Maps',
-  'Modernizr',
-  'Nginx',
-  'RequireJS',
-  'jQuery' 
-]
-
-// Detailed info on links
-{ 
-  CloudFlare: { 
-    app: 'CloudFlare',
-    confidence: { 'headers Server /cloudflare/i': 100 },
-    confidenceTotal: 100,
-    detected: true,
-    excludes: [],
-    version: '',
-    versions: [] 
-  },
-  'Font Awesome': { 
-    app: 'Font Awesome',
-    confidence: { 'html /<link[^>]* href=[^>]+font-awesome(?:\.min)?\.css/i': 100 },
-    confidenceTotal: 100,
-    detected: true,
-    excludes: [],
-    version: '',
-    versions: [] 
-  },
-  'Google Maps': { 
-    app: 'Google Maps',
-    confidence: { 'script ///maps.googleapis.com/maps/api/js/i': 100 },
-    confidenceTotal: 100,
-    detected: true,
-    excludes: [],
-    version: '',
-    versions: [] 
-  },
-  'Modernizr': { 
-    app: 'Modernizr',
-    confidence: { 'script /modernizr(?:-([\d.]*[\d]))?.*\.js/i': 100 },
-    confidenceTotal: 100,
-    detected: true,
-    excludes: [],
-    version: '2.6.2',
-    versions: [ '2.6.2' ] 
-  },
-  'Nginx': { 
-    app: 'Nginx',
-    confidence: { 'headers Server /nginx(?:/([\d.]+))?/i': 100 },
-    confidenceTotal: 100,
-    detected: true,
-    excludes: [],
-    version: '',
-    versions: [] 
-  },
-  'RequireJS': { 
-    app: 'RequireJS',
-    confidence: { 'script /require.*\.js/i': 100 },
-    confidenceTotal: 100,
-    detected: true,
-    excludes: [],
-    version: '',
-    versions: [] 
-  },
-  'jQuery': { 
-    app: 'jQuery',
-    confidence: 
-    { 'script //([\d.]+)/jquery(\.min)?\.js/i': 100,
-    'script /jquery.*\.js/i': 100 },
-    confidenceTotal: 100,
-    detected: true,
-    excludes: [],
-    version: '1.10.1',
-    versions: [ '1.10.1' ] 
-  } 
-}
-```
-## Credits
-
-### Wappalyzer Author - Elbert Alias
-
-[Wappalyzer](https://wappalyzer.com/) is a
-[cross-platform](https://github.com/AliasIO/Wappalyzer/wiki/Drivers) utility that uncovers the
-technologies used on websites.  It detects
-[content management systems](https://wappalyzer.com/categories/cms),
-[eCommerce platforms](https://wappalyzer.com/categories/ecommerce),
-[web servers](https://wappalyzer.com/categories/web-servers),
-[JavaScript frameworks](https://wappalyzer.com/categories/javascript-frameworks),
-[analytics tools](https://wappalyzer.com/categories/analytics) and
-[many more](https://wappalyzer.com/applications).
-
-Refer to the [wiki](https://github.com/AliasIO/Wappalyzer/wiki) for
-[screenshots](https://github.com/AliasIO/Wappalyzer/wiki/Screenshots), information on how to
-[contribute](https://github.com/AliasIO/Wappalyzer/wiki/Contributing) and
-[more](https://github.com/AliasIO/Wappalyzer/wiki/_pages).
-
-### NPM Module
-
-* [Pasindu De Silva](https://github.com/pasindud) - Initial version with tests
-* [Johann du Toit](http://johanndutoit.net) from [Passmarked](http://passmarked.com) - Updated to support just passing data and helped publish to NPMJS
-
-## License
-
-*Licensed under the [GPL](https://github.com/AliasIO/Wappalyzer/blob/master/LICENSE).*
-
-## Donations
-
-Donate Bitcoin: 16gb4uGDAjaeRJwKVmKr2EXa8x2fmvT8EQ - *Thanks!*
-
-![QR Code](https://wappalyzer.com/sites/default/themes/wappalyzer/images/bitcoinqrcode.png)
diff --git a/src/drivers/npm/check.js b/src/drivers/npm/check.js
deleted file mode 100644
index f91e36c6b..000000000
--- a/src/drivers/npm/check.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var wappalyzer = require("./index");
-
-var options={
-  url : "http://codelanka.github.io/Presentation-Engines",
-  hostname:"codelanka.github.io",
-  debug:false
-}
-
-wappalyzer.detectFromUrl(options,function  (err,apps,appInfo) {
-  console.log(err,apps,appInfo);
-})
\ No newline at end of file
diff --git a/src/drivers/npm/index.js b/src/drivers/npm/index.js
deleted file mode 100644
index c88b7cde1..000000000
--- a/src/drivers/npm/index.js
+++ /dev/null
@@ -1,151 +0,0 @@
-'use strict';
-
-var request = require('request');
-var fs = require('fs');
-var path = require('path');
-
-/**
-* Does the actual detection with information passed
-**/
-exports.detect = function(options, data, cb) {
-
-	// run the wrapper function that will
-	// trigger the actual library to run
-	runWrappalyer(options, data, cb);
-
-};
-
-/**
-* Wraps the detect method, just kept to reuse old method names
-* and not break anything. Although this was just stubbed out.
-**/
-exports.detectFromHTML = function(options, data, cb) {
-
-	// run the detect method
-	exports.detect(options, data, cb);
-
-};
-
-/**
-* Do a actual request for the body & headers, then
-* run through detection
-**/ 
-exports.detectFromUrl = function(options, cb) {
-
-	// ensure options and url were
-	if(!options || !options.url) {
-
-		// send back a error ...
-		cb(new Error("\"url\" is a required option to run"
-			+ " wappalyzer and get the page content"))
-
-	} else {
-
-		// local variables to
-		var url = options.url;
-
-		// get the body content from the url
-		getHTMLFromUrl(url, function(err, data) {
-
-			// check for error or if we got no data back
-			if (err || data === null) {
-
-				// handle the error and don't do anything else ..
-				cb(err, null);
-
-			} else {
-
-				// run actual detection
-				exports.detect(options, data, cb);
-
-			}
-		
-		});
-
-	}
-};
-
-function getHTMLFromUrl(url, cb) {
-	request(url, function(error, response, body) {
-		if (!error && response.statusCode == 200) {
-			var data = {
-				html: body,
-				url: url,
-				headers: response
-			};
-			cb(null, data);
-		} else {
-			cb(error, null);
-		}
-	});
-}
-
-function getAppsJson(cb) {
-
-	// depending on evironment select a direction to the path
-	var appsFileStr = path.resolve(__dirname, './apps.json');
-
-	// handle the environment variable if it's there
-	if(process.env.NODE_ENV == 'testing') {
-
-		// set the apps.json to testing stage
-		appsFileStr = path.resolve(__dirname, '../../apps.json');
-
-	}
-
-	// read in the file
-	fs.readFile(appsFileStr, 'utf8', function(err, data) {
-		if (err) throw err;
-		return cb(null, JSON.parse(data));
-	});
-}
-
-function runWrappalyer(options, data, cb) {
-	var debug = options.debug || false;
-
-	// according to environment check it
-	var wappalyzer = null;
-
-	// change depending on the environment
-	if( process.env.NODE_ENV == 'testing' ) {
-
-		wappalyzer = require('../../wappalyzer').wappalyzer;
-
-	} else {
-
-		wappalyzer = require('./wappalyzer').wappalyzer;
-
-	}
-
-	getAppsJson(function(err, apps) {
-		var w = wappalyzer;
-		w.driver = {
-			log: function(args) {
-				if (debug) {
-					console.log(args.message);
-				}
-			},
-
-			init: function() {
-				w.categories = apps.categories;
-				w.apps = apps.apps;
-			},
-			displayApps: function() {
-				var app, url = Object.keys(w.detected)[0];
-				var detectedApps = [];
-
-				for (app in w.detected[url]) {
-					detectedApps.push(app);
-
-					if (debug) {
-						console.log(app);
-					}
-				}
-				cb(null, detectedApps, w.detected[url]);
-			}
-		};
-		w.init();
-		w.detected = [];
-		w.analyze(options.hostname, options.url, data);
-	});
-}
diff --git a/src/drivers/npm/package.json b/src/drivers/npm/package.json
deleted file mode 100644
index a342ed19c..000000000
--- a/src/drivers/npm/package.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "name": "wappalyzer",
-  "version": "2.0.3",
-  "description": "NPM Module that uncovers the technologies used on websites",
-  "main": "index.js",
-  "scripts": {
-    "test": "NODE_ENV=testing mocha -t 15000"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/AliasIO/Wappalyzer"
-  },
-  "keywords": [
-    "wappalyzer",
-    "detect",
-    "stack",
-    "technologies"
-  ],
-  "contributors": [
-    { 
-      "name": "Pasindu De Silva"
-    },
-    { 
-      "name": "Johann du Toit"
-    }
-  ],
-  "author": "Elbert Alias",
-  "license": "GPLv3",
-  "bugs": {
-    "url": "https://github.com/AliasIO/Wappalyzer/issues"
-  },
-  "homepage": "https://github.com/AliasIO/Wappalyzer",
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {
-    "request": "^2.51.0"
-  }
-}
diff --git a/src/drivers/npm/test/sample.headers.json b/src/drivers/npm/test/sample.headers.json
deleted file mode 100644
index c8441bf8e..000000000
--- a/src/drivers/npm/test/sample.headers.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-   "Date":"Fri, 17 Jul 2015 11:05:08 GMT",
-   "Content-Encoding":"gzip",
-   "Age":"0",
-   "X-Cache":"MISS",
-   "Connection":"keep-alive",
-   "Content-Length":"1940",
-   "Via":"1.1 varnish",
-   "X-Served-By":"cache-lcy1122-LCY",
-   "Last-Modified":"Thu, 16 Apr 2015 14:24:18 GMT",
-   "Server":"GitHub.com",
-   "X-Timer":"S1437131108.300792,VS0,VE84",
-   "Vary":"Accept-Encoding",
-   "Content-Type":"text/html; charset=utf-8",
-   "Access-Control-Allow-Origin":"*",
-   "Expires":"Fri, 17 Jul 2015 11:10:54 GMT",
-   "Cache-Control":"max-age=600",
-   "Accept-Ranges":"bytes",
-   "X-Cache-Hits":"0"
-}
\ No newline at end of file
diff --git a/src/drivers/npm/test/sample.html b/src/drivers/npm/test/sample.html
deleted file mode 100644
index f8624a4e1..000000000
--- a/src/drivers/npm/test/sample.html
+++ /dev/null
@@ -1,149 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en" ng-app="presen" >
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Preso Engines | CodeLanka</title>
-    <!-- Bootstrap CSS -->
-    <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
-    <link href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
-    <script src="//code.jquery.com/jquery.js"></script>
-    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.5/angular.min.js"></script>
-    <link href='//fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
-
-    <link href="css/style.css" rel="stylesheet">
-
-    <script type="text/javascript">
-        $(function () {
-            "use strict";
-        var $bgobj = $(".ha-bg-parallax"); // assigning the object
-        $(window).on("scroll", function () {
-            var yPos = -($(window).scrollTop() / $bgobj.data('speed'));
-        // Put together our final background position
-        var coords = '100% ' + yPos + 'px';
-        // Move the background
-        $bgobj.css({ backgroundPosition: coords });
-    });
-        $('div.product-chooser').not('.disabled').find('div.product-chooser-item').on('click', function(){
-            $(this).parent().parent().find('div.product-chooser-item').removeClass('selected');
-            $(this).addClass('selected');
-            $(this).find('input[type="radio"]').prop("checked", true);
-        });
-    });
-    </script>
-</head>
-<body>
-
-    <div class="container-fluid">
-        <div>
-            <div class="ha-bg-parallax text-center block-marginb-none" data-type="background" data-speed="20">
-                <div class="ha-parallax-body">
-                    <div class="ha-content ha-content-whitecolor">
-                        <h1 id="headernav">Preso Engines</h1>
-                        "Presentation Engines"
-                    </div>
-                    <div class="ha-parallax-divider-wrapper">
-                        <span class="ha-diamond-divider-md img-responsive"></span>
-                    </div>
-                    <div class="ha-heading-parallax">By | CodeLanka</div>
-                </div>
-            </div>
-            <div class="container" ng-controller="presentationController">
-                <h2></h2>
-                <div class="row form-group product-chooser">
-                    <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4"
-                    ng-repeat="presentation in presentations">
-                    <div class="product-chooser-item">
-                        <div class="col-xs-8 col-sm-8 col-md-12 col-lg-12">
-                            <hr/>
-                            <span class="title">
-                                {{presentation.name}}
-                            </span>
-
-                            <span class="website">
-                                <a href="{{presentation.website}}">{{presentation.website}}</a>
-                            </span>
-
-                            <span class="description">
-                                {{presentation.description}}</span>
-                                <input type="radio" name="product" value="mobile_desktop"
-                                checked="checked">
-                                <hr/>
-                                <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 text-center">
-                                    <i class="fa fa-star"></i>
-                                    <h2>{{presentation.stargazers_count}}</h2>
-                                </div>
-                                <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 text-center">
-                                    <i class="fa fa-users"></i>
-                                    <h2>{{presentation.watchers_count}}</h2>
-                                </div>
-                                <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 text-center">
-                                    <i class="fa fa-bug"></i>
-                                    <h2>{{presentation.open_issues_count}}</h2>
-                                </div>
-
-                                <div class="clear"></div>
-                                <hr>
-                                <p>Github - 
-                                    <a href="http://github.com/{{presentation.github}}">{{presentation.github}}</a>
-                                </p>
-                                <p>Demo - 
-                                    <a href="{{presentation.demo}}">{{presentation.demo}}</a>
-                                </p>
-
-                                <p>License - {{presentation.license}} </p>
-
-                                <p>Language - {{presentation.language}} </p>
-                                <hr/>
-                            </div>
-                            <div class="clear"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <!-- jQuery -->
-    <!-- Bootstrap JavaScript -->
-    <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-
-    <script>
-        var phonecatApp = angular.module('presen', []);
-        phonecatApp.controller('presentationController', function ($scope,$http) {
-
-            var github = "https://api.github.com/repos/";
-
-            $http.get('data.json').
-            success(function(data, status, headers, config) {
-                $scope.presentations=data.engines;
-
-                for (var i = data.engines.length - 1; i >= 0; i--) {
-                    $scope.presentations[i].stargazers_count=0;
-                    $scope.presentations[i].watchers_count=0;
-                    $scope.presentations[i].open_issues_count=0;
-
-                    (function(no){
-                        var githuburl = github+data.engines[no].github;
-
-                        $http.get(githuburl)
-                        .success(function(data, status, headers, config) {
-                            $scope.presentations[no].stargazers_count=data.stargazers_count;
-                            $scope.presentations[no].watchers_count=data.watchers_count;
-                            $scope.presentations[no].open_issues_count=data.open_issues_count;
-
-                        })
-                        .error(function(data, status, headers, config) {});
-                    }(i));
-
-
-
-                };
-            }).
-error(function(data, status, headers, config) {});
-});
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/drivers/npm/test/test.js b/src/drivers/npm/test/test.js
deleted file mode 100644
index 8e994d1cc..000000000
--- a/src/drivers/npm/test/test.js
+++ /dev/null
@@ -1,65 +0,0 @@
-var assert    = require("assert")
-var fs        = require('fs')
-
-describe('wappalyzer', function(){
-  describe('detectFromUrl', function(){
-    it('should have the expected apps detected', function(done){
-
-      var wappalyzer = require("../index");
-
-      var expect = ['AngularJS','Font Awesome','Google Font API','Twitter Bootstrap','jQuery'];
-
-      var options={
-        url : "http://codelanka.github.io/Presentation-Engines",
-        hostname:"codelanka.github.io",
-        debug:false
-      }
-
-      wappalyzer.detectFromUrl(options,function  (err,apps) {
-        assert.equal(expect[0], apps[0]);
-        assert.equal(expect[1], apps[1]);
-        assert.equal(expect[2], apps[2]);
-        assert.equal(expect[3], apps[3]);
-        done();
-      })
-
-    })
-  })
-  describe('detectFromHTML', function(){
-    it('should have the expected apps detected when passed raw info', function(done){
-
-      var wappalyzer = require("../index");
-
-      var expect = ['AngularJS','Font Awesome','Google Font API','Twitter Bootstrap','jQuery'];
-
-      var options={
-        url : "http://codelanka.github.io/Presentation-Engines",
-        hostname:"codelanka.github.io",
-        debug:false
-      }
-
-      var data = {
-
-        url: options.url,
-        headers: require('./sample.headers.json'),
-        html: fs.readFileSync('./test/sample.html').toString(),
-        headers: {
-
-          headers: {}
-
-        }
-
-      };
-
-      wappalyzer.detectFromHTML(options, data, function  (err,apps) {
-
-        assert.equal(expect[0], apps[0]);
-        assert.equal(expect[1], apps[1]);
-        assert.equal(expect[2], apps[2]);
-        assert.equal(expect[3], apps[3]);
-        done();
-      })
-
-    })
-  })
-})
diff --git a/src/drivers/phantomjs/Dockerfile b/src/drivers/phantomjs/Dockerfile
index 52a75669e..deb9d1653 100644
--- a/src/drivers/phantomjs/Dockerfile
+++ b/src/drivers/phantomjs/Dockerfile
@@ -1,30 +1,33 @@
-FROM phusion/baseimage
+FROM ubuntu:latest
 
 MAINTAINER Elbert Alias <elbert@alias.io>
 
 ENV DEBIAN_FRONTEND noninteractive
 
+ENV WAPPALYZER_ROOT /usr/local/wappalyzer
+
+RUN sed -i 's/archive\.ubuntu\.com/au.archive.ubuntu.com/g' /etc/apt/sources.list
+
 RUN \
 	apt-get update && apt-get install -y \
-	bzip2 \
 	libfreetype6 \
 	libfontconfig \
+	nodejs \
+	npm \
 	&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-WORKDIR /usr/local
+RUN ln -s $(which nodejs) /usr/bin/node
 
-# PhantomJS
-RUN \
-	mkdir phantomjs && \
-	curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2 | tar xvjC phantomjs --strip 1
+RUN mkdir "$WAPPALYZER_ROOT"
 
-# Wappalyzer
-RUN \
-	mkdir wappalyzer && \
-	curl -sSL https://github.com/AliasIO/Wappalyzer/archive/master.tar.gz | tar xzC wappalyzer --strip 1
+WORKDIR "$WAPPALYZER_ROOT"
 
-RUN wappalyzer/bin/wappalyzer-links wappalyzer
+ADD apps.json .
+ADD driver.js .
+ADD index.js .
+ADD package.json .
+ADD wappalyzer.js .
 
-WORKDIR wappalyzer/src/drivers/phantomjs
+RUN npm i
 
-ENTRYPOINT ["/usr/local/phantomjs/bin/phantomjs", "--load-images=false", "--ignore-ssl-errors=yes", "--ssl-protocol=any", "driver.js"]
+ENTRYPOINT ["node", "index.js"]
diff --git a/src/drivers/phantomjs/README.md b/src/drivers/phantomjs/README.md
new file mode 100644
index 000000000..5dc340538
--- /dev/null
+++ b/src/drivers/phantomjs/README.md
@@ -0,0 +1,57 @@
+# Wappalyzer
+
+[Wappalyzer](https://wappalyzer.com/) is a
+[cross-platform](https://github.com/AliasIO/Wappalyzer/wiki/Drivers) utility that uncovers the
+technologies used on websites. It detects
+[content management systems](https://wappalyzer.com/categories/cms),
+[eCommerce platforms](https://wappalyzer.com/categories/ecommerce),
+[web servers](https://wappalyzer.com/categories/web-servers),
+[JavaScript frameworks](https://wappalyzer.com/categories/javascript-frameworks),
+[analytics tools](https://wappalyzer.com/categories/analytics) and
+[many more](https://wappalyzer.com/applications).
+
+
+## Installation
+
+```shell
+$ npm i wappalyzer
+```
+
+
+## Run from the command line
+
+```shell
+$ node index.js https://wappalyzer.com --quiet
+```
+
+
+## Run from a script
+
+```javascript
+const wappalyzer = require('wappalyzer');
+
+wappalyzer.run(['https://wappalyzer.com', '--quiet'], function(stdout, stderr) {
+	if ( stdout ) {
+		process.stdout.write(stdout);
+	}
+
+	if ( stderr ) {
+		process.stderr.write(stderr);
+	}
+});
+```
+
+
+## Arguments
+
+**-v, --verbose**
+
+Display debug output.
+
+**-q, --quiet**
+
+Suppress errors.
+
+**--resource-timeout=ms**
+
+Abort the connection after 'ms' milliseconds.
diff --git a/src/drivers/phantomjs/driver.js b/src/drivers/phantomjs/driver.js
index a11925d0f..922e3cb05 100644
--- a/src/drivers/phantomjs/driver.js
+++ b/src/drivers/phantomjs/driver.js
@@ -52,6 +52,8 @@
 		}
 
 		wappalyzer.driver = {
+			timeout: 1000,
+
 			/**
 			 * Log messages to console
 			 */
@@ -86,7 +88,7 @@
 
 						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
@@ -131,16 +133,8 @@
 				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');
-
-					wappalyzer.driver.sendResponse();
-
-					phantom.exit(1);
 				};
 
 				page.onResourceTimeout = function() {
@@ -167,6 +161,10 @@
 					}
 				};
 
+				page.onResourceError = function(resourceError) {
+					wappalyzer.log(resourceError.errorString, 'error');
+				};
+
 				page.open(url, function(status) {
 					var html, environmentVars;
 
diff --git a/src/drivers/phantomjs/index.js b/src/drivers/phantomjs/index.js
new file mode 100644
index 000000000..823a33fad
--- /dev/null
+++ b/src/drivers/phantomjs/index.js
@@ -0,0 +1,32 @@
+'use strict';
+
+const
+	path      = require('path'),
+	spawn     = require('child_process').spawn,
+	phantomjs = require('phantomjs-prebuilt');
+
+exports.run = function(args, callback) {
+	args.unshift.apply(args, ['driver.js', '--web-security=false', '--load-images=false', '--ignore-ssl-errors=yes', '--ssl-protocol=any']);
+
+	var driver = phantomjs.exec.apply(this, args);
+
+	driver.stdout.on('data', (data) => {
+		callback(`${data}`, null);
+	});
+
+	driver.stderr.on('data', (data) => {
+		callback(null, `${data}`);
+	});
+}
+
+if ( !module.parent ) {
+	exports.run(process.argv.slice(2), function(stdout, stderr) {
+		if ( stdout ) {
+			process.stdout.write(stdout);
+		}
+
+		if ( stderr ) {
+			process.stderr.write(stderr);
+		}
+	});
+}
diff --git a/src/drivers/phantomjs/package.json b/src/drivers/phantomjs/package.json
new file mode 100644
index 000000000..a77059371
--- /dev/null
+++ b/src/drivers/phantomjs/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "wappalyzer",
+  "description": "Uncovers the technologies used on websites",
+  "homepage": "https://github.com/AliasIO/Wappalyzer",
+  "version": "3.0.8",
+  "author": "Elbert Alias",
+  "license": "GPL-3.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/AliasIO/Wappalyzer"
+  },
+  "main": "index.js",
+	"files": [
+		"apps.json",
+		"driver.js",
+		"wappalyzer.js"
+	],
+  "dependencies": {
+    "phantomjs-prebuilt": "*"
+  }
+}
diff --git a/src/drivers/php/.gitignore b/src/drivers/php/.gitignore
deleted file mode 100644
index 2d6f40c2f..000000000
--- a/src/drivers/php/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-js/wappalyzer.js
-apps.json
diff --git a/src/drivers/php/Wappalyzer.php b/src/drivers/php/Wappalyzer.php
deleted file mode 100644
index 2fcdd93d3..000000000
--- a/src/drivers/php/Wappalyzer.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-class Wappalyzer
-{
-	public
-		$debug              = false,
-		$curlUserAgent      = 'Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20100101 Firefox/15.0.1',
-		$curlFollowLocation = true,
-		$curlTimeout        = 5,
-		$curlMaxRedirects   = 3
-		;
-
-	protected
-		$v8,
-		$apps,
-		$categories
-		;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct($url)
-	{
-		chdir(dirname(__FILE__));
-
-		$this->v8 = new V8Js();
-
-		$this->url = $url;
-
-		$json = json_decode(file_get_contents('apps.json'));
-
-		$this->apps       = $json->apps;
-		$this->categories = $json->categories;
-	}
-
-	/**
-	 * Analyze a website
-	 * @param string $url
-	 */
-	public function analyze()
-	{
-		try {
-			$this->load(array('wappalyzer.js', 'driver.js'));
-
-			$result = $this->curl($this->url);
-
-			//$env = $this->executeScripts($result);
-
-			$json = json_encode(array(
-				'host'    => $result->host,
-				'url'     => $result->url,
-				'html'    => $result->html,
-				'headers' => $result->headers,
-				//'env'     => $env
-				));
-
-			$result = $this->v8->executeString('
-				w.apps         = ' . json_encode($this->apps) . ';
-				w.categories   = ' . json_encode($this->categories) . ';
-				w.driver.debug = ' . ( $this->debug ? 'true' : 'false' ) . ';
-				w.driver.data  = ' . $json . ';
-
-				w.driver.init();
-				');
-
-			return json_decode($result);
-		} catch ( V8JsException $e ) {
-			throw new WappalyzerException('JavaScript error: ' . $e->getMessage());
-		}
-	}
-
-	/**
-	 * Load and execute one or more JavaScript files
-	 * @param mixed $files
-	 */
-	protected function load($files)
-	{
-		if ( !is_array($files) ) {
-			$files = array($files);
-		}
-
-		foreach ( $files as $file ) {
-			$this->v8->executeString(file_get_contents('js/' . $file), $file);
-		}
-	}
-
-	/**
-	 * Perform a cURL request
-	 * @param string $url
-	 */
-	protected function curl($url)
-	{
-		if ( $this->debug ) {
-			echo 'cURL request: ' . $url . "\n";
-		}
-
-		$ch = curl_init($url);
-
-		curl_setopt_array($ch, array(
-			CURLOPT_SSL_VERIFYPEER => false,
-			CURLOPT_HEADER         => true,
-			CURLOPT_RETURNTRANSFER => true,
-			CURLOPT_FOLLOWLOCATION => $this->curlFollowLocation,
-			CURLOPT_MAXREDIRS      => $this->curlMaxRedirects,
-			CURLOPT_TIMEOUT        => $this->curlTimeout,
-			CURLOPT_USERAGENT      => $this->curlUserAgent
-			));
-
-		$response = curl_exec($ch);
-
-		if ( curl_errno($ch) !== 0 ) {
-			throw new WappalyzerException('cURL error: ' . curl_error($ch));
-		}
-
-		$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-
-		if ( $httpCode != 200 ) {
-			throw new WappalyzerException('cURL request returned HTTP code ' . $httpCode);
-		}
-
-		$result = new stdClass();
-
-		$result->url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
-
-		$result->host = parse_url($result->url, PHP_URL_HOST);
-
-		$headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
-
-		$result->html = substr($response, $headerSize);
-
-		$result->html = mb_check_encoding($result->html, 'UTF-8') ? $result->html : utf8_encode($result->html);
-		
-		$headers = trim(substr($response, 0, $headerSize));
-		$headers = preg_split('/^\s*$/m', $headers);
-		$headers = end($headers);
-		$lines = array_slice(explode("\n", $headers), 1);
-
-		foreach ( $lines as $line ) {
-			if ( strpos(trim($line), ': ') !== false ) {
-				list($key, $value) = explode(': ', trim($line, "\r"));
-
-				$result->headers[strtolower($key)] = $value;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 *
-	 */
-	protected function executeScripts($page)
-	{
-		preg_match_all('/<script[^>]+src=("|\')(.+?)\1/i', $page->html, $matches);
-
-		if ( $urls = $matches[2] ) {
-			foreach ( $urls as $url ) {
-				if ( !preg_match('/^https?:\/\//', $url) ) {
-					$url = $page->url . '/' . $url;
-				}
-
-				try {
-					$result = $this->curl($url);
-				} catch ( WappalyzerException $e ) {
-					if ( $this->debug ) echo $e->getMessage() . "\n";
-
-					continue;
-				}
-
-				$v8 = new V8Js();
-
-				try {
-					$v8->executeString('
-						var
-							document = {},
-							window   = { document: document }
-							;
-						');
-
-					$v8->executeString($result->html, $url);
-
-					$result = $v8->executeString('Object.keys(window);');
-
-					var_dump($result);
-				} catch ( V8JsException $e ) {
-					if ( $this->debug ) echo "\n", print_r($e->getJsTrace()), "\n\n";
-
-					continue;
-				}
-			}
-		}
-	}
-}
diff --git a/src/drivers/php/WappalyzerException.php b/src/drivers/php/WappalyzerException.php
deleted file mode 100644
index 89b6a71bc..000000000
--- a/src/drivers/php/WappalyzerException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-class WappalyzerException extends Exception
-{ }
diff --git a/src/drivers/php/index.php b/src/drivers/php/index.php
deleted file mode 100644
index de82e3799..000000000
--- a/src/drivers/php/index.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-require('WappalyzerException.php');
-require('Wappalyzer.php');
-
-try {
-	if ( php_sapi_name() !== 'cli' ) {
-		exit('Run me from the command line');
-	}
-
-	$url = !empty($argv[1]) ? $argv[1] : '';
-
-	if ( !$url ) {
-		echo "Usage: php {$argv[0]} <url>\n";
-
-		exit(0);
-	}
-
-	$wappalyzer = new Wappalyzer($url);
-
-	$detectedApps = $wappalyzer->analyze();
-
-	if ( $detectedApps ) {
-		foreach ( $detectedApps as $detectedApp => $data ) {
-			echo $detectedApp . ', ' . $data->version . ', ', $data->confidence . '%, ', implode(', ', $data->categories) . "\n";
-		}
-	} else {
-		echo "No applications detected\n";
-	}
-
-	exit(0);
-} catch ( Exception $e ) {
-	echo $e->getMessage() . "\n";
-
-	exit(1);
-}
diff --git a/src/drivers/php/js/driver.js b/src/drivers/php/js/driver.js
deleted file mode 100644
index f6e6994bd..000000000
--- a/src/drivers/php/js/driver.js
+++ /dev/null
@@ -1,46 +0,0 @@
-var w = wappalyzer;
-
-w.driver = {
-	debug: false,
-	data: {},
-	timeout: 5000,
-
-	/**
-	 * Log messages to console
-	 */
-	log: function(args) {
-		if ( w.driver.debug ) { print(args.type + ': ' + args.message + "\n"); }
-	},
-
-	/**
-	 * Initialize
-	 */
-	init: function() {
-		var app, apps = {};
-
-		w.analyze(w.driver.data.host, w.driver.data.url, {
-			html:    w.driver.data.html,
-			headers: w.driver.data.headers
-		});
-
-		for ( app in w.detected[w.driver.data.url] ) {
-			apps[app] = {
-				categories: [],
-				confidence: w.detected[w.driver.data.url][app].confidenceTotal,
-				version:    w.detected[w.driver.data.url][app].version
-				};
-
-			w.apps[app].cats.forEach(function(cat) {
-				apps[app].categories.push(w.categories[cat]);
-			});
-		};
-
-		return JSON.stringify(apps);
-	},
-
-	/**
-	 * Dummy
-	 */
-	displayApps: function() {
-	}
-};
diff --git a/src/drivers/python/.gitignore b/src/drivers/python/.gitignore
deleted file mode 100644
index 2d6f40c2f..000000000
--- a/src/drivers/python/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-js/wappalyzer.js
-apps.json
diff --git a/src/drivers/python/js/.gitkeep b/src/drivers/python/js/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/drivers/python/wappalyzer.py b/src/drivers/python/wappalyzer.py
deleted file mode 100755
index a6f1f6c42..000000000
--- a/src/drivers/python/wappalyzer.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import os
-import sys
-import PyV8
-import requests
-from urlparse import urlparse
-
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
-
-class Wappalyzer(object):
-
-    def __init__(self, url):
-        self.file_dir = os.path.dirname(__file__)
-
-        f = open(os.path.join(self.file_dir, 'apps.json'))
-        data = json.loads(f.read())
-        f.close()
-
-        self.categories = data['categories']
-        self.apps = data['apps']
-        self.url = url
-
-    def analyze(self):
-        ctxt = PyV8.JSContext()
-        ctxt.enter()
-
-        f1 = open(os.path.join(self.file_dir, 'js/wappalyzer.js'))
-        f2 = open(os.path.join(self.file_dir, '../php/js/driver.js'))
-        ctxt.eval(f1.read())
-        ctxt.eval(f2.read())
-        f1.close()
-        f2.close()
-
-        host = urlparse(self.url).hostname
-        response = requests.get(self.url)
-        html = response.text
-        headers = dict(response.headers)
-
-        data = {'host': host, 'url': self.url, 'html': html, 'headers': headers}
-        apps = json.dumps(self.apps)
-        categories = json.dumps(self.categories)
-        return ctxt.eval("w.apps = %s; w.categories = %s; w.driver.data = %s; w.driver.init();" % (apps, categories, json.dumps(data)))
-
-if __name__ == '__main__':
-    try:
-        w = Wappalyzer(sys.argv[1])
-        print w.analyze()
-    except IndexError:
-        print ('Usage: python %s <url>' % sys.argv[0])
diff --git a/src/drivers/ruby/.gitignore b/src/drivers/ruby/.gitignore
deleted file mode 100644
index 2d6f40c2f..000000000
--- a/src/drivers/ruby/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-js/wappalyzer.js
-apps.json
diff --git a/src/drivers/ruby/js/driver.js b/src/drivers/ruby/js/driver.js
deleted file mode 100644
index f6e6994bd..000000000
--- a/src/drivers/ruby/js/driver.js
+++ /dev/null
@@ -1,46 +0,0 @@
-var w = wappalyzer;
-
-w.driver = {
-	debug: false,
-	data: {},
-	timeout: 5000,
-
-	/**
-	 * Log messages to console
-	 */
-	log: function(args) {
-		if ( w.driver.debug ) { print(args.type + ': ' + args.message + "\n"); }
-	},
-
-	/**
-	 * Initialize
-	 */
-	init: function() {
-		var app, apps = {};
-
-		w.analyze(w.driver.data.host, w.driver.data.url, {
-			html:    w.driver.data.html,
-			headers: w.driver.data.headers
-		});
-
-		for ( app in w.detected[w.driver.data.url] ) {
-			apps[app] = {
-				categories: [],
-				confidence: w.detected[w.driver.data.url][app].confidenceTotal,
-				version:    w.detected[w.driver.data.url][app].version
-				};
-
-			w.apps[app].cats.forEach(function(cat) {
-				apps[app].categories.push(w.categories[cat]);
-			});
-		};
-
-		return JSON.stringify(apps);
-	},
-
-	/**
-	 * Dummy
-	 */
-	displayApps: function() {
-	}
-};
diff --git a/src/drivers/ruby/wappalyzer.rb b/src/drivers/ruby/wappalyzer.rb
deleted file mode 100755
index b0e4452fe..000000000
--- a/src/drivers/ruby/wappalyzer.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'net/http'
-require 'v8'
-require 'json'
-
-Encoding.default_external = Encoding::UTF_8
-
-class Wappalyzer
-  def initialize
-    @realdir = File.dirname(File.realpath(__FILE__))
-    file = File.join(@realdir, '..', '..', 'share', 'apps.json')
-    @json = JSON.parse(IO.read(file))
-    @categories, @apps = @json['categories'], @json['apps']
-  end
-
-  def analyze(url)
-    uri, body, headers = URI(url), nil, {}
-    Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https', :open_timeout => 5) do |http|
-      resp = http.get(uri.request_uri)
-      resp.each_header{|k,v| headers[k.downcase] = v}
-      body = resp.body.encode('UTF-8', :invalid => :replace, :undef => :replace)
-    end
-
-    cxt = V8::Context.new
-    cxt.load File.join(@realdir, 'js', 'wappalyzer.js')
-    cxt.load File.join(@realdir, 'js', 'driver.js')
-    data = {'host' => uri.hostname, 'url' => url, 'html' => body, 'headers' => headers}
-    output = cxt.eval("w.apps = #{@apps.to_json}; w.categories = #{@categories.to_json}; w.driver.data = #{data.to_json}; w.driver.init();")
-    JSON.load(output)
-  end
-end
-
-if $0 == __FILE__
-  url = ARGV[0]
-  if url
-    puts JSON.pretty_generate(Wappalyzer.new.analyze(ARGV[0]))
-  else
-    puts "Usage: #{__FILE__} http://example.com"
-  end
-end
diff --git a/src/drivers/html/.gitignore b/src/drivers/webextension/.gitignore
similarity index 53%
rename from src/drivers/html/.gitignore
rename to src/drivers/webextension/.gitignore
index 01d2786a1..602df1590 100644
--- a/src/drivers/html/.gitignore
+++ b/src/drivers/webextension/.gitignore
@@ -1,4 +1,7 @@
 apps.json
+images/icons/converted/*.png
 images/icons/*.png
 images/icons/*.svg
 js/wappalyzer.js
+js/iframe.js
+js/network.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..bd6096f5f
--- /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 1.5rem 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..6c91d5888
--- /dev/null
+++ b/src/drivers/webextension/css/popup.css
@@ -0,0 +1,96 @@
+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;
+}
+
+#footer {
+	border-top: 1px solid #ccc;
+	margin-top: 17px;
+	overflow: hidden;
+	padding-top: 11px;
+}
+
+#footer a {
+	text-decoration: none;
+}
+
+#footer a:hover {
+	border-bottom: 1px solid #dbdbdb;
+}
+
+#options {
+	float: right;
+}
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_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/html/images/icons/.gitkeep b/src/drivers/webextension/images/icons/converted/.gitkeep
similarity index 100%
rename from src/drivers/html/images/icons/.gitkeep
rename to src/drivers/webextension/images/icons/converted/.gitkeep
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..eeda6b920
--- /dev/null
+++ b/src/drivers/webextension/js/driver.js
@@ -0,0 +1,306 @@
+/**
+ * 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;
+			};
+
+			xhr.send(null);
+
+			// Version check
+			try {
+				var version = browser.app.getDetails().version;
+
+				if ( localStorage['version'] == null ) {
+					firstRun = true;
+
+					// Set defaults
+					for ( option in defaults ) {
+						localStorage[option] = defaults[option];
+					}
+				} else if ( version !== localStorage['version'] && parseInt(localStorage['upgradeMessage'], 10) ) {
+					upgraded = true;
+				}
+
+				localStorage['version'] = version;
+			} catch(e) { }
+
+			browser.runtime.onMessage.addListener(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;
+					}
+				}
+			});
+
+			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;
+			}
+		},
+
+		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 i, 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)));
+		},
+
+		categoryOrder: [ // Used to pick the main application
+			 1, // CMS
+			11, // Blog
+			 6, // Web Shop
+			 2, // Message Board
+			51, // Landing Page Builder
+			 8, // Wiki
+			13, // Issue Tracker
+			30, // Web Mail
+			18, // Web Framework
+			21, // LMS
+			 7, // Photo Gallery
+			38, // Media Server
+			 3, // Database Manager
+			34, // Database
+			 4, // Documentation Tool
+			 9, // Hosting Panel
+			29, // Search Engine
+			12, // JavaScript Framework
+			26, // Mobile Framework
+			25, // JavaScript Graphics
+			22, // Web Server
+			27, // Programming Language
+			28, // Operating System
+			15, // Comment System
+			20, // Editor
+			41, // Payment Processor
+			10, // Analytics
+			32, // Marketing Automation
+			31, // CDN
+			23, // Cache Tool
+			17, // Font Script
+			24, // Rich Text Editor
+			35, // Map
+			 5, // Widget
+			14, // Video Player
+			16, // Captcha
+			33, // Web Server Extension
+			37, // Network Device
+			39, // Webcam
+			40, // Printer
+			36, // Advertising Network
+			42, // Tag Managers
+			43, // Paywalls
+			19  // Miscellaneous
+			]
+	};
+
+	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/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/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..2b0a0e84d
--- /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(/ /g, '-').replace(/[^\w-]/g, '');
+	};
+
+	popup = {
+		init: function() {
+
+			d.getElementById('options').addEventListener('click', function() {
+				window.open(browser.extension.getURL('options.html'));
+			});
+
+			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) {
+				browser.runtime.sendMessage({ id: 'get_apps', tab: tabs[0] }, function(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]) + '">' +
+										'<span class="category"><span class="name">' + browser.i18n.getMessage('categoryName' + cat) + '</span></span>' +
+									'</a>';
+							});
+
+							html +=
+									'</a>' +
+								'</div>';
+
+							detectedApps.innerHTML = detectedApps.innerHTML + html;
+						}
+					}
+				});
+			});
+		}
+	};
+
+	popup.init();
+});
diff --git a/src/drivers/webextension/manifest.json b/src/drivers/webextension/manifest.json
new file mode 100644
index 000000000..37879632e
--- /dev/null
+++ b/src/drivers/webextension/manifest.json
@@ -0,0 +1,48 @@
+{ "name": "Wappalyzer",
+	"homepage_url": "https://wappalyzer.com/",
+	"description": "Identify web technologies",
+	"version": "3",
+	"default_locale": "en",
+	"manifest_version": 2,
+	"icons": {
+		"16":  "images/icon_16.png",
+		"32":  "images/icon_32.png",
+		"128": "images/icon_128.png"
+	},
+	"page_action": {
+		"default_icon": "images/icon_32.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",
+	"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..bd7f606d0
--- /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_16.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..35c1ea3e5
--- /dev/null
+++ b/src/drivers/webextension/popup.html
@@ -0,0 +1,21 @@
+<!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>
+
+		<div id="footer">
+			<a href="javascript: void(0);" data-i18n="options" id="options">Options</a>
+		</div>
+	</body>
+</html>
diff --git a/src/icons/3dCart.png b/src/icons/3dCart.png
index 6813cc2fd..a8fc57467 100644
Binary files a/src/icons/3dCart.png and b/src/icons/3dCart.png differ
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/ActOn.png b/src/icons/ActOn.png
new file mode 100644
index 000000000..d288e5116
Binary files /dev/null and b/src/icons/ActOn.png differ
diff --git a/src/icons/Amazon-Cloudfront.svg b/src/icons/Amazon-Cloudfront.svg
new file mode 100755
index 000000000..a28de1faa
--- /dev/null
+++ b/src/icons/Amazon-Cloudfront.svg
@@ -0,0 +1,23 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 100 100">
+  <title>NetworkingContentDelivery</title>
+  <g>
+    <polygon points="39.74 56.97 24.12 77.94 15.94 57.01 30.86 56.1 39.74 56.97" fill="#fbbf93"/>
+    <polygon points="60.1 56.97 75.88 78.06 83.9 57.03 69.14 56.1 60.1 56.97" fill="#fbbf93"/>
+    <polygon points="39.74 42.97 24.12 21.94 15.94 42.99 30.99 43.89 39.74 42.97" fill="#6b3a19"/>
+    <polygon points="60.1 42.97 75.88 21.94 84.06 42.99 69.14 43.9 60.1 42.97" fill="#6b3a19"/>
+    <polygon points="60.1 42.97 75.88 41.8 75.88 21.94 60.1 26.02 60.1 42.97" fill="#9d5025"/>
+    <polygon points="84.06 42.99 75.88 41.8 75.88 21.94 84.06 26.03 84.06 42.99" fill="#f58536"/>
+    <polygon points="60.1 56.97 75.88 58.2 75.88 78.06 60.1 73.92 60.1 56.97" fill="#9d5025"/>
+    <polygon points="83.9 57.03 75.88 58.2 75.88 78.06 83.9 74.05 83.9 57.03" fill="#f58536"/>
+    <polygon points="39.74 42.97 24.12 41.8 24.12 21.94 39.74 26.02 39.74 42.97" fill="#f58536"/>
+    <polygon points="15.94 42.99 24.12 41.8 24.12 21.94 15.94 26.03 15.94 42.99" fill="#9d5025"/>
+    <polygon points="39.74 56.97 24.12 58.2 24.12 78.06 39.74 73.92 39.74 56.97" fill="#f58536"/>
+    <polygon points="15.94 57.01 24.12 58.2 24.12 78.06 15.94 73.97 15.94 57.01" fill="#9d5025"/>
+    <polygon points="66.26 59.59 50 57.98 33.58 59.57 50 91 66.26 59.59" fill="#fbbf93"/>
+    <polygon points="66.26 40.41 50 42.02 33.58 40.43 50 9 66.26 40.41" fill="#6b3a19"/>
+    <polygon points="66.26 40.41 50 38.05 50 9 66.26 17.13 66.26 40.41" fill="#f58536"/>
+    <polygon points="33.58 40.43 50 38.05 50 9 33.58 17.21 33.58 40.43" fill="#9d5025"/>
+    <polygon points="66.26 59.59 50 61.95 50 91 66.26 82.87 66.26 59.59" fill="#f58536"/>
+    <polygon points="33.58 59.57 50 61.95 50 91 33.58 82.79 33.58 59.57" fill="#9d5025"/>
+  </g>
+</svg>
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/Apache.svg b/src/icons/Apache.svg
index 4d1c71997..2494ae756 100644
--- a/src/icons/Apache.svg
+++ b/src/icons/Apache.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="51.066" width="168.74"><g stroke="#D9D9D9" fill="#D9D9D9"><path d="M.281 44.304c13.561-1.867 63.613-4.392 85.943-8.05 17.961-2.937 35.502-8.285 52.242-13.9 4.328-1.453 11.991-4.434 16.896-7.07 3.104-2.373 10.571-5.889 12.606-9.222-32.45 15.407-45.513 19.649-83.582 27.354C68.95 36.585 12.769 41.136.281 44.304z" stroke-width=".596"/><path d="M48.301 50.277l1.454.498 1.418.119 1.417-.23 1.417-.574 1.379-.766 1.38-.994 1.305-1.145 1.301-1.227 1.228-1.26 1.149-1.266 1.111-1.225 1.035-1.148.958-.957.881-.763.766-.499.689-.228-.576.036-.611.038-.689.077-.688.074-.69.078-.689.076-.689.038-.612.076-.957.88-.921.841-.805.842-.729.844-.727.801-.688.805-.652.764-.691.729-.688.727-.729.65-.767.65-.882.611-.919.576-1.034.535-1.149.496-1.302.42z" stroke-width=".254"/><path d="M43.551 50.082l1.688.271 1.569.037 1.455-.15 1.377-.344 1.265-.535 1.151-.652 1.148-.766 1.034-.879 1.035-.918.957-.994.959-1.072.921-1.033.956-1.033.96-1.033.958-.955.995-.881-.381.037h-.423l-.384.039-.419.037-.424.037-.421.078-.42.035-.42.041-.421.037-.461.037-.422.078-.459.037-.459.037-.46.037h-.46l-.459.039-.347.535-.42.652-.537.764-.575.805-.69.881-.729.879-.766.918-.805.879-.844.844-.84.805-.885.727-.842.611-.844.496-.843.346-.804.189h-.768z" stroke-width=".254"/><path d="M40.411 50.119l.958.115.919.076.881-.037.881-.152.882-.189.843-.344.841-.422.883-.574.882-.65.882-.764.882-.92.919-.994.958-1.188.997-1.301 1.034-1.416 1.074-1.607-.651-.002-.613.039-.614.076-.612.076-.611.078-.613.072h-1.415l-.616.613-.573.65-.576.613-.574.688-.575.65-.535.689-.576.648-.539.691-.572.65-.574.65-.612.65-.582.617-.65.572-.652.574-.65.574-.729.498z" stroke-width=".254"/><path d="M37.081 49.96l.728.387.802.154.807-.117.842-.342.844-.5.881-.689.88-.764.884-.916.841-.959.884-.992.804-.998.805-.957.768-.957.729-.84.689-.729.614-.613-4.099.382-.462.611-.498.611-.458.615-.459.609-.46.613-.5.613-.461.611-.497.613-.537.572-.537.611-.536.578-.613.57-.612.574-.653.576-.688.537-.728.531z" stroke-width=".254"/><path d="M30.302 49.076l1.188.768 1.109.5 1.11.23h1.074l1.033-.191.995-.342.955-.539.96-.686.919-.842.923-.881.84-1.037.884-1.031.843-1.109.844-1.146.805-1.148.805-1.111-.689.114-.536.037-.384.037-.345.039-.343.039h-.346l-.499.037-.651.037-.729 1.033-.727.955-.729.922-.805.803-.767.727-.767.689-.804.611-.768.537-.766.457-.768.422-.727.305-.689.27-.689.229-.614.152-.612.076-.537.037z" stroke-width=".254"/><path d="M26.74 48.843l1.228.152 1.186.08 1.149-.078 1.109-.15 1.036-.227 1.033-.346.958-.422.92-.535.92-.572.844-.65.843-.727.803-.805.766-.842.73-.918.729-.959.689-.994-.767.039-.844.074-.802.076-.806.039-.69.076-.574.035-.42.041-.191.037-.076.078-.191.191-.308.305-.382.385-.422.459-.536.537-.577.572-.648.615-.731.607-.764.65-.768.615-.843.611-.88.572-.881.535-.921.461-.921.381z" stroke-width=".254"/><path d="M22.031 49.109l1.033.191.998.076 1.033-.113 1.034-.191 1.034-.342.994-.422.996-.498.998-.611.919-.648.918-.689.881-.727.845-.766.806-.803.766-.766.69-.768.651-.766h-.461l-.574.041-.611.035h-.651l-.613.074-.613.041-.496.039-.423.074v.078l-.154.189-.381.346-.537.42-.653.537-.764.613-.845.652-.882.648-.92.686-.918.691-.881.65-.846.574-.766.535-.689.422-.537.305-.382.191z" stroke-width=".254"/><path d="M16.822 49.066l.612.613.806.266.996.002 1.11-.266 1.227-.461 1.262-.646 1.341-.768 1.305-.84 1.302-.92 1.227-.916 1.147-.879.999-.844.881-.688.65-.574.423-.381.192-.154-.498.039-.538.035-.574.037-.572.041-.614.072-.614.039-.611.041-.652.037-.688.42-.688.422-.693.455-.649.426-.689.455-.653.498-.688.459-.653.459-.69.496-.65.461-.688.459-.651.459-.688.42-.691.422-.651.42-.69.383z" stroke-width=".254"/><path d="M12.993 49.14l.652.229.649.115.65.037.653-.109.65-.195.689-.264.727-.383.768-.461.843-.535.881-.611.959-.688 1.072-.729 1.187-.803 1.265-.881 1.379-.918 1.534-.957-.653.039-.727.039h-.65l-.65.037-.574.037-.459.039-.307.039-.116.035-.077.115-.229.23-.346.307-.458.42-.574.496-.654.58-.689.57-.805.613-.805.611-.843.613-.843.533-.882.537-.842.457-.842.383-.805.268-.729.154z" stroke-width=".254"/><path d="M10.198 48.716l.879.344.958.152.998-.072 1.033-.268 1.072-.383 1.033-.498 1.074-.607.996-.691.958-.688.92-.729.843-.688.728-.691.653-.572.495-.498.383-.342.232-.232-.613.039-.577.039-.571.037-.575.074-.535.041-.577.037-.61.074-.613.039-.459.42-.501.42-.458.422-.499.459-.498.498-.497.459-.536.459-.538.459-.536.422-.534.422-.577.381-.534.342-.614.309-.574.266-.613.193-.613.152z" stroke-width=".254"/><path d="M6.831 47.642l.765.535.763.346.767.154.767.039.768-.152.766-.232.766-.342.765-.459.729-.498.766-.611.729-.613.729-.65.727-.648.69-.689.689-.65.69-.615-.422.041-.46.076-.497.037-.535.039-.575.074-.612.039-.652.074-.612.037-.192.461-.267.459-.271.422-.346.422-.381.383-.424.383-.42.381-.496.307-.5.307-.537.268-.573.268-.576.191-.612.154-.61.15-.657.073-.649.039z" stroke-width=".254"/><path d="M3.803 47.066l.652.266.69.193.726.115.806.002.767-.039.842-.115.805-.229.803-.229.768-.344.729-.383.65-.422.614-.494.536-.539.46-.572.345-.65.23-.652-.46.039-.46.037-.497.076-.5.039-.495.037-.537.037-.574.039-.652.037-.271.384-.307.385-.306.344-.306.307-.307.305-.348.229-.343.27-.347.229-.381.191-.422.191-.421.189-.459.154-.462.152-.495.152-.537.115-.539.154z" stroke-width=".254"/><path d="M2.233 46.529l.23.229.347.152.42.078h.46l.536-.037.574-.114.613-.193.612-.189.613-.27.614-.307.612-.342.537-.385.537-.42.458-.459.345-.459.307-.498-.343.041-.308.037-.383.037-.344.038-.344.039-.306.037h-.537v.152l-.343.305-.576.422-.767.498-.917.496-.922.5-.919.381-.806.23z" stroke-width=".254"/><path d="M1.124 45.455l.078.535.192.344.305.156.42.076.499-.076.574-.191.573-.229.614-.307.613-.346.574-.381.575-.381.461-.346.42-.307.307-.23.191-.152.038-.076-2.986.342-.229.152-.384.192-.458.23-.5.229-.535.27-.497.189-.461.191-.384.115z" stroke-width=".254"/><path d="M4.573 43.886l-.651.039-.574.039-.536.036-.498.037-.46.041-.497.035-.498.078-.577.113.117.729.343.346h.537l.689-.189.689-.348.729-.381.651-.346.536-.229z" stroke-width=".254"/><path d="M4.459 43.505l-.653.113-.573.076-.497.113-.5.076-.458.113-.459.115-.538.119-.574.152-.038-.844.345-.535.537-.193.727-.033.766.15.766.193.651.23.499.154zm39.839-15.556l1.684-.651 1.611-.419 1.491-.113 1.417.076 1.379.309 1.262.459 1.227.652 1.187.729 1.149.845 1.11.919 1.106.959 1.074.996 1.071.957 1.07.921 1.073.882 1.109.807-.384.073-.421.038-.421.039-.383.076-.423.039-.421.038-.459.036-.421.039-.422.035-.461.041-.458.076-.422.037-.461.04-.457.074-.498.037-.461.077-.382-.534-.495-.653-.576-.766-.688-.768-.727-.843-.805-.843-.879-.844-.881-.806-.959-.766-.953-.688-.957-.615-.997-.497-.957-.385-.958-.23-.956-.039-.88.152z" stroke-width=".254"/><path d="M41.423 28.597l.96-.345.92-.227.878-.152.923-.077.878.077.919.192.88.268.919.423.956.537.959.691.995.803 1.033.96 1.108 1.11 1.11 1.266 1.186 1.418 1.264 1.57-.69.039-.611.072-.576.039-.534.076-.537.076-.573.076-.653.113-.765.117-.689-.574-.65-.613-.689-.653-.612-.653-.649-.649-.649-.65-.613-.653-.651-.651-.651-.612-.688-.574-.651-.576-.688-.574-.727-.498-.767-.423-.766-.421-.805-.347z" stroke-width=".254"/><path d="M38.207 29.438l.727-.611.808-.307.88-.074.879.191.958.383.956.538.995.688.996.805.996.881.993.921.956.921.92.958.841.88.84.805.729.691.69.574-4.176.496-.536-.613-.536-.615-.498-.613-.533-.611-.537-.613-.534-.651-.573-.614-.535-.576-.613-.574-.612-.573-.652-.538-.688-.498-.728-.497-.766-.423-.804-.383-.843-.346z" stroke-width=".254"/><path d="M31.926 32.113l1.148-1.111 1.111-.802 1.073-.534 1.072-.307 1.072-.037 1.034.154 1.033.385.996.498.994.689.955.804.996.921.919.996.957 1.035.917 1.111.918 1.111.919 1.11-.729.04-.611.035-.498.039-.461.076-.458.076-.499.075-.571.078-.692.112-.803-1.034-.766-.919-.803-.844-.766-.728-.802-.612-.766-.538-.728-.461-.768-.382-.728-.309-.688-.229-.728-.192-.689-.152-.648-.08-.653-.074h-.649l-.612-.002z" stroke-width=".254"/><path d="M27.442 33.145l1.267-.461 1.187-.344 1.187-.189 1.109-.077 1.111.001 1.071.155 1.035.231.996.347.995.419.919.537.957.613.878.689.882.768.84.842.806.922.803.996-.803.115-.919.111-.921.115-.921.115-.842.113-.649.078-.499.037-.191-.002-.075-.075-.192-.153-.269-.268-.343-.346-.423-.42-.495-.424-.575-.496-.65-.538-.728-.499-.765-.536-.844-.5-.918-.495-.92-.424-.993-.383-1.034-.348-1.073-.229z" stroke-width=".254"/><path d="M21.775 33.828l1.034-.418 1.035-.307 1.108-.115 1.073.001 1.111.118 1.108.229 1.072.346 1.111.422 1.033.498 1.033.537.995.651.994.651.882.693.881.727.802.728.726.729-.495.037-.612.076-.689.075-.728.077-.729.075-.652.076-.573.037h-.422l-.001-.077-.191-.191-.38-.268-.574-.385-.689-.42-.805-.5-.919-.537-.956-.533-.955-.54-.996-.538-.998-.496-.916-.457-.846-.387-.762-.307-.616-.193-.495-.115z" stroke-width=".254"/><path d="M16.413 34.936l.537-.842.805-.498.996-.188h1.147l1.264.268 1.379.422 1.455.576 1.415.651 1.455.729 1.339.766 1.265.73 1.149.727.954.615.729.459.496.342.23.117-.537.116-.61.077-.653.073-.689.038-.727.078-.729.074-.688.115-.689.115-.729-.345-.688-.348-.729-.381-.688-.385-.69-.346-.688-.383-.728-.384-.688-.382-.689-.35-.688-.382-.729-.343-.688-.307-.689-.348-.727-.305-.727-.311-.729-.266zm-6.855 1.832l.844-.611.956-.346.996-.149 1.07.001 1.113.189 1.148.348 1.11.421 1.108.5 1.035.574 1.032.575.919.614.804.536.727.499.574.459.42.307.229.193-.612.074-.574.076-.495.076-.501.037-.536.037-.496.076-.576.076-.61.074-.537-.342-.536-.348-.574-.419-.574-.383-.611-.422-.613-.421-.612-.423-.612-.383-.614-.384-.647-.308-.652-.305-.613-.232-.648-.189-.615-.117h-.615l-.612.037z" stroke-width=".254"/><path d="M12.084 35.661l.653-.423.688-.305.652-.154.688-.074.689.037.728.152.807.27.838.308.921.423.959.459 1.07.576 1.147.614 1.265.65 1.378.692 1.49.765 1.648.768-.613.039-.689.074-.688.078-.691.111-.614.079-.457.078-.346.035-.153-.035-.075-.078-.27-.191-.345-.308-.459-.344-.573-.422-.689-.459-.729-.5-.803-.499-.879-.498-.882-.497-.955-.425-.957-.384-.958-.303-.957-.196-.92-.111-.919-.001zm-5.593 3.058l.691-.766.726-.574.729-.382.766-.229.767-.037.804.076.844.192.804.271.84.422.805.42.842.536.843.539.843.536.803.574.805.578.803.496-.459.076-.498.039-.574.115-.613.072-.649.08-.69.072-.65.078-.653.076-.229-.498-.269-.422-.305-.422-.384-.382-.383-.344-.419-.27-.5-.271-.497-.229-.536-.191-.572-.154-.576-.114-.612-.079-.65-.037-.652.001-.65.073-.689.078zm-4.713 2.523l.193-.307.306-.268.422-.227.459-.155.536-.114.612-.036.613.001.689.037.65.114.689.155.652.229.61.27.576.307.534.383.422.422.381.461-.343.076-.419.076-.42.076-.423.074-.382.037-.308.041h-.305l-.153-.078-.381-.23-.652-.307-.766-.342-.881-.309-.995-.27-.957-.154-.959.037z" stroke-width=".254"/><path d="M.858 42.81l-.036-.609.152-.461.271-.307.42-.191.497-.078.575.041.613.076.688.154.65.23.65.23.613.23.535.23.46.23.383.154.191.152.078.037-3.065.533-.27-.113-.42-.117-.459-.152-.534-.152-.536-.115-.535-.074-.499-.002-.422.074zm2.531-2.562l.612-.498.651-.383.729-.342.805-.231.806-.153.803-.11.844.001.841.072.804.156.804.27.729.307.689.383.649.461.536.535.421.613.344.689-.499.039-.457.078-.5.035-.536.076-.535.078-.574.037-.612.115-.65.072-.231-.34-.271-.308-.307-.268-.343-.27-.383-.23-.421-.23-.422-.192-.459-.152-.459-.154-.497-.115-.46-.076-.499-.04-.497-.037-.496-.001-.499.038-.46.075zM139.73 21.932l.077.117.192.307.267.497.344.613.386.727.382.806.346.92.303.918.228.959.079.92-.041.918-.192.842-.422.768-.651.687-.919.535-1.189.384.193-.578.117-.611.113-.611.076-.689.039-.689v-.726l-.037-.69-.037-.729-.076-.729-.074-.725-.116-.69-.152-.651-.113-.651-.154-.575-.188-.574-.155-.498.191-.075.154-.04.19-.076.156-.036.153-.077.15-.039.191-.078.19-.076z" stroke-width=".254"/><path d="M138.43 22.468l.534 2.108.382 1.914.189 1.646.037 1.455-.077 1.264-.23 1.072-.307.92-.347.764-.46.613-.497.496-.498.347-.495.267-.54.191-.459.076-.42.037h-.384l.229-.613.229-.612.192-.688.154-.689.152-.767.118-.764.116-.767.075-.803.041-.806.001-.843-.041-.804-.073-.843-.114-.804-.155-.843-.188-.766-.229-.805.457-.154.463-.152.422-.152.418-.115.348-.113.381-.115.306-.076.27-.077z" stroke-width=".254"/><path d="M135.32 23.424l.231.765.227.959.155 1.073.072 1.186.041 1.303-.002 1.301-.116 1.301-.192 1.267-.271 1.187-.345 1.109-.499.957-.572.766-.731.574-.84.304-.96.04-1.108-.307.422-.691.421-.727.347-.766.307-.727.229-.803.231-.768.152-.805.154-.805.077-.804.038-.841v-.805l-.073-.842-.076-.842-.152-.806-.152-.845-.229-.803.383-.152.458-.152.461-.153.46-.153.46-.151.382-.153.346-.117.267-.074z" stroke-width=".254"/><path d="M125.59 39.307l1.036.08.997-.154.879-.381.805-.535.766-.73.652-.879.536-.994.499-1.109.384-1.188.309-1.266.192-1.3.078-1.302.001-1.301-.114-1.303-.229-1.265-.343-1.188-.422.152-.425.154-.456.114-.463.152-.458.154-.497.153-.46.152-.497.152v.804l-.001.879-.04.999-.039 1.033-.039 1.033-.038 1.072-.116 1.11-.113 1.032-.156 1.035-.152.957-.233.919-.268.806-.308.687-.384.577-.421.419-.461.267z" stroke-width=".254"/><path d="M128.32 25.715l-.384.153-.383.114-.343.115-.386.077-.382.114-.347.113-.384.116-.38.153-.077.766-.041.84-.039.92-.038.958-.001.958-.001 1.031-.04 1.037-.039.994-.076.997-.115.994-.193.919-.191.844-.305.802-.346.727-.422.616-.536.496 1.108-.267.919-.383.767-.533.651-.614.537-.729.423-.839.306-.919.232-.959.156-1.072.112-1.11.039-1.15.042-1.225.037-1.225.039-1.264.001-1.264.078-1.303z" stroke-width=".254"/><path d="M118.16 42.058l1.531-.074 1.304-.305 1.07-.496.882-.652.689-.841.502-.958.419-1.071.27-1.188.154-1.226.114-1.261.041-1.305.001-1.262.001-1.305.001-1.223.076-1.15.078-1.071-.421.114-.383.113-.343.117-.387.113-.382.113-.343.115-.384.077-.423.114.039.113.075.269.078.423.114.537.074.688.078.768.039.881-.04.996-.114 1.035-.195 1.145-.347 1.189-.42 1.225-.614 1.265-.766 1.339-.921 1.3-1.15 1.338z" stroke-width=".254"/><path d="M112.94 43.703l1.035.191 1.035-.074.995-.346.996-.537.956-.725.92-.881.844-1.07.769-1.188.649-1.265.576-1.378.462-1.456.309-1.489.192-1.496.041-1.531-.152-1.454-.308-1.456-3.638 1.146.037.613.037.729-.038.801-.08.92-.112.958-.192 1.034-.192 1.072-.308 1.109-.347 1.109-.421 1.073-.461 1.071-.575 1.035-.612.996-.729.918-.805.842-.883.727z" stroke-width=".254"/><path d="M118.7 28.619l-.573.189-.73.192-.807.268-.84.229-.806.27-.804.227-.689.191-.537.115-.076.881-.042.955-.075.959-.038.995-.117.995-.077 1.037-.115.994-.153.996-.19.956-.232.921-.309.916-.344.842-.422.807-.498.688-.536.65-.65.576.766.115.803-.039.804-.189.805-.344.804-.5.807-.611.768-.764.766-.957.689-1.035.611-1.227.578-1.339.495-1.528.388-1.65.307-1.758.194-1.955.077-2.066z" stroke-width=".254"/><path d="M104.02 45.226l1.725.08 1.455-.154 1.265-.418.998-.652.841-.803.691-.957.497-1.072.386-1.224.308-1.225.19-1.343.116-1.3.117-1.302.038-1.303.078-1.188.075-1.11.117-.995-.535.114-.463.115-.419.153-.418.112-.463.117-.422.111-.496.154-.576.151-.116 1.038-.112.992-.116.996-.156.955-.116.961-.153.918-.189.879-.194.881-.269.844-.308.841-.382.805-.422.805-.536.801-.576.768-.69.729-.77.727z" stroke-width=".254"/><path d="M99.389 46.066l1.532.078 1.34-.193 1.188-.418 1.036-.65.88-.805.766-.957.615-1.107.537-1.188.458-1.226.347-1.3.269-1.266.194-1.299.19-1.226.116-1.15.116-1.073.079-.919-.539.117-.459.112-.42.115-.423.077-.38.113-.425.074-.495.152-.576.115-.192 1.496-.229 1.417-.27 1.301-.269 1.226-.31 1.109-.345 1.071-.383.918-.384.883-.383.803-.425.727-.459.613-.422.574-.459.535-.461.42-.498.383-.459.346z" stroke-width=".254"/><path d="M95.021 46.636l1.457.078 1.302-.189 1.151-.424 1.071-.611.881-.801.805-.92.69-1.072.614-1.145.535-1.189.422-1.263.347-1.264.308-1.262.271-1.188.192-1.149.152-1.031.155-.922-.459.076-.46.116-.462.114-.459.115-.462.115-.458.112-.46.114-.497.117-.038.725-.116.805-.153.843-.269.918-.27.995-.382.957-.385 1.033-.422.998-.499.996-.537.957-.534.879-.577.84-.574.807-.614.689-.649.572-.617.459z" stroke-width=".254"/><path d="M90.237 47.513l1.49.193 1.38-.191 1.264-.496 1.15-.766 1.073-.955.921-1.148.84-1.301.77-1.34.613-1.416.537-1.381.46-1.302.384-1.262.23-1.074.192-.88.114-.65.001-.381-.573.111-.537.115-.535.152-.536.115-.536.152-.5.113-.497.115-.499.078-.191.651-.19.765-.229.879-.271.996-.308 1.035-.343 1.071-.384 1.069-.424 1.115-.461 1.07-.497.994-.537.959-.574.842-.653.725-.65.574-.728.422-.765.229z" stroke-width=".254"/><path d="M86.752 47.32l1.377.307 1.223.002 1.113-.268 1.034-.535.882-.729.805-.881.727-1.068.652-1.15.539-1.225.498-1.262.384-1.264.385-1.227.307-1.147.231-1.035.23-.918.189-.727-.419.076-.423.038-.38.075-.347.076-.384.076-.346.078-.305.074-.345.041-.118.879-.189.919-.232.917-.228.883-.309.918-.347.881-.382.843-.461.842-.46.842-.537.805-.615.764-.61.689-.729.689-.727.611-.806.574-.879.535z" stroke-width=".254"/><path d="M82.385 48.005l1.147.002 1.112-.115 1.07-.268 1.037-.383.956-.533.959-.65.842-.764.841-.842.73-.959.69-1.033.614-1.15.573-1.185.461-1.264.385-1.34.347-1.379.23-1.414-.498.113-.499.076-.536.115-.496.074-.497.078-.459.112-.5.077-.459.115-.231.805-.191.842-.231.805-.194.803-.23.804-.228.803-.307.766-.346.805-.42.766-.463.803-.576.766-.688.766-.768.729-.918.766-1.073.766-1.188.725z" stroke-width=".254"/><path d="M76.18 48.728l1.495.117 1.454-.076 1.34-.229 1.266-.383 1.187-.496 1.112-.65 1.033-.768.918-.916.844-.955.767-1.074.693-1.148.573-1.221.496-1.304.425-1.34.307-1.377.233-1.381-.423.076-.46.117-.456.074-.461.075-.459.078-.5.114-.497.076-.5.115-.152.955-.23.957-.31.96-.383.917-.457.917-.502.918-.574.883-.648.842-.691.844-.767.762-.808.727-.879.689-.921.611-.995.576-.997.496-1.072.42z" stroke-width=".254"/><path d="M72.772 49.107l1.264-.074 1.226-.189 1.228-.307 1.186-.457 1.112-.537 1.109-.648 1.034-.729.958-.842.881-.916.843-.994.73-1.076.65-1.109.536-1.183.46-1.226.348-1.267.229-1.299-.419.074-.385.037-.346.039-.343.039-.346.037-.382.077-.458.075-.539.075-.537 1.112-.459 1.031-.46.997-.422.918-.46.881-.424.805-.461.764-.498.727-.537.729-.613.65-.688.689-.765.611-.884.65-.996.611-1.108.613-1.265.609z" stroke-width=".254"/><path d="M66.645 49.488l1.877.076 1.763-.072 1.57-.268 1.455-.422 1.34-.572 1.187-.691 1.113-.801.993-.92.921-.992.844-1.072.729-1.109.688-1.189.652-1.184.577-1.187.538-1.227.496-1.187-.343.036-.461.078-.573.076-.575.076-.613.115-.537.076-.456.076-.347.035-.46 1.074-.499 1.074-.577.994-.573.955-.652.881-.688.879-.729.805-.804.807-.804.727-.885.688-.917.688-.96.613-.995.572-1.072.535-1.072.496-1.149.461z" stroke-width=".254"/><path d="M63.006 50.019l1.034-.037 1.071-.152 1.15-.268 1.186-.42 1.188-.494 1.189-.613 1.188-.727 1.187-.803 1.149-.918 1.111-.957 1.035-1.07.999-1.15.879-1.188.804-1.261.691-1.34.576-1.38-.575.079-.575.074-.611.037-.612.077-.536.037-.461.077-.382.076-.192.115-.69.535-.689.575-.729.688-.729.688-.727.765-.767.803-.767.844-.768.844-.766.879-.804.842-.805.842-.845.84-.842.844-.845.762-.842.768-.882.688z" stroke-width=".254"/><path d="M57.415 50.015l.997.654 1.032.268 1.034.002 1.073-.268 1.071-.537 1.073-.729 1.111-.916 1.11-1.033 1.112-1.188 1.148-1.225 1.189-1.301 1.188-1.299 1.188-1.264 1.226-1.263 1.228-1.148 1.226-1.031h-.425l-.494.074-.576.038-.573.116-.614.076-.612.113-.572.115-.5.075-.956.88-.957.88-.923.918-.919.92-.881.916-.883.92-.88.92-.845.84-.844.84-.842.768-.805.688-.804.613-.805.535-.767.459-.766.344-.767.229z" stroke-width=".254"/><path d="M53.086 50.511l1.572.002 1.492-.152 1.342-.385 1.304-.494 1.187-.613 1.109-.766 1.075-.84.995-.92.997-.994.956-1.033.921-1.035.959-1.07.959-1.07.994-1.034 1.035-.957 1.072-.918-.382.04-.458.037-.577.074-.572.041-.577.073-.459.038-.382.041-.229-.001-.651.151-.651.306-.649.423-.692.573-.689.686-.729.805-.766.844-.769.916-.88.957-.883.955-.997.996-1.032.959-1.111.955-1.188.881-1.264.801-1.381.729zm85.224-31.529v-.153l.04-.42.038-.649.04-.807.039-.957-.037-1.033-.038-1.072-.111-1.111-.229-1.033-.309-.996-.38-.882-.572-.728-.654-.537-.843-.307-1.034-.039-1.186.306.385.384.343.459.345.574.306.613.305.689.27.689.264.767.271.804.228.767.19.806.194.803.188.766.155.768.152.727.114.65.113.613.19-.037.154-.037.189-.078.155-.037.151-.079.155-.075.192-.037.226-.078z" stroke-width=".254"/><path d="M136.9 19.558l-.497-2.489-.535-2.108-.535-1.801-.532-1.492-.539-1.188-.534-.958-.533-.689-.499-.497-.536-.347-.458-.153-.502-.039-.42.078-.419.152-.382.191-.348.229-.306.23.536.497.533.573.462.538.494.611.424.615.422.648.382.652.344.691.344.727.306.766.307.768.268.805.227.842.23.842.227.882.194.919.457-.077.345-.036.232-.077.153-.077.151-.037.156-.076.153-.039.229-.075z" stroke-width=".254"/><path d="M134.98 20.283l-.113-.918-.194-1.035-.305-1.15-.379-1.226-.5-1.264-.571-1.227-.611-1.187-.688-1.111-.729-.996-.765-.843-.803-.65-.842-.425-.9-.151-.882.152-.842.499-.882.878.688.498.65.576.613.574.574.576.574.611.496.689.459.691.42.688.423.769.343.767.345.805.267.842.267.879.193.92.189.959.155.994.416-.114.461-.152.499-.153.498-.191.461-.189.421-.154.344-.151.23-.077z" stroke-width=".254"/><path d="M120.06 10.239l.919-.612.92-.344.957-.115.919.115.958.307.919.5.882.689.843.805.762.919.766 1.073.65 1.188.572 1.226.496 1.305.384 1.376.306 1.38.151 1.416-.47.114-.459.116-.46.15-.46.154-.497.191-.499.113-.457.154-.498.075-.346-.88-.305-.959-.383-.957-.348-.957-.379-.996-.419-.998-.423-.956-.421-.918-.456-.884-.499-.805-.533-.766-.539-.651-.609-.575-.615-.459-.648-.346-.69-.19z" stroke-width=".254"/><path d="M115.84 11.383l1.455-.648 1.302-.344 1.149-.038 1.034.193.919.421.806.65.724.807.65.957.575 1.072.495 1.188.5 1.229.457 1.225.457 1.264.421 1.264.459 1.188.497 1.111-.421.037-.384.115-.383.113-.385.152-.381.118-.384.151-.421.114-.422.074-.038-.151-.038-.383-.114-.498-.114-.689-.189-.803-.27-.92-.306-.996-.42-1.034-.494-1.034-.574-1.035-.728-1.035-.803-.958-.96-.918-1.07-.767-1.228-.691-1.375-.5z" stroke-width=".254"/><path d="M110.41 12.185l.882-.651.997-.42 1.069-.153 1.072.04 1.149.229 1.148.461 1.108.615 1.111.768 1.07.956.997 1.075.878 1.225.805 1.342.687 1.416.537 1.533.342 1.57.19 1.687-3.945 1.029-.228-.649-.307-.77-.306-.803-.382-.881-.461-.92-.457-.956-.537-.961-.573-.956-.652-.957-.725-.92-.766-.842-.803-.808-.878-.728-.959-.613-.996-.537-1.07-.421z" stroke-width=".254"/><path d="M120.54 25.02l-.572.115-.727.152-.729.23-.808.229-.764.267-.729.191-.649.189-.536.152-.382-.957-.421-.995-.422-.996-.42-1.036-.421-1.032-.458-.997-.498-.995-.497-.997-.533-.918-.573-.845-.614-.804-.651-.727-.65-.652-.728-.537-.804-.423-.804-.306.692-.459.764-.344.806-.23.88-.075.918.076.959.231.957.383.992.576.999.728.993.92.995 1.149.954 1.304.919 1.532.917 1.723.843 1.992.802 2.184z" stroke-width=".254"/><path d="M101.33 14.973l1.571-.841 1.415-.498 1.304-.114 1.187.193 1.032.458.996.691.841.883.805 1.073.688 1.188.649 1.265.573 1.341.534 1.34.536 1.302.498 1.265.458 1.148.456 1.035-.534.076-.459.112-.422.079-.422.114-.421.114-.459.115-.498.076-.572.112-.5-1.033-.458-1.036-.46-.994-.458-.958-.459-.958-.495-.88-.5-.881-.495-.806-.575-.807-.61-.727-.612-.688-.688-.652-.769-.615-.801-.536-.92-.498-.956-.46z" stroke-width=".254"/><path d="M96.577 16.348l1.419-.765 1.339-.383 1.265-.075 1.225.191 1.111.461 1.069.689.996.844.921.998.841 1.149.802 1.187.726 1.227.652 1.264.611 1.266.537 1.148.455 1.111.423.957-.574.113-.5.115-.46.113-.421.076-.458.115-.461.115-.536.076-.613.115-.688-1.533-.688-1.417-.646-1.302-.651-1.188-.614-1.071-.573-.961-.61-.84-.574-.807-.612-.651-.613-.575-.611-.498-.65-.421-.653-.308-.685-.269-.731-.155-.765-.113z" stroke-width=".254"/><path d="M92.977 17.379l1.378-.65 1.307-.308 1.222.001 1.19.233 1.07.458 1.033.654.956.844.92.957.802 1.072.766 1.148.726 1.188.613 1.188.609 1.189.5 1.15.456 1.033.421.959-.459.113-.42.113-.424.076-.383.116-.421.077-.42.075-.462.113-.496.077-.231-.765-.342-.845-.42-.842-.497-.919-.535-.919-.651-.921-.649-.92-.728-.92-.765-.841-.805-.846-.803-.766-.804-.652-.843-.613-.805-.498-.802-.383-.806-.23z" stroke-width=".254"/><path d="M88.648 18.484l1.417-.762 1.38-.345 1.379.039 1.301.385 1.264.612 1.226.879 1.149 1.038 1.069 1.147.995 1.229.881 1.264.8 1.227.65 1.187.536 1.036.422.879.23.652.113.383-.574.115-.498.113-.498.115-.5.115-.496.115-.459.074-.499.077-.497.076-.344-.651-.384-.804-.458-.882-.537-.921-.571-1.033-.614-1.034-.646-.997-.691-1.034-.727-.959-.762-.88-.802-.804-.803-.652-.844-.537-.844-.345-.878-.152-.882.035z" stroke-width=".254"/><path d="M85.508 19.709l1.266-.842 1.224-.459 1.149-.113 1.149.19 1.071.461 1.033.692.958.842.915 1.035.844 1.113.805 1.184.727 1.229.687 1.225.574 1.15.535 1.073.421.918.383.766-.46.077-.382.114-.344.115-.308.113-.347.114-.305.115-.307.079-.343.073-.344-.955-.421-.958-.422-.921-.46-.918-.537-.919-.531-.844-.613-.844-.65-.805-.689-.767-.764-.688-.765-.614-.844-.574-.919-.5-.919-.421-.996-.308-1.071-.229z" stroke-width=".254"/><path d="M81.523 20.625l1.113-.422 1.109-.266 1.148-.077 1.074.078 1.109.231 1.032.345 1.034.536 1.034.652.956.768.918.92.881.996.842 1.112.802 1.226.689 1.34.688 1.418.571 1.491-.498.077-.495.076-.501.115-.497.153-.496.115-.498.153-.497.115-.5.074-.343-.842-.343-.882-.347-.843-.342-.883-.422-.842-.419-.805-.501-.842-.534-.767-.649-.729-.688-.728-.805-.652-.88-.613-.996-.537-1.11-.498-1.261-.424-1.381-.344z" stroke-width=".254"/><path d="M75.855 21.961l1.455-.609 1.457-.385 1.34-.189 1.34-.037 1.265.191 1.226.346 1.147.498 1.111.652.992.805.994.919.884 1.036.84 1.15.764 1.264.652 1.34.611 1.381.535 1.491-.459.077-.46.076-.536.078-.501.074-.533.078-.538.074-.535.076-.535.076-.269-1.072-.383-.994-.42-.996-.533-.959-.575-.881-.651-.843-.688-.805-.766-.729-.842-.689-.916-.574-.959-.539-.995-.459-1.071-.346-1.113-.307-1.146-.191-1.188-.078z" stroke-width=".254"/><path d="M73.062 22.265l1.302-.19 1.262-.113 1.262.038 1.228.154 1.224.307 1.15.385 1.109.498 1.073.613.995.729.954.844.844.919.803 1.034.688 1.15.611 1.226.499 1.341.38 1.419-.46.035-.383.038-.382.077-.384.077-.384.074-.382.078-.46.114-.496.076-.651-1.111-.613-1.073-.532-.958-.5-.956-.535-.844-.498-.804-.497-.767-.572-.69-.612-.651-.688-.575-.768-.535-.842-.498-.995-.425-1.071-.383-1.264-.346-1.415-.308z" stroke-width=".254"/><path d="M66.973 23.064l1.914-.457 1.8-.268 1.646-.075 1.531.154 1.417.307 1.302.461 1.187.573 1.074.77 1.03.842.917.96.844 1.034.802 1.112.728 1.147.688 1.227.612 1.226.611 1.265-.307.037-.42.037-.459.115-.501.076-.496.115-.462.114-.419.036-.346.039-.571-1.148-.613-1.035-.689-.996-.726-.918-.766-.883-.805-.806-.878-.725-.919-.69-.956-.616-.996-.573-1.034-.498-1.07-.498-1.111-.423-1.147-.383-1.189-.346-1.222-.309z" stroke-width=".254"/><path d="M63.335 23.443l1.068-.189 1.113-.037 1.225.038 1.263.192 1.267.271 1.3.384 1.303.497 1.302.614 1.3.729 1.224.845 1.186.92 1.147 1.035 1.035 1.149.956 1.225.841 1.342.728 1.455-.537.039-.533.076-.538.115-.536.113-.459.113-.385.117-.306.036-.19-.037-.769-.46-.763-.537-.804-.613-.843-.689-.843-.729-.878-.768-.92-.768-.916-.802-.959-.806-.956-.807-.995-.803-.996-.729-1.033-.729-.995-.652-1.071-.613-1.031-.537z" stroke-width=".254"/><path d="M58.237 24.895l.958-.955 1.034-.572 1.074-.23 1.109.077 1.148.308 1.225.575 1.227.769 1.3.879 1.301 1.074 1.341 1.11 1.34 1.19 1.34 1.188 1.377 1.188 1.377 1.112 1.376 1.035 1.381.92-.421.074-.499.037-.612.041-.613.037-.648.037h-1.227l-.497-.002-1.034-.766-.993-.804-.996-.808-.918-.842-.919-.805-.883-.807-.878-.805-.88-.767-.919-.688-.879-.651-.92-.575-.956-.5-.996-.422-1.034-.345-1.073-.192-1.11-.117z" stroke-width=".254"/><path d="M54.408 25.352l1.61-.381 1.493-.152 1.415.076 1.343.271 1.262.461 1.226.575 1.186.729 1.148.805 1.11.919 1.109.922 1.071.995 1.111.996 1.109.958 1.107.959 1.188.843 1.185.807-.38.037-.498.075-.576.078-.576.036-.572.079-.5.072-.38.041-.231.037-.688-.002-.69-.189-.727-.348-.766-.496-.766-.614-.843-.728-.879-.807-.919-.844-.959-.881-1.031-.918-1.109-.882-1.148-.844-1.262-.808-1.302-.728-1.379-.651-1.494-.5z" stroke-width=".254"/><path d="M49.583 26.689L51 25.885l1.495-.342h1.455l1.49.309 1.495.576 1.494.804 1.454.96 1.415 1.034 1.339 1.149 1.302 1.15 1.263 1.075 1.148.993 1.033.844.956.65.843.385.726.116-.61.077-.653.113-.727.113-.765.117-.767.074-.767.115-.728.038-.652.037-1.07-.806-.958-.766-.879-.767-.84-.728-.767-.73-.725-.723-.767-.691-.726-.651-.729-.612-.804-.576-.841-.537-.919-.496-.996-.461-1.071-.383-1.226-.348-1.34-.307z" stroke-width=".254"/><g stroke-width=".254"><path d="M142.34 10.982l.191-.383.153-.42.152-.423.113-.421.117-.459.115-.496.077-.459.042-.5.036-.459.035-.498.001-.499-.035-.46-.036-.459-.08-.457-.112-.461-.114-.42.611.804.459.882.345.842.189.88.076.919v.92l-.116.918-.194.92-.228.918-.31.883-.343.879-.343.88-.385.843-.347.842-.346.765-.343.767.074-.152.037-.269.042-.266v-.345l.037-.424v-.881l.001-.496.038-.499v-.498l.039-.534.04-.498.038-.461.078-.461.075-.42.116-.383zm11.67 15.903l-.729-.422-.729-.462-.687-.421-.688-.422-.65-.383-.651-.422-.616-.385-.609-.42-.64-.383-.607-.384-.614-.422-.652-.382-.611-.386-.654-.342-.686-.386-.689-.382.61.61.613.616.613.611.612.576.65.611.651.536.65.539.688.497.651.461.689.383.651.346.688.269.688.229.688.115.691.037.691-.035z"/><path d="M148.32 11.561l-.536.308-.5.345-.495.345-.461.344-.46.343-.419.383-.424.421-.423.383-.384.422-.384.422-.382.421-.345.457-.383.422-.346.459-.344.459-.346.459.153-.496.192-.499.191-.537.229-.534.231-.536.265-.499.31-.498.346-.495.382-.46.461-.381.498-.385.537-.344.612-.269.652-.229.765-.152.805-.076zm-5.71-4.6l-.153.767-.114.767-.154.766-.116.689-.08.726-.114.689-.079.689-.115.689-.075.688-.117.689-.074.651-.118.689-.116.689-.115.689-.15.689-.157.727-.076-.842-.113-.805-.077-.843-.076-.841-.037-.807-.038-.805.039-.805.039-.764.076-.767.116-.688.194-.689.229-.651.269-.573.384-.537.422-.46.497-.421z"/><path d="M146.71 5.703l.692.648.416.729.189.766.04.805-.153.804-.307.843-.424.844-.498.841-.575.804-.611.805-.653.764-.65.689-.614.689-.534.572-.463.539-.383.418.077-1.147.154-.995.191-.844.307-.764.306-.65.386-.574.382-.535.424-.501.383-.496.424-.495.382-.538.307-.613.307-.688.23-.766.194-.919.075-1.032z"/><path d="M141.8 17.951v-.805l-.039-.765-.034-.765-.04-.768-.036-.729-.077-.727-.076-.727-.073-.691-.117-.688-.114-.728-.189-.689-.152-.689-.193-.689-.268-.689-.229-.689-.306-.689 1.111 1.073.918 1.034.649.959.457.92.309.879.151.805.037.806-.077.727-.195.689-.187.651-.27.613-.271.533-.23.537-.229.459-.152.459-.078.383zm11.22 2.652l-.613.114-.614.116-.611.075-.613.075-.609.038-.616.037h-1.188l-.612-.039h-.574l-.613-.077-.573-.038-.613-.04-.575-.075-.612-.079-.574-.075.498.229.498.192.535.231.537.19.574.193.576.151.61.156.61.076.612.039h.651l.651-.039.654-.15.651-.191.651-.27.648-.381.654-.46z"/><path d="M149.46 23.702l.461.078.419.075.461.115.457.115.463.194.456.151.421.191.46.23.421.23.421.267.383.271.386.268.343.307.308.307.304.307.27.344-.269-.917-.422-.808-.494-.688-.615-.651-.688-.536-.768-.5-.84-.421-.882-.347-.919-.306-.919-.307-.955-.231-.958-.23-.957-.193-.919-.189-.843-.154-.842-.192.42.153.574.306.69.463.841.497.843.535.879.499.842.46.768.308zm1.75 6.857l.345-.881.117-.844-.116-.842-.307-.766-.457-.729-.612-.727-.728-.69-.804-.614-.843-.613-.879-.536-.919-.538-.884-.459-.801-.42-.767-.387-.651-.344-.496-.309.532 1.113.538.919.573.728.536.652.574.498.574.459.574.346.574.346.571.346.577.382.572.384.536.46.537.573.535.691.497.806.498.995z"/><path d="M141.57 21.129l.422.652.42.652.421.65.38.613.346.613.345.649.346.614.305.613.304.652.268.65.271.613.229.65.19.689.192.65.152.689.152.73.384-1.455.191-1.265.041-1.149-.115-.994-.229-.844-.346-.766-.42-.652-.458-.537-.538-.499-.535-.421-.573-.346-.537-.306-.496-.306-.46-.268-.342-.307-.31-.271z"/></g></g><defs><linearGradient id="a" y2="4153.3" gradientUnits="userSpaceOnUse" x2="-3520.4" gradientTransform="translate(-2022.6 2980.7) scale(.5318)" y1="4186.3" x1="-3510.4"><stop stop-color="#4F0C81" offset="0"/><stop stop-color="#690C73" offset=".07"/><stop stop-color="#9A0A5B" offset=".209"/><stop stop-color="#C20748" offset=".337"/><stop stop-color="#E0053A" offset=".451"/><stop stop-color="#F20032" offset=".548"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><g stroke="#000" stroke-width=".254" fill="url(#a)"><path stroke-width=".596" d="M.241 40.672c13.561-1.867 63.613-4.393 85.943-8.051 17.961-2.937 35.502-8.285 52.242-13.9 4.328-1.453 11.991-4.434 16.896-7.07 3.104-2.373 10.571-5.889 12.606-9.222-32.45 15.407-45.513 19.649-83.582 27.354C68.91 32.952 12.729 37.504.241 40.672z" fill="#000"/><defs><linearGradient id="b" y2="-3479.4" gradientUnits="userSpaceOnUse" x2="-3789.2" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3507.6" x1="-3788.1"><stop stop-color="#4F0C81" offset="0"/><stop stop-color="#690C73" offset=".07"/><stop stop-color="#9A0A5B" offset=".209"/><stop stop-color="#C20748" offset=".337"/><stop stop-color="#E0053A" offset=".451"/><stop stop-color="#F20032" offset=".548"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M48.261 46.645l1.454.498 1.418.118 1.417-.229 1.417-.574 1.379-.766 1.38-.994 1.305-1.146 1.301-1.226 1.228-1.26 1.149-1.267 1.111-1.224 1.035-1.148.958-.957.881-.763.767-.501.689-.228-.576.036-.611.038-.689.077-.688.074-.69.078-.689.076-.689.038-.612.076-.957.88-.921.842-.805.842-.729.844-.727.801-.688.805-.652.764-.691.729-.688.727-.729.65-.767.65-.882.61-.919.576-1.034.535-1.149.496-1.302.421z" fill="url(#b)"/><defs><linearGradient id="c" y2="-3475.5" gradientUnits="userSpaceOnUse" x2="-3818.3" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3498.7" x1="-3817.4"><stop stop-color="#4F0C81" offset="0"/><stop stop-color="#690C73" offset=".07"/><stop stop-color="#9A0A5B" offset=".209"/><stop stop-color="#C20748" offset=".337"/><stop stop-color="#E0053A" offset=".451"/><stop stop-color="#F20032" offset=".548"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M43.511 46.45l1.688.271 1.569.038 1.455-.15 1.377-.345 1.265-.534 1.151-.652 1.148-.766 1.034-.879 1.035-.918.957-.995.959-1.072.921-1.032.956-1.033.96-1.033.958-.955.995-.881-.381.037h-.423l-.384.039-.419.037-.424.037-.421.078-.42.035-.42.041-.421.037-.461.037-.422.078-.459.037-.459.037-.46.037h-.46l-.459.039-.347.535-.42.651-.537.765-.575.805-.69.881-.729.879-.766.918-.805.879-.844.844-.84.805-.885.726-.842.612-.844.496-.843.346-.804.189h-.768z" fill="url(#c)"/><defs><linearGradient id="d" y2="-3480.6" gradientUnits="userSpaceOnUse" x2="-3807.8" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3505.3" x1="-3806.9"><stop stop-color="#4F0C81" offset="0"/><stop stop-color="#690C73" offset=".07"/><stop stop-color="#9A0A5B" offset=".209"/><stop stop-color="#C20748" offset=".337"/><stop stop-color="#E0053A" offset=".451"/><stop stop-color="#F20032" offset=".548"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M40.371 46.487l.958.115.919.076.881-.037.881-.152.882-.19.843-.344.841-.421.883-.574.882-.65.882-.764.882-.921.919-.993.958-1.188.997-1.3 1.034-1.416 1.074-1.607-.651-.002-.613.039-.614.076-.612.076-.611.078-.613.072h-1.415l-.616.612-.573.65-.576.614-.574.688-.575.65-.535.689-.576.648-.539.691-.572.65-.574.65-.612.65-.577.613-.65.572-.652.574-.65.573-.729.499z" fill="url(#d)"/><path d="M37.041 46.329l.728.387.802.153.807-.116.842-.342.844-.5.881-.689.88-.764.884-.917.841-.958.884-.993.804-.997.805-.957.768-.957.729-.84.689-.729.614-.613-4.099.382-.462.612-.498.61-.458.616-.459.608-.46.614-.5.612-.461.612-.497.612-.537.573-.537.611-.536.578-.613.57-.612.574-.653.576-.688.536-.728.532z" fill="url(#c)"/><defs><linearGradient id="e" y2="-3480.1" gradientUnits="userSpaceOnUse" x2="-3826.3" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3503.9" x1="-3825.4"><stop stop-color="#4F0C81" offset="0"/><stop stop-color="#690C73" offset=".07"/><stop stop-color="#9A0A5B" offset=".209"/><stop stop-color="#C20748" offset=".337"/><stop stop-color="#E0053A" offset=".451"/><stop stop-color="#F20032" offset=".548"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M30.262 45.444l1.188.767 1.109.5 1.11.231h1.074l1.033-.191.995-.343.955-.538.96-.687.919-.841.923-.881.84-1.037.884-1.031.843-1.109.844-1.146.805-1.148.805-1.111-.688.115-.536.037-.384.037-.345.039-.343.039-.346-.001-.499.037-.651.037-.729 1.034-.727.955-.729.921-.805.804-.767.727-.767.689-.804.611-.768.536-.766.458-.768.421-.727.306-.689.269-.689.229-.614.152-.612.075-.537.038z" fill="url(#e)"/><path d="M26.7 45.21l1.228.153 1.186.08 1.149-.078 1.109-.151 1.036-.227 1.033-.345.958-.422.92-.535.92-.572.844-.651.843-.727.803-.804.766-.842.73-.918.729-.959.689-.994-.767.039-.844.074-.802.076-.806.038-.69.077-.574.035-.421.039-.191.037-.076.078-.191.19-.308.306-.382.385-.422.459-.536.536-.577.573-.648.614-.731.608-.764.65-.768.615-.843.611-.88.572-.881.535-.921.46-.92.385z" fill="url(#c)"/><defs><linearGradient id="f" y2="-3482.3" gradientUnits="userSpaceOnUse" x2="-3842.4" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3502.4" x1="-3841.7"><stop stop-color="#4F0C81" offset="0"/><stop stop-color="#690C73" offset=".07"/><stop stop-color="#9A0A5B" offset=".209"/><stop stop-color="#C20748" offset=".337"/><stop stop-color="#E0053A" offset=".451"/><stop stop-color="#F20032" offset=".548"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M21.991 45.476l1.033.192.998.076 1.033-.113 1.034-.191 1.034-.342.994-.423.996-.497.998-.611.919-.648.918-.69.881-.726.845-.766.806-.804.766-.765.69-.768.651-.766h-.461l-.574.04-.611.036h-.651l-.613.073-.613.041-.496.039-.423.075v.077l-.154.189-.381.347-.537.42-.652.535-.764.613-.845.652-.882.647-.92.687-.918.691-.881.65-.846.574-.765.539-.69.421-.537.305-.382.191z" fill="url(#f)"/><path d="M16.782 45.434l.612.612.806.267.996.001 1.11-.266 1.227-.46 1.262-.646 1.341-.768 1.305-.841 1.302-.919 1.227-.916 1.147-.879.999-.844.881-.688.65-.574.423-.381.192-.154-.498.038-.538.036-.574.037-.572.041-.614.072-.614.039-.611.04-.652.038-.688.419-.688.422-.693.456-.649.425-.689.456-.653.498-.688.459-.653.459-.69.496-.65.461-.688.459-.651.458-.688.421-.691.422-.651.419-.69.384z" fill="url(#c)"/><defs><linearGradient id="g" y2="-3493.2" gradientUnits="userSpaceOnUse" x2="-3872.4" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3504" x1="-3872.2"><stop stop-color="#F7EE5F" offset="0"/><stop stop-color="#F5D65D" offset=".186"/><stop stop-color="#F4C35B" offset=".383"/><stop stop-color="#F4BC5A" offset=".52"/><stop stop-color="#F5DA5D" offset=".781"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M12.953 45.507l.652.229.649.115.65.037.653-.11.65-.194.689-.265.727-.383.768-.46.843-.535.881-.612.959-.688 1.072-.728 1.187-.803 1.265-.881 1.379-.918 1.534-.957-.653.039-.727.039-.65-.001-.65.038-.574.037-.459.038-.307.039-.116.036-.077.115-.229.23-.346.307-.458.42-.575.499-.653.577-.689.571-.805.613-.805.611-.843.612-.843.534-.882.537-.842.457-.842.383-.805.267-.729.154z" fill="url(#g)"/><defs><linearGradient id="h" y2="-3484.9" gradientUnits="userSpaceOnUse" x2="-3874.5" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3508.4" x1="-3878.1"><stop stop-color="#F7EE5F" offset="0"/><stop stop-color="#F5D65D" offset=".186"/><stop stop-color="#F4C35B" offset=".383"/><stop stop-color="#F4BC5A" offset=".52"/><stop stop-color="#F5DA5D" offset=".781"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M10.158 45.084l.879.344.958.152.998-.072 1.033-.268 1.072-.383 1.033-.498 1.074-.608.996-.69.958-.688.92-.728.843-.688.728-.691.653-.572.495-.499.383-.341.232-.232-.613.038-.577.04-.571.037-.575.074-.535.041-.577.037-.61.074-.613.038-.459.421-.501.42-.458.421-.499.46-.498.498-.497.459-.536.459-.538.458-.536.423-.534.421-.577.381-.534.343-.614.309-.574.266-.613.193-.613.152z" fill="url(#h)"/><path d="M6.791 44.01l.765.535.763.345.767.154.767.039.768-.151.766-.232.766-.343.765-.458.729-.498.766-.611.729-.613.729-.65.727-.648.69-.69.689-.649.69-.615-.422.041-.46.076-.497.037-.535.039-.575.074-.612.039-.652.074-.612.037-.192.461-.27.457-.271.422-.346.422-.381.383-.424.383-.42.381-.496.306-.5.308-.537.268-.573.268-.576.189-.612.154-.61.15-.654.077-.649.039z" fill="url(#g)"/><path d="M3.763 43.434l.652.266.69.193.726.115.806.001.767-.038.842-.115.805-.229.803-.229.768-.344.729-.384.65-.421.614-.495.536-.538.46-.572.345-.651.23-.652-.46.04-.46.037-.497.076-.5.038-.495.038-.537.037-.574.039-.652.036-.271.385-.307.384-.306.345-.306.306-.307.306-.348.229-.343.27-.347.229-.381.191-.422.19-.421.19-.456.153-.462.152-.495.152-.537.116-.539.154z" fill="url(#h)"/><path d="M2.193 42.896l.23.229.347.152.42.078h.46l.536-.038.573-.112.613-.193.612-.189.613-.27.614-.307.612-.342.537-.385.537-.42.458-.459.345-.46.307-.498-.343.041-.308.037-.383.038-.343.038-.344.039-.307.036-.268.001-.269-.001v.153l-.342.306-.576.422-.767.498-.917.496-.922.499-.919.381-.806.23z" fill="url(#g)"/><path d="M1.084 41.822l.078.536.192.344.305.155.42.076.499-.075.574-.192.573-.229.614-.306.613-.346.574-.381.575-.381.461-.347.42-.307.307-.229.191-.152.038-.076-2.986.341-.229.152-.386.192-.458.23-.5.229-.535.269-.497.189-.461.192-.384.114z" fill="url(#g)"/><defs><linearGradient id="i" y2="-3490.1" gradientUnits="userSpaceOnUse" x2="-3892.7" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3497" x1="-3892.6"><stop stop-color="#F7EE5F" offset="0"/><stop stop-color="#F5D65D" offset=".186"/><stop stop-color="#F4C35B" offset=".383"/><stop stop-color="#F4BC5A" offset=".52"/><stop stop-color="#F5DA5D" offset=".781"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M4.533 40.253l-.651.039-.574.039-.536.036-.498.037-.46.04-.497.036-.498.077-.577.114.117.729.343.345.537.001.689-.19.689-.347.729-.382.651-.345.536-.229z" fill="url(#i)"/><path d="M4.419 39.874l-.653.112-.573.076-.497.114-.5.075-.458.114-.459.115-.537.116-.575.154-.038-.844.345-.536.537-.192.727-.034.766.151.766.193.651.23.499.154z" fill="url(#g)"/><defs><linearGradient id="j" y2="-3555.2" gradientUnits="userSpaceOnUse" x2="-3726.8" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3522.2" x1="-3716.8"><stop stop-color="#4F0C81" offset="0"/><stop stop-color="#690C73" offset=".07"/><stop stop-color="#9A0A5B" offset=".209"/><stop stop-color="#C20748" offset=".337"/><stop stop-color="#E0053A" offset=".451"/><stop stop-color="#F20032" offset=".548"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M44.258 24.317l1.684-.651 1.611-.419 1.491-.113 1.417.076 1.379.309 1.262.459 1.227.652 1.187.729 1.149.845 1.11.919 1.106.959 1.074.996 1.071.957 1.07.921 1.073.882 1.109.807-.384.073-.421.038-.421.039-.383.076-.423.039-.421.038-.459.036-.421.039-.422.035-.461.041-.458.076-.422.037-.461.04-.457.074-.498.037-.461.077-.382-.534-.495-.653-.576-.766-.688-.768-.727-.843-.805-.843-.879-.844-.881-.806-.959-.766-.953-.688-.957-.615-.997-.497-.957-.385-.958-.23-.956-.039-.88.152z" fill="url(#j)"/><defs><linearGradient id="k" y2="-3532.4" gradientUnits="userSpaceOnUse" x2="-3836.3" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3506.2" x1="-3818.3"><stop stop-color="#4F0C81" offset="0"/><stop stop-color="#690C73" offset=".07"/><stop stop-color="#9A0A5B" offset=".209"/><stop stop-color="#C20748" offset=".337"/><stop stop-color="#E0053A" offset=".451"/><stop stop-color="#F20032" offset=".548"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M41.383 24.964l.96-.345.92-.227.878-.152.923-.077.878.077.919.192.88.268.919.423.956.537.959.691.995.803 1.033.96 1.108 1.11 1.11 1.266 1.186 1.418 1.264 1.57-.69.039-.611.072-.576.039-.534.076-.537.076-.573.076-.653.113-.765.117-.689-.574-.65-.613-.689-.653-.612-.653-.649-.649-.649-.65-.613-.653-.651-.651-.651-.612-.688-.574-.651-.576-.688-.574-.727-.498-.767-.423-.766-.421-.805-.347z" fill="url(#k)"/><path d="M38.167 25.805l.727-.611.808-.307.88-.074.879.191.958.383.956.538.995.688.996.805.996.881.993.921.956.921.92.958.841.88.84.805.729.691.69.574-4.176.496-.536-.613-.536-.615-.498-.613-.533-.611-.537-.613-.534-.651-.573-.614-.535-.576-.613-.574-.612-.573-.652-.538-.688-.498-.728-.497-.766-.423-.804-.383-.843-.346z" fill="url(#j)"/><path d="M31.886 28.481l1.148-1.111 1.111-.802 1.073-.534 1.072-.307 1.072-.037 1.034.154 1.033.385.996.498.994.689.955.804.996.921.919.996.957 1.035.917 1.111.918 1.111.919 1.11-.729.04-.611.035-.498.039-.461.076-.458.076-.499.075-.571.078-.692.112-.803-1.034-.766-.919-.803-.844-.766-.728-.802-.612-.766-.538-.728-.461-.768-.382-.728-.309-.688-.229-.728-.192-.689-.152-.648-.08-.653-.074h-.649l-.612-.002z" fill="url(#k)"/><path d="M27.402 29.512l1.267-.461 1.187-.344 1.187-.189 1.109-.077 1.111.001 1.071.155 1.035.231.996.347.995.419.919.537.957.613.878.689.882.768.84.842.806.922.803.996-.803.115-.919.111-.921.115-.921.115-.842.113-.649.08-.499.037-.191-.002-.075-.075-.192-.153-.269-.268-.343-.346-.423-.42-.495-.424-.575-.496-.65-.538-.728-.499-.765-.536-.844-.5-.918-.495-.92-.424-.993-.383-1.034-.348-1.073-.229z" fill="url(#j)"/><path d="M21.735 30.196l1.034-.418 1.035-.307 1.108-.115 1.073.001 1.111.118 1.108.229 1.072.346 1.111.422 1.033.498 1.033.537.995.651.994.651.882.693.881.727.802.728.726.729-.495.037-.612.076-.689.075-.728.077-.729.075-.652.076-.573.037h-.422l-.001-.077-.191-.191-.38-.268-.574-.385-.689-.42-.805-.5-.919-.537-.956-.533-.955-.54-.996-.538-.998-.496-.916-.457-.846-.387-.762-.307-.616-.193-.495-.115z" fill="url(#k)"/><path d="M16.373 31.303l.537-.842.805-.498.996-.188h1.147l1.264.268 1.379.422 1.455.576 1.415.651 1.455.729 1.339.766 1.265.73 1.149.727.954.615.729.459.496.342.23.117-.537.116-.61.077-.653.073-.689.038-.727.078-.729.074-.688.115-.689.115-.729-.346-.688-.348-.729-.381-.688-.385-.69-.346-.688-.383-.728-.384-.688-.382-.689-.35-.688-.382-.729-.343-.688-.307-.689-.348-.727-.305-.727-.311-.729-.266z" fill="url(#j)"/><path d="M9.518 33.135l.844-.611.956-.346.996-.149 1.07.001 1.113.189 1.148.348 1.11.421 1.108.5 1.035.574 1.032.575.919.614.804.536.727.499.574.46.42.306.229.193-.612.074-.574.077-.495.076-.501.037-.536.037-.496.076-.576.078-.61.074-.537-.342-.536-.348-.574-.42-.574-.383-.612-.421-.613-.421-.612-.423-.612-.383-.614-.384-.647-.308-.652-.305-.613-.232-.648-.189-.615-.117h-.614l-.612.037z" fill="url(#g)"/><path d="M12.044 32.029l.653-.423.688-.305.652-.154.688-.074.689.037.728.152.807.27.838.308.921.423.959.459 1.07.576 1.147.614 1.265.65 1.378.692 1.49.765 1.648.768-.613.04-.689.073-.688.078-.691.112-.613.078-.457.078-.346.035-.153-.035-.075-.079-.27-.19-.345-.309-.459-.344-.573-.422-.689-.459-.729-.5-.803-.499-.879-.498-.882-.497-.955-.425-.957-.384-.959-.304-.957-.196-.92-.111-.919-.001zm-5.593 3.057l.691-.766.726-.574.729-.382.766-.229.767-.037.804.076.844.192.804.271.84.422.805.42.842.536.843.539.843.536.803.574.805.578.803.496-.459.076-.498.038-.574.116-.613.072-.649.079-.69.073-.65.078-.653.075-.229-.497-.269-.422-.305-.422-.384-.383-.383-.344-.419-.27-.5-.271-.497-.229-.536-.191-.572-.154-.58-.112-.612-.079-.65-.037-.652.001-.65.073-.689.078zm-4.713 2.523l.193-.306.306-.268.422-.228.459-.154.536-.114.612-.036.613.001.689.037.65.114.689.155.652.229.61.269.576.308.534.383.422.422.381.461-.343.076-.419.076-.42.076-.423.074-.382.037-.308.041h-.305l-.153-.078-.381-.23-.652-.307-.766-.343-.881-.309-.995-.269-.957-.154-.959.036z" fill="url(#h)"/><path d="M.818 39.178l-.036-.609.152-.461.271-.307.42-.191.497-.078.575.041.613.076.688.154.65.229.65.231.613.23.535.23.46.23.383.154.191.152.078.036-3.065.533-.27-.112-.42-.117-.459-.153-.534-.152-.536-.115-.535-.074-.499-.001-.422.074zm2.531-2.562l.612-.498.651-.383.729-.342.805-.231.806-.153.803-.11.844.001.841.072.804.156.804.27.729.307.689.383.649.461.536.535.421.613.344.689-.499.039-.457.077-.5.036-.536.076-.535.078-.574.037-.615.115-.65.072-.231-.341-.268-.308L9.244 38l-.343-.27-.382-.23-.421-.23-.423-.192-.459-.151-.459-.154-.497-.116-.46-.076-.499-.04-.497-.037-.496-.001-.499.038-.46.075z" fill="url(#g)"/><defs><linearGradient id="l" y2="-3508.4" gradientUnits="userSpaceOnUse" x2="-3636.6" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3531.6" x1="-3644.5"><stop stop-color="#681083" offset="0"/><stop stop-color="#681083" offset=".001"/><stop stop-color="#8D0F6D" offset=".072"/><stop stop-color="#AD0D5A" offset=".146"/><stop stop-color="#C80A4A" offset=".223"/><stop stop-color="#DE083E" offset=".304"/><stop stop-color="#ED0335" offset=".391"/><stop stop-color="#F60030" offset=".488"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M139.69 18.299l.077.117.192.307.267.497.344.613.386.727.382.806.346.92.303.918.228.959.079.92-.05.917-.192.842-.422.768-.651.687-.919.535-1.189.384.193-.578.117-.611.113-.611.076-.689.039-.689v-.728l-.037-.69-.037-.729-.076-.729-.074-.725-.116-.69-.152-.651-.113-.651-.154-.575-.188-.574-.155-.498.191-.075.154-.04.19-.076.156-.036.153-.077.15-.039.191-.078.19-.076z" fill="url(#l)"/><path d="M138.39 18.835l.534 2.108.382 1.914.189 1.646.037 1.455-.077 1.264-.23 1.072-.307.92-.347.764-.46.613-.497.496-.498.347-.495.267-.54.191-.459.076-.42.037h-.384l.229-.613.229-.612.192-.688.154-.689.152-.767.118-.764.116-.767.075-.803.041-.806.001-.843-.041-.804-.073-.843-.114-.804-.155-.843-.188-.766-.229-.805.457-.154.463-.152.422-.152.418-.115.348-.113.381-.115.306-.076.27-.077z" fill="url(#l)"/><path d="M135.28 19.792l.231.765.227.959.155 1.073.072 1.186.041 1.303-.002 1.301-.116 1.301-.192 1.267-.271 1.187-.345 1.109-.499.957-.572.766-.731.574-.84.304-.96.04-1.108-.307.422-.691.421-.727.347-.766.307-.727.229-.803.231-.768.152-.805.154-.805.077-.804.038-.841v-.805l-.073-.842-.076-.842-.152-.806-.152-.845-.229-.803.383-.152.458-.152.461-.153.46-.153.46-.151.382-.153.346-.117.267-.074z" fill="url(#l)"/><path d="M125.55 35.674l1.036.08.997-.154.879-.381.805-.535.766-.73.652-.879.536-.994.499-1.109.384-1.188.309-1.266.192-1.3.078-1.302.001-1.301-.114-1.303-.229-1.265-.343-1.188-.422.152-.425.154-.456.114-.463.152-.458.154-.497.153-.46.152-.497.152v.804l-.001.879-.04.999-.039 1.033-.039 1.033-.038 1.072-.116 1.11-.113 1.032-.156 1.035-.17.961-.233.919-.268.806-.308.687-.384.577-.421.419-.461.267z" fill="url(#l)"/><defs><linearGradient id="m" y2="-3424.1" gradientUnits="userSpaceOnUse" x2="-3733.1" gradientTransform="translate(2110.5 1859.4) scale(.5318)" y1="-3453.4" x1="-3738.2"><stop stop-color="#681083" offset="0"/><stop stop-color="#6F1182" offset=".075"/><stop stop-color="#831380" offset=".194"/><stop stop-color="#A3157B" offset=".34"/><stop stop-color="#D11975" offset=".509"/><stop stop-color="#F21B71" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M128.28 22.083l-.384.153-.383.114-.343.115-.386.077-.382.114-.347.113-.384.116-.38.153-.077.766-.041.84-.039.92-.038.958-.001.958-.001 1.031-.04 1.037-.039.994-.076.997-.115.994-.193.919-.191.844-.305.802-.346.727-.422.616-.536.496 1.108-.268.919-.383.767-.533.651-.614.537-.729.423-.839.306-.919.232-.959.156-1.072.112-1.11.039-1.15.042-1.225.037-1.225.039-1.264.001-1.264.078-1.303z" fill="url(#m)"/><defs><linearGradient id="n" y2="-3491.7" gradientUnits="userSpaceOnUse" x2="-3713.7" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3509.7" x1="-3716.3"><stop stop-color="#681083" offset="0"/><stop stop-color="#681083" offset=".001"/><stop stop-color="#8D0F6D" offset=".072"/><stop stop-color="#AD0D5A" offset=".146"/><stop stop-color="#C80A4A" offset=".223"/><stop stop-color="#DE083E" offset=".304"/><stop stop-color="#ED0335" offset=".391"/><stop stop-color="#F60030" offset=".488"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M118.12 38.426l1.531-.074 1.304-.305 1.07-.497.882-.651.689-.842.502-.958.419-1.071.27-1.188.154-1.226.114-1.261.041-1.305.001-1.262.001-1.305.001-1.223.076-1.15.078-1.071-.421.114-.383.113-.343.117-.387.113-.382.113-.343.115-.384.077-.423.114.039.113.075.269.078.423.114.537.074.688.078.768.039.881-.04.996-.114 1.035-.195 1.145-.347 1.189-.42 1.225-.614 1.265-.766 1.339-.921 1.3-1.15 1.339z" fill="url(#n)"/><path d="M112.9 40.07l1.035.191 1.035-.073.995-.346.996-.537.956-.725.92-.881.844-1.07.769-1.188.649-1.265.576-1.378.462-1.456.309-1.489.192-1.496.041-1.531-.152-1.454-.308-1.456-3.638 1.146.037.613.037.729-.038.801-.08.92-.112.958-.192 1.034-.192 1.072-.308 1.109-.347 1.109-.421 1.073-.461 1.071-.575 1.035-.612.995-.729.919-.805.841-.883.727z" fill="url(#n)"/><defs><linearGradient id="o" y2="-3473.3" gradientUnits="userSpaceOnUse" x2="-3712.4" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3513" x1="-3716.5"><stop stop-color="#681083" offset="0"/><stop stop-color="#681083" offset=".001"/><stop stop-color="#8D0F6D" offset=".072"/><stop stop-color="#AD0D5A" offset=".146"/><stop stop-color="#C80A4A" offset=".223"/><stop stop-color="#DE083E" offset=".304"/><stop stop-color="#ED0335" offset=".391"/><stop stop-color="#F60030" offset=".488"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M118.66 24.987l-.573.189-.729.191-.807.268-.84.229-.806.27-.804.227-.689.191-.537.115-.076.881-.042.955-.075.959-.038.995-.117.995-.077 1.037-.115.994-.153.996-.19.956-.232.921-.309.916-.344.842-.422.807-.498.688-.536.65-.65.576.766.114.803-.038.804-.19.805-.343.804-.5.807-.612.768-.763.766-.958.689-1.034.611-1.227.578-1.339.495-1.528.388-1.65.307-1.758.194-1.955.077-2.066z" fill="url(#o)"/><path d="M103.98 41.593l1.725.081 1.455-.154 1.265-.418.998-.653.841-.802.691-.958.497-1.072.386-1.224.308-1.225.19-1.343.116-1.3.117-1.302.038-1.303.078-1.188.075-1.11.117-.995-.535.114-.463.115-.419.153-.418.112-.463.117-.422.111-.496.154-.576.151-.116 1.038-.112.992-.116.996-.156.955-.116.961-.153.918-.189.879-.194.881-.269.844-.308.841-.382.805-.422.806-.536.801-.576.767-.689.728-.77.726z" fill="url(#n)"/><path d="M99.349 42.433l1.532.078 1.34-.192 1.188-.418 1.036-.65.88-.805.766-.957.615-1.107.537-1.188.458-1.227.347-1.3.269-1.266.194-1.299.19-1.226.116-1.15.116-1.073.079-.919-.539.117-.459.112-.42.115-.423.077-.38.113-.425.074-.495.152-.576.115-.192 1.496-.229 1.417-.27 1.301-.269 1.226-.31 1.109-.345 1.071-.383.919-.384.883-.383.803-.425.727-.459.613-.422.573-.459.536-.461.42-.498.383-.459.345z" fill="url(#o)"/><defs><linearGradient id="p" y2="-3493.5" gradientUnits="userSpaceOnUse" x2="-3709.7" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3514" x1="-3711.2"><stop stop-color="#681083" offset="0"/><stop stop-color="#681083" offset=".001"/><stop stop-color="#8D0F6D" offset=".072"/><stop stop-color="#AD0D5A" offset=".146"/><stop stop-color="#C80A4A" offset=".223"/><stop stop-color="#DE083E" offset=".304"/><stop stop-color="#ED0335" offset=".391"/><stop stop-color="#F60030" offset=".488"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M94.98 43.004l1.457.078 1.302-.189 1.151-.424 1.071-.611.881-.802.805-.919.69-1.072.614-1.146.535-1.189.422-1.263.347-1.264.308-1.262.271-1.188.192-1.149.152-1.031.155-.922-.459.076-.46.116-.462.114-.459.115-.462.115-.458.112-.46.114-.497.117-.038.725-.116.805-.153.843-.269.918-.27.995-.382.957-.385 1.033-.422.998-.499.996-.537.957-.534.879-.577.84-.574.806-.614.69-.649.572-.617.459z" fill="url(#p)"/><defs><linearGradient id="q" y2="-3483" gradientUnits="userSpaceOnUse" x2="-3716.7" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3510.1" x1="-3718.5"><stop stop-color="#681083" offset="0"/><stop stop-color="#681083" offset=".001"/><stop stop-color="#8D0F6D" offset=".072"/><stop stop-color="#AD0D5A" offset=".146"/><stop stop-color="#C80A4A" offset=".223"/><stop stop-color="#DE083E" offset=".304"/><stop stop-color="#ED0335" offset=".391"/><stop stop-color="#F60030" offset=".488"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M90.197 43.881l1.49.193 1.38-.191 1.264-.496 1.15-.766 1.073-.955.921-1.148.84-1.301.77-1.341.613-1.415.537-1.381.46-1.302.384-1.262.23-1.074.192-.88.114-.65.001-.381-.573.111-.537.115-.535.152-.536.115-.536.152-.5.113-.497.115-.499.078-.191.651-.19.765-.229.879-.271.996-.308 1.035-.343 1.071-.384 1.069-.424 1.114-.461 1.07-.497.995-.537.959-.574.842-.653.725-.65.574-.728.422-.765.229z" fill="url(#q)"/><path d="M86.712 43.688l1.377.307 1.223.001 1.113-.267 1.034-.535.882-.729.805-.881.727-1.068.652-1.15.539-1.226.498-1.261.384-1.265.385-1.227.307-1.147.231-1.035.23-.918.189-.727-.419.076-.423.038-.38.075-.347.076-.384.076-.346.078-.305.074-.345.041-.118.879-.189.919-.232.917-.228.883-.309.918-.347.881-.382.844-.461.842-.46.842-.537.804-.615.765-.61.688-.729.69-.727.611-.806.574-.879.535z" fill="url(#q)"/><path d="M82.345 44.374l1.147.002 1.112-.115 1.07-.268 1.037-.384.956-.533.959-.65.842-.763.841-.842.73-.96.69-1.032.614-1.15.573-1.186.461-1.264.385-1.34.347-1.379.23-1.414-.498.113-.499.076-.536.115-.496.074-.497.078-.459.112-.5.077-.459.115-.231.805-.191.842-.231.805-.194.803-.23.804-.228.804-.307.766-.346.804-.42.767-.463.803-.576.766-.688.766-.768.729-.918.765-1.073.766-1.188.726z" fill="url(#o)"/><path d="M76.14 45.095l1.495.118 1.454-.076 1.34-.229 1.266-.382 1.187-.497 1.112-.649 1.033-.768.918-.917.844-.955.767-1.073.693-1.148.573-1.222.496-1.304.425-1.34.307-1.377.233-1.381-.423.076-.46.117-.456.074-.461.075-.459.078-.5.114-.497.076-.5.115-.152.955-.23.957-.31.96-.383.917-.457.918-.502.918-.574.882-.648.843-.691.844-.767.762-.808.727-.879.689-.921.611-.995.575-.997.497-1.072.419z" fill="url(#o)"/><path d="M72.732 45.475l1.264-.075 1.226-.189 1.228-.306 1.186-.458 1.112-.536 1.109-.648 1.034-.729.958-.842.881-.917.843-.993.73-1.076.65-1.109.536-1.184.46-1.226.348-1.267.229-1.299-.419.074-.385.037-.346.039-.343.039-.346.037-.382.077-.456.076-.539.075-.537 1.112-.459 1.031-.46.997-.422.919-.46.881-.424.805-.461.764-.498.727-.537.729-.613.649-.688.69-.765.611-.884.65-.996.611-1.108.612-1.265.61z" fill="url(#n)"/><path d="M66.604 45.855l1.877.077 1.763-.073 1.57-.267 1.455-.422 1.34-.572 1.187-.691 1.113-.801.993-.92.921-.993.844-1.072.729-1.109.688-1.189.652-1.184.577-1.187.538-1.227.496-1.187-.343.036-.461.078-.573.076-.575.076-.613.115-.537.076-.456.076-.347.035-.46 1.074-.499 1.074-.577.994-.573.955-.652.881-.688.879-.729.804-.804.807-.804.727-.885.688-.917.688-.96.613-.995.572-1.072.535-1.072.496-1.149.46z" fill="url(#o)"/><path d="M62.966 46.387L64 46.35l1.071-.152 1.15-.269 1.186-.419 1.188-.495 1.189-.613 1.188-.726 1.187-.803 1.149-.918 1.111-.957 1.035-1.07.999-1.15.879-1.188.804-1.262.691-1.34.576-1.38-.575.079-.575.074-.611.037-.612.077-.536.037-.461.077-.382.076-.192.115-.69.535-.689.575-.729.688-.729.688-.727.766-.767.802-.767.844-.768.845-.766.879-.804.842-.805.842-.845.84-.842.843-.845.763-.838.768-.882.688z" fill="url(#n)"/><path d="M57.375 46.383l.997.654 1.032.268 1.034.001 1.073-.268 1.071-.536 1.073-.729 1.111-.916 1.11-1.033 1.112-1.188 1.148-1.225 1.189-1.301 1.188-1.299 1.188-1.264 1.226-1.264 1.228-1.148 1.226-1.031h-.425l-.494.074-.576.038-.573.116-.613.079-.612.113-.572.115-.5.075-.956.88-.957.88-.923.919-.919.919-.881.916-.883.921-.88.92-.845.84-.844.84-.842.768-.805.688-.804.613-.805.535-.767.459-.766.343-.767.229z" fill="url(#o)"/><path d="M53.046 46.879l1.572.001 1.492-.151 1.342-.385 1.304-.494 1.187-.614 1.109-.765 1.075-.84.995-.92.997-.994.956-1.033.921-1.035.959-1.07.959-1.07.994-1.034 1.035-.957 1.072-.918-.382.04-.458.037-.577.074-.572.041-.577.073-.459.038-.382.041-.229-.001-.651.151-.652.306-.649.423-.692.573-.689.687-.729.805-.766.844-.769.915-.88.958-.883.955-.997.996-1.032.959-1.111.955-1.188.88-1.264.802-1.381.729z" fill="url(#n)"/><path d="M138.27 15.35v-.153l.04-.42.038-.649.04-.807.039-.957-.037-1.033-.038-1.072-.111-1.111-.229-1.033-.309-.996-.38-.882-.572-.728-.654-.537-.843-.307-1.034-.039-1.186.306.385.384.343.459.345.574.306.613.305.689.27.689.264.767.271.804.228.767.19.806.194.803.188.766.155.768.152.727.114.65.113.613.19-.037.154-.037.189-.078.155-.037.151-.079.155-.075.192-.037.226-.078z" fill="url(#j)"/><defs><linearGradient id="r" y2="-3558.3" gradientUnits="userSpaceOnUse" x2="-3702.7" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3526.3" x1="-3690.9"><stop stop-color="#4F0C81" offset="0"/><stop stop-color="#690C73" offset=".07"/><stop stop-color="#9A0A5B" offset=".209"/><stop stop-color="#C20748" offset=".337"/><stop stop-color="#E0053A" offset=".451"/><stop stop-color="#F20032" offset=".548"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M136.86 15.925l-.497-2.489-.535-2.108-.535-1.801-.532-1.492-.539-1.188-.534-.958-.533-.689-.499-.497-.536-.347-.458-.153-.502-.039-.42.078-.419.152-.382.191-.348.229-.306.23.536.497.533.573.462.538.494.611.424.615.422.648.382.652.344.691.344.727.306.766.307.768.268.805.227.842.23.842.227.882.194.919.457-.077.345-.036.232-.077.153-.077.151-.037.156-.076.18-.04.229-.075z" fill="url(#r)"/><path d="M134.94 16.651l-.113-.918-.194-1.035-.305-1.15-.379-1.226-.5-1.264-.571-1.227-.611-1.187-.688-1.111-.729-.996-.765-.843-.803-.65-.842-.425-.881-.152-.882.152-.842.499-.882.878.688.498.65.576.613.574.574.576.574.611.496.689.459.691.42.688.423.769.343.767.345.805.267.842.267.879.193.92.189.959.155.994.416-.114.461-.152.499-.153.498-.191.461-.189.421-.154.344-.151.23-.077z" fill="url(#j)"/><path d="M120.02 6.607l.919-.612.92-.344.957-.115.919.115.958.307.919.5.882.689.843.805.762.919.766 1.073.65 1.188.572 1.226.496 1.305.384 1.376.306 1.38.151 1.416-.46.115-.459.116-.46.15-.46.154-.497.191-.499.113-.457.154-.498.075-.346-.88-.305-.959-.383-.957-.348-.957-.379-.996-.419-.998-.423-.956-.421-.918-.456-.884-.499-.805-.533-.766-.539-.651-.609-.575-.615-.459-.648-.346-.69-.19z" fill="url(#r)"/><path d="M115.8 7.75l1.455-.648 1.302-.344 1.149-.038 1.034.193.919.421.806.65.724.807.65.957.575 1.072.495 1.188.5 1.229.457 1.225.457 1.264.421 1.264.459 1.188.497 1.111-.421.037-.384.115-.383.113-.385.152-.381.118-.384.151-.421.114-.422.074-.038-.151-.038-.383-.114-.498-.114-.689-.189-.803-.27-.92-.306-.996-.42-1.034-.494-1.034-.574-1.035-.728-1.035-.803-.958-.96-.918-1.07-.767-1.228-.691-1.375-.5z" fill="url(#j)"/><path d="M110.37 8.552l.882-.651.997-.42 1.069-.153 1.072.04 1.149.229 1.148.461 1.108.615 1.111.768 1.07.956.997 1.075.878 1.225.805 1.342.687 1.416.537 1.533.342 1.57.19 1.687-3.945 1.029-.228-.649-.307-.77-.306-.803-.382-.881-.461-.92-.457-.956-.537-.961-.573-.956-.652-.957-.725-.92-.766-.842-.803-.808-.878-.728-.959-.613-.996-.537-1.07-.421z" fill="url(#r)"/><path d="M120.5 21.387l-.572.115-.727.152-.729.23-.808.229-.764.267-.729.191-.649.189-.536.152-.382-.957-.421-.995-.422-.996-.42-1.036-.421-1.032-.458-.997-.498-.995-.497-.997-.533-.918-.573-.845-.614-.804-.651-.727-.65-.652-.728-.537-.804-.423-.804-.306.692-.459.764-.344.806-.23.88-.075.918.076.959.231.957.383.992.576.999.728.993.92.995 1.149.954 1.304.919 1.532.917 1.723.843 1.992.802 2.184z" fill="url(#j)"/><path d="M101.29 11.34l1.571-.841 1.415-.498 1.304-.114 1.187.193 1.032.458.996.691.841.883.805 1.073.688 1.188.649 1.265.573 1.341.534 1.34.536 1.302.498 1.265.458 1.148.456 1.035-.534.076-.459.112-.422.079-.422.114-.421.114-.459.115-.498.076-.572.112-.5-1.033-.458-1.036-.46-.994-.458-.958-.459-.958-.495-.88-.5-.881-.495-.806-.575-.807-.61-.727-.612-.688-.688-.652-.769-.615-.801-.536-.92-.498-.956-.46z" fill="url(#j)"/><path d="M96.537 12.715l1.419-.765 1.339-.383 1.265-.075 1.225.191 1.111.461 1.069.689.996.844.921.998.841 1.149.802 1.187.726 1.227.652 1.264.611 1.266.537 1.148.455 1.111.423.957-.574.113-.5.115-.46.113-.421.076-.458.115-.461.115-.536.076-.613.115-.688-1.533-.688-1.417-.646-1.302-.651-1.188-.614-1.071-.573-.961-.61-.84-.574-.807-.612-.651-.613-.575-.611-.498-.65-.421-.653-.308-.685-.269-.731-.155-.765-.113z" fill="url(#r)"/><path d="M92.937 13.747l1.378-.65 1.307-.308 1.222.001 1.19.233 1.07.458 1.033.654.956.844.92.957.802 1.072.766 1.148.726 1.188.613 1.188.609 1.189.5 1.15.456 1.033.421.959-.459.113-.42.113-.424.076-.383.116-.421.077-.42.075-.462.113-.496.077-.231-.765-.342-.845-.42-.842-.497-.919-.535-.919-.651-.921-.649-.92-.728-.92-.765-.841-.805-.846-.803-.766-.804-.652-.843-.613-.805-.498-.802-.383-.806-.23z" fill="url(#j)"/><path d="M88.608 14.852l1.417-.762 1.38-.345 1.379.039 1.301.385 1.264.612 1.226.879 1.149 1.038 1.069 1.147.995 1.229.881 1.264.8 1.227.65 1.187.536 1.036.422.879.23.652.113.383-.574.115-.498.113-.498.115-.5.115-.496.115-.459.074-.499.077-.497.076-.344-.651-.384-.804-.458-.882-.537-.921-.571-1.033-.614-1.034-.646-.997-.691-1.034-.727-.959-.767-.881-.802-.804-.803-.652-.844-.537-.844-.345-.878-.152-.882.035z" fill="url(#r)"/><path d="M85.468 16.077l1.266-.842 1.224-.459 1.149-.113 1.149.19 1.071.461 1.033.692.958.842.915 1.035.844 1.113.805 1.184.727 1.229.687 1.225.574 1.15.535 1.073.421.918.383.766-.46.077-.382.114-.344.115-.308.113-.347.114-.305.115-.308.078-.343.073-.344-.955-.421-.958-.422-.921-.46-.918-.537-.919-.531-.844-.613-.844-.65-.805-.689-.767-.764-.688-.765-.614-.844-.574-.919-.5-.919-.421-.996-.308-1.071-.229z" fill="url(#j)"/><path d="M81.483 16.993l1.113-.422 1.109-.266 1.148-.077 1.074.078 1.109.231 1.032.345 1.034.536 1.034.652.956.768.918.92.881.996.842 1.112.802 1.226.689 1.34.688 1.418.571 1.491-.498.077-.495.076-.501.115-.497.153-.496.115-.498.153-.497.115-.5.074-.343-.842-.343-.882-.347-.843-.342-.883-.422-.842-.419-.805-.501-.842-.534-.767-.649-.729-.688-.728-.805-.652-.88-.613-.996-.537-1.11-.498-1.261-.424-1.381-.344z" fill="url(#r)"/><path d="M75.815 18.329l1.455-.609 1.457-.385 1.34-.189 1.34-.037 1.265.191 1.226.346 1.147.498 1.111.652.992.805.994.919.884 1.036.84 1.15.764 1.264.652 1.34.611 1.381.535 1.491-.459.077-.46.076-.536.078-.501.074-.533.078-.538.074-.535.076-.535.076-.269-1.072-.383-.994-.42-.996-.533-.959-.575-.881-.651-.843-.688-.805-.766-.729-.842-.689-.916-.574-.959-.539-.995-.459-1.071-.346-1.112-.307-1.146-.191-1.188-.078z" fill="url(#j)"/><path d="M73.021 18.632l1.302-.19 1.262-.113 1.263.039 1.228.154 1.224.307 1.15.385 1.109.498 1.073.613.995.729.954.844.844.919.803 1.034.688 1.149.611 1.226.499 1.341.38 1.419-.46.035-.383.038-.382.077-.384.077-.384.074-.382.078-.46.114-.496.076-.651-1.111-.613-1.073-.532-.958-.5-.956-.535-.844-.498-.804-.497-.767-.572-.69-.612-.651-.688-.575-.768-.535-.842-.498-.995-.425-1.072-.382-1.264-.346-1.415-.308z" fill="url(#r)"/><path d="M66.933 19.432l1.914-.457 1.8-.268 1.646-.075 1.531.154 1.417.307 1.302.461 1.187.573 1.074.77 1.03.842.917.96.844 1.034.802 1.112.728 1.147.688 1.227.612 1.226.611 1.265-.307.037-.42.037-.459.115-.501.076-.496.115-.462.114-.419.036-.346.039-.571-1.148-.613-1.035-.689-.996-.726-.918-.766-.883-.805-.806-.879-.726-.919-.69-.956-.616-.996-.573-1.034-.498-1.07-.498-1.111-.423-1.147-.383-1.189-.346-1.222-.309z" fill="url(#j)"/><path d="M63.295 19.811l1.068-.189 1.113-.037 1.225.038 1.263.192 1.267.271 1.3.384 1.303.497 1.302.614 1.3.729 1.224.845 1.186.92 1.147 1.035 1.035 1.149.956 1.225.841 1.342.728 1.455-.537.039-.533.076-.538.115-.536.113-.459.113-.385.117-.306.036-.19-.037-.769-.46-.763-.537-.804-.613-.843-.689-.843-.729-.878-.768-.92-.768-.916-.802-.959-.806-.956-.807-.995-.803-.996-.729-1.033-.729-.995-.652-1.071-.613-1.031-.537z" fill="url(#j)"/><path d="M58.197 21.262l.958-.955 1.034-.572 1.074-.23 1.109.077 1.148.308 1.225.575 1.227.769 1.3.879 1.301 1.074 1.341 1.11 1.34 1.19 1.34 1.188 1.377 1.188 1.377 1.112 1.376 1.035 1.381.92-.421.074-.499.037-.612.041-.613.037-.648.037h-1.227l-.497-.002-1.034-.766-.993-.804-.996-.808-.918-.842-.919-.805-.883-.807-.878-.805-.88-.767-.919-.688-.879-.651-.92-.575-.956-.5-.996-.422-1.034-.345-1.073-.192-1.11-.117z" fill="url(#j)"/><defs><linearGradient id="s" y2="-3537.7" gradientUnits="userSpaceOnUse" x2="-3797.3" gradientTransform="translate(2070.8 1900.1) scale(.5318)" y1="-3509.7" x1="-3772.4"><stop stop-color="#4F0C81" offset="0"/><stop stop-color="#690C73" offset=".07"/><stop stop-color="#9A0A5B" offset=".209"/><stop stop-color="#C20748" offset=".337"/><stop stop-color="#E0053A" offset=".451"/><stop stop-color="#F20032" offset=".548"/><stop stop-color="#FA002F" offset=".616"/><stop stop-color="#F7EE5F" offset="1"/></linearGradient></defs><path d="M54.368 21.719l1.61-.381 1.493-.152 1.415.076 1.343.271 1.262.461 1.226.575 1.186.729 1.148.805 1.11.919 1.109.922 1.071.995 1.111.996 1.109.958 1.107.959 1.188.843 1.185.807-.38.037-.498.075-.576.078-.576.036-.572.079-.5.072-.38.041-.231.037-.688-.002-.69-.189-.727-.348-.766-.496-.766-.614-.843-.728-.879-.807-.919-.844-.959-.881-1.031-.918-1.109-.882-1.148-.844-1.262-.808-1.302-.728-1.379-.651-1.494-.5z" fill="url(#s)"/><path d="M49.543 23.057l1.417-.805 1.495-.342h1.455l1.49.309 1.495.576 1.494.804 1.454.96 1.415 1.034 1.339 1.149 1.302 1.15 1.263 1.075 1.148.993 1.033.844.956.65.843.385.726.116-.61.077-.653.113-.727.113-.765.117-.767.074-.767.115-.728.038-.651.04-1.07-.806-.958-.766-.879-.767-.84-.728-.767-.73-.726-.725-.767-.691-.726-.651-.729-.612-.804-.576-.841-.537-.919-.496-.996-.461-1.071-.383-1.226-.348-1.34-.307z" fill="url(#s)"/><defs><linearGradient id="t" y2="4209.6" gradientUnits="userSpaceOnUse" x2="-3482.4" gradientTransform="translate(-1982.9 3021.4) scale(.5318)" y1="4158" x1="-3498.5"><stop stop-color="#D8E7EB" offset="0"/><stop stop-color="#C9D9DE" offset=".085"/><stop stop-color="#A5B8C2" offset=".218"/><stop stop-color="#728896" offset=".384"/><stop stop-color="#405766" offset=".554"/><stop stop-color="#667D8B" offset=".642"/><stop stop-color="#92A7B1" offset=".742"/><stop stop-color="#B7C8D0" offset=".837"/><stop stop-color="#CFDFE4" offset=".926"/><stop stop-color="#D8E7EB" offset="1"/></linearGradient></defs><g fill="url(#t)"><defs><linearGradient id="u" y2="-3442.3" gradientUnits="userSpaceOnUse" x2="-3688.8" gradientTransform="translate(2110.5 1859.4) scale(.5318)" y1="-3493.9" x1="-3704.9"><stop stop-color="#D8E7EB" offset="0"/><stop stop-color="#C9D9DE" offset=".085"/><stop stop-color="#A5B8C2" offset=".218"/><stop stop-color="#728896" offset=".384"/><stop stop-color="#405766" offset=".554"/><stop stop-color="#667D8B" offset=".642"/><stop stop-color="#92A7B1" offset=".742"/><stop stop-color="#B7C8D0" offset=".837"/><stop stop-color="#CFDFE4" offset=".926"/><stop stop-color="#D8E7EB" offset="1"/></linearGradient></defs><path d="M142.3 7.35l.191-.383.153-.42.152-.423.113-.421.117-.459.115-.496.077-.459.042-.5.036-.459.035-.498.001-.499-.035-.46-.036-.459-.08-.457-.112-.461-.114-.42.611.804.459.882.345.842.189.88.076.919v.92l-.116.918-.194.92-.228.918-.31.883-.343.879-.343.88-.385.843-.347.842-.346.765-.343.767.074-.152.037-.269.042-.266v-.345l.037-.424V11.6l.001-.496.038-.499v-.498l.039-.534.04-.498.038-.461.078-.461.075-.42.116-.383zm11.67 15.902l-.729-.422-.729-.462-.687-.421-.688-.422-.65-.383-.651-.422-.616-.385-.609-.42-.653-.384-.607-.384-.614-.422-.652-.382-.611-.386-.654-.342-.686-.386-.689-.382.61.61.613.616.613.611.612.576.65.611.651.536.65.539.688.497.651.461.689.383.651.346.688.269.688.229.688.115.691.037.691-.035z" fill="url(#u)"/><path d="M148.28 7.928l-.536.308-.5.345-.495.345-.461.344-.46.343-.419.383-.424.421-.423.383-.384.422-.384.422-.382.421-.345.457-.383.422-.346.459-.344.459-.346.459.153-.496.192-.499.191-.537.229-.534.231-.536.265-.499.31-.498.346-.495.382-.46.461-.381.498-.385.537-.344.612-.269.652-.229.765-.152.805-.076zm-5.71-4.599l-.153.767-.114.767-.154.766-.116.689-.076.727-.114.689-.079.689-.115.689-.08.688-.117.689-.074.651-.118.689-.116.689-.115.689-.15.689-.157.727-.076-.842-.113-.805-.077-.843-.076-.841-.037-.807-.038-.805.039-.805.039-.764.076-.767.116-.688.194-.689.229-.651.269-.573.384-.537.422-.46.497-.421z" fill="url(#u)"/><path d="M146.67 2.071l.692.648.416.729.189.766.04.805-.153.804-.307.843-.424.844-.498.841-.575.804-.611.805-.653.764-.65.689-.614.689-.534.572-.463.539-.383.418.077-1.147.154-.995.191-.844.307-.764.306-.65.386-.574.382-.535.424-.501.383-.496.424-.495.382-.538.307-.613.307-.688.23-.766.194-.919.075-1.032z" fill="url(#u)"/><path d="M141.76 14.319v-.805l-.039-.765-.034-.765-.04-.768-.036-.729-.077-.727-.076-.727-.073-.691-.117-.688-.114-.728-.189-.689-.152-.689-.19-.688-.268-.689-.229-.689-.306-.689 1.111 1.073.918 1.034.649.959.457.92.309.879.151.805.037.806-.077.727-.195.689-.187.651-.27.613-.271.533-.23.537-.229.459-.152.459-.078.383zm11.22 2.651l-.613.114-.614.116-.611.075-.613.075-.609.038-.616.037h-1.188l-.612-.039h-.574l-.613-.077-.573-.038-.613-.04-.575-.075-.612-.079-.574-.075.498.229.498.192.535.231.537.19.574.193.576.151.61.156.61.076.612.039h.651l.651-.039.654-.15.651-.191.651-.27.648-.381.654-.46z" fill="url(#u)"/><path d="M149.42 20.07l.461.078.419.075.461.115.457.115.463.194.456.151.421.191.46.23.421.23.421.267.383.271.386.268.343.307.308.307.304.307.27.344-.269-.917-.422-.808-.494-.688-.615-.651-.688-.536-.768-.5-.85-.42-.882-.347-.919-.306-.919-.307-.955-.231-.958-.23-.957-.193-.919-.189-.843-.154-.842-.192.42.153.574.306.69.463.841.497.843.535.879.499.842.46.768.308zm1.75 6.856l.345-.881.117-.844-.116-.842-.307-.766-.457-.729-.612-.727-.728-.69-.804-.614-.843-.613-.879-.536-.919-.538-.884-.459-.801-.42-.767-.387-.651-.344-.496-.309.532 1.113.538.919.573.728.536.652.574.498.574.459.574.346.574.346.571.346.577.382.572.384.536.46.537.573.535.691.497.806.498.995z" fill="url(#u)"/><path d="M141.53 17.497l.422.652.42.652.421.65.38.613.346.613.345.649.346.614.305.613.304.652.268.65.271.613.229.65.19.689.192.65.152.689.152.73.384-1.455.191-1.265.041-1.149-.115-.994-.229-.844-.346-.766-.42-.652-.458-.537-.538-.499-.535-.421-.573-.346-.537-.306-.496-.306-.46-.268-.342-.307-.31-.271z" fill="url(#u)"/></g></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="100%" width="100%" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 255.9999 256.00004" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><defs><linearGradient id="linearGradient3256" y2="1395.6" gradientUnits="userSpaceOnUse" x2="-4570.1" gradientTransform="matrix(0.05126963,-0.0548933,0.10995189,0.02559628,381.5268,-279.78346)" y1="697.55" x1="-5167.1"><stop stop-color="#f69923" offset="0"/><stop stop-color="#f79a23" offset="0.3123"/><stop stop-color="#e97826" offset="0.8383"/></linearGradient><linearGradient id="linearGradient3258" y2="620.5" gradientUnits="userSpaceOnUse" x2="-5326.2" gradientTransform="matrix(0.05126963,-0.0548933,0.10995189,0.02559628,381.5268,-279.78346)" y1="620.5" x1="-9585.3"><stop stop-color="#9e2064" offset="0.3233"/><stop stop-color="#c92037" offset="0.6302"/><stop stop-color="#cd2335" offset="0.7514"/><stop stop-color="#e97826" offset="1"/></linearGradient><linearGradient id="linearGradient3260" y2="1047.7" gradientUnits="userSpaceOnUse" x2="-6533.2" gradientTransform="matrix(0.05126963,-0.0548933,0.10995189,0.02559628,381.5268,-279.78346)" y1="1047.7" x1="-9071.2"><stop stop-color="#282662" offset="0"/><stop stop-color="#662e8d" offset="0.095484"/><stop stop-color="#9f2064" offset="0.7882"/><stop stop-color="#cd2032" offset="0.9487"/></linearGradient><linearGradient id="linearGradient3262" y2="580.82" gradientUnits="userSpaceOnUse" x2="-5087" gradientTransform="matrix(0.05126963,-0.0548933,0.10995189,0.02559628,381.5268,-279.78346)" y1="580.82" x1="-9346.1"><stop stop-color="#9e2064" offset="0.3233"/><stop stop-color="#c92037" offset="0.6302"/><stop stop-color="#cd2335" offset="0.7514"/><stop stop-color="#e97826" offset="1"/></linearGradient><linearGradient id="linearGradient3264" y2="638.44" gradientUnits="userSpaceOnUse" x2="-6797.2" gradientTransform="matrix(0.05126963,-0.0548933,0.10995189,0.02559628,381.5268,-279.78346)" y1="638.44" x1="-9035.5"><stop stop-color="#282662" offset="0"/><stop stop-color="#662e8d" offset="0.095484"/><stop stop-color="#9f2064" offset="0.7882"/><stop stop-color="#cd2032" offset="0.9487"/></linearGradient><linearGradient id="linearGradient3266" y2="1021.6" gradientUnits="userSpaceOnUse" x2="-5087" gradientTransform="matrix(0.05126963,-0.0548933,0.10995189,0.02559628,381.5268,-279.78346)" y1="1021.6" x1="-9346.1"><stop stop-color="#9e2064" offset="0.3233"/><stop stop-color="#c92037" offset="0.6302"/><stop stop-color="#cd2335" offset="0.7514"/><stop stop-color="#e97826" offset="1"/></linearGradient><linearGradient id="linearGradient3268" y2="999.73" gradientUnits="userSpaceOnUse" x2="-5351.2" gradientTransform="matrix(0.05126963,-0.0548933,0.10995189,0.02559628,381.5268,-279.78346)" y1="999.73" x1="-9610.3"><stop stop-color="#9e2064" offset="0.3233"/><stop stop-color="#c92037" offset="0.6302"/><stop stop-color="#cd2335" offset="0.7514"/><stop stop-color="#e97826" offset="1"/></linearGradient><linearGradient id="linearGradient3270" y2="1152.7" gradientUnits="userSpaceOnUse" x2="-5087" gradientTransform="matrix(0.05126963,-0.0548933,0.10995189,0.02559628,381.5268,-279.78346)" y1="1152.7" x1="-9346.1"><stop stop-color="#9e2064" offset="0.3233"/><stop stop-color="#c92037" offset="0.6302"/><stop stop-color="#cd2335" offset="0.7514"/><stop stop-color="#e97826" offset="1"/></linearGradient><linearGradient id="linearGradient3272" y2="1137.7" gradientUnits="userSpaceOnUse" x2="-5087" gradientTransform="matrix(0.05126963,-0.0548933,0.10995189,0.02559628,381.5268,-279.78346)" y1="1137.7" x1="-9346.1"><stop stop-color="#9e2064" offset="0.3233"/><stop stop-color="#c92037" offset="0.6302"/><stop stop-color="#cd2335" offset="0.7514"/><stop stop-color="#e97826" offset="1"/></linearGradient><linearGradient id="linearGradient3274" y2="1134.7" gradientUnits="userSpaceOnUse" x2="-6012" gradientTransform="matrix(0.05126963,-0.0548933,0.10995189,0.02559628,381.5268,-279.78346)" y1="1134.7" x1="-6953.4"><stop stop-color="#9e2064" offset="0.3233"/><stop stop-color="#c92037" offset="0.6302"/><stop stop-color="#cd2335" offset="0.7514"/><stop stop-color="#e97826" offset="1"/></linearGradient></defs><path fill="url(#linearGradient3256)" d="m218.24,1.2182c-8.0435,2.3683-21.401,9.0793-37.354,18.801l14.655,13.81c10.288-7.347,20.734-13.955,31.276-19.6,0.8128-0.4482,1.2374-0.6602,1.2374-0.6602-0.4124,0.218-0.8249,0.4421-1.2374,0.6602-3.4091,1.8776-13.758,7.9042-29.372,19.872,15.032-0.3755,38.131-1.9079,56.972-3.519,5.6049-15.675-5.4958-22.853-5.4958-22.853s-14.11-11.399-30.682-6.5112z"/><path fill="none" d="m193.43,79.994c0.1092-0.012,0.2184-0.018,0.3276-0.03l-2.111,0.115c-0.1334,0.03-0.2426,0.061-0.376,0.085,0.7279-0.054,1.4437-0.1151,2.1594-0.1696z"/><path fill="none" d="m178.47,104.73c-1.201,0.1333-2.4263,0.2363-3.6638,0.3271,1.2375-0.091,2.4628-0.1999,3.6638-0.3271z"/><path fill="none" d="m76.807,160.22c0.1577-0.2059,0.3154-0.4118,0.461-0.6178,3.2271-4.2519,6.4178-8.3827,9.5842-12.41,3.5547-4.5184,7.0608-8.8915,10.531-13.131,3.6517-4.47,7.2549-8.7886,10.81-12.962,3.7246-4.3791,7.4005-8.5947,11.004-12.653,2.936-3.301,5.8234-6.499,8.6744-9.5941,0.9463-1.0296,1.8926-2.0532,2.8388-3.0647,1.8684-2.0049,3.7246-3.9733,5.5444-5.8934,1.6863-1.7746,3.3605-3.5069,5.0226-5.2088,0.5459-0.5694,1.104-1.1266,1.6499-1.6899,0.085-0.091,0.182-0.1817,0.2669-0.2726l-1.7955,0.097-1.4316-1.4052c-0.1334,0.1394-0.279,0.2726-0.4246,0.4119-2.572,2.55-5.1197,5.1241-7.6431,7.7225-1.4558,1.5021-2.9117,3.0103-4.3554,4.5245-4.0035,4.1974-7.9464,8.4311-11.816,12.695-3.9186,4.3065-7.7523,8.6371-11.513,12.974-3.7003,4.258-7.3156,8.522-10.87,12.774-3.5425,4.2458-7.0001,8.4795-10.385,12.683-3.5304,4.3912-6.9638,8.7401-10.288,13.04-0.7522,0.9691-1.5044,1.9382-2.2444,2.9073-2.669,3.4706-5.2653,6.8927-7.8009,10.272l2.2566,2.2228,2.0139-0.109c0.073-0.103,0.1456-0.2059,0.2184-0.3028,3.2635-4.4518,6.4906-8.7885,9.6934-13.01z"/><path fill="none" d="m173.88,105.13,0,0c0.012,0,0.012-0.01,0.024-0.01l-0.024,0.01z"/><path fill="#be202e" d="m169.02,117.19c-1.8684,0.1696-3.7973,0.3331-5.7749,0.5027-0.012,0-0.024,0.01-0.036,0.01,0.9948-0.073,1.9775-0.1454,2.948-0.2302,0.9706-0.085,1.9169-0.1757,2.8632-0.2786z"/><path opacity="0.35" fill="#be202e" d="m169.02,117.19c-1.8684,0.1696-3.7973,0.3331-5.7749,0.5027-0.012,0-0.024,0.01-0.036,0.01,0.9948-0.073,1.9775-0.1454,2.948-0.2302,0.9706-0.085,1.9169-0.1757,2.8632-0.2786z"/><path fill="#be202e" d="m173.92,105.12l-0.012,0.01c-0.012,0-0.012,0.01-0.024,0.01,0.3154-0.018,0.6187-0.048,0.922-0.067,1.2496-0.091,2.4749-0.1998,3.6639-0.327-1.4922,0.1211-3.0087,0.2544-4.5495,0.3816z"/><path opacity="0.35" fill="#be202e" d="m173.92,105.12l-0.012,0.01c-0.012,0-0.012,0.01-0.024,0.01,0.3154-0.018,0.6187-0.048,0.922-0.067,1.2496-0.091,2.4749-0.1998,3.6639-0.327-1.4922,0.1211-3.0087,0.2544-4.5495,0.3816z"/><path fill="url(#linearGradient3258)" d="m152.34,69.509c4.4524-4.155,8.9655-8.2191,13.527-12.174,4.7314-4.1065,9.5235-8.0919,14.364-11.932,0.279-0.2241,0.5702-0.4542,0.8492-0.6844,4.78-3.7795,9.6085-7.4136,14.473-10.89l-14.655-13.81c-1.104,0.6723-2.208,1.3568-3.3362,2.0533-4.222,2.6287-8.6137,5.4572-13.115,8.4554-5.0711,3.3797-10.288,6.9896-15.59,10.775-4.8892,3.5009-9.8512,7.1653-14.813,10.957-4.2219,3.2283-8.4681,6.5535-12.678,9.9635-0.1577,0.1272-0.3154,0.2544-0.4731,0.3816l19.071,18.806c4.0764-4.0278,8.2012-8.0011,12.375-11.902z"/><path fill="url(#linearGradient3260)" d="m65.476,175.47c-2.5234,3.4645-5.059,6.9896-7.6067,10.593-0.036,0.054-0.073,0.103-0.1092,0.1575-0.3639,0.5087-0.7158,1.0175-1.0797,1.5263-1.7106,2.4288-3.2029,4.6153-6.6119,9.588,5.6171,1.278,10.13,4.6456,14.401,8.4675-0.4489-3.9551-3.7366-7.674-9.9603-10.551,27.697,0.6239,51.561-2.8709,63.899-12.98,1.104-0.9025,2.1109-1.8473,3.0208-2.8588-5.605,3.5493-12.557,5.0574-25.647,4.688-0.024,0.01-0.061,0.012-0.085,0.018,0.024-0.01,0.061-0.012,0.085-0.018,19.266-4.3064,28.935-8.4372,37.476-15.288,2.026-1.6233,3.9914-3.3979,6.0053-5.3664-16.851,8.6371-36.372,11.096-56.935,9.2306l-15.42,0.8419c-0.4853,0.6481-0.9584,1.2962-1.4316,1.9504z"/><path fill="url(#linearGradient3262)" d="m72.67,158.23c3.3363-4.3004,6.7696-8.6492,10.288-13.04,3.3727-4.2035,6.8424-8.4312,10.385-12.683,3.5426-4.2519,7.17-8.5099,10.87-12.774,3.7609-4.3367,7.6067-8.6674,11.513-12.974,3.8701-4.258,7.813-8.4978,11.816-12.695,1.4437-1.5142,2.8996-3.0224,4.3554-4.5245,2.5234-2.5983,5.0711-5.1725,7.6431-7.7224,0.1335-0.1394,0.279-0.2726,0.4246-0.4119l-19.071-18.807c-0.3154,0.2544-0.6187,0.5088-0.9342,0.7632-4.4402,3.622-8.8684,7.3288-13.212,11.114-4.3918,3.8219-8.6987,7.7165-12.908,11.666-3.5547,3.3312-7.0244,6.6928-10.397,10.085-0.6794,0.6905-1.3467,1.3689-2.0139,2.0533-4.1613,4.2701-7.9101,8.3948-11.307,12.362-3.8458,4.4942-7.2307,8.7885-10.191,12.859-1.9532,2.6772-3.7245,5.2635-5.3501,7.7468-1.3346,2.1199-2.6084,4.2458-3.8095,6.3597-2.851,4.9848-5.3016,9.9574-7.3155,14.912l19.168,18.891c2.5356-3.3797,5.1319-6.8019,7.8009-10.272,0.74-0.9631,1.4922-1.9382,2.2444-2.9073z"/><path fill="url(#linearGradient3264)" d="m43.202,153.19c-2.4021,6.0447-4.1128,12.065-4.9741,18.049-0.024,0.212-0.073,0.4179-0.097,0.6299-5.981-4.7849-21.995-9.4547-21.959-9.4123,11.465,8.2979,20.163,16.535,21.461,24.621-6.1388,0.6299-14.546-0.2786-24.264-2.0654,10.13,4.6456,17.737,5.9297,20.697,6.2749-9.3052,0.2907-18.999,3.4827-28.765,7.1592,14.279-2.9073,25.817-4.0581,34.079-3.1253-13.102,18.522-26.241,38.97-39.38,60.678,4.0278-0.5936,6.4299-1.9443,7.7766-3.7734,2.3414-3.9309,17.882-29.721,42.231-63.621,0.6915-0.963,1.3952-1.9321,2.0988-2.9073,0.1941-0.2725,0.4004-0.5451,0.5945-0.8116,2.572-3.5554,5.241-7.1834,7.995-10.884,0.6308-0.8419,1.2617-1.6838,1.8925-2.5317,0.012-0.018,0.024-0.036,0.036-0.048l-19.144-18.885c-0.085,0.212-0.1941,0.4301-0.279,0.6542z"/><path fill="url(#linearGradient3266)" d="m142.93,82.998c-0.5459,0.5573-1.0918,1.1206-1.6499,1.6899-1.65,1.702-3.3242,3.4342-5.0226,5.2089-1.832,1.92-3.676,3.8824-5.5444,5.8933-0.9462,1.0115-1.8804,2.0291-2.8388,3.0648-2.851,3.0951-5.7384,6.2931-8.6744,9.5941-3.6032,4.0581-7.2791,8.2736-11.004,12.653-3.5546,4.1732-7.1578,8.4918-10.81,12.962-3.4698,4.2398-6.9759,8.6189-10.531,13.131-3.1664,4.0278-6.3571,8.1586-9.5842,12.41-0.1577,0.2059-0.3154,0.4118-0.461,0.6178-3.2028,4.2216-6.4299,8.5583-9.6813,13.004-0.073,0.1029-0.1456,0.2059-0.2184,0.3028l15.42-0.8419c-0.3033-0.03-0.6187-0.048-0.922-0.079,18.441-1.1448,42.947-8.0254,58.791-16.517,7.3035-3.9127,13.928-8.5281,20.054-13.931,4.5616-4.0217,8.8441-8.4796,12.92-13.416,3.5668-4.3125,6.988-8.9823,10.288-14.046-4.2341,1.1145-9.0868,1.9322-14.437,2.5015-0.9342,0.097-1.8926,0.1938-2.8632,0.2786-0.9705,0.085-1.9532,0.1636-2.948,0.2302,0.012,0,0.024-0.01,0.036-0.01,17.191-3.301,28.037-9.6789,35.923-17.486-4.5253,1.5384-11.877,3.5554-20.685,4.5245-1.2011,0.1332-2.4264,0.2362-3.6639,0.327-0.3154,0.024-0.6187,0.049-0.922,0.067,0.012,0,0.012-0.01,0.024-0.01l0.012-0.01c5.9689-1.2477,11.004-2.6408,15.371-4.2883,0.9341-0.3513,1.844-0.7147,2.7175-1.0963,1.3345-0.5754,2.5963-1.181,3.8095-1.817,0.7764-0.4058,1.5286-0.8238,2.2565-1.2598,1.7106-1.0176,3.312-2.1139,4.8164-3.3071,0.461-0.3634,0.9099-0.7329,1.3588-1.1144,0.5702-0.5512,1.1161-1.0903,1.6499-1.6233,2.4021-2.4106,4.319-4.5608,5.8476-6.4505,0.7643-0.9449,1.4316-1.8171,2.0018-2.6287,0.2305-0.321,0.4489-0.636,0.6551-0.9388,0.6066-0.9086,1.104-1.7141,1.4922-2.4228,0.5824-1.0599,0.9342-1.9018,1.1283-2.5136-0.5823,0.2302-1.2496,0.4603-2.0018,0.6844-5.1924,1.5506-14.097,2.9558-21.279,3.616l14.158-0.7753-14.158,0.7753c-0.1092,0.012-0.2184,0.018-0.3276,0.03-0.7157,0.061-1.4437,0.1151-2.1716,0.1756,0.1335-0.03,0.2427-0.061,0.3761-0.085l-48.443,2.6529c-0.085,0.085-0.1698,0.1696-0.2669,0.2605z"/><path fill="url(#linearGradient3268)" d="m197.46,34.107c-4.3069,3.301-9.0141,7.0502-14.073,11.296-0.2669,0.2181-0.5338,0.4482-0.8007,0.6723-4.3675,3.6765-9.0141,7.7104-13.891,12.132-4.2219,3.8158-8.6137,7.9103-13.175,12.314-3.9793,3.834-8.092,7.9042-12.314,12.211l48.443-2.6529c14.11-3.2404,20.418-6.1719,26.545-10.412,1.6256-1.169,3.2635-2.3925,4.8891-3.6583,4.9741-3.8764,9.8512-8.1465,14.219-12.392,4.2098-4.1005,7.9221-8.1646,10.773-11.829,1.8076-2.3319,3.2635-4.5003,4.2704-6.4021,0.8856-1.6778,1.5772-3.2707,2.111-4.791-18.865,1.6051-41.964,3.1435-56.996,3.513z"/><path fill="#be202e" d="m166.16,117.47c-0.9705,0.085-1.9532,0.1636-2.948,0.2302,0.9948-0.067,1.9775-0.1454,2.948-0.2302z"/><path opacity="0.35" fill="#be202e" d="m166.16,117.47c-0.9705,0.085-1.9532,0.1636-2.948,0.2302,0.9948-0.067,1.9775-0.1454,2.948-0.2302z"/><path fill="url(#linearGradient3270)" d="m166.16,117.47c-0.9705,0.085-1.9532,0.1636-2.948,0.2302,0.9948-0.067,1.9775-0.1454,2.948-0.2302z"/><path fill="#be202e" d="m173.88,105.13c0.3155-0.018,0.6188-0.048,0.9221-0.067-0.3033,0.018-0.6066,0.042-0.9221,0.067z"/><path opacity="0.35" fill="#be202e" d="m173.88,105.13c0.3155-0.018,0.6188-0.048,0.9221-0.067-0.3033,0.018-0.6066,0.042-0.9221,0.067z"/><path fill="url(#linearGradient3272)" d="m173.88,105.13c0.3155-0.018,0.6188-0.048,0.9221-0.067-0.3033,0.018-0.6066,0.042-0.9221,0.067z"/><path fill="#be202e" d="m173.91,105.12l0.012-0.01-0.012,0.01z"/><path opacity="0.35" fill="#be202e" d="m173.91,105.12l0.012-0.01-0.012,0.01z"/><path fill="url(#linearGradient3274)" d="m173.91,105.12l0.012-0.01-0.012,0.01z"/></svg>
diff --git a/src/icons/ArvanCloud.png b/src/icons/ArvanCloud.png
index b8eb19159..c9ec8e0ed 100644
Binary files a/src/icons/ArvanCloud.png and b/src/icons/ArvanCloud.png differ
diff --git a/src/icons/Asymptix PHP Framework.png b/src/icons/Asymptix PHP Framework.png
index 72dacb36b..cc8d5eeac 100644
Binary files a/src/icons/Asymptix PHP Framework.png and b/src/icons/Asymptix PHP Framework.png differ
diff --git a/src/icons/Aurelia.svg b/src/icons/Aurelia.svg
new file mode 100644
index 000000000..3bf9ad8fd
--- /dev/null
+++ b/src/icons/Aurelia.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="256px" height="249px" viewBox="0 0 256 249" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <defs>
+        <linearGradient x1="-388.147851%" y1="-113.677693%" x2="237.683809%" y2="370.654866%" id="linearGradient-1">
+            <stop stop-color="#C06FBB" offset="0%"></stop>
+            <stop stop-color="#6E4D9B" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="72.9454854%" y1="79.5146865%" x2="-97.0517904%" y2="-119.502084%" id="linearGradient-2">
+            <stop stop-color="#6E4D9B" offset="0%"></stop>
+            <stop stop-color="#77327A" offset="14%"></stop>
+            <stop stop-color="#B31777" offset="29%"></stop>
+            <stop stop-color="#CD0F7E" offset="84%"></stop>
+            <stop stop-color="#ED2C89" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="-232.211989%" y1="-693.599872%" x2="250.775991%" y2="101.70976%" id="linearGradient-3">
+            <stop stop-color="#C06FBB" offset="0%"></stop>
+            <stop stop-color="#6E4D9B" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="-821.186214%" y1="-466.930382%" x2="101.985142%" y2="287.264085%" id="linearGradient-4">
+            <stop stop-color="#C06FBB" offset="0%"></stop>
+            <stop stop-color="#6E4D9B" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="-140.094614%" y1="-230.925718%" x2="418.49908%" y2="261.976742%" id="linearGradient-5">
+            <stop stop-color="#C06FBB" offset="0%"></stop>
+            <stop stop-color="#6E4D9B" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="191.083716%" y1="225.066658%" x2="20.3577022%" y2="24.5947708%" id="linearGradient-6">
+            <stop stop-color="#6E4D9B" offset="0%"></stop>
+            <stop stop-color="#77327A" offset="14%"></stop>
+            <stop stop-color="#B31777" offset="29%"></stop>
+            <stop stop-color="#CD0F7E" offset="84%"></stop>
+            <stop stop-color="#ED2C89" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="-388.094004%" y1="-138.727507%" x2="237.674802%" y2="445.404664%" id="linearGradient-7">
+            <stop stop-color="#C06FBB" offset="0%"></stop>
+            <stop stop-color="#6E4D9B" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="11.503492%" y1="89.6525993%" x2="89.8192643%" y2="11.5773982%" id="linearGradient-8">
+            <stop stop-color="#6E4D9B" offset="0%"></stop>
+            <stop stop-color="#77327A" offset="14%"></stop>
+            <stop stop-color="#B31777" offset="53%"></stop>
+            <stop stop-color="#CD0F7E" offset="79%"></stop>
+            <stop stop-color="#ED2C89" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+	<g>
+		<path d="M167.876207,46.3687469 L144.195715,62.173447 L119.80056,25.6145151 L143.481051,9.80981504 L167.876207,46.3687469 L167.876207,46.3687469 L167.876207,46.3687469 Z" fill="url(#linearGradient-1)"></path>
+		<path d="M187.128711,156.199437 L227.589323,216.829994 L179.391024,248.994707 L138.930412,188.363184 L131.871655,177.787122 L180.07092,145.622408 L187.128711,156.199437 L187.128711,156.199437 L187.128711,156.199437 Z" fill="url(#linearGradient-2)"></path>
+		<path d="M126.421861,196.710267 L135.330053,210.059034 L98.6436403,234.541108 L82.6766922,210.615313 L90.6915535,205.266921 L119.36407,186.133238 L126.421861,196.710267 L126.421861,196.710267 L126.421861,196.710267 Z" fill="url(#linearGradient-3)"></path>
+		<path d="M207.172143,127.536576 L217.46234,120.670006 L233.428323,144.595801 L209.744934,160.400501 L200.836742,147.051735 L214.229934,138.113604 L207.172143,127.536576 L207.172143,127.536576 L207.172143,127.536576 L207.172143,127.536576 Z M200.836742,147.051735 L193.778952,136.474706 L207.172143,127.536576 L214.229934,138.113604 L200.836742,147.051735 L200.836742,147.051735 L200.836742,147.051735 L200.836742,147.051735 Z" fill="url(#linearGradient-4)"></path>
+		<path d="M41.1093181,130.966968 L33.0954225,136.315359 L8.69833531,99.7564274 L45.3847478,75.2743531 L62.4855008,100.900856 L33.8139497,120.034538 L62.4855008,100.900856 L69.781835,111.834251 L41.1093181,130.966968 L41.1093181,130.966968 L41.1093181,130.966968 Z" fill="url(#linearGradient-5)"></path>
+		<path d="M130.488688,71.3224496 L82.2894234,103.487163 L74.994055,92.5537678 L34.9120223,32.4910791 L83.1112871,0.3263657 L123.19332,60.3890547 L130.488688,71.3224496 Z" fill="url(#linearGradient-6)"></path>
+		<path d="M157.589904,53.2375841 L144.196713,62.1747484 L136.900379,51.2423191 L119.799626,25.6158165 L143.483014,9.81111647 L167.880102,46.3700483 L157.589904,53.2375841 L157.589904,53.2375841 L157.589904,53.2375841 Z" fill="url(#linearGradient-7)"></path>
+		<path d="M97.7503053,215.84395 L90.6915487,205.266921 L119.364066,186.133238 L126.421857,196.710267 L97.7503053,215.84395 L97.7503053,215.84395 L97.7503053,215.84395 Z" fill="#714896"></path>
+		<path d="M200.836744,147.051736 L193.778953,136.474708 L207.172145,127.536577 L214.229936,138.113606 L200.836744,147.051736 L200.836744,147.051736 L200.836744,147.051736 Z" fill="#6F4795"></path>
+		<path d="M41.1093172,130.966965 L33.8139488,120.034536 L62.4854999,100.900853 L69.7818341,111.834248 L41.1093172,130.966965 L41.1093172,130.966965 L41.1093172,130.966965 Z" fill="#88519F"></path>
+		<path d="M144.196718,62.1747499 L136.900384,51.2423206 L150.294542,42.3041905 L157.58991,53.2375855 L144.196718,62.1747499 L144.196718,62.1747499 L144.196718,62.1747499 Z" fill="#85509E"></path>
+		<path d="M187.128711,156.199434 L138.930412,188.363182 L131.871655,177.787119 L180.07092,145.622405 L187.128711,156.199434 L187.128711,156.199434 L187.128711,156.199434 Z" fill="#8D166A"></path>
+		<path d="M123.19332,60.3890532 L130.488688,71.3224482 L82.2894233,103.487162 L74.9940548,92.5537666 L123.19332,60.3890532 L123.19332,60.3890532 L123.19332,60.3890532 Z" fill="#A70D6F"></path>
+		<path d="M27.4386316,51.6530056 L36.5361217,65.2857977 L22.9033297,74.3832878 L13.8058395,60.7504958 L27.4386316,51.6530056 L27.4386316,51.6530056 Z" fill="#9E61AD"></path>
+		<path d="M76.5679915,215.084186 L85.6654817,228.716978 L72.0326896,237.814468 L62.9351995,224.181676 L76.5679915,215.084186 L76.5679915,215.084186 Z" fill="#8053A3"></path>
+		<path d="M40.7042434,228.813811 L0.791684264,168.517994 L214.08857,25.8555586 L255.941111,85.1892808 L40.7042434,228.813811 L40.7042434,228.813811 L40.7042434,228.813811 L40.7042434,228.813811 Z" fill="url(#linearGradient-8)"></path>
+	</g>
+</svg>
diff --git a/src/icons/BEM.png b/src/icons/BEM.png
index 172170eb3..78356f4cf 100644
Binary files a/src/icons/BEM.png and b/src/icons/BEM.png differ
diff --git a/src/icons/Bigcommerce.png b/src/icons/Bigcommerce.png
new file mode 100644
index 000000000..edd047e96
Binary files /dev/null and b/src/icons/Bigcommerce.png differ
diff --git a/src/icons/Bigcommerce.svg b/src/icons/Bigcommerce.svg
deleted file mode 100644
index 50eed6fb6..000000000
--- a/src/icons/Bigcommerce.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 612 792"><style>.st0{fill:#34313f}</style><path class="st0" d="M310.3 379.2h21.1c6 0 9.8-3.3 9.8-8.6 0-5-3.8-8.6-9.8-8.6h-21.1c-.7 0-1.3.6-1.3 1.2V378c.1.7.6 1.2 1.3 1.2zm0 34.1h21.8c6.7 0 10.7-3.4 10.7-9.4 0-5.2-3.8-9.4-10.7-9.4h-21.8c-.7 0-1.3.6-1.3 1.2V412c.1.8.6 1.3 1.3 1.3z"/><path class="st0" d="M387.5 284.4l-62.4 62.2h10.2c15.9 0 25.3 10 25.3 20.9 0 8.6-5.8 14.9-12 17.7-1 .4-1 1.8.1 2.2 7.2 2.8 12.3 10.3 12.3 19.1 0 12.4-8.3 22.3-24.4 22.3h-44.2c-.7 0-1.3-.6-1.3-1.2v-47.1l-68.5 68.2c-.9.9-.3 2.5 1 2.5h164.7c.6 0 1.1-.5 1.1-1.1V285.3c.3-1.1-1.1-1.7-1.9-.9z"/></svg>
\ No newline at end of file
diff --git a/src/icons/Blesta.png b/src/icons/Blesta.png
index e43ded809..a2294b68f 100644
Binary files a/src/icons/Blesta.png and b/src/icons/Blesta.png 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/Chartbeat.png b/src/icons/Chartbeat.png
index c26f01c79..75f35303e 100644
Binary files a/src/icons/Chartbeat.png and b/src/icons/Chartbeat.png differ
diff --git a/src/icons/Comandia.svg b/src/icons/Comandia.svg
new file mode 100644
index 000000000..9c91aef7e
--- /dev/null
+++ b/src/icons/Comandia.svg
@@ -0,0 +1,9 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="72px" height="72px" viewBox="0 0 720 720" preserveAspectRatio="xMidYMid meet">
+<g id="layer1" fill="#0f457b" stroke="none">
+ <path d="M420 450 l83 -91 -34 -37 c-18 -20 -56 -61 -84 -90 l-50 -53 69 3 69 3 80 88 80 87 -80 88 -80 87 -68 3 -68 3 83 -91z"/>
+ <path d="M200 503 c0 -4 30 -38 67 -75 l67 -68 -45 -47 c-24 -27 -55 -60 -68 -75 l-24 -28 54 0 54 0 69 76 69 76 -74 74 c-71 71 -75 74 -121 74 -27 0 -48 -3 -48 -7z"/>
+ <path d="M116 438 c74 -82 73 -71 20 -133 l-48 -55 40 0 c36 0 45 6 86 52 25 29 46 56 46 59 0 4 -21 30 -46 58 -41 46 -50 51 -87 51 l-41 0 30 -32z"/>
+ </g>
+
+</svg>
\ No newline at end of file
diff --git a/src/icons/DTG.png b/src/icons/DTG.png
index e2134e1f5..fff0ad86e 100644
Binary files a/src/icons/DTG.png and b/src/icons/DTG.png differ
diff --git a/src/icons/DovetailWRP.png b/src/icons/DovetailWRP.png
new file mode 100755
index 000000000..fbf47ef05
Binary files /dev/null and b/src/icons/DovetailWRP.png 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/Express.png b/src/icons/Express.png
index 82539558c..e89a824d9 100644
Binary files a/src/icons/Express.png and b/src/icons/Express.png differ
diff --git a/src/icons/Facebook.svg b/src/icons/Facebook.svg
new file mode 100644
index 000000000..aaba01894
--- /dev/null
+++ b/src/icons/Facebook.svg
@@ -0,0 +1 @@
+<svg width="256" height="256" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M241.871 256.001c7.802 0 14.129-6.326 14.129-14.129V14.129C256 6.325 249.673 0 241.871 0H14.129C6.324 0 0 6.325 0 14.129v227.743c0 7.803 6.324 14.129 14.129 14.129h227.742" fill="#395185"/><path d="M176.635 256.001v-99.137h33.277l4.982-38.635h-38.259V93.561c0-11.186 3.107-18.809 19.148-18.809l20.459-.009V40.188c-3.54-.471-15.684-1.523-29.812-1.523-29.498 0-49.692 18.005-49.692 51.071v28.493h-33.362v38.635h33.362v99.137h39.897" fill="#FFF"/></svg>
\ No newline at end of file
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/Fireblade.png b/src/icons/Fireblade.png
index e34ef1313..aff85b1c0 100644
Binary files a/src/icons/Fireblade.png and b/src/icons/Fireblade.png differ
diff --git a/src/icons/Font Awesome.png b/src/icons/Font Awesome.png
index 8666a591f..4a9568af1 100644
Binary files a/src/icons/Font Awesome.png and b/src/icons/Font Awesome.png differ
diff --git a/src/icons/Froala.svg b/src/icons/Froala.svg
new file mode 100644
index 000000000..725e7ff3c
--- /dev/null
+++ b/src/icons/Froala.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 822.8 225.8"><defs><style>.cls-1,.cls-2{fill:#0098f7;}.cls-2{stroke:#231f20;stroke-miterlimit:10;stroke-width:5px;}</style></defs><title>Froala</title><path class="cls-1" d="M171.85,89.65A16.16,16.16,0,0,0,159.39,84H64.87c-9,0-16.6,7.74-16.6,16.9V139.3a16.45,16.45,0,0,0,32.9,0V115.14h78.5a15.63,15.63,0,0,0,15.46-12.94A15.14,15.14,0,0,0,171.85,89.65Z" transform="translate(-48.27 -72.94)"/><path class="cls-1" d="M151.81,181a16.05,16.05,0,0,0-11.44-4.85H64.06a15.81,15.81,0,0,0-15.79,15.79v88.69a16.88,16.88,0,0,0,5,11.92,16,16,0,0,0,11.35,4.7h0.17a16.45,16.45,0,0,0,16.41-16.6v-73.4h59.3A15.61,15.61,0,0,0,156.16,192,15.1,15.1,0,0,0,151.81,181Z" transform="translate(-48.27 -72.94)"/><path class="cls-2" d="M78.67,178.64" transform="translate(-48.27 -72.94)"/><path class="cls-1" d="M281.31,155.17c-5.29-6.22-16-7.52-24.14-7.52-16.68,0-28.72,7.71-36.5,23.47v-5.67a16.15,16.15,0,1,0-32.3,0v115.5a16.15,16.15,0,1,0,32.3,0v-38.7c0-19.09,3.5-63.5,35.9-63.5a44.73,44.73,0,0,1,5.95.27h0.12c12.79,1.2,20.06-2.73,21.6-11.69C285,162.48,284,158.39,281.31,155.17Z" transform="translate(-48.27 -72.94)"/><path class="cls-1" d="M420.1,168c-13.93-13.11-32.9-20.33-53.43-20.33s-39.43,7.22-53.28,20.33C298.72,181.86,291,200.8,291,222.74c0,21.68,8,41.28,22.4,55.2,13.92,13.41,32.85,20.8,53.3,20.8s39.44-7.38,53.44-20.79c14.55-13.94,22.56-33.54,22.56-55.21S434.65,181.67,420.1,168Zm-9.73,54.77c0,25.84-18.38,44.6-43.7,44.6S323,248.59,323,222.74c0-25.15,18.38-43.4,43.7-43.4S410.37,197.59,410.37,222.74Z" transform="translate(-48.27 -72.94)"/><path class="cls-1" d="M601,149.14a16.17,16.17,0,0,0-16,16.3v1c-10.29-11.63-27.74-18.84-46.7-18.84-19.83,0-38.19,7.24-51.69,20.4-14.33,14-21.91,33-21.91,55,0,21.61,7.78,41.16,21.9,55,13.56,13.33,31.92,20.67,51.7,20.67,18.83,0,36.29-7.41,46.7-19.37v1.57a16.15,16.15,0,1,0,32.3,0V165.44A16.32,16.32,0,0,0,601,149.14Zm-16.3,73.6c0,30.44-22.81,44.3-44,44.3-24.57,0-43.1-19-43.1-44.3s18.13-43.4,43.1-43.4C562,179.34,584.67,194.55,584.67,222.74Z" transform="translate(-48.27 -72.94)"/><path class="cls-1" d="M671.77,72.94a16.17,16.17,0,0,0-16,16.3v191.7a16.15,16.15,0,1,0,32.3,0V89.24A16.32,16.32,0,0,0,671.77,72.94Z" transform="translate(-48.27 -72.94)"/><path class="cls-1" d="M854.77,149.14a16.17,16.17,0,0,0-16,16.3v1c-10.29-11.63-27.74-18.84-46.7-18.84-19.83,0-38.19,7.24-51.69,20.4-14.33,14-21.91,33-21.91,55,0,21.61,7.78,41.16,21.9,55,13.56,13.33,31.92,20.67,51.7,20.67,18.83,0,36.29-7.41,46.7-19.37v1.57a16.15,16.15,0,1,0,32.3,0V165.44A16.32,16.32,0,0,0,854.77,149.14Zm-16.3,73.6c0,30.44-22.81,44.3-44,44.3-24.57,0-43.1-19-43.1-44.3s18.13-43.4,43.1-43.4C815.8,179.34,838.47,194.55,838.47,222.74Z" transform="translate(-48.27 -72.94)"/></svg>
\ No newline at end of file
diff --git a/src/icons/Google Plus.svg b/src/icons/Google Plus.svg
new file mode 100644
index 000000000..3db5d94ae
--- /dev/null
+++ b/src/icons/Google Plus.svg	
@@ -0,0 +1 @@
+<svg width="256" height="258" viewBox="0 0 256 258" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><defs><filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="a"><feOffset dy="2" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.168 0" in="shadowBlurOuter1" result="shadowMatrixOuter1"/><feOffset in="SourceAlpha" result="shadowOffsetOuter2"/><feGaussianBlur stdDeviation="1" in="shadowOffsetOuter2" result="shadowBlurOuter2"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.084 0" in="shadowBlurOuter2" result="shadowMatrixOuter2"/><feMerge><feMergeNode in="shadowMatrixOuter1"/><feMergeNode in="shadowMatrixOuter2"/><feMergeNode in="SourceGraphic"/></feMerge></filter></defs><g fill="none" transform="translate(2 2)"><rect fill="#DC4E41" filter="url(#a)" width="252" height="252" rx="7"/><path d="M100.8 119.7v15.12h25.011c-1.008 6.489-7.56 19.026-25.011 19.026-15.057 0-27.342-12.474-27.342-27.846S85.743 98.154 100.8 98.154c8.568 0 14.301 3.654 17.577 6.804l11.97-11.529C122.661 86.247 112.707 81.9 100.8 81.9c-24.381 0-44.1 19.719-44.1 44.1s19.719 44.1 44.1 44.1c25.452 0 42.336-17.892 42.336-43.092 0-2.898-.315-5.103-.693-7.308H100.8z" fill="#FFF"/><path d="M100.8 120.456h41.643c.441 2.079.693 4.284.693 6.93v-.441c0-2.898-.315-5.103-.693-7.308H100.8v.819zm0-37.8c11.655 0 21.483 4.221 29.043 11.151l.441-.441C122.661 86.247 112.707 81.9 100.8 81.9c-24.381 0-44.1 19.719-44.1 44.1v.378c.252-24.129 19.908-43.722 44.1-43.722zm0 71.946c17.451 0 24.003-12.474 25.011-19.026h-.189c-1.386 6.678-8.001 18.207-24.822 18.207-14.931 0-27.09-12.285-27.279-27.405 0 .126-.063.252-.063.378 0 15.372 12.285 27.846 27.342 27.846z" opacity=".4" fill="#FFF"/><path d="M100.8 98.154c-15.057 0-27.342 12.474-27.342 27.846 0 .126.063.252.063.378.189-15.183 12.348-27.405 27.279-27.405 8.568 0 14.301 3.654 17.577 6.804l11.97-11.529c-.126-.126-.315-.252-.441-.378l-11.529 11.151c-3.276-3.15-9.009-6.867-17.577-6.867zm0 36.666v.756h24.822c.063-.252.126-.567.189-.756H100.8z" opacity=".1" fill="#3E2723"/><path d="M100.8 170.1c-24.192 0-43.848-19.53-44.1-43.722v.378c0 24.381 19.719 44.1 44.1 44.1 25.452 0 42.336-17.892 42.336-43.092v-.378c-.189 25.011-17.01 42.714-42.336 42.714z" opacity=".1" fill="#3E2723"/><path d="M195.3 119.7h-12.6v-12.6h-12.6v12.6h-12.6v12.6h12.6v12.6h12.6v-12.6h12.6" fill="#FFF"/><path d="M182.7 119.7h12.6v.756h-12.6v-.756zm-12.6-12.6h12.6v.756h-12.6v-.756zm-12.6 12.6h12.6v.756h-12.6v-.756z" opacity=".4" fill="#FFF"/><path d="M157.5 132.3h12.6v.756h-12.6v-.756zm25.2 0h12.6v.756h-12.6v-.756zm-12.6 12.6h12.6v.756h-12.6v-.756z" opacity=".1" fill="#3E2723"/><path d="M25.2 25.2h201.6v201.6H25.2V25.2z"/></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/Ink.png b/src/icons/Ink.png
deleted file mode 100644
index 813119b4d..000000000
Binary files a/src/icons/Ink.png and /dev/null differ
diff --git a/src/icons/Ionicons.png b/src/icons/Ionicons.png
index bddc79c12..ace620764 100644
Binary files a/src/icons/Ionicons.png and b/src/icons/Ionicons.png differ
diff --git a/src/icons/Javascript Infovis Toolkit.png b/src/icons/JavaScript Infovis Toolkit.png
similarity index 100%
rename from src/icons/Javascript Infovis Toolkit.png
rename to src/icons/JavaScript Infovis Toolkit.png
diff --git a/src/icons/Jive.png b/src/icons/Jive.png
new file mode 100755
index 000000000..4d45c241d
Binary files /dev/null and b/src/icons/Jive.png differ
diff --git a/src/icons/Kamva.svg b/src/icons/Kamva.svg
new file mode 100644
index 000000000..8bbf89c96
--- /dev/null
+++ b/src/icons/Kamva.svg
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="700"
+   height="700"
+   viewBox="0 0 700 700"
+   enable-background="new 0 0 2267.72 2267.72"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Kamva.svg"><metadata
+     id="metadata3544"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs3542" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1210"
+     inkscape:window-height="764"
+     id="namedview3540"
+     showgrid="false"
+     inkscape:zoom="0.24209338"
+     inkscape:cx="617.5303"
+     inkscape:cy="1133.86"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><g
+     id="g3467"
+     transform="translate(-1498.5418,-784.5835)"><g
+       id="g3469"><path
+         stroke-miterlimit="2.6131"
+         d="m 2075.437,1277.961 c -22.163,2.487 -44.683,3.811 -67.52,3.811 -167.263,0 -318.3,-68.579 -425.956,-178.811 15.652,-133.332 129.008,-236.786 266.545,-236.786 156.004,0 268.409,131.895 268.409,268.409 0,52.727 -15.215,101.896 -41.478,143.377 z"
+         id="path3471"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 2103.123,1219.717 c -23.825,2.884 -48.079,4.395 -72.693,4.395 -170.719,0 -324.529,-71.448 -432.567,-185.704 38.675,-100.727 136.302,-172.234 250.644,-172.234 156.004,0 268.409,131.895 268.409,268.409 0,29.759 -4.853,58.382 -13.793,85.134 z"
+         id="path3473"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 2114.399,1171.344 c -20.327,2.085 -40.955,3.169 -61.84,3.169 -169.741,0 -322.774,-70.624 -430.714,-183.737 47.62,-74.899 131.333,-124.602 226.662,-124.602 156.004,0 268.409,131.895 268.409,268.409 0,12.473 -0.87,24.741 -2.517,36.761 z"
+         id="path3475"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><linearGradient
+         id="SVGID_1_"
+         gradientUnits="userSpaceOnUse"
+         x1="1580.0979"
+         y1="1134.5836"
+         x2="2116.9158"
+         y2="1134.5828"><stop
+           offset="0"
+           style="stop-color:#00A884"
+           id="stop3478" /><stop
+           offset="0.5"
+           style="stop-color:#51B958"
+           id="stop3480" /><stop
+           offset="1"
+           style="stop-color:#85C441"
+           id="stop3482" /></linearGradient><path
+         stroke-miterlimit="2.6131"
+         d="m 1848.507,866.174 c 156.004,0 268.409,131.895 268.409,268.409 0,148.238 -120.171,268.409 -268.409,268.409 -157.903,0 -268.409,-127.963 -268.409,-268.409 0,-148.238 120.171,-268.409 268.409,-268.409 z"
+         id="path3484"
+         style="clip-rule:evenodd;fill:url(#SVGID_1_);fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005"
+         inkscape:connector-curvature="0" /><path
+         stroke-miterlimit="2.6131"
+         d="m 1621.725,990.969 c 7.818,37.928 11.929,77.188 11.929,117.397 0,53.512 -7.311,105.329 -20.927,154.572 -20.802,-38.13 -32.628,-81.861 -32.628,-128.355 -10e-4,-52.827 15.271,-102.084 41.626,-143.614 z"
+         id="path3486"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 1693.879,915.174 c 22.752,62.141 35.178,129.167 35.178,199.067 0,81.796 -15.147,162.277 -45.824,232.974 -61.711,-49.177 -103.135,-127.59 -103.135,-212.633 0,-90.659 43.235,-172.915 113.781,-219.408 z"
+         id="path3488"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 1862.236,866.52 c 39.224,78.197 61.31,166.278 61.31,259.471 0,100.197 -25.507,194.498 -70.425,276.942 -1.537,0.026 -3.072,0.059 -4.614,0.059 -157.903,0 -268.409,-127.963 -268.409,-268.409 0,-148.238 120.171,-268.409 268.409,-268.409 4.604,0 9.181,0.117 13.729,0.346 z"
+         id="path3490"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 1911.491,873.625 c 37.925,77.151 59.215,163.768 59.215,255.304 0,96.626 -23.722,187.771 -65.696,268.085 -18.219,3.904 -37.118,5.978 -56.503,5.978 -157.903,0 -268.409,-127.963 -268.409,-268.409 0,-148.238 120.171,-268.409 268.409,-268.409 21.695,0 42.781,2.593 62.984,7.451 z"
+         id="path3492"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 1966.364,893.383 c 32.945,72.838 51.286,153.541 51.286,238.483 0,87.671 -19.549,170.819 -54.519,245.471 -34.763,16.444 -73.615,25.655 -114.624,25.655 -157.903,0 -268.409,-127.963 -268.409,-268.409 0,-148.238 120.171,-268.409 268.409,-268.409 42.285,0 82.278,9.791 117.857,27.209 z"
+         id="path3494"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 1815.858,868.155 c 37.8,77.049 59.012,163.523 59.012,254.899 0,99.965 -25.394,194.06 -70.119,276.368 -137.088,-22.48 -224.653,-137.71 -224.653,-264.839 0,-137.185 102.922,-250.317 235.76,-266.428 z"
+         id="path3496"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 2034.605,941.181 c 23.217,65.437 33.238,130.118 33.238,193.624 0,67.613 -11.645,132.529 -32.996,192.945 -48.276,46.581 -113.957,75.243 -186.34,75.243 -157.903,0 -268.409,-127.963 -268.409,-268.409 0,-148.238 120.171,-268.409 268.409,-268.409 72.261,-10e-4 137.844,28.564 186.098,75.006 z"
+         id="path3498"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 1772.606,877.077 c 34.256,74.023 53.37,156.322 53.37,243.04 0,96.604 -23.71,187.728 -65.667,268.029 -114.574,-39.849 -180.212,-140.654 -180.212,-253.562 10e-4,-121.876 81.237,-224.76 192.509,-257.507 z"
+         id="path3500"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 1732.829,892.321 c 29.192,69.229 45.338,145.176 45.338,224.858 0,90.671 -26.366,170.979 -63.62,247.578 -78.406,-42.825 -134.448,-124.206 -134.448,-230.173 -10e-4,-106.817 62.398,-199.053 152.73,-242.263 z"
+         id="path3502"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 1658.441,945.068 c 15.246,51.879 23.45,106.718 23.45,163.456 0,70.951 -10.925,141.568 -34.335,204.493 -40.862,-47.097 -67.458,-111.186 -67.458,-178.434 0,-73.979 29.932,-140.965 78.343,-189.515 z"
+         id="path3504"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><linearGradient
+         id="SVGID_2_"
+         gradientUnits="userSpaceOnUse"
+         x1="1618.5714"
+         y1="1255.621"
+         x2="2410.5544"
+         y2="841.46442"><stop
+           offset="0"
+           style="stop-color:#85C441"
+           id="stop3507" /><stop
+           offset="0.37"
+           style="stop-color:#51B958"
+           id="stop3509" /><stop
+           offset="1"
+           style="stop-color:#00A884"
+           id="stop3511" /></linearGradient><path
+         stroke-miterlimit="2.6131"
+         d="m 2061.911,1086.055 c 11.094,-21.326 20.9,-43.415 29.319,-66.163 -10.085,-21.306 -25.096,-45.979 -48.299,-70.354 -1.717,3.837 -3.471,7.654 -5.269,11.447 -9.711,20.498 -20.589,40.348 -32.55,59.466 -11.894,19.011 -24.859,37.298 -38.812,54.78 -13.975,17.51 -28.942,34.212 -44.815,50.023 -10.137,10.097 -20.645,19.831 -31.501,29.181 -5.98,-1.569 -11.922,-3.227 -17.826,-4.975 -16.448,-4.868 -32.596,-10.424 -48.408,-16.633 -14.097,-5.536 -27.927,-11.592 -41.467,-18.143 l -9.455,-4.679 c -15.952,-8.072 -31.485,-16.839 -46.558,-26.26 -16.982,-10.614 -33.38,-22.058 -49.135,-34.276 -19.445,-15.078 -37.911,-31.333 -55.288,-48.656 -1.279,-1.275 -2.551,-2.555 -3.818,-3.841 -18.841,31.488 -31.406,67.157 -35.987,105.284 15.255,15.454 31.363,30.084 48.258,43.8 14.695,11.93 29.982,23.174 45.81,33.683 14.066,9.339 28.559,18.097 43.445,26.24 14.825,8.109 30.039,15.608 45.609,22.463 3.05,1.343 6.113,2.66 9.19,3.953 -3.696,1.903 -7.415,3.768 -11.156,5.596 -18,8.792 -36.517,16.706 -55.495,23.686 -17.06,6.274 -34.491,11.794 -52.253,16.517 -3.206,10.576 -4.843,23.646 -8.629,33.961 7.607,8.843 57.05,50.716 73.019,58.98 17.925,-6.007 39.281,-10.27 54.143,-16.755 21.783,-9.505 42.876,-20.271 63.186,-32.202 22.131,-13.002 43.331,-27.389 63.478,-43.041 3.332,-2.589 6.635,-5.211 9.908,-7.868 12.815,2.048 25.769,3.691 38.846,4.912 15.515,1.45 31.205,2.307 47.046,2.55 3.115,0.047 6.235,0.072 9.361,0.072 13.432,0 26.76,-0.442 39.969,-1.313 10.686,-0.704 21.285,-1.717 31.809,-2.974 19.167,-31.31 32.092,-66.852 37.054,-104.897 -17.177,2.07 -34.577,3.431 -52.176,4.014 -6.71,0.223 -13.449,0.335 -20.214,0.335 -9.459,0 -18.865,-0.219 -28.215,-0.653 -2.529,-0.117 -5.053,-0.25 -7.574,-0.399 2.808,-3.646 5.573,-7.326 8.296,-11.039 17.578,-23.967 33.361,-49.306 47.154,-75.822 z"
+         id="path3513"
+         style="clip-rule:evenodd;fill:url(#SVGID_2_);fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-miterlimit:2.61310005"
+         inkscape:connector-curvature="0" /><path
+         stroke-miterlimit="2.6131"
+         d="m 2114.428,1171.132 c -22.999,2.683 -46.389,4.104 -70.118,4.104 -167.263,0 -318.301,-68.58 -425.957,-178.813 46.946,-78.038 132.448,-130.249 230.153,-130.249 156.004,0 268.409,131.895 268.409,268.409 0,12.4 -0.859,24.596 -2.487,36.549 z"
+         id="path3515"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 2076.583,1276.126 c -22.548,2.576 -45.467,3.945 -68.713,3.945 -167.151,0 -318.096,-68.489 -425.738,-178.591 16.313,-132.618 129.347,-235.306 266.376,-235.306 156.004,0 268.409,131.895 268.409,268.409 -10e-4,51.954 -14.778,100.449 -40.334,141.543 z"
+         id="path3517"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 2103.104,1219.774 c -28.064,4.035 -56.755,6.16 -85.952,6.16 -165.926,0 -315.877,-67.495 -423.359,-176.183 35.507,-106.662 136.123,-183.577 254.714,-183.577 156.004,0 271.743,131.731 268.409,268.409 -0.727,29.771 -4.859,58.423 -13.812,85.191 z"
+         id="path3519"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><linearGradient
+         id="SVGID_3_"
+         gradientUnits="userSpaceOnUse"
+         x1="1594.5371"
+         y1="1316.9475"
+         x2="2488.896"
+         y2="849.25482"><stop
+           offset="0"
+           style="stop-color:#85C441"
+           id="stop3522" /><stop
+           offset="0.37"
+           style="stop-color:#51B958"
+           id="stop3524" /><stop
+           offset="1"
+           style="stop-color:#00A884"
+           id="stop3526" /></linearGradient><path
+         stroke-miterlimit="2.6131"
+         d="m 2061.911,1086.055 c 11.094,-21.326 20.9,-43.415 29.319,-66.163 -10.085,-21.306 -25.096,-45.979 -48.299,-70.354 -1.717,3.837 -3.471,7.654 -5.269,11.447 -9.711,20.498 -20.589,40.348 -32.55,59.466 -11.894,19.011 -24.859,37.298 -38.812,54.78 -13.975,17.51 -28.942,34.212 -44.815,50.023 -6.617,6.591 -13.392,13.028 -20.319,19.303 l 0,10e-4 c -36.287,37.638 -92.492,69.909 -127.049,87.739 l 0.238,0.1 c -3.696,1.903 -7.415,3.768 -11.156,5.596 -6.341,3.097 -12.747,6.086 -19.215,8.963 l -0.306,0.136 -0.074,0.033 c -11.768,5.225 -23.74,10.081 -35.9,14.554 -17.06,6.274 -34.491,11.794 -52.253,16.517 -3.206,10.576 -4.843,23.646 -8.629,33.961 7.607,8.843 57.05,50.716 73.019,58.98 17.925,-6.007 39.281,-10.27 54.143,-16.755 21.783,-9.505 42.876,-20.271 63.186,-32.202 22.171,-13.026 43.485,-27.49 63.78,-43.276 0,0 64.372,-52.055 109.145,-110.753 1.568,-2.08 3.122,-4.17 4.663,-6.271 1.188,-1.619 2.367,-3.245 3.538,-4.877 l 0,0 c 1.171,-1.632 2.334,-3.27 3.488,-4.914 14.78,-21.049 28.197,-43.101 40.127,-66.034 z"
+         id="path3528"
+         style="clip-rule:evenodd;fill:url(#SVGID_3_);fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-miterlimit:2.61310005"
+         inkscape:connector-curvature="0" /><path
+         stroke-miterlimit="2.6131"
+         d="m 2096.363,1031.428 c -60.74,151.196 -211.295,287.978 -376.275,339.839 -81.431,-42.03 -139.99,-137.85 -139.99,-236.684 0,-148.238 120.171,-268.409 268.409,-268.409 114.565,0 216.284,78.317 247.856,165.254 z"
+         id="path3530"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 2072.65,986.979 c -71.729,170.785 -224.011,298.921 -409.109,342.911 -50.304,-48.784 -83.443,-119.698 -83.443,-195.307 0,-148.238 120.171,-268.409 268.409,-268.409 91.807,0 175.746,50.5 224.143,120.805 z"
+         id="path3532"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         stroke-miterlimit="2.6131"
+         d="m 2042.578,949.17 c -76.415,168.331 -230.994,294.453 -418.084,333.29 -28.049,-42.405 -44.396,-93.228 -44.396,-147.877 0,-148.238 120.171,-268.409 268.409,-268.409 76.321,0 145.2,31.857 194.071,82.996 z"
+         id="path3534"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /><path
+         d="m 1653.156,1288.156 -11.25,3.094 4.498,20.412 c 2.345,2.739 4.747,5.426 7.198,8.068 l 8.67,-2.089 -9.116,-29.485 z"
+         id="path3536"
+         inkscape:connector-curvature="0"
+         style="clip-rule:evenodd;fill:#77c043;fill-rule:evenodd" /></g><path
+       stroke-miterlimit="2.6131"
+       d="m 1848.507,1402.992 c 147.834,0 268.409,-120.574 268.409,-268.409 0,-136.11 -112.808,-268.409 -268.409,-268.409 -147.835,0 -268.409,120.574 -268.409,268.409 0,140.042 110.909,268.409 268.409,268.409 z"
+       id="path3538"
+       inkscape:connector-curvature="0"
+       style="clip-rule:evenodd;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:23.99979973;stroke-miterlimit:2.61310005" /></g></svg>
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/Klarna.svg b/src/icons/Klarna.svg
new file mode 100644
index 000000000..e611627af
--- /dev/null
+++ b/src/icons/Klarna.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128px" height="128px" viewBox="0 0 128 128" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
+    <title>klarna</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="klarna" fill="#0072CC">
+            <path d="M50.4869029,67.7473035 C50.6841294,89.2449923 62.9121726,109.164869 82.2403698,119.913713 C91.7072419,125.140216 102.357473,127.901387 113.303544,128 C113.106317,117.546995 110.246533,107.291217 104.822804,98.3174114 C93.5808937,79.6795069 72.7734977,68.0431433 50.4869029,67.7473035 L50.4869029,67.7473035 Z M50.4869029,60.2526965 C72.7734977,59.9568567 93.5808937,48.3204931 104.822804,29.6825886 C110.246533,20.7087827 113.106317,10.4530046 113.303544,0 C102.357473,0.0986132512 91.7072419,2.95839753 82.2403698,8.18489985 C62.9121726,18.9337442 50.6841294,38.853621 50.4869029,60.2526965 Z M39.6394453,0 L21.8890601,0 C17.550077,0 14,3.35285054 14,7.49460709 L14,124.942989 C14,126.323575 15.2819723,127.70416 17.155624,127.70416 L35.0046225,127.70416 C39.3436055,127.70416 42.7950693,124.35131 42.7950693,120.209553 L42.7950693,2.56394453 C42.7950693,1.08474576 41.5130971,0 39.6394453,0 L39.6394453,0 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Lighty.png b/src/icons/Lighty.png
index e0e3dd27a..fa64c37af 100644
Binary files a/src/icons/Lighty.png and b/src/icons/Lighty.png differ
diff --git a/src/icons/Linkedin.svg b/src/icons/Linkedin.svg
new file mode 100644
index 000000000..f7ed76695
--- /dev/null
+++ b/src/icons/Linkedin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><path d="M12.8 51.2V24.384h8.192V51.2H12.8m8.448-34.24c.064 2.304-1.664 4.16-4.416 4.16-2.56 0-4.224-1.856-4.224-4.16 0-2.368 1.728-4.16 4.352-4.16s4.288 1.792 4.288 4.16M42.752 51.2V36.352c0-3.456-1.152-5.824-4.16-5.824-2.24 0-3.584 1.6-4.224 3.136-.192.576-.256 1.344-.256 2.112V51.2H25.92V32.96c0-3.328-.128-6.144-.192-8.576h7.104l.384 3.776h.128c1.088-1.792 3.776-4.352 8.192-4.352 5.376 0 9.472 3.648 9.472 11.584V51.2h-8.256M64 5.632C64 2.56 61.44 0 58.368 0H5.632C2.56 0 0 2.56 0 5.632v52.736C0 61.44 2.56 64 5.632 64h52.736C61.44 64 64 61.44 64 58.368V5.632" fill="#1d87bd"/></svg>
\ No newline at end of file
diff --git a/src/icons/List.js.png b/src/icons/List.js.png
index d2b027856..b58fefb76 100644
Binary files a/src/icons/List.js.png and b/src/icons/List.js.png differ
diff --git a/src/icons/LiveAgent.png b/src/icons/LiveAgent.png
new file mode 100644
index 000000000..112c6a95b
Binary files /dev/null and b/src/icons/LiveAgent.png differ
diff --git a/src/icons/LiveChat.png b/src/icons/LiveChat.png
new file mode 100644
index 000000000..5f0619e17
Binary files /dev/null and b/src/icons/LiveChat.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/MODX.png b/src/icons/MODX.png
new file mode 100644
index 000000000..671e1f79e
Binary files /dev/null and b/src/icons/MODX.png differ
diff --git a/src/icons/MODx.png b/src/icons/MODx.png
deleted file mode 100644
index d53611f51..000000000
Binary files a/src/icons/MODx.png and /dev/null differ
diff --git a/src/icons/ManyContacts.png b/src/icons/ManyContacts.png
index 570450fe5..c4510a6e1 100644
Binary files a/src/icons/ManyContacts.png and b/src/icons/ManyContacts.png differ
diff --git a/src/icons/Materialize CSS.png b/src/icons/Materialize CSS.png
index 12be1b4a9..833bd0f07 100644
Binary files a/src/icons/Materialize CSS.png and b/src/icons/Materialize CSS.png differ
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/Mono.net.png b/src/icons/Mono.net.png
index c66e40185..74b1d85dc 100644
Binary files a/src/icons/Mono.net.png and b/src/icons/Mono.net.png differ
diff --git a/src/icons/Moodle.png b/src/icons/Moodle.png
index 6721efe77..3afa9c9fe 100644
Binary files a/src/icons/Moodle.png and b/src/icons/Moodle.png differ
diff --git a/src/icons/NVD3.png b/src/icons/NVD3.png
index 9e1b4f8d4..d5bfdb177 100644
Binary files a/src/icons/NVD3.png and b/src/icons/NVD3.png differ
diff --git a/src/icons/Neos.svg b/src/icons/Neos.svg
new file mode 100644
index 000000000..5fff5a8c2
--- /dev/null
+++ b/src/icons/Neos.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414"><g fill-rule="nonzero"><path d="M132.984 37.5l-20.642 15.162v31.716l20.642 29.413V37.5zm0 113.065L53.627 37.5l-9.193 6.773V162.5l20.642-15.162V88.79l51.619 73.71h22.58l16.291-11.935h-22.582z" fill="#26224c"/><path d="M65.076 88.79v58.548L44.434 162.5h22.582l20.642-15.162v-26.3L65.076 88.79zm67.908 25.001V37.5h22.582v113.065h-22.582L53.627 37.5h25.809l53.548 76.291z" fill="#00adee"/></g></svg>
\ No newline at end of file
diff --git a/src/icons/Neto.svg b/src/icons/Neto.svg
new file mode 100644
index 000000000..a4fabcbe3
--- /dev/null
+++ b/src/icons/Neto.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<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"
+	 viewBox="0 0 505 194" style="enable-background:new 0 0 505 194;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#45C0EF;}
+</style>
+<g id="Vector_Smart_Object">
+	<path class="st0" d="M71,46.4c-7.8,0-15.5,1.4-22.6,4.6c-4.1,1.9-7.9,4.4-11.3,7.3v-4.5c0-8.3-6-6.7-15.9-6.7
+		c-9.8,0-15.4-1.4-15.4,6.8v129.3c0,7.9,5.6,6.5,15.1,6.5S38,191,38,183.3v-56.8c0-11.5,1-28.5,7.6-38.3c5.4-7.9,13.7-10.5,23-10.5
+		c8.3,0,16.4,2,21.7,8.9c6,7.8,7.2,20.1,7.2,29.6V183c0,7.6,6,6.6,15.7,6.6c10.2,0,16.7,1.2,16.7-6.9v-71.9c0-17-3.5-34.5-15.2-47.5
+		C103.3,50.8,87.6,46.4,71,46.4"/>
+	<path class="st0" d="M349.7,46.7h-15.3V12.8c0-6.9-4.1-8.6-16.1-8.6c-11.9,0-16.1,1.9-16.1,8.6v33.9h-18.8c-5.4,0-5.2,5.9-5.2,13.8
+		c0,8.3-0.7,16.6,5.4,16.6h18.6l0,0v106.7c0,7,7.7,5.9,16.6,5.9c9.6,0,15.6,1.5,15.6-6.1V77.1h16c6.9,0,7.1-4.8,7.1-14.9
+		C357.5,51.2,357.6,46.7,349.7,46.7"/>
+	<path class="st0" d="M268.4,122c-3.5-1.1-7.1-0.7-10.4,1.1c-3.3,1.8-5.5,4.5-6.6,8c-1.3,4.2-3.2,8.1-5.7,11.7l0,0
+		c0,0-1.5,2.2-2.3,3.2c-3.7,4.6-8.3,8.2-13.4,11c-4.7,2.5-9.7,4.2-15,4.9c-5.1,0.7-10.3,0.5-15.4-0.6c-5-1.1-9.8-3-14.2-5.7
+		c-12.2-7.5-21.1-25.1-20.7-39.3c0.6-21,17.1-39.7,38-42.3c2-0.2,4-0.4,5.9-0.3h-0.1c-0.3,0-0.5-0.1-0.8-0.1c0.1,0,0.1,0,0.2,0
+		c0.2,0,0.4,0.1,0.6,0.1h0.1l0,0c10.7,0.1,21.4,3.8,29.6,10.8l1.2,1l-1.3,0.7c-16.6,9.1-33.2,18.2-49.8,27.4c-3.6,2-6.6,5.1-7.8,9.1
+		c-0.7,2.4-0.7,5,0,7.4l0,0c0.3,1,0.7,1.9,1.2,2.8c1.8,3.1,4.7,5.4,8.2,6.3c4.2,1.1,8.6,0,12.4-2.1l64.2-35.2
+		c3.2-1.7,5.3-4.5,6.6-7.8c4.4-11.5-14-28-20.3-32.8c-7-5.3-14.8-9.2-22.9-11.6l0,0c-27.3-8.2-58.3,0.1-76.8,23.8
+		c-11.4,14.7-17.1,32.8-15.3,51.4c0.9,9.5,3.8,18.6,8.3,27c4.7,8.6,10.8,16.3,18.5,22.4c7.3,5.7,15.4,10,24.3,12.5
+		c8.8,2.5,17.9,3.2,27,2.3c9.5-1,18.5-3.9,26.9-8.5c8.4-4.5,16.3-10.2,22.5-17.4c6.2-7,10.1-15.5,12.3-24.5c1-3.5,0.6-7.1-1.1-10.2
+		C274.8,125.4,272,123.1,268.4,122"/>
+	<path class="st0" d="M494.4,90.3c-3.8-8.5-9-16.2-15.5-22.8c-6.5-6.5-14.2-11.7-22.6-15.5c-5.9-2.6-12.1-4.4-18.5-5.2
+		c0.8,0.3-0.1,0,0,0c-0.1,0-0.2-0.1-0.2-0.1c-2.9-0.4-5.7-0.6-8.7-0.6h-0.1h-0.1c-9.8,0.4-19.4,2.4-28.5,6.4
+		c-8.5,3.7-16.3,8.8-22.8,15.4c-6.5,6.5-11.5,14.1-15.1,22.6c-3.8,8.8-5.5,18.2-5.5,27.8c0,9.8,1.7,19.5,5.7,28.5
+		c3.6,8.5,8.8,16.2,15.5,22.6c6.6,6.4,14.2,11.4,22.7,14.8c7.7,3.2,15.8,4.9,24.1,5.3c0.1,0,2.6,0,3.7,0c9.7,0,19.3-1.8,28.2-5.7
+		c8.5-3.7,16.2-8.8,22.7-15.4c6.4-6.6,11.5-14.2,15.2-22.6c3.8-8.7,5.7-18,5.7-27.5C500.2,108.6,498.3,99.1,494.4,90.3 M464.5,144.1
+		c-1.4,1.9-2.9,3.7-4.6,5.4c-4.1,4.1-8.9,7.3-14.3,9.5c-5.5,2.3-11.3,3.5-17.3,3.5c-5.9,0-11.7-1.1-17.2-3.4
+		c-5.3-2.3-10.1-5.5-14.2-9.5c-4.1-4.1-7.3-8.9-9.5-14.1c-2.4-5.4-3.5-11.2-3.5-17.2s1.2-11.8,3.5-17.3c2.3-5.3,5.4-10.2,9.5-14.3
+		c4.1-4.1,8.9-7.3,14.2-9.5c4.4-1.9,9.1-3,13.8-3.3c-1.3-0.1-1.3-0.1,0.1,0h-0.1c0,0,2.3-0.1,3.3-0.1c6,0,11.8,1.1,17.3,3.5
+		c5.3,2.3,10.1,5.4,14.3,9.5c4.1,4.1,7.3,8.9,9.5,14.3c2.3,5.5,3.4,11.3,3.4,17.3c0,5.9-1.1,11.7-3.4,17.2
+		C468.1,138.5,466.5,141.4,464.5,144.1C464.6,144.1,464.6,144.1,464.5,144.1C464.6,144.1,464.6,144.1,464.5,144.1L464.5,144.1z"/>
+</g>
+</svg>
diff --git a/src/icons/OpenSSL.png b/src/icons/OpenSSL.png
index 3f4a6f7b9..837b4e973 100644
Binary files a/src/icons/OpenSSL.png and b/src/icons/OpenSSL.png differ
diff --git a/src/icons/PHP-Nuke.png b/src/icons/PHP-Nuke.png
index 9bb91a904..5e8f3182f 100644
Binary files a/src/icons/PHP-Nuke.png and b/src/icons/PHP-Nuke.png differ
diff --git a/src/icons/Phabricator.png b/src/icons/Phabricator.png
new file mode 100644
index 000000000..2d72ad4d2
Binary files /dev/null and b/src/icons/Phabricator.png differ
diff --git a/src/icons/Pinterest.svg b/src/icons/Pinterest.svg
new file mode 100644
index 000000000..cf60b5531
--- /dev/null
+++ b/src/icons/Pinterest.svg
@@ -0,0 +1 @@
+<svg width="256" height="256" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M0 128.002c0 52.414 31.518 97.442 76.619 117.239-.36-8.938-.064-19.668 2.228-29.393 2.461-10.391 16.47-69.748 16.47-69.748s-4.089-8.173-4.089-20.252c0-18.969 10.994-33.136 24.686-33.136 11.643 0 17.268 8.745 17.268 19.217 0 11.704-7.465 29.211-11.304 45.426-3.207 13.578 6.808 24.653 20.203 24.653 24.252 0 40.586-31.149 40.586-68.055 0-28.054-18.895-49.052-53.262-49.052-38.828 0-63.017 28.956-63.017 61.3 0 11.152 3.288 19.016 8.438 25.106 2.368 2.797 2.697 3.922 1.84 7.134-.614 2.355-2.024 8.025-2.608 10.272-.852 3.242-3.479 4.401-6.409 3.204-17.884-7.301-26.213-26.886-26.213-48.902 0-36.361 30.666-79.961 91.482-79.961 48.87 0 81.035 35.364 81.035 73.325 0 50.213-27.916 87.726-69.066 87.726-13.819 0-26.818-7.47-31.271-15.955 0 0-7.431 29.492-9.005 35.187-2.714 9.869-8.026 19.733-12.883 27.421a127.897 127.897 0 0 0 36.277 5.249c70.684 0 127.996-57.309 127.996-128.005C256.001 57.309 198.689 0 128.005 0 57.314 0 0 57.309 0 128.002z" fill="#CB1F27"/></svg>
\ No newline at end of file
diff --git a/src/icons/Plotly.png b/src/icons/Plotly.png
new file mode 100644
index 000000000..20f7b24d8
Binary files /dev/null and b/src/icons/Plotly.png differ
diff --git a/src/icons/Prospector.png b/src/icons/Prospector.png
index fba2daee9..2a694ae38 100644
Binary files a/src/icons/Prospector.png and b/src/icons/Prospector.png differ
diff --git a/src/icons/Proximis Omnichannel.png b/src/icons/Proximis Omnichannel.png
new file mode 100644
index 000000000..a0e2f6044
Binary files /dev/null and b/src/icons/Proximis Omnichannel.png differ
diff --git a/src/icons/Public CMS.png b/src/icons/Public CMS.png
index 7a25b47fe..9a8e084ed 100644
Binary files a/src/icons/Public CMS.png and b/src/icons/Public CMS.png differ
diff --git a/src/icons/Pure CSS.png b/src/icons/Pure CSS.png
index 52fa6fed8..a137a80e8 100644
Binary files a/src/icons/Pure CSS.png and b/src/icons/Pure CSS.png differ
diff --git a/src/icons/RD Station.png b/src/icons/RD Station.png
index 710260214..627231ba2 100644
Binary files a/src/icons/RD Station.png and b/src/icons/RD Station.png differ
diff --git a/src/icons/Rakuten DBCore.png b/src/icons/Rakuten DBCore.png
new file mode 100644
index 000000000..e048710d9
Binary files /dev/null and b/src/icons/Rakuten DBCore.png differ
diff --git a/src/icons/Revel.png b/src/icons/Revel.png
new file mode 100644
index 000000000..f8e9b6ef5
Binary files /dev/null and b/src/icons/Revel.png differ
diff --git a/src/icons/RockRMS.svg b/src/icons/RockRMS.svg
new file mode 100644
index 000000000..1a782b9bb
--- /dev/null
+++ b/src/icons/RockRMS.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="59px" height="61px" viewBox="0 0 59 61" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.2 (33826) - http://www.bohemiancoding.com/sketch -->
+    <title>rock-logo</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="rock-logo" fill="#EE7624">
+            <path d="M57.705,60.063 L41.387,40.936 C41.387,40.936 53.217,40.91 53.315,40.908 C54.628,40.959 55.969,40.557 57.051,39.649 C59.381,37.701 59.694,34.235 57.744,31.897 L32.396,2.151 C32.154,1.832 31.88,1.531 31.56,1.26 C31.521,1.231 31.476,1.209 31.439,1.178 C31.427,1.168 31.412,1.16 31.4,1.153 C31.121,0.937 30.834,0.748 30.533,0.59 C30.515,0.581 30.494,0.576 30.474,0.569 C30.173,0.418 29.865,0.293 29.552,0.203 C29.495,0.19 29.433,0.178 29.374,0.164 C29.097,0.101 28.817,0.035 28.534,0.014 C28.362,-0.007 28.188,0.006 28.018,0.006 C27.846,0.006 27.678,-0.008 27.504,0.014 C27.223,0.035 26.945,0.101 26.664,0.164 C26.605,0.178 26.549,0.19 26.49,0.203 C26.172,0.293 25.865,0.418 25.566,0.569 C25.545,0.578 25.527,0.583 25.509,0.59 C25.204,0.746 24.911,0.937 24.64,1.153 C24.622,1.162 24.615,1.17 24.603,1.178 C24.564,1.209 24.519,1.231 24.48,1.26 C24.16,1.531 23.886,1.83 23.64,2.145 L0,29.86 L14.461,29.86 L28.018,13.969 L41.622,29.936 L29.518,29.944 C29.473,29.944 29.43,29.957 29.385,29.961 C29.098,29.961 28.807,29.987 28.52,30.032 C28.438,30.049 28.354,30.067 28.276,30.086 C28.016,30.139 27.756,30.218 27.501,30.315 C27.407,30.349 27.319,30.387 27.235,30.432 C27.003,30.53 26.78,30.645 26.563,30.784 C26.467,30.846 26.37,30.915 26.278,30.981 C26.161,31.062 26.04,31.124 25.932,31.21 C25.856,31.277 25.795,31.357 25.721,31.431 C25.633,31.513 25.547,31.603 25.463,31.695 C25.297,31.866 25.145,32.046 25.01,32.226 C24.942,32.331 24.879,32.431 24.815,32.534 C24.688,32.732 24.579,32.93 24.483,33.135 C24.424,33.261 24.376,33.39 24.327,33.519 C24.255,33.718 24.182,33.917 24.136,34.124 C24.099,34.269 24.073,34.425 24.052,34.575 C24.017,34.777 23.993,34.978 23.982,35.181 C23.976,35.255 23.959,35.318 23.959,35.39 C23.959,35.491 23.982,35.579 23.986,35.684 C23.998,35.872 24.009,36.052 24.037,36.241 C24.062,36.429 24.105,36.613 24.148,36.796 C24.187,36.95 24.23,37.097 24.283,37.253 C24.355,37.452 24.437,37.65 24.531,37.841 C24.592,37.96 24.65,38.075 24.719,38.191 C24.842,38.406 24.979,38.605 25.127,38.796 C25.172,38.853 25.195,38.911 25.242,38.964 L43.246,60.068 L57.705,60.068 L57.705,60.063 L57.705,60.063 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Rubicon Project.png b/src/icons/Rubicon Project.png
index 2aec17ef4..fe5a3f3bf 100644
Binary files a/src/icons/Rubicon Project.png and b/src/icons/Rubicon Project.png 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/ShellInABox.png b/src/icons/ShellInABox.png
new file mode 100644
index 000000000..036151609
Binary files /dev/null and b/src/icons/ShellInABox.png differ
diff --git a/src/icons/Sitecore.png b/src/icons/Sitecore.png
index b5b3faf8f..31f2b6e9a 100644
Binary files a/src/icons/Sitecore.png and b/src/icons/Sitecore.png differ
diff --git a/src/icons/Sitefinity.svg b/src/icons/Sitefinity.svg
new file mode 100644
index 000000000..a2a2275eb
--- /dev/null
+++ b/src/icons/Sitefinity.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 748.97 800"><defs><style>.cls-1{fill:#5ce500}</style></defs><title>Progress_symbol_primary_RGB</title><path class="cls-1" d="M540.9 764V331.55L166.46 115.36l194.14-112c7.66-4.42 20.23-4.42 27.89 0L749 211.45v416.3c0 8.86-6.27 19.72-13.95 24.13zm-97.23-64c7.67-4.43 14-15.29 14-24.16V379.57l-256.5-148.08c-7.66-4.44-20.2-4.44-27.87 0L0 331.55 270.45 487.7V800zM0 643.85l187.13 108.08V535.71z"/></svg>
\ No newline at end of file
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/Stamplay.png b/src/icons/Stamplay.png
index 264699655..8f5b25759 100644
Binary files a/src/icons/Stamplay.png and b/src/icons/Stamplay.png differ
diff --git a/src/icons/SumoMe.png b/src/icons/SumoMe.png
index 1738981f3..b70b8f935 100644
Binary files a/src/icons/SumoMe.png and b/src/icons/SumoMe.png differ
diff --git a/src/icons/TawkTo.png b/src/icons/TawkTo.png
new file mode 100644
index 000000000..87d0b6611
Binary files /dev/null and b/src/icons/TawkTo.png 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/Telescope.png b/src/icons/Telescope.png
index b3eed1b7d..65f03875a 100644
Binary files a/src/icons/Telescope.png and b/src/icons/Telescope.png differ
diff --git a/src/icons/ThinkPHP.png b/src/icons/ThinkPHP.png
index 4f8c577ac..5851c4a74 100644
Binary files a/src/icons/ThinkPHP.png and b/src/icons/ThinkPHP.png differ
diff --git a/src/icons/Twitter.svg b/src/icons/Twitter.svg
new file mode 100644
index 000000000..dbd044201
--- /dev/null
+++ b/src/icons/Twitter.svg
@@ -0,0 +1 @@
+<svg width="256" height="209" viewBox="0 0 256 209" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M256 25.45a105.04 105.04 0 0 1-30.166 8.27c10.845-6.5 19.172-16.793 23.093-29.057a105.183 105.183 0 0 1-33.351 12.745C205.995 7.201 192.346.822 177.239.822c-29.006 0-52.523 23.516-52.523 52.52 0 4.117.465 8.125 1.36 11.97-43.65-2.191-82.35-23.1-108.255-54.876-4.52 7.757-7.11 16.78-7.11 26.404 0 18.222 9.273 34.297 23.365 43.716a52.312 52.312 0 0 1-23.79-6.57c-.003.22-.003.44-.003.661 0 25.447 18.104 46.675 42.13 51.5a52.592 52.592 0 0 1-23.718.9c6.683 20.866 26.08 36.05 49.062 36.475-17.975 14.086-40.622 22.483-65.228 22.483-4.24 0-8.42-.249-12.529-.734 23.243 14.902 50.85 23.597 80.51 23.597 96.607 0 149.434-80.031 149.434-149.435 0-2.278-.05-4.543-.152-6.795A106.748 106.748 0 0 0 256 25.45" fill="#55acee"/></svg>
\ No newline at end of file
diff --git a/src/icons/Usabilla.svg b/src/icons/Usabilla.svg
new file mode 100644
index 000000000..c9072c2ca
--- /dev/null
+++ b/src/icons/Usabilla.svg
@@ -0,0 +1 @@
+<svg width="140" height="164" viewBox="0 0 140 164" xmlns="http://www.w3.org/2000/svg"><title>Group + logo copy 2</title><g fill="none" fill-rule="evenodd"><g fill="#00A5C9"><circle cx="15.4" cy="128.8" r="2.1"/><circle cx="34.3" cy="141.4" r="7"/><ellipse cx="38.5" cy="160.3" rx="2.8" ry="2.8"/><ellipse cx="65.8" cy="147" rx="4.9" ry="4.9"/><circle cx="85.4" cy="148.4" r="9.1"/><circle cx="49" cy="142.1" r="2.1"/><ellipse cx="119" cy="117.6" rx="5.6" ry="5.6"/><circle cx="99.4" cy="130.2" r="2.1"/><ellipse cx="98.7" cy="136.5" rx="1.4" ry="1.4"/><circle cx="107.8" cy="125.3" r="2.1"/><ellipse cx="115.5" cy="128.8" rx="1.4" ry="1.4"/><circle cx="120.4" cy="132.3" r="2.1"/><ellipse cx="126" cy="103.6" rx="4.9" ry="4.9"/><circle cx="133" cy="109.9" r="2.1"/><ellipse cx="138.6" cy="102.9" rx="1.4" ry="1.4"/><ellipse cx="135.1" cy="97.3" rx="2.8" ry="2.8"/><circle cx="128.8" cy="88.2" r="4.2"/><ellipse cx="137.2" cy="81.9" rx="2.8" ry="2.8"/><circle cx="124.6" cy="79.8" r="2.1"/><ellipse cx="128.8" cy="72.1" rx="2.8" ry="2.8"/><ellipse cx="133" cy="61.6" rx="2.8" ry="2.8"/><ellipse cx="130.2" cy="47.6" rx="2.8" ry="2.8"/><ellipse cx="123.2" cy="53.9" rx="2.8" ry="2.8"/><circle cx="119" cy="39.9" r="3.5"/><ellipse cx="114.1" cy="30.1" rx="2.8" ry="2.8"/><circle cx="105.7" cy="27.3" r="2.1"/><ellipse cx="101.5" cy="13.3" rx="6.3" ry="6.3"/><circle cx="85.4" cy="13.3" r="4.2"/><circle cx="74.9" cy="3.5" r="3.5"/><ellipse cx="67.2" cy="9.8" rx="2.8" ry="2.8"/><circle cx="57.4" cy="9.8" r="2.1"/><circle cx="42" cy="10.5" r="2.1"/><ellipse cx="59.5" cy="76.3" rx="59.5" ry="59.5"/></g><path d="M64.897 65.398a2.865 2.865 0 1 1-5.73 0 2.865 2.865 0 0 1 5.73 0m2.19 5.217a1.481 1.481 0 1 1-2.962 0 1.481 1.481 0 0 1 2.962 0m.823-12.578a3.012 3.012 0 1 1-6.024 0 3.012 3.012 0 0 1 6.024 0m6.722 7.006a3.993 3.993 0 1 1-7.987 0 3.993 3.993 0 0 1 7.987 0M20.48 76.072h3.326v6.574c0 1.23.085 2.083.254 2.56.169.48.44.85.816 1.116.374.265.835.397 1.383.397s1.012-.13 1.396-.391c.382-.261.666-.645.852-1.151.136-.378.205-1.185.205-2.423v-6.681h3.29v5.813c0 2.29-.18 3.857-.543 4.701-.441 1.028-1.092 1.818-1.952 2.368-.86.55-1.952.826-3.278.826-1.439 0-2.602-.321-3.49-.965-.888-.642-1.512-1.538-1.874-2.687-.257-.795-.385-2.241-.385-4.339v-5.718m20.843 2.09L39.286 80.2c-.828-.82-1.579-1.229-2.254-1.229-.37 0-.658.078-.867.235-.21.156-.314.352-.314.584 0 .177.066.34.2.489.131.148.459.351.981.608l1.206.603c1.27.627 2.14 1.265 2.615 1.916.474.651.71 1.414.71 2.29 0 1.165-.427 2.137-1.283 2.917-.855.78-2.002 1.17-3.44 1.17-1.913 0-3.44-.749-4.58-2.243l2.024-2.205c.386.45.838.813 1.356 1.09.518.277.978.416 1.38.416.434 0 .784-.104 1.049-.313.265-.21.397-.45.397-.723 0-.507-.477-1-1.434-1.483l-1.109-.554c-2.12-1.07-3.181-2.406-3.181-4.014 0-1.036.4-1.922 1.199-2.658.8-.734 1.822-1.102 3.067-1.102a5.322 5.322 0 0 1 4.315 2.169m11.037-1.06h3.29v12.34h-3.29v-1.386c-.642.611-1.286 1.05-1.932 1.32a5.415 5.415 0 0 1-2.1.404c-1.694 0-3.159-.657-4.395-1.97-1.236-1.315-1.854-2.948-1.854-4.9 0-2.025.598-3.684 1.794-4.978 1.195-1.293 2.648-1.94 4.358-1.94.787 0 1.524.148 2.215.446.69.297 1.328.743 1.914 1.338v-.674zm-3.459 1.927c-1.017 0-1.862.36-2.534 1.08-.673.718-1.01 1.64-1.01 2.765 0 1.133.343 2.065 1.027 2.796.685.731 1.528 1.097 2.529 1.097 1.033 0 1.89-.36 2.57-1.079.681-.719 1.022-1.661 1.022-2.826 0-1.141-.34-2.065-1.021-2.772-.681-.707-1.542-1.06-2.583-1.06zm10.819-7.247v5.994c.595-.595 1.238-1.04 1.929-1.338a5.544 5.544 0 0 1 2.218-.446c1.711 0 3.165.647 4.363 1.94 1.197 1.294 1.795 2.953 1.795 4.978 0 1.952-.618 3.585-1.855 4.9-1.238 1.313-2.704 1.97-4.4 1.97a5.471 5.471 0 0 1-2.109-.404c-.65-.27-1.298-.709-1.94-1.32v1.386h-3.267v-17.66h3.267zm3.46 7.247c-1.037 0-1.897.354-2.58 1.06-.682.708-1.024 1.632-1.024 2.773 0 1.165.342 2.107 1.024 2.826.683.72 1.543 1.079 2.58 1.079 1.004 0 1.85-.366 2.537-1.097.687-.73 1.03-1.663 1.03-2.796 0-1.125-.337-2.047-1.012-2.766-.675-.72-1.527-1.079-2.555-1.079zm12.142-7.247h3.29v17.66h-3.29v-17.66zm4.168 0h3.291v17.66h-3.29v-17.66zm14.466 5.32h3.29v12.34h-3.29v-1.386c-.642.611-1.286 1.05-1.932 1.32a5.42 5.42 0 0 1-2.1.404c-1.694 0-3.159-.657-4.395-1.97-1.236-1.315-1.854-2.948-1.854-4.9 0-2.025.598-3.684 1.794-4.978 1.196-1.293 2.648-1.94 4.358-1.94.787 0 1.524.148 2.215.446.69.297 1.328.743 1.914 1.338v-.674zm-3.459 1.927c-1.017 0-1.862.36-2.534 1.08-.673.718-1.01 1.64-1.01 2.765 0 1.133.343 2.065 1.028 2.796.685.731 1.527 1.097 2.528 1.097 1.033 0 1.89-.36 2.57-1.079.681-.719 1.022-1.661 1.022-2.826 0-1.141-.34-2.065-1.021-2.772-.681-.707-1.542-1.06-2.583-1.06zm-17.955-.633c-.909 0-1.646.736-1.646 1.645v9.401h3.29v-9.4c0-.91-.736-1.646-1.644-1.646m-1.243-7.129c.813 0 1.51.295 2.092.884.581.588.873 1.302.873 2.14a2.9 2.9 0 0 1-.865 2.115c-.575.584-1.265.875-2.066.875a2.843 2.843 0 0 1-2.11-.892c-.581-.594-.872-1.316-.872-2.166 0-.815.288-1.512.864-2.09a2.836 2.836 0 0 1 2.084-.866" fill="#FFF"/></g></svg>
\ No newline at end of file
diff --git a/src/icons/UserLike.svg b/src/icons/UserLike.svg
new file mode 100644
index 000000000..75f524c0c
--- /dev/null
+++ b/src/icons/UserLike.svg
@@ -0,0 +1 @@
+<svg width="60" height="60" viewBox="0 0 60 60" xmlns="http://www.w3.org/2000/svg"><title>userlike_general_logo_small_60x60</title><g fill="none" fill-rule="evenodd"><path d="M37.971 17v17.045c0 2.88-.32 3.984-.92 4.853-1.596 2.446-4.593 2.486-5.59 2.486-6.031 0-6.272-3.906-6.272-7.024v-7.777c-.992.635-2.22.96-3.692.96A9.913 9.913 0 0 1 19 27.215v6.829c0 2.644.079 4.853 1.477 7.022C23.195 45.368 28.466 46 31.34 46 37.173 46 44 43.277 44 34.795V17h-6.029z" fill="#3D3D3F"/><path d="M8.375 12.446c1.304 1.974 2.446 3.457 3.424 4.456 1.692 1.762 3.29 2.64 4.798 2.64.43 0 .777-.107 1.04-.319.247-.232.367-.56.367-.984 0-.212-.027-.476-.076-.797a4.755 4.755 0 0 1-.077-.667 4.79 4.79 0 0 1 1.314-3.36c.876-.944 2.06-1.415 3.547-1.415 1.57 0 2.842.495 3.822 1.482.976.986 1.466 2.275 1.466 3.865 0 1.952-.656 3.549-1.973 4.79-1.312 1.24-3.071 1.863-5.27 1.863-3.363 0-6.422-1.401-9.172-4.203-1.467-1.526-2.997-3.723-4.585-6.586l1.375-.765z" fill="#009DE0"/></g></svg>
\ No newline at end of file
diff --git a/src/icons/Woltlab Community Framework.png b/src/icons/Woltlab Community Framework.png
index d226be408..680ffe468 100644
Binary files a/src/icons/Woltlab Community Framework.png and b/src/icons/Woltlab Community Framework.png differ
diff --git a/src/icons/Yahoo Advertising.png b/src/icons/Yahoo Advertising.png
deleted file mode 100644
index b0b64781b..000000000
Binary files a/src/icons/Yahoo Advertising.png and /dev/null differ
diff --git a/src/icons/Yahoo! Ecommerce.png b/src/icons/Yahoo! Ecommerce.png
deleted file mode 100644
index b0b64781b..000000000
Binary files a/src/icons/Yahoo! Ecommerce.png and /dev/null differ
diff --git a/src/icons/Yahoo! Web Analytics.png b/src/icons/Yahoo! Web Analytics.png
deleted file mode 100644
index b0b64781b..000000000
Binary files a/src/icons/Yahoo! Web Analytics.png and /dev/null differ
diff --git a/src/icons/Yaws.png b/src/icons/Yaws.png
index 34b078442..5b8c597c2 100644
Binary files a/src/icons/Yaws.png and b/src/icons/Yaws.png differ
diff --git a/src/icons/YouTrack.png b/src/icons/YouTrack.png
new file mode 100644
index 000000000..4a00a51d4
Binary files /dev/null and b/src/icons/YouTrack.png differ
diff --git a/src/icons/Zendesk Chat.png b/src/icons/Zendesk Chat.png
new file mode 100644
index 000000000..37773ca31
Binary files /dev/null and b/src/icons/Zendesk Chat.png differ
diff --git a/src/icons/adminer.png b/src/icons/adminer.png
new file mode 100644
index 000000000..231efe4d6
Binary files /dev/null and b/src/icons/adminer.png differ
diff --git a/src/icons/adnegah.png b/src/icons/adnegah.png
new file mode 100644
index 000000000..360efa8e7
Binary files /dev/null and b/src/icons/adnegah.png differ
diff --git a/src/icons/aircall.png b/src/icons/aircall.png
new file mode 100644
index 000000000..de76b397a
Binary files /dev/null and b/src/icons/aircall.png differ
diff --git a/src/icons/akka-http.png b/src/icons/akka-http.png
new file mode 100644
index 000000000..fdc3a7726
Binary files /dev/null and b/src/icons/akka-http.png differ
diff --git a/src/icons/anchorCache.png b/src/icons/anchorCache.png
deleted file mode 100644
index 9e160bce5..000000000
Binary files a/src/icons/anchorCache.png and /dev/null differ
diff --git a/src/icons/aws-ec2.svg b/src/icons/aws-ec2.svg
new file mode 100755
index 000000000..f6da9f51d
--- /dev/null
+++ b/src/icons/aws-ec2.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="256px" height="310px" viewBox="0 0 256 310" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+	<g>
+		<path d="M42.754,244.495 L12.836,251.321 L12.836,57.565 L42.754,64.404 L42.754,244.495" fill="#F68536"></path>
+		<path d="M80.082,255.931 L42.754,266.539 L42.754,42.612 L80.082,53.207 L80.082,255.931" fill="#F68536"></path>
+		<path d="M127.966,267.681 L80.082,285.205 L80.082,23.946 L127.966,41.462 L127.966,267.681" fill="#F68536"></path>
+		<path d="M256,245.079 L127.966,309.096 L127.966,0 L256,64.017 L256,245.079" fill="#F68536"></path>
+		<path d="M102.444,12.763 L127.966,0 L127.966,309.096 L102.444,296.337 L102.444,12.763" fill="#9D5025"></path>
+		<path d="M60.325,33.82 L80.082,23.942 L80.082,285.154 L60.325,275.276 L60.325,33.82" fill="#9D5025"></path>
+		<path d="M27.016,50.477 L42.754,42.608 L42.754,266.488 L27.016,258.614 L27.016,50.477" fill="#9D5025"></path>
+		<path d="M12.836,57.565 L0,63.983 L0,245.117 L12.836,251.531 L12.836,57.565" fill="#9D5025"></path>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/aws-s3.svg b/src/icons/aws-s3.svg
new file mode 100755
index 000000000..70a784357
--- /dev/null
+++ b/src/icons/aws-s3.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="256px" height="310px" viewBox="0 0 256 310" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+	<g>
+		<path d="M20.624,53.686 L0,64 L0,245.02 L20.624,255.274 L20.748,255.125 L20.748,53.828 L20.624,53.686" fill="#8C3123"></path>
+		<path d="M131,229 L20.624,255.274 L20.624,53.686 L131,79.387 L131,229" fill="#E05243"></path>
+		<path d="M81.178,187.866 L127.996,193.826 L128.29,193.148 L128.553,116.378 L127.996,115.778 L81.178,121.652 L81.178,187.866" fill="#8C3123"></path>
+		<path d="M127.996,229.295 L235.367,255.33 L235.536,255.061 L235.533,53.866 L235.363,53.686 L127.996,79.682 L127.996,229.295" fill="#8C3123"></path>
+		<path d="M174.827,187.866 L127.996,193.826 L127.996,115.778 L174.827,121.652 L174.827,187.866" fill="#E05243"></path>
+		<path d="M174.827,89.631 L127.996,98.166 L81.178,89.631 L127.937,77.375 L174.827,89.631" fill="#5E1F18"></path>
+		<path d="M174.827,219.801 L127.996,211.21 L81.178,219.801 L127.939,232.854 L174.827,219.801" fill="#F2B0A9"></path>
+		<path d="M81.178,89.631 L127.996,78.045 L128.375,77.928 L128.375,0.313 L127.996,0 L81.178,23.413 L81.178,89.631" fill="#8C3123"></path>
+		<path d="M174.827,89.631 L127.996,78.045 L127.996,0 L174.827,23.413 L174.827,89.631" fill="#E05243"></path>
+		<path d="M127.996,309.428 L81.173,286.023 L81.173,219.806 L127.996,231.388 L128.685,232.171 L128.498,308.077 L127.996,309.428" fill="#8C3123"></path>
+		<path d="M127.996,309.428 L174.823,286.023 L174.823,219.806 L127.996,231.388 L127.996,309.428" fill="#E05243"></path>
+		<path d="M235.367,53.686 L256,64 L256,245.02 L235.367,255.33 L235.367,53.686" fill="#E05243"></path>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/bubble.png b/src/icons/bubble.png
new file mode 100644
index 000000000..16ec01d91
Binary files /dev/null and b/src/icons/bubble.png differ
diff --git a/src/icons/cloudcart.svg b/src/icons/cloudcart.svg
new file mode 100644
index 000000000..a97253618
--- /dev/null
+++ b/src/icons/cloudcart.svg
@@ -0,0 +1 @@
+<svg id="svg" version="1.1" width="1000" height="1000" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display: block;"><g id="svgg"><path id="path0" d="" stroke="none" fill="#000000" fill-rule="evenodd"></path><path id="path1" d="M247.098 226.702 C 237.254 236.548,229.200 244.751,229.200 244.932 C 229.200 245.112,230.032 246.545,231.048 248.117 C 256.277 287.117,307.229 300.663,348.745 279.409 C 355.790 275.802,365.382 268.997,369.592 264.620 L 370.984 263.173 362.392 254.670 C 357.666 249.993,350.076 242.508,345.523 238.036 L 337.247 229.904 334.904 231.942 C 312.093 251.782,274.721 240.857,266.347 211.900 C 265.854 210.195,265.349 208.800,265.224 208.800 C 265.099 208.800,256.942 216.856,247.098 226.702 " stroke="none" fill="#ffffff" fill-rule="evenodd"></path><path id="path2" d="M17.281 2.409 C 9.527 4.440,3.603 10.007,1.026 17.686 L 0.000 20.741 -0.000 199.686 C -0.000 395.265,-0.179 380.506,2.246 385.290 C 5.363 391.443,10.100 395.352,17.000 397.465 C 19.314 398.174,25.857 398.200,200.200 398.200 L 381.000 398.200 384.185 397.074 C 390.241 394.934,394.586 391.277,397.387 385.963 C 400.243 380.546,400.000 397.863,400.000 199.686 L 400.000 20.741 398.999 17.759 C 396.346 9.855,390.546 4.432,382.562 2.390 C 377.781 1.168,21.949 1.186,17.281 2.409 M128.458 110.818 C 147.818 112.770,166.383 121.146,181.103 134.568 L 183.261 136.536 166.930 152.893 C 147.696 172.158,149.797 170.566,146.890 168.079 C 119.389 144.558,76.861 164.118,77.051 200.200 C 77.228 233.756,114.293 253.408,142.676 234.996 C 146.424 232.564,145.109 233.837,196.407 183.003 C 246.018 133.839,247.604 132.303,252.400 128.746 C 288.036 102.313,334.861 104.495,368.520 134.155 L 371.240 136.552 364.120 143.703 C 360.204 147.636,352.549 155.179,347.109 160.466 L 337.218 170.078 335.109 168.294 C 319.996 155.516,297.891 154.514,282.295 165.900 C 279.316 168.074,276.795 170.540,220.400 226.449 C 179.260 267.234,176.788 269.567,169.800 274.207 C 117.594 308.870,46.324 281.662,31.580 221.439 C 16.817 161.142,66.372 104.557,128.458 110.818 M267.112 213.400 C 276.631 241.198,311.124 251.020,334.038 232.458 L 337.476 229.673 354.333 246.536 L 371.190 263.400 368.542 265.800 C 326.965 303.487,260.632 295.033,231.073 248.281 L 228.746 244.600 247.073 226.546 C 257.153 216.616,265.446 208.606,265.503 208.746 C 265.559 208.886,266.283 210.980,267.112 213.400 " stroke="none" fill="#2c3f51" fill-rule="evenodd"></path><path id="path3" d="M113.100 110.682 C 113.595 110.778,114.405 110.778,114.900 110.682 C 115.395 110.587,114.990 110.509,114.000 110.509 C 113.010 110.509,112.605 110.587,113.100 110.682 M123.500 110.682 C 123.995 110.778,124.805 110.778,125.300 110.682 C 125.795 110.587,125.390 110.509,124.400 110.509 C 123.410 110.509,123.005 110.587,123.500 110.682 M301.700 110.687 C 302.305 110.778,303.295 110.778,303.900 110.687 C 304.505 110.595,304.010 110.520,302.800 110.520 C 301.590 110.520,301.095 110.595,301.700 110.687 M310.500 110.687 C 311.105 110.778,312.095 110.778,312.700 110.687 C 313.305 110.595,312.810 110.520,311.600 110.520 C 310.390 110.520,309.895 110.595,310.500 110.687 M181.183 134.900 C 182.164 135.945,183.019 136.800,183.083 136.800 C 183.384 136.800,183.066 136.441,181.300 134.783 L 179.400 133.000 181.183 134.900 M241.992 137.900 L 238.200 141.800 242.100 138.008 C 245.722 134.486,246.182 134.000,245.892 134.000 C 245.833 134.000,244.078 135.755,241.992 137.900 M368.800 134.525 C 368.800 134.594,369.385 135.179,370.100 135.825 L 371.400 137.000 370.225 135.700 C 369.130 134.488,368.800 134.216,368.800 134.525 M54.985 136.900 L 53.000 139.000 55.100 137.015 C 57.051 135.171,57.383 134.800,57.085 134.800 C 57.022 134.800,56.077 135.745,54.985 136.900 M357.397 150.100 L 347.000 160.600 357.500 150.203 C 363.275 144.484,368.000 139.759,368.000 139.703 C 368.000 139.420,367.059 140.343,357.397 150.100 M160.597 158.900 L 149.800 169.800 160.700 159.003 C 170.829 148.969,171.780 148.000,171.497 148.000 C 171.441 148.000,166.536 152.905,160.597 158.900 M117.500 157.893 C 118.435 157.977,119.965 157.977,120.900 157.893 C 121.835 157.809,121.070 157.740,119.200 157.740 C 117.330 157.740,116.565 157.809,117.500 157.893 M305.700 157.891 C 306.525 157.978,307.875 157.978,308.700 157.891 C 309.525 157.805,308.850 157.734,307.200 157.734 C 305.550 157.734,304.875 157.805,305.700 157.891 M205.397 174.100 L 194.600 185.000 205.500 174.203 C 211.495 168.264,216.400 163.359,216.400 163.303 C 216.400 163.020,215.431 163.971,205.397 174.100 M270.196 176.900 L 262.600 184.600 270.300 177.004 C 277.454 169.946,278.181 169.200,277.896 169.200 C 277.839 169.200,274.374 172.665,270.196 176.900 M28.950 199.800 C 28.951 202.220,29.016 203.158,29.096 201.885 C 29.176 200.612,29.175 198.632,29.094 197.485 C 29.014 196.338,28.949 197.380,28.950 199.800 M161.997 217.100 L 151.000 228.200 162.100 217.203 C 168.205 211.154,173.200 206.159,173.200 206.103 C 173.200 205.820,172.217 206.785,161.997 217.100 M227.397 219.300 L 216.600 230.200 227.500 219.403 C 237.629 209.369,238.580 208.400,238.297 208.400 C 238.241 208.400,233.336 213.305,227.397 219.300 M237.800 235.600 C 234.506 238.900,231.900 241.600,232.010 241.600 C 232.120 241.600,234.906 238.900,238.200 235.600 C 241.494 232.300,244.100 229.600,243.990 229.600 C 243.880 229.600,241.094 232.300,237.800 235.600 M342.000 234.600 C 344.743 237.350,347.078 239.600,347.188 239.600 C 347.298 239.600,345.143 237.350,342.400 234.600 C 339.657 231.850,337.322 229.600,337.212 229.600 C 337.102 229.600,339.257 231.850,342.000 234.600 M118.300 242.282 C 118.795 242.378,119.605 242.378,120.100 242.282 C 120.595 242.187,120.190 242.109,119.200 242.109 C 118.210 242.109,117.805 242.187,118.300 242.282 M187.796 258.500 L 180.600 265.800 187.900 258.604 C 194.682 251.919,195.381 251.200,195.096 251.200 C 195.039 251.200,191.754 254.485,187.796 258.500 M240.000 260.125 C 240.000 260.194,240.585 260.779,241.300 261.425 L 242.600 262.600 241.425 261.300 C 240.330 260.088,240.000 259.816,240.000 260.125 M114.505 289.487 C 115.114 289.579,116.014 289.577,116.505 289.482 C 116.997 289.387,116.500 289.311,115.400 289.314 C 114.300 289.317,113.897 289.395,114.505 289.487 M122.300 289.482 C 122.795 289.578,123.605 289.578,124.100 289.482 C 124.595 289.387,124.190 289.309,123.200 289.309 C 122.210 289.309,121.805 289.387,122.300 289.482 " stroke="none" fill="#4f8ab3" fill-rule="evenodd"></path><path id="path4" d="M111.787 110.796 C 56.367 115.449,18.138 168.509,31.811 221.800 C 45.935 276.850,107.015 305.100,158.600 280.440 C 172.358 273.863,172.437 273.795,217.800 228.810 C 287.467 159.725,281.431 165.405,289.002 161.812 C 304.130 154.633,323.538 157.373,335.311 168.349 L 337.222 170.130 353.711 153.779 C 362.780 144.786,370.370 137.288,370.577 137.117 C 371.386 136.450,364.494 130.442,357.600 125.804 C 325.887 104.469,283.126 105.746,252.258 128.950 C 247.919 132.212,244.797 135.246,194.800 184.806 C 171.150 208.249,150.360 228.782,148.600 230.435 C 120.724 256.605,75.488 236.243,76.900 198.161 C 78.229 162.316,119.675 145.164,148.000 168.736 L 149.400 169.901 166.177 153.353 L 182.955 136.805 181.777 135.550 C 166.267 119.011,137.044 108.676,111.787 110.796 M349.600 242.200 C 351.017 243.630,352.267 244.800,352.377 244.800 C 352.487 244.800,351.417 243.630,350.000 242.200 C 348.583 240.770,347.333 239.600,347.223 239.600 C 347.113 239.600,348.183 240.770,349.600 242.200 M230.181 243.300 L 228.600 245.000 230.300 243.419 C 231.881 241.948,232.184 241.600,231.881 241.600 C 231.816 241.600,231.051 242.365,230.181 243.300 " stroke="none" fill="#5fabdd" fill-rule="evenodd"></path></g></svg>
\ No newline at end of file
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/eCommercePy.png b/src/icons/eCommercePy.png
new file mode 100644
index 000000000..16fb0d0b9
Binary files /dev/null and b/src/icons/eCommercePy.png differ
diff --git a/src/icons/ebis.png b/src/icons/ebis.png
new file mode 100644
index 000000000..1c572e816
Binary files /dev/null and b/src/icons/ebis.png differ
diff --git a/src/icons/ec-cube.png b/src/icons/ec-cube.png
new file mode 100644
index 000000000..beb4e7123
Binary files /dev/null and b/src/icons/ec-cube.png differ
diff --git a/src/icons/enduro.js.svg b/src/icons/enduro.js.svg
new file mode 100644
index 000000000..28262f089
--- /dev/null
+++ b/src/icons/enduro.js.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#221F1F" d="M57.7 124.4L14.9 99.6c-3.9-2.2-6.3-6.4-6.3-10.9V39.3c0-4.5 2.4-8.6 6.3-10.9L57.7 3.6c3.9-2.2 8.7-2.2 12.6 0l42.9 24.7c3.9 2.2 6.3 6.4 6.3 10.9v49.5c0 4.5-2.4 8.6-6.3 10.9l-42.9 24.7c-3.9 2.3-8.7 2.3-12.6.1z"/><path fill="#FFF" d="M84.5 51.3c0 15.5-16.8 18.1-28.6 18.2.4 6.5 3.8 11.8 12.3 11.8 5.9 0 10.2-2.7 12.6-4.4l3.8 8.1c-1.6 1.4-8.2 5.6-17.7 5.6-17.1 0-23.7-10.4-23.7-25.4 0-14.8 8.3-27.9 24.8-27.9 9.9.1 16.5 5.1 16.5 14zm-17.1-5.4c-8 0-11.6 7.7-11.9 15.1 7.4-.1 18-1.8 18-9.5-.1-3.7-2.5-5.6-6.1-5.6z"/></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/gerrit.svg b/src/icons/gerrit.svg
new file mode 100644
index 000000000..160dd52e3
--- /dev/null
+++ b/src/icons/gerrit.svg
@@ -0,0 +1,8 @@
+<svg width="52" height="52" xmlns="http://www.w3.org/2000/svg">
+<rect ry="4" rx="4" height="40" width="40" y="0" x="0" fill="#ffaaaa"/>
+<rect ry="4" rx="4" height="40" width="40" y="12" x="12" fill="#aaffaa"/>
+<path d="m18,22l12,0l0,4l-12,0l0,-4z" fill="#ff0000"/>
+<path d="m34,22l12,0l0,4l-12,0l0,-4z" fill="#ff0000"/>
+<path d="m18,36l4,0l0,-4l4,0l0,4l4,0l0,4l-4,0l0,4l-4,0l0,-4l-4,0l0,-4z" fill="#008000"/>
+<path d="m34,36l4,0l0,-4l4,0l0,4l4,0l0,4l-4,0l0,4l-4,0l0,-4l-4,0l0,-4z" fill="#008000"/>
+</svg>
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/gogs.png b/src/icons/gogs.png
new file mode 100644
index 000000000..e64bfcc2e
Binary files /dev/null and b/src/icons/gogs.png differ
diff --git a/src/icons/gravityforms.svg b/src/icons/gravityforms.svg
new file mode 100644
index 000000000..b2c4ee7c6
--- /dev/null
+++ b/src/icons/gravityforms.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 350 426.87"><defs><style>.cls-1{fill:#355667;}.cls-2{fill:#f0f0f1;}</style></defs><title>gravityforms</title><g id="Rpqhq1.tif"><path class="cls-1" d="M75,343q0-71.16,0-142.32a44.86,44.86,0,0,0,1.75-4.59c4.83-18.29,14.36-33.22,31-42.86,36.63-21.17,73.2-42.44,110-63.25,19.89-11.24,40.57-11.05,61.3-1.81,1.63.73,3.32,1.32,6.3,2.5-2.2-17,7.31-25.22,20-31.83,13.45-7,26.48-14.81,39.69-22.27h10.17c15.29,8.65,30.48,17.47,45.89,25.9,9.43,5.16,14.16,13,14.32,23.45q.34,22.47,0,44.95c-.17,9.85-4.4,17.65-13.26,22.6a15.69,15.69,0,0,0-2.69,2.07c6.32,8.87,12.87,16.91,18.08,25.74,3.46,5.88,5,12.88,7.39,19.39V343a28,28,0,0,0-1.55,4c-4.49,20.18-15.36,35.52-33.52,45.86-35.47,20.19-70.7,40.8-106.17,61-22.39,12.75-45.13,12.76-67.52,0-35.88-20.45-71.55-41.26-107.42-61.74C94.25,383.82,84.76,371.52,79,356.06,77.45,351.79,76.33,347.35,75,343Zm18.61-70.93c0,20.81-.18,41.63.05,62.44.2,18.09,8.12,32.27,23.71,41.39q54.15,31.68,108.71,62.65c15.72,9,31.95,9,47.68.08q54.52-31,108.72-62.63c15.84-9.27,23.84-23.62,23.89-42,.11-41.14,0-82.29.08-123.43,0-14.19-5.56-25.84-15.32-35.61-8.79-8.79-10.93-8.86-21.66-2.64-1.67,1-3.37,1.91-5,2.9q-14,8.37-28.15.13c-8.78-5.1-17.2-11-26.46-15.05-18.56-8.05-27.71-20.88-24.79-41.51.32-2.28-.5-5.88-2.13-7.11-15.77-11.88-36.24-17-55.68-6.07q-55.28,31.16-110,63.31c-15.58,9.12-23.39,23.39-23.57,41.48C93.46,230.92,93.61,251.5,93.61,272.07ZM332,104.34c-.64-6,2.5-6.93,6.57-6.93q15.6,0,31.2,0c5.56,0,11.13-.07,16.69-.08s6.08-4.45,5.81-8.1c-.11-1.42-3.86-3.63-6-3.67-17.17-.29-34.35-.28-51.52-.08-10.18.12-14.29,3.66-16.27,13.85-1.65,8.53-3,17.13-4.19,25.73-1.07,7.56,1.39,10,8.56,7.63,2.24-.75,4.55-4.82,4.72-7.5.45-7.14,3.39-9.33,10.49-9,12.06.62,24.18.29,36.27.06,2.4,0,5.64-.8,6.93-2.45s1.76-5.26,1-7.45c-.43-1.24-4-1.91-6.2-1.93C361.45,104.26,346.77,104.34,332,104.34Z" transform="translate(-75 -36.56)"/><path class="cls-2" d="M332,104.34c14.73,0,29.41-.08,44.09.09,2.18,0,5.77.69,6.2,1.93.76,2.19.39,5.68-1,7.45s-4.53,2.4-6.93,2.45c-12.09.24-24.21.56-36.27-.06-7.1-.36-10,1.83-10.49,9-.17,2.68-2.49,6.75-4.72,7.5-7.17,2.4-9.63-.06-8.56-7.63,1.22-8.6,2.53-17.2,4.19-25.73,2-10.19,6.09-13.73,16.27-13.85,17.17-.2,34.35-.21,51.52.08,2.12,0,5.88,2.25,6,3.67.27,3.65-.15,8.1-5.81,8.1s-11.13.07-16.69.08q-15.6,0-31.2,0C334.54,97.42,331.4,98.38,332,104.34Z" transform="translate(-75 -36.56)"/><path class="cls-1" d="M130.84,336.34c-3.76-31-2.92-61.15,8.18-90.31,12.64-33.2,36.3-49.35,71.63-49.35h157v40.17h-8.35q-73.67,0-147.34,0c-20,0-29.28,6.1-35.69,25.23-3.55,10.59-5.23,21.8-8,33.85,4.65.27,7.45.56,10.25.57q69.31,0,138.63,0c9.36,0,9.36,0,9.37-9.63,0-3.6,0-7.21,0-11.48h39.64v60.94Z" transform="translate(-75 -36.56)"/></g></svg>
diff --git a/src/icons/http2.png b/src/icons/http2.png
new file mode 100644
index 000000000..c20d5d447
Binary files /dev/null and b/src/icons/http2.png 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/iPresta.png b/src/icons/iPresta.png
new file mode 100644
index 000000000..f493a4650
Binary files /dev/null and b/src/icons/iPresta.png differ
diff --git a/src/icons/ikiwiki.png b/src/icons/ikiwiki.png
new file mode 100644
index 000000000..c8de80f7a
Binary files /dev/null and b/src/icons/ikiwiki.png differ
diff --git a/src/icons/infusionsoft.svg b/src/icons/infusionsoft.svg
new file mode 100644
index 000000000..50f50d016
--- /dev/null
+++ b/src/icons/infusionsoft.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 220.59 350"><defs><style>.cls-1{fill:#67b244;}.cls-2{fill:#333;opacity:0.3;}</style></defs><title>infusionsoft</title><polygon class="cls-1" points="204.13 158.82 0 276.47 0 117.65 204.13 0 204.13 158.82"/><polyline class="cls-2" points="0 117.65 220.59 191.18 220.59 350 0 276.47"/></svg>
\ No newline at end of file
diff --git a/src/icons/jimdo.png b/src/icons/jimdo.png
new file mode 100644
index 000000000..d4a12d8a8
Binary files /dev/null and b/src/icons/jimdo.png differ
diff --git a/src/icons/kibana.svg b/src/icons/kibana.svg
new file mode 100644
index 000000000..419dcbd87
--- /dev/null
+++ b/src/icons/kibana.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<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"
+	 viewBox="0 0 80 80" style="enable-background:new 0 0 80 80;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#E9478B;}
+	.st1{fill:#3EBEB0;}
+	.st2{fill:#37A595;}
+	.st3{fill:#353535;}
+	.st4{fill:none;}
+</style>
+<g>
+	<path class="st0" d="M19.6,33.1c7.3,0,14.2,1.9,20.2,5.1l21.4-25.7H18.8v51l0,0V33.1C19.1,33.1,19.4,33.1,19.6,33.1z"/>
+	<path class="st1" d="M39.8,38.2l-21,25.3v4h42.3C58.7,54.9,50.7,44.2,39.8,38.2z"/>
+	<path class="st2" d="M39.8,38.2l-21,25.3v4h7.5l20.4-24.6c0,0-1.4-1.1-3.3-2.5C42,39.4,39.8,38.2,39.8,38.2z"/>
+	<path class="st3" d="M19.6,33.1c-0.3,0-0.5,0-0.8,0v30.4l21-25.3C33.8,35,26.9,33.1,19.6,33.1z"/>
+</g>
+<rect class="st4" width="80" height="80"/>
+</svg>
diff --git a/src/icons/mailchimp.svg b/src/icons/mailchimp.svg
new file mode 100644
index 000000000..2456a7208
--- /dev/null
+++ b/src/icons/mailchimp.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 475.84 498"><defs><style>.cls-1{fill:#684c46;}.cls-2{fill:#f5dcba;}.cls-3{fill:#0788bf;}.cls-4{fill:#46b8e3;}.cls-5{fill:#ffd14f;}.cls-6{fill:#122030;}.cls-7{fill:#fff;}.cls-8{fill:#eabe8d;}.cls-9{fill:#9c7356;}</style></defs><title>mailchimp</title><path class="cls-1" d="M480.5,356.87c-.39,1.27-37,142.18-181.08,142.13-124.51,0-183.53-108.26-183.53-108.26A64.52,64.52,0,0,1,90,386.83c-36.53-13.42-54.06-55.21-41.45-90.27L28.45,281.22C-49.32,222,171-49.13,248.9,12.21l18.6,15c28-17,55.68-26.17,78.19-26.17,16,0,29.37,4.63,38.37,14.38,20.22,21.89,13,63.7-14.66,106,5.94,5.64,10.86,13.3,14.37,20.91,8.78,6.77,14.47,17.07,17.29,31.29,3.15,15.81,3.8,38.34,5.78,48,7.45,3.36,4.27,1.81,12.21,5.77,8.28,4.14,18.36,9.17,29.5,19.89,19.8,5,27.36,26,15.78,40.38-.31.39-1.71,2-3.16,3.69A74.49,74.49,0,0,1,468.07,311a26.16,26.16,0,0,1,18.17,14.32C492.17,339.61,480.5,356.87,480.5,356.87ZM423.4,463.28v5.9h2.26v-5.9H428v-1.86h-6.85v1.86Zm5.26-1.86v7.76h2.06v-5.6l1.68,5.6h1.76l1.68-5.62v5.62h2.06v-7.76h-3.22l-1.39,4.47-1.41-4.47Z" transform="translate(-12.08 -1)"/><path class="cls-2" d="M145.27,303.84h0A123.34,123.34,0,0,0,150,289.33a91.78,91.78,0,0,1,4.71,34.2h0c3-4,6.17-11.42,6.17-11.42,5.54,32.6-18.25,62.44-49.6,62.44-27.83,0-50.39-23.75-50.39-53s22.56-53,50.39-53a48.08,48.08,0,0,1,20.28,4.47S142.26,278.32,145.27,303.84Zm274.19,115c39.06-30.69,45.89-67.66,46.54-68.93,9.61-11.53,7-22.88-5.7-22.89a23.72,23.72,0,0,0-7.09,1.07s0-16.82-7.73-29.92c-6,6.75-22.65,20.11-44.5,30.48-20.49,9.73-47.82,18.24-81.7,19.37h0c-9.49.41-15.35-1.13-18.66,9.93-1.05,3.91-.6,9.71.19,11.39,2.67,9.16,9.65,13.2,18.84,15.33A80,80,0,0,0,334,386.42c68.71,1.93,123.88-51.66,124.54-52.1a10.51,10.51,0,0,0,1.17-1.14l-.68,1.58c-9.92,22.32-67.38,62.79-124.57,61.63l-.19.07c-13.26-.05-29.38-3.46-37.76-13.85-13.26-16.44-6.38-43.77,14.75-44.41l7-.17c52.31-1.61,99.24-20.83,132.85-61,4.62-5.74-.54-13.63-10.56-13.87a.33.33,0,0,1-.23-.1c-11.87-12.71-22.31-17.21-31.6-21.93-19.47-9.92-17.64-1.35-22.16-49.46-1.22-13-3.68-30.66-15.07-37.44a18.52,18.52,0,0,0-9.64-2.54,17.89,17.89,0,0,0-5.64.83c-6.24,1.38-9.79,4.92-14.23,9-21,19.37-37.8,14.11-62.86,13.89-23.54-.21-44.32,16.21-48.29,41.42h0c-1.93,13.2-.68,26.61,1.39,32.64,0,0-6.39-4.25-9.43-8,3.68,23,24.7,38.09,24.7,38.09a34.24,34.24,0,0,1-8.07.45s12,9.49,22.39,12.79c-2.71,1.69-16.41,15.2-23.47,33.81-6.61,17.42-3.92,38.32-3.92,38.32l5.74-8.56s-3.75,19.07,3.51,37.55c2.41-5.5,7.67-15.3,7.67-15.3s-.83,20.48,9,37.26c.25-3.87,1.73-13.73,1.73-13.73s5.66,17.49,18.73,29.72C305.35,453.64,370.15,457.56,419.46,418.81Z" transform="translate(-12.08 -1)"/><path class="cls-3" d="M56.07,281.64c-.2-.05-19-13.82-21.63-18.36-15.79-26.64,11.68-81.36,31.22-112.46C114,74,194.36,13.29,230.87,22l37.5,19.35a303.28,303.28,0,0,0-37.08,26.08l-8,6.69S200,89.77,188.42,99.66C142,139.3,96.23,200.66,79.27,259.89A64.31,64.31,0,0,0,56.07,281.64Z" transform="translate(-12.08 -1)"/><path class="cls-4" d="M230.87,22h0C194.36,13.29,114,74,65.67,150.82l0,.07.2,0,38.48,30.3c42.26-67.08,95.36-101.66,96.86-102.68l-6.1-41.05L206.5,32l22.94,7.43-1.76-7.66L230.87,22Z" transform="translate(-12.08 -1)"/><path class="cls-5" d="M268.37,41.31,231.29,67.39l-2.59,2L195.82,42.56l-.76-5.08L206.5,32l22.94,7.43.38-14.24L230.87,22l10-3.85Z" transform="translate(-12.08 -1)"/><path class="cls-6" d="M341.53,15.73c-24.52,0-52,12.9-73.16,25.57-3,1.74-5.9,3.57-8.78,5.43l-11-9.26,4,13.95q-2.28,1.56-4.45,3.11l-22.83-7,15.11,12.65c-3.45,2.61-6.53,5.06-9.09,7.18L195.07,37.48,197,50.88l26.33,23.2S200,89.77,188.42,99.66C142,139.29,96.23,200.66,79.27,259.89l1-.54.39-.2,1.41-.73.91-.45c.49-.23,1-.45,1.46-.66l.86-.38c.53-.22,1.05-.42,1.58-.62l.73-.28c.77-.27,1.53-.53,2.29-.76,11.53-3.44,27.22-5.65,45.59,2.15,9.22-23.26,20.24-46.93,37.61-69.67,14.08-18.44,27.61-34.9,43.86-44,30.76-28.89,113.66-59.53,140.22-33,6.28-10.27,11.73-20,16.22-32.19C384.43,49.3,384.64,15.73,341.53,15.73Z" transform="translate(-12.08 -1)"/><polygon class="cls-6" points="224.21 40.65 218.79 20.95 215.6 30.77 217.51 38.48 224.21 40.65"/><path class="cls-7" d="M453.21,328s0-16.82-7.73-29.92c-6,6.75-22.65,20.11-44.5,30.48-20.49,9.73-47.82,18.24-81.7,19.37h0c-9.49.41-15.35-1.13-18.66,9.93a18.1,18.1,0,0,0-.52,3.11v.11h0c0,.35-.05.71-.06,1.06,0,1,0,1.9,0,2.68v.23c0,.49.07,1,.12,1.39v.14a10.09,10.09,0,0,0,.61,2.67h0l0,.15c2.7,9.06,9.66,13.06,18.8,15.19A80,80,0,0,0,334,386.4c56.06,1.57,103.11-33.81,118.89-47.13A96.77,96.77,0,0,0,453.21,328Zm-161-299.45c13.39-6.17,27.75-11.05,41.51-12.46C320,19.2,303.34,26.29,283.6,38.37c-.48.28-46.71,31.48-75,59.49-15.39,15.27-77.2,89.38-77.15,89.32,11.3-21.38,18.74-31.87,36.62-54.36,10.11-12.72,20.9-25.09,32-36.51q5.57-5.76,11.21-11.17h0C212.72,83.77,245,50.7,292.17,28.59Z" transform="translate(-12.08 -1)"/><path class="cls-8" d="M419.46,418.81a136.69,136.69,0,0,1-20.83,13.5C382.12,426,372,412.67,372,412.67s14.15-3.35,33.07-13c23-11.69,44.5-28.58,60.94-49.83C465.35,351.15,458.52,388.12,419.46,418.81ZM374.54,240.63c-8-5.68-21.21-1.16-24.12,8.24,4.62.23,9.52,3.73,9.22,8.2a17.7,17.7,0,0,1,12.41-4.86C369.88,248.72,371,242.7,374.54,240.63ZM290.78,355.29c2.51-9.36,9.62-16.77,20.5-17.11l7-.17c52.31-1.61,99.24-20.83,132.85-61,4.62-5.74-.54-13.63-10.56-13.87h-.14c-1.69,1.79-2,5.06-4.8,10-10.22,17.76-24.36,25.88-43.21,35.3-57.8,28.78-87.78,15.39-99.8,33-3.5,5.19-3.56,11-1.88,13.84ZM395.37,234.6c-5.53-4-5.73-10.89-8.74-42.89-1-10.21-2.69-23.34-8.94-31.77a8.5,8.5,0,0,0-5.72-2.43c-3.95-.17-8.41,3.91-10.94,6.71-7.18,10.36-14,17-26.17,22.81a78.82,78.82,0,0,1-36.06,7.19c-8.87-.28-16.63-1.74-24.24-1.84-14.1-.22-26.32,4.35-35.23,15.6-6.11,7.71-8.56,15.87-9.34,25.58,0,1.17.08,2.27.15,3.31.11,1.54.25,3,.42,4.4a40.69,40.69,0,0,0,1.51,7.47.38.38,0,0,1,0,.11c.07.24.15.47.22.69,0,0-6.39-4.25-9.43-8,3.07,19.2,18.19,32.86,23.13,36.87l.86.67.06.06.64.48a34.23,34.23,0,0,1-8.07.45s12,9.49,22.39,12.79c13.79-11.65,29.42-16.13,42.25-17.51,7.78-4.83,16.14-9.57,25.12-14.14-2.72-16.93,12.3-34,31.19-35.62,14.26-1,21.19,5.35,26.19,12.19,2.71-.87,5.77-1.81,9.18-2.82A2.88,2.88,0,0,1,395.37,234.6Zm6.82,114a2.79,2.79,0,0,0-.53.09C396,350,337.22,372.8,300.09,361.14c-.17,2-.11,6.3.72,8.16h0a108.67,108.67,0,0,0,21,1.85C370.65,371.15,405.86,348.94,402.19,348.64Zm-273.36-4.56,0,0a14.18,14.18,0,0,0,3.52-11.94c-1.1-6.15-8.07-7.39-12.67-12.17l-.22-.23-.23-.25v0a10.3,10.3,0,0,1-2.62-7.51c.36-6.29,6-8.06,8.86-6.9a11.65,11.65,0,0,1,6.12,4.54h0c-.41-1.23-.32-3.21-2.41-6.17-3.42-4.85-11.29-9.79-22.44-7.42h0a22.16,22.16,0,0,0-2.94.76,7.7,7.7,0,0,0-.86.28c-.64.3-1.23.5-1.8.81h0a25.11,25.11,0,0,0-4,2.44C84.63,316.43,105.86,345.77,128.83,344.08Z" transform="translate(-12.08 -1)"/><path class="cls-9" d="M313.64,244.49c1.06,1.55,1.34,2.72.91,3.2-.85,1-3.9-.35-8.39-2.1-11.51-4.29-20-4.95-35,.73-3.8,1.45-6.49,2.57-7.78,2.37-2.1-.31-.07-4.17,4.53-7.9,9.26-7.38,22-9.68,32.83-5.63C305.51,236.91,310.85,240.4,313.64,244.49Zm-2.28,11.77c-3.16-2.41-9-4-15-3a32.42,32.42,0,0,0-3.59.89,8.3,8.3,0,0,0-1.22.42,20.73,20.73,0,0,0-6.75,4.19c-2.4,2.32-3.09,4.48-2.39,5s2.35-.26,4.92-1.3a41.23,41.23,0,0,1,20.52-3.27c2.8.19,4.68.36,5.11-.41C313.27,258.28,312.72,257.29,311.36,256.26ZM125.88,300.44h0a16.9,16.9,0,0,1,3.31,3.47c2.65,3.75,1.81,5.94,2.89,7a1.36,1.36,0,0,0,1.51.28c1.5-.62,2.24-3,2.38-4.68h0c.38-4-1.74-8.51-4.55-11.71h0a24.62,24.62,0,0,0-6.67-5.35,27.8,27.8,0,0,0-9.26-3.17,34.83,34.83,0,0,0-13.42.75h0c-.84.24-1.88.46-2.77.81-9.69,3.78-16.07,10.71-18.9,19.9h0a34.88,34.88,0,0,0-.67,17.41h0c.82,3.75,2.5,8,5.11,10.74h0c3.27,3.54,6.86,2.86,5.33-.43a28.49,28.49,0,0,1-2.61-11.38,33.26,33.26,0,0,1,2.05-13.19,24.8,24.8,0,0,1,3.72-6.45,23.67,23.67,0,0,1,7.81-6.1h0c.57-.3,1.16-.51,1.8-.81a7.58,7.58,0,0,1,.86-.28,22.19,22.19,0,0,1,2.94-.76h0C114.5,294.84,121.17,296.64,125.88,300.44Zm-1.65,15a4.65,4.65,0,0,1-1.86-2.69c-.44-2-.21-3.21,1.53-4.43,1.34-.91,2.41-1.36,2.41-1.93.06-1.09-4.41-2.21-7.53.87-2.59,2.76-3.41,8.53.73,13,4.61,5,11.77,6.15,12.89,12.4a11.89,11.89,0,0,1,.18,2.85,15.07,15.07,0,0,1-.38,2.83c-1.39,6-7.12,11.8-16.57,10.33-1.74-.25-2.87-.47-3.21,0-.73,1,3.32,5.65,10.74,5.48,7.25-.15,14.45-5.58,16.76-13.75a20.78,20.78,0,0,0,.76-4.49,18.64,18.64,0,0,0-.27-4.77C138.51,320.65,128.1,318.5,124.22,315.41ZM377,240.57c-2.87-.45-5.69,2.38-6.3,6.31s1.21,7.48,4.08,7.93,5.69-2.38,6.3-6.31S379.9,241,377,240.57ZM345.54,252c-1.58,2.88.34,7,4.29,9.12s8.42,1.58,10-1.29-.34-7-4.29-9.12S347.11,249.16,345.54,252Zm-115.4-116.3c54.24-35.16,108.42-39.2,127-24.93h0c0-.09-.33-.92-.45-1.14h0c-4.71-10-15.71-17-25.51-19.8a38.23,38.23,0,0,1,5.21,7,78,78,0,0,0-27.47-11.68s1.22.88,1.43,1.07c2,1.9,4.76,4.91,5.88,7.49-9.8-3.93-22.19-6.14-32.79-4.1L282.1,90s1.38.34,1.69.43c3.52,1,8.54,3.19,10.75,6.12-17.6-3.1-37,.33-47.41,6.17a24.2,24.2,0,0,1,2.47,0c3.84.1,11.58.62,14.83,2.69-11.1,2.26-27.17,7.23-35.82,14.66,1.53-.18,10.2-1.28,13.74-.71-47.61,27.25-69.29,68.44-69.29,68.44h0C187.09,169.44,205.3,151.83,230.14,135.74Z" transform="translate(-12.08 -1)"/><path class="cls-1" d="M358.11,212.55c-.07-3.74.52-9.91,4-11.06h0c6-2.09,14,13.32,14.35,27a30.15,30.15,0,0,0-16.08-2.89A46.31,46.31,0,0,1,358.11,212.55Z" transform="translate(-12.08 -1)"/></svg>
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/meliscmsv2.png b/src/icons/meliscmsv2.png
new file mode 100644
index 000000000..39ec358a6
Binary files /dev/null and b/src/icons/meliscmsv2.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/octopress.png b/src/icons/octopress.png
new file mode 100644
index 000000000..0f2506730
Binary files /dev/null and b/src/icons/octopress.png differ
diff --git a/src/icons/phpliteadmin.png b/src/icons/phpliteadmin.png
new file mode 100644
index 000000000..03487a2d3
Binary files /dev/null and b/src/icons/phpliteadmin.png differ
diff --git a/src/icons/pygments.png b/src/icons/pygments.png
new file mode 100644
index 000000000..222c8951c
Binary files /dev/null and b/src/icons/pygments.png differ
diff --git a/src/icons/question2answer.png b/src/icons/question2answer.png
index 53f6e571b..4b58a3c6f 100644
Binary files a/src/icons/question2answer.png and b/src/icons/question2answer.png differ
diff --git a/src/icons/spin.js.png b/src/icons/spin.js.png
index 69e9c1a53..4d79611b6 100644
Binary files a/src/icons/spin.js.png and b/src/icons/spin.js.png 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/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/icons/xonic.png b/src/icons/xonic.png
index a49fffc98..77f6d9e17 100644
Binary files a/src/icons/xonic.png and b/src/icons/xonic.png differ
diff --git a/src/icons/YUI Doc.png b/src/icons/yahoo.png
similarity index 100%
rename from src/icons/YUI Doc.png
rename to src/icons/yahoo.png
diff --git a/src/utils/iframe.js b/src/utils/iframe.js
index 6292dadb1..64e2c20e4 100644
--- a/src/utils/iframe.js
+++ b/src/utils/iframe.js
@@ -7,18 +7,19 @@ var exports = {};
 (function(exports) {
 
 	var utils = {
-		getReferrer: function() {
+		normalizeUrl: function(url) {
 
-			return this.hashUrl(document.referrer) || null;
+			return this.hashUrl(url) || null;
 
 		},
 
-		getPageUrl: function() {
-
-			return this.hashUrl(window.location.href) || null;
-
+		getReferrer: function() {
+			return this.normalizeUrl(document.referrer);
 		},
 
+		getPageUrl: function() {
+			return this.normalizeUrl(window.location.href);
+		},
 		hashUrl: function(url) {
 			var a,
 				result;
@@ -121,6 +122,7 @@ var exports = {};
 
 	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 = {
@@ -134,11 +136,21 @@ var exports = {};
 
 	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,
-				assets: opt_assets || [],
+				video_assets: opt_video_assets,
+				assets: opt_assets,
 				version: '3',
+				mrev: '9efbfba-c',
 				msgNum: this.msgNum,
 				timestamp: new Date().getTime(),
 				pageVis: document.visibilityState,
@@ -157,255 +169,342 @@ var exports = {};
 
 (function(exports) {
 
-	var VALID_AD_SIZES = [
-		[160, 600],
-
-		[300, 250],
-		[300, 600],
-		[300, 1050],
-
-		[336, 280],
-		[336, 850],
-		[468, 60],
-		[728, 90],
-		[728, 270],
-		[970, 66],
-		[970, 90],
-		[970, 125],
-		[970, 250],
-		[970, 400],
-		[970, 415],
-		[1280, 100]
-	];
-
-	var PX_SIZE_TOL = 10;
-	var MIN_WINDOW_PX = 10;
-	var MAX_SEARCHES_PER_WINDOW = 10;
-	var MAX_SEARCHES_PER_ELEMENT = 2;
-
-	function makeSizeSet(validAdSizes, sizeTol) {
-		var set = {};
-		var i;
-		var xfuz;
-		var yfuz;
-		var size;
-		var width;
-		var height;
-
-		for ( i = 0; i < validAdSizes.length; i++ ) {
-			for ( xfuz = -sizeTol; xfuz <= sizeTol; xfuz++ ) {
-				for ( yfuz = -sizeTol; yfuz <= sizeTol; yfuz++ ) {
-					size = validAdSizes[i];
-					width = size[0] + xfuz;
-					height = size[1] + yfuz;
-					set[width + 'x' + height] = size;
-				}
+	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 set;
-	}
 
-	var SIZE_SET = makeSizeSet(VALID_AD_SIZES, PX_SIZE_TOL);
-
-	function elementIsAd(el) {
-		if ( typeof el.searches !== 'number' ) {
-			el.searches = 0;
-		}
-
-		if ( el.searches >= MAX_SEARCHES_PER_ELEMENT ) {
-			return false;
-		}
-
-		el.searches += 1;
-
-		var isImgWithoutSrc = el.tagName === 'IMG' && !el.src;
-		var isImgWithoutAnchor = el.tagName === 'IMG' && !(el.parentNode.tagName === 'A' || el.getAttribute('onclick'));
+			return this.set[Math.round(width) + 'x' + Math.round(height)];
+		},
 
-		return elementIsAdShaped(el) && !isImgWithoutSrc && !isImgWithoutAnchor;
-	}
+		elementIsAdShaped: function(el) {
+			return !!this.getMatchedAdSizeForElement(el);
+		},
 
-	function isNewAd(el, win) {
-		return !el.mp_adFound && (win === win.top || !win.mp_adFound);
-	}
+		getMatchedAdSizeForElement: function(el) {
+			var rect = el.getBoundingClientRect();
+			return this.getMatchedAdSize(rect.width, rect.height);
+		},
 
-	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;
-	}
+		_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;
+		}
+	};
 
-	function getMatchedAdSize(width, height) {
-		return SIZE_SET[width + 'x' + height];
-	}
+	var Throttler = {
+		MAX_SEARCHES_PER_WINDOW: 10,
+		MAX_SEARCHES_PER_ELEMENT: 2,
 
-	function elementIsAdShaped(el) {
-		return !!getMatchedAdSizeForElement(el);
-	}
+		countSearch: function(el) {
+			if ( typeof el.searches !== 'number' ) {
+				el.searches = 0;
+			}
 
-	function getMatchedAdSizeForElement(el) {
-		var rect = el.getBoundingClientRect();
-		return getMatchedAdSize(rect.width, rect.height);
-	}
+			el.searches += 1;
+		},
 
-	function containsLargeIframes(win) {
-		var iframes = win.document.querySelectorAll('iframe');
-		var rect;
-		var i;
-		for ( i = 0; i < iframes.length; i++ ) {
-			rect = iframes[i].getBoundingClientRect();
-			if ( rect.width > 10 || rect.height > 10 ) {
+		throttle: function(el, max) {
+			if ( typeof el.searches === 'number' && el.searches >= max ) {
 				return true;
 			}
-		}
-		return false;
-	}
-
-	function isValidHTML5Div(div, winSize) {
-		var elSize = getMatchedAdSizeForElement(div);
-
-		if ( typeof div.checks !== 'number' ) {
-			div.checks = 1;
-		} else {
-			div.checks += 1;
-		}
-
-		return (elSize &&
-				elSize[0] === winSize[0] && elSize[1] === winSize[1] &&
-				div.checks > 1);
-	}
+			return false;
+		},
 
-	var HTML5_SIGNAL_ELEMENTS = 'canvas, button, video, svg, img';
-	function iframeGetHTMLAd(win) {
-		var body = win.document.body,
-			elements, i, el, divs, div, numElements,
-			winSize, elSize;
+		throttleElement: function(el) {
+			return this.throttle(el, this.MAX_SEARCHES_PER_ELEMENT);
+		},
 
-		if ( !body ) {
-			return null;
-		}
-		winSize = getMatchedAdSize(win.innerWidth, win.innerHeight);
+		throttleWin: function(win) {
+			return this.throttle(win, this.MAX_SEARCHES_PER_WINDOW);
+		},
 
-		if ( !winSize ) {
-			return null;
+		getCount: function(el) {
+			return el.searches || 0;
 		}
+	};
 
-		elements = body.querySelectorAll(HTML5_SIGNAL_ELEMENTS);
+	function TopSearcher(win) {
+		this.win = win;
+		this.doc = win.document;
+	}
 
-		for ( i = 0; i < elements.length; i++ ) {
-			el = elements[i];
-			elSize = getMatchedAdSizeForElement(el);
-			if ( elSize && elSize[0] === winSize[0] && elSize[1] === winSize[1] ) {
-				return el;
+	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;
+		}));
 
-		numElements = body.querySelectorAll('*').length;
-		if ( numElements < 5 ) {
-			return null;
+		html5Ad = this._mainGetHTMLAd();
+		if ( html5Ad ) {
+			html5Ad.html5 = true;
+			html5Ad.mpAdFound = true;
+			ads.push(html5Ad);
 		}
 
-		divs = body.querySelectorAll('div');
+		return ads;
+	};
 
-		for ( i = 0; i < divs.length; i++ ) {
-			div = divs[i];
-			if ( isValidHTML5Div(div, winSize) ) {
+	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;
-	}
-
-	function jumpedOut(el) {
+	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 mainGetHTMLAd(win) {
-		var styles = win.document.querySelectorAll('div > style, div > link[rel="stylesheet"]'),
-			i, div;
-		for ( i = 0; i < styles.length; i++ ) {
-			div = styles[i].parentNode;
-			if ( elementIsAdShaped(div) && jumpedOut(div) ) {
-				return div;
+	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;
 			}
 		}
+
 	}
 
-	function findAds(win, opt_ads) {
+	IframeSearcher.prototype.search = function() {
+		var ad;
 
-		if ( typeof win.searches !== 'number' ) {
-			win.searches = 0;
+		if ( this.shouldSearchWindow ) {
+			ad = this._search();
+			if ( ad ) {
+				ad.mpAdFound = true;
+				win.mpAdFound = true;
+				return ad;
+			}
+			Throttler.countSearch(this.win);
 		}
 
-		var ads = opt_ads || [];
-		var adsFound = 0;
+		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 ( win.innerWidth <= MIN_WINDOW_PX || win.innerHeight <= MIN_WINDOW_PX ) {
-			win.searches++;
-			return ads;
+		if ( stdEl ) {
+			return stdEl;
 		}
 
-		if ( exports.utils.SCRIPT_IN_WINDOW_TOP || win.searches < MAX_SEARCHES_PER_WINDOW ) {
-			var adCandidates = win.document.querySelectorAll('img, object, embed');
-			adCandidates = exports.utils.realArray(adCandidates);
+		if ( this._isHTML5Iframe() ) {
+			html5Candidates = this.doc.querySelectorAll('body, canvas, button, video, svg, div');
+			html5El = getFirst(html5Candidates, function(el) {
 
-			adCandidates.forEach(function(el) {
-				if ( elementIsAd(el) && isNewAd(el, win) ) {
-					el.mp_adFound = true;
-					el.inIframe = win !== win.top;
-					win.mp_adFound = true;
-					ads.push(el);
-					adsFound += 1;
+				if ( _this._elementIsAtLeastAsBigAsWindow(el) ) {
+					return true;
 				}
+				Throttler.countSearch(el);
+				return false;
 			});
+		}
 
-			var htmlAd, adSizeMeta;
-			if ( win === win.top ) {
-				htmlAd = mainGetHTMLAd(win);
-			} else {
-				if ( adsFound === 0 && !containsLargeIframes(win) ) {
-					htmlAd = iframeGetHTMLAd(win);
-				}
-			}
+		if ( html5El ) {
+			html5El.html5 = true;
+			html5El.winClickTag = this.winClickTag;
+			html5El.adSizeMeta = this.adSizeMeta;
+			return html5El;
+		}
 
-			if ( htmlAd && isNewAd(htmlAd, win) ) {
-				htmlAd.html5 = true;
-				htmlAd.inIframe = win !== win.top;
-				if ( htmlAd.inIframe ) {
-					adSizeMeta = win.document.querySelectorAll('meta[name="ad.size"]');
-					if ( adSizeMeta.length > 0 ) {
-						htmlAd.adSizeMeta = adSizeMeta[0].content;
-					}
-					if ( win.clickTag ) {
-						htmlAd.winClickTag = win.clickTag;
-					}
-				}
-				htmlAd.mp_adFound = true;
-				win.mp_adFound = true;
-				ads.push(htmlAd);
+		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;
+	};
 
-			win.searches += 1;
+	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;
+	}
 
-		var iframes = getFriendlyIframes(win);
-		iframes.forEach(function(ifr) {
-			findAds(ifr.contentWindow, ads);
+	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: getMatchedAdSize,
+		getMatchedAdSize: SizeMatcher.getMatchedAdSize.bind(SizeMatcher),
 		findAds: findAds
 	};
 })(exports);
@@ -463,11 +562,12 @@ var exports = {};
 		getPosition: function(el) {
 			var rect = el.getBoundingClientRect();
 			var win = exports.utils.elementWindow(el);
+
 			return {
-				width: rect.width,
-				height: rect.height,
-				left: rect.left + win.pageXOffset,
-				top: rect.top + win.pageYOffset
+				width: Math.round(rect.width),
+				height: Math.round(rect.height),
+				left: Math.round(rect.left + win.pageXOffset),
+				top: Math.round(rect.top + win.pageYOffset)
 			};
 		},
 
@@ -682,7 +782,7 @@ var exports = {};
 
 			while ( true ) {
 				parentContainer = curContainer.parentElement;
-				if ( this.isValidContainer(parentContainer) ) {
+				if ( parentContainer && this.isValidContainer(parentContainer) ) {
 					curContainer = parentContainer;
 				} else {
 					return curContainer;
@@ -693,12 +793,6 @@ var exports = {};
 
 	var tagfinder = {
 
-		prepToSend: function(adData) {
-			adData.matchedSize = exports.adfinder.getMatchedAdSize(adData.width, adData.height);
-			delete adData.width;
-			delete adData.height;
-		},
-
 		setPositions: function(adData, opt_el, opt_winPos) {
 			var el = opt_el || adData.context;
 			var winPos = opt_winPos || {left: 0, top: 0};
@@ -732,10 +826,12 @@ var exports = {};
 			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) ) {
@@ -763,6 +859,8 @@ var exports = {};
 	var _pageTags;
 	var INIT_MS_BW_SEARCHES = 2000;
 	var PAGE_TAG_RE = new RegExp('gpt|oascentral');
+	var POST_MSG_ID = '1488911709-15415-26289-19282-15751';
+	var AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)');
 
 	function getPageTags(doc) {
 		var scripts = doc.getElementsByTagName('script');
@@ -778,7 +876,7 @@ var exports = {};
 
 	function messageAllParentFrames(adData) {
 
-		adData.dummyId = true;
+		adData.postMessageId = POST_MSG_ID;
 
 		adData = JSON.stringify(adData);
 
@@ -795,16 +893,31 @@ var exports = {};
 			messageAllParentFrames(adData);
 
 		} else if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
+
 			exports.tagfinder.setPositions(adData);
-			exports.tagfinder.prepToSend(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);
-			}
 
+					_onAdFound(log, results.referenceElement);
+
+			}
 		}
 	}
 
@@ -819,26 +932,20 @@ var exports = {};
 
 	function extractAds() {
 		var ads = exports.adfinder.findAds(window);
-
-		if ( !ads ) {
-			return;
-		}
-
 		ads.forEach(function(ad) {
 
 			var startTime = new Date().getTime();
 			var adId = startTime + '-' + Math.floor(Math.random() * 10e12);
 
 			var adData = {
-				width: ad.offsetWidth,
-				height: ad.offsetHeight,
+				width: Math.round(ad.offsetWidth),
+				height: Math.round(ad.offsetHeight),
 				startTime: startTime,
 				adId: adId,
-				html5: ad.html5 || false,
-				inIframe: ad.inIframe
+				html5: ad.html5 || false
 			};
 
-			if ( ad.html5 && ad.inIframe ) {
+			if ( ad.html5 ) {
 				adData.adSizeMeta = ad.adSizeMeta || null;
 				adData.winClickTag = ad.winClickTag || null;
 			}
@@ -898,9 +1005,11 @@ var exports = {};
 			return;
 		}
 
-		if ( adData.dummyId ) {
+		if ( adData.postMessageId === POST_MSG_ID ) {
+
+			delete adData.postMessageId;
 
-			delete adData.dummyId;
+			event.stopImmediatePropagation();
 
 			if ( isChildWin(myWin, ifrWin) ) {
 				if ( exports.utils.isFriendlyWindow(ifrWin) ) {
@@ -917,6 +1026,40 @@ var exports = {};
 		}
 	}
 
+	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 chrome !== 'undefined' ) {
+			chrome.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) {
 
@@ -925,19 +1068,21 @@ var exports = {};
 			}
 
 			_onAdFound = onAdFound;
+			window.addEventListener('message', onPostMessage, false);
 
 			if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
 				var log = _logGen.log('page');
 				onAdFound(log);
-			}
 
-			window.addEventListener('message', onPostMessage, false);
-			if ( exports.utils.SCRIPT_IN_WINDOW_TOP ) {
 				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);
diff --git a/src/utils/network.js b/src/utils/network.js
new file mode 100644
index 000000000..944db09c2
--- /dev/null
+++ b/src/utils/network.js
@@ -0,0 +1,604 @@
+'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',
+		'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',
+		'solvemedia.com',
+		'spotible.com',
+		'teads.tv',
+		'tribalfusion.com',
+		'tubemogul.com',
+		'videologygroup.com',
+		'washingtonpost.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'};
+		chrome.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;
+
+		chrome.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;
+		chrome.webNavigation.getFrame(getFrameDetails, 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;
+		chrome.webNavigation.getFrame(getFrameDetails, 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 ( assetRequest.isYoutubeAd ) {
+			return true;
+		}
+		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];
+		chrome.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;
+		}
+	};
+
+	chrome.webRequest.onBeforeRequest.addListener(function(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRequest);
+	}, {urls: ['http://*/*', 'https://*/*']}, []);
+
+	chrome.webRequest.onSendHeaders.addListener(function(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onSendHeaders);
+	}, {urls: ['http://*/*', 'https://*/*']}, ['requestHeaders']);
+
+	chrome.webRequest.onHeadersReceived.addListener(function(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onHeadersReceived);
+	}, {urls: ['http://*/*', 'https://*/*']}, ['responseHeaders']);
+
+	chrome.webRequest.onBeforeRedirect.addListener(function(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onBeforeRedirect);
+	}, {urls: ['http://*/*', 'https://*/*']}, []);
+
+	chrome.webRequest.onResponseStarted.addListener(function(details) {
+		globalPageContainer.forwardCall(details, PageNetworkTrafficCollector.prototype.onResponseStarted);
+	}, {urls: ['http://*/*', 'https://*/*']}, ['responseHeaders']);
+
+	chrome.webNavigation.onBeforeNavigate.addListener(function(details) {
+		if ( details.frameId === 0 ) {
+			globalPageContainer.onNewNavigation(details);
+		}
+	}, {});
+
+	chrome.webNavigation.onCommitted.addListener(function(details) {
+		if ( details.frameId === 0 ) {
+			globalPageContainer.onNavigationCommitted(details);
+		}
+	});
+
+	chrome.webNavigation.onCompleted.addListener(function(details) {
+		if ( details.frameId === 0 ) {
+			globalPageContainer.onNavigationCompleted(details);
+		}
+	});
+
+	chrome.tabs.onRemoved.addListener(function(tabId, closeInfo) {
+		globalPageContainer.onTabClose(tabId, closeInfo);
+	});
+
+	chrome.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/wappalyzer.js b/src/wappalyzer.js
index b6bc25523..7bddd6930 100644
--- a/src/wappalyzer.js
+++ b/src/wappalyzer.js
@@ -125,7 +125,7 @@ var wappalyzer = (function() {
 
 			this.lastTime = new Date().getTime();
 
-			this.timedOut = this.lastTime - this.startTime > 1000;
+			this.timedOut = this.lastTime - this.startTime > w.driver.timeout;
 		}
 	};
 
@@ -329,7 +329,7 @@ var wappalyzer = (function() {
 								for ( meta in w.apps[app][type] ) {
 									profiler.checkPoint(app, type, regexMeta);
 
-									if ( new RegExp('name=["\']' + meta + '["\']', 'i').test(match) ) {
+									if ( new RegExp('(name|property)=["\']' + meta + '["\']', 'i').test(match) ) {
 										content = match.toString().match(/content=("|')([^"']+)("|')/i);
 
 										parse(w.apps[app].meta[meta]).forEach(function(pattern) {
@@ -351,8 +351,16 @@ var wappalyzer = (function() {
 
 							for ( header in w.apps[app].headers ) {
 								parse(w.apps[app][type][header]).forEach(function(pattern) {
-									if ( typeof data[type][header.toLowerCase()] === 'string' && pattern.regex.test(data[type][header.toLowerCase()]) ) {
-										apps[app].setDetected(pattern, type, data[type][header.toLowerCase()], header);
+									if ( data[type][header.toLowerCase()] instanceof Array ) {
+										data[type][header.toLowerCase()].forEach(function(el) {
+											if ( typeof el === 'string' && pattern.regex.test(el) ) {
+												apps[app].setDetected(pattern, type, data[type][header.toLowerCase()], header);
+											}
+										});
+									} else {
+											if ( typeof data[type][header.toLowerCase()] === 'string' && pattern.regex.test(data[type][header.toLowerCase()]) ) {
+												apps[app].setDetected(pattern, type, data[type][header.toLowerCase()], header);
+											}
 									}
 
 									profiler.checkPoint(app, type, pattern.regex);
@@ -492,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');
 			}