diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build
index 2b291f8dc..3f973b736 100755
--- a/bin/wappalyzer-build
+++ b/bin/wappalyzer-build
@@ -24,7 +24,7 @@ node $WAPPALYZER_NODE_PATH/node_modules/jsonlint/lib/cli.js -ist $'\t' $WAPPALYZ
 
 echo "Compressing PNG and SVG icons..."
 
-node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* --out-dir $WAPPALYZER_ROOT/src/icons
+node $WAPPALYZER_NODE_PATH/node_modules/imagemin-cli/cli.js $WAPPALYZER_ROOT/src/icons/* --out-dir $WAPPALYZER_ROOT/src/icons 2>&1 > /dev/null
 
 echo "Converting SVG icons to PNG..."
 
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/src/apps.json b/src/apps.json
index 2b8dc58de..ca821064b 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -6,8 +6,8 @@
 			],
 			"icon": "1and1.svg",
 			"implies": "PHP",
-			"url": "/shop/catalog/browse\\?sessid=",
-			"website": "1and1.com"
+			"url": "/shop/catalog/browse\\?sessid="
+			"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,7 @@
 				"Server": "3ware\\/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "3ware.png",
-			"website": "www.3ware.com"
+			"website": "http://www.3ware.com"
 		},
 		"AD EBiS": {
 			"cats": [
@@ -76,7 +76,7 @@
 				"<!-- EBiS common tag"
 			],
 			"icon": "ebis.png",
-			"website": "www.ebis.ne.jp"
+			"website": "http://www.ebis.ne.jp"
 		},
 		"AMPcms": {
 			"cats": [
@@ -89,7 +89,7 @@
 			},
 			"icon": "AMPcms.png",
 			"implies": "PHP",
-			"website": "www.ampcms.org"
+			"website": "http://www.ampcms.org"
 		},
 		"AOLserver": {
 			"cats": [
@@ -99,7 +99,7 @@
 				"Server": "AOLserver/?([\\d.]+)?\\;version:\\1"
 			},
 			"icon": "AOLserver.png",
-			"website": "aolserver.com"
+			"website": "http://aolserver.com"
 		},
 		"AT Internet Analyzer": {
 			"cats": [
@@ -109,17 +109,17 @@
 				"^xtsite$",
 				"^ATInternet$"
 			],
-			"icon": "AT Internet Analyzer.png",
-			"website": "atinternet.com/en"
+			"icon": "AT Internet.png",
+			"website": "http://atinternet.com/en"
 		},
 		"AT Internet XiTi": {
 			"cats": [
 				10
 			],
 			"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": [
@@ -129,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": [
@@ -140,7 +140,7 @@
 			"meta": {
 				"generator": "AWStats ([\\d.]+(?: \\(build [\\d.]+\\))?)\\;version:\\1"
 			},
-			"website": "awstats.sourceforge.net"
+			"website": "http://awstats.sourceforge.net"
 		},
 		"Accessible Portal": {
 			"cats": [
@@ -151,7 +151,7 @@
 			"meta": {
 				"generator": "Accessible Portal"
 			},
-			"website": "www.accessibleportal.com"
+			"website": "http://www.accessibleportal.com"
 		},
 		"Act-On": {
 			"cats": [
@@ -159,7 +159,7 @@
 			],
 			"env": "^ActOn$",
 			"icon": "ActOn.png",
-			"website": "act-on.com"
+			"website": "http://act-on.com"
 		},
 		"AdInfinity": {
 			"cats": [
@@ -167,7 +167,7 @@
 			],
 			"icon": "AdInfinity.png",
 			"script": "adinfinity\\.com\\.au",
-			"website": "adinfinity.com.au"
+			"website": "http://adinfinity.com.au"
 		},
 		"AdRiver": {
 			"cats": [
@@ -177,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": [
@@ -186,7 +186,7 @@
 			"env": "^adroll_",
 			"icon": "AdRoll.svg",
 			"script": "(?:a|s)\\.adroll\\.com",
-			"website": "adroll.com"
+			"website": "http://adroll.com"
 		},
 		"Adcash": {
 			"cats": [
@@ -196,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": [
@@ -204,7 +204,7 @@
 			],
 			"icon": "AddShoppers.png",
 			"script": "cdn\\.shop\\.pe/widget/",
-			"website": "www.addshoppers.com"
+			"website": "http://www.addshoppers.com"
 		},
 		"AddThis": {
 			"cats": [
@@ -213,7 +213,7 @@
 			"env": "^addthis",
 			"icon": "AddThis.svg",
 			"script": "addthis\\.com/js/",
-			"website": "www.addthis.com"
+			"website": "http://www.addthis.com"
 		},
 		"AddToAny": {
 			"cats": [
@@ -222,7 +222,7 @@
 			"env": "^a2apage_init$",
 			"icon": "AddToAny.png",
 			"script": "addtoany\\.com/menu/page\\.js",
-			"website": "www.addtoany.com"
+			"website": "http://www.addtoany.com"
 		},
 		"Adminer": {
 			"cats": [
@@ -232,9 +232,9 @@
 				"Adminer</a> <span class=\"version\">([\\d.]+)</span>\\;version:\\1",
 				"onclick=\"bodyClick\\(event\\);\" onload=\"verifyVersion\\('([\\d.]+)'\\);\">\\;version:\\1"
 			],
-			"implies": "PHP",
 			"icon": "adminer.png",
-			"website": "www.adminer.org"
+			"implies": "PHP",
+			"website": "http://www.adminer.org"
 		},
 		"Adnegah": {
 			"cats": [
@@ -244,7 +244,7 @@
 			"html": "<iframe [^>]*src=\"[^\"]+adnegah\\.net",
 			"icon": "adnegah.png",
 			"script": "[^a-z]adnegah.*\\.js",
-			"website": "Adnegah.net"
+			"website": "http://Adnegah.net"
 		},
 		"Adobe ColdFusion": {
 			"cats": [
@@ -259,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": [
@@ -272,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": [
@@ -282,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": [
@@ -292,7 +292,7 @@
 			"meta": {
 				"generator": "^Muse(?:$| ?/?(\\d[\\d.]+))\\;version:\\1"
 			},
-			"website": "muse.adobe.com"
+			"website": "http://muse.adobe.com"
 		},
 		"Adobe RoboHelp": {
 			"cats": [
@@ -304,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": [
@@ -313,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": [
@@ -322,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": [
@@ -332,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": [
@@ -346,7 +346,7 @@
 				"PHP",
 				"jQuery"
 			],
-			"website": "blogengine.ru"
+			"website": "http://blogengine.ru"
 		},
 		"AfterBuy": {
 			"cats": [
@@ -357,7 +357,7 @@
 			],
 			"icon": "after-buy.png",
 			"script": "shop-static\\.afterbuy\\.de",
-			"website": "www.afterbuy.de"
+			"website": "http://www.afterbuy.de"
 		},
 		"Aircall": {
 			"cats": [
@@ -365,7 +365,7 @@
 			],
 			"icon": "aircall.png",
 			"script": "^https?://cdn\\.aircall\\.io/",
-			"website": "aircall.io"
+			"website": "http://aircall.io"
 		},
 		"Airee": {
 			"cats": [
@@ -375,7 +375,7 @@
 				"Server": "Airee"
 			},
 			"icon": "Airee.png",
-			"website": "xn--80aqc2a.xn--p1ai"
+			"website": "http://xn--80aqc2a.xn--p1ai"
 		},
 		"Akamai": {
 			"cats": [
@@ -385,7 +385,7 @@
 				"X-Akamai-Transformed": ""
 			},
 			"icon": "Akamai.png",
-			"website": "akamai.com"
+			"website": "http://akamai.com"
 		},
 		"Akka HTTP": {
 			"cats": [
@@ -396,7 +396,7 @@
 				"Server": "akka-http(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "akka-http.png",
-			"website": "akka.io"
+			"website": "http://akka.io"
 		},
 		"Algolia Realtime Search": {
 			"cats": [
@@ -404,7 +404,7 @@
 			],
 			"env": "^AlgoliaSearch$",
 			"icon": "Algolia Realtime Search.svg",
-			"website": "www.algolia.com"
+			"website": "http://www.algolia.com"
 		},
 		"Allegro RomPager": {
 			"cats": [
@@ -414,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": [
@@ -427,7 +427,7 @@
 				"YUI"
 			],
 			"script": "^https?://cdn\\.alloyui\\.com/",
-			"website": "www.alloyui.com"
+			"website": "http://www.alloyui.com"
 		},
 		"Amaya": {
 			"cats": [
@@ -437,7 +437,7 @@
 			"meta": {
 				"generator": "Amaya(?: V?([\\d.]+[a-z]))?\\;version:\\1"
 			},
-			"website": "www.w3.org/Amaya"
+			"website": "http://www.w3.org/Amaya"
 		},
 		"Amazon Cloudfront": {
 			"cats": [
@@ -447,8 +447,8 @@
 				"X-Amz-Cf-Id": ""
 			},
 			"icon": "Amazon-Cloudfront.svg",
-			"website": "aws.amazon.com/cloudfront/"
-    },
+			"website": "http://aws.amazon.com/cloudfront/"
+		},
 		"Amazon EC2": {
 			"cats": [
 				22
@@ -457,18 +457,18 @@
 				"Server": "\\(Amazon\\)"
 			},
 			"icon": "aws-ec2.svg",
-			"website": "aws.amazon.com/ec2/"
-		},
-    "Amazon S3": {
-      "cats": [
-        19
-      ],
-      "headers": {
-        "Server": "AmazonS3"
-      },
-      "icon": "aws-s3.svg",
-      "website": "aws.amazon.com/s3/"
-    },
+			"website": "http://aws.amazon.com/ec2/"
+		},
+		"Amazon S3": {
+			"cats": [
+				19
+			],
+			"headers": {
+				"Server": "AmazonS3"
+			},
+			"icon": "aws-s3.svg",
+			"website": "http://aws.amazon.com/s3/"
+		},
 		"Ametys": {
 			"cats": [
 				1
@@ -479,7 +479,7 @@
 				"generator": "(?:Ametys|Anyware Technologies)"
 			},
 			"script": "ametys\\.js",
-			"website": "ametys.org"
+			"website": "http://ametys.org"
 		},
 		"Amiro.CMS": {
 			"cats": [
@@ -490,7 +490,7 @@
 			"meta": {
 				"generator": "Amiro"
 			},
-			"website": "amirocms.com"
+			"website": "http://amirocms.com"
 		},
 		"Angular Material": {
 			"cats": [
@@ -503,7 +503,7 @@
 				"/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular-material(?:\\.min)?\\.js\\;version:\\1",
 				"angular-material.*\\.js"
 			],
-			"website": "material.angularjs.org"
+			"website": "http://material.angularjs.org"
 		},
 		"AngularJS": {
 			"cats": [
@@ -516,7 +516,7 @@
 				"/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular(?:\\.min)?\\.js\\;version:\\1",
 				"angular.*\\.js"
 			],
-			"website": "angularjs.org"
+			"website": "http://angularjs.org"
 		},
 		"Apache": {
 			"cats": [
@@ -526,16 +526,16 @@
 				"Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\b)HTTPD)\\;version:\\1"
 			},
 			"icon": "Apache.svg",
-			"website": "apache.org"
+			"website": "http://apache.org"
 		},
 		"Apache HBase": {
 			"cats": [
 				34
 			],
 			"html": "<style[^>]+static/hbase",
-			"implies": "Java",
 			"icon": "Apache HBase.png",
-			"website": "hbase.apache.org"
+			"implies": "Java",
+			"website": "http://hbase.apache.org"
 		},
 		"Apache Hadoop": {
 			"cats": [
@@ -543,7 +543,7 @@
 			],
 			"html": "<style[^>]+static/hadoop",
 			"icon": "Apache Hadoop.svg",
-			"website": "hadoop.apache.org"
+			"website": "http://hadoop.apache.org"
 		},
 		"Apache JSPWiki": {
 			"cats": [
@@ -551,10 +551,10 @@
 			],
 			"html": "<html[^>]* xmlns:jspwiki=",
 			"icon": "Apache JSPWiki.png",
-			"script": "jspwiki",
 			"implies": "Apache Tomcat",
+			"script": "jspwiki",
 			"url": "wiki\\.jsp",
-			"website": "jspwiki.org"
+			"website": "http://jspwiki.org"
 		},
 		"Apache Tomcat": {
 			"cats": [
@@ -564,9 +564,9 @@
 				"Server": "Apache-Coyote(/1\\.1)?\\;version:\\1?4.1+:",
 				"X-Powered-By": "\bTomcat\b(?:-([\\d.]+))?\\;version:\\1"
 			},
-			"implies": "Java",
 			"icon": "Apache Tomcat.svg",
-			"website": "tomcat.apache.org"
+			"implies": "Java",
+			"website": "http://tomcat.apache.org"
 		},
 		"Apache Traffic Server": {
 			"cats": [
@@ -576,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": [
@@ -585,7 +585,7 @@
 			"env": "^Wicket",
 			"icon": "Apache Wicket.svg",
 			"implies": "Java",
-			"website": "wicket.apache.org"
+			"website": "http://wicket.apache.org"
 		},
 		"AppNexus": {
 			"cats": [
@@ -594,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": [
@@ -609,7 +609,7 @@
 			"icon": "Arastta.svg",
 			"implies": "PHP",
 			"script": "arastta\\.js",
-			"website": "arastta.org"
+			"website": "http://arastta.org"
 		},
 		"Arc Forum": {
 			"cats": [
@@ -617,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": [
@@ -631,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": [
@@ -644,7 +644,7 @@
 			"implies": [
 				"Artifactory"
 			],
-			"website": "jfrog.com/open-source/#os-arti"
+			"website": "http://jfrog.com/open-source/#os-arti"
 		},
 		"ArvanCloud": {
 			"cats": [
@@ -655,7 +655,7 @@
 				"AR-PoweredBy": "Arvan Cloud \\(arvancloud.com\\)"
 			},
 			"icon": "ArvanCloud.png",
-			"website": "www.ArvanCloud.com"
+			"website": "http://www.ArvanCloud.com"
 		},
 		"AsciiDoc": {
 			"cats": [
@@ -668,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": [
@@ -682,7 +682,7 @@
 			],
 			"icon": "Asymptix PHP Framework.png",
 			"implies": "PHP",
-			"website": "github.com/Asymptix/Framework"
+			"website": "http://github.com/Asymptix/Framework"
 		},
 		"Atlassian Bitbucket": {
 			"cats": [
@@ -694,7 +694,7 @@
 			"meta": {
 				"application-name": "Bitbucket"
 			},
-			"website": "www.atlassian.com/software/bitbucket/overview/"
+			"website": "http://www.atlassian.com/software/bitbucket/overview/"
 		},
 		"Atlassian Confluence": {
 			"cats": [
@@ -709,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": [
@@ -720,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": [
@@ -734,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": [
@@ -746,22 +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
 			],
-			"icon": "Aurelia.svg",
 			"html": [
 				"<[^>]+aurelia-app=[^>]",
 				"<[^>]+data-main=[^>]aurelia-bootstrapper",
 				"<[^>]+au-target-id=[^>]\\d"
 			],
+			"icon": "Aurelia.svg",
 			"script": [
 				"aurelia(?:\\.min)?\\.js"
 			],
-			"website": "aurelia.io"
+			"website": "http://aurelia.io"
 		},
 		"Avangate": {
 			"cats": [
@@ -771,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": [
@@ -779,7 +779,7 @@
 			],
 			"html": "<[^>]+data-bem",
 			"icon": "BEM.png",
-			"website": "en.bem.info"
+			"website": "http://en.bem.info"
 		},
 		"BIGACE": {
 			"cats": [
@@ -791,7 +791,7 @@
 			"meta": {
 				"generator": "BIGACE ([\\d.]+)\\;version:\\1"
 			},
-			"website": "bigace.de"
+			"website": "http://bigace.de"
 		},
 		"Backbone.js": {
 			"cats": [
@@ -801,7 +801,7 @@
 			"icon": "Backbone.js.png",
 			"implies": "Underscore.js",
 			"script": "backbone.*\\.js",
-			"website": "backbonejs.org"
+			"website": "http://backbonejs.org"
 		},
 		"Backdrop": {
 			"cats": [
@@ -814,7 +814,7 @@
 			"meta": {
 				"generator": "Backdrop CMS(?: (\\d))?\\;version:\\1"
 			},
-			"website": "backdropcms.org"
+			"website": "http://backdropcms.org"
 		},
 		"Banshee": {
 			"cats": [
@@ -827,7 +827,7 @@
 			"meta": {
 				"generator": "Banshee PHP"
 			},
-			"website": "www.banshee-php.org"
+			"website": "http://www.banshee-php.org"
 		},
 		"BaseHTTP": {
 			"cats": [
@@ -838,19 +838,19 @@
 			},
 			"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": [
@@ -860,7 +860,7 @@
 			"icon": "Bigcommerce.png",
 			"script": "cdn\\d+\\.bigcommerce\\.com/",
 			"url": "mybigcommerce\\.com",
-			"website": "www.bigcommerce.com"
+			"website": "http://www.bigcommerce.com"
 		},
 		"Bigware": {
 			"cats": [
@@ -873,7 +873,7 @@
 			"icon": "Bigware.png",
 			"implies": "PHP",
 			"url": "(?:\\?|&)bigWAdminID=",
-			"website": "bigware.de"
+			"website": "http://bigware.de"
 		},
 		"BittAds": {
 			"cats": [
@@ -882,7 +882,7 @@
 			"env": "^bitt$",
 			"icon": "BittAds.png",
 			"script": "bittads\\.com/js/bitt\\.js$",
-			"website": "bittads.com"
+			"website": "http://bittads.com"
 		},
 		"Blesta": {
 			"cats": [
@@ -892,7 +892,7 @@
 				"Set-Cookie": "blesta_sid"
 			},
 			"icon": "Blesta.png",
-			"website": "www.blesta.com"
+			"website": "http://www.blesta.com"
 		},
 		"Blip.tv": {
 			"cats": [
@@ -900,7 +900,7 @@
 			],
 			"html": "<(?:param|embed|iframe)[^>]+blip\\.tv/play",
 			"icon": "Blip.tv.png",
-			"website": "blip.tv"
+			"website": "http://blip.tv"
 		},
 		"Blogger": {
 			"cats": [
@@ -911,7 +911,7 @@
 				"generator": "blogger"
 			},
 			"url": "\\.blogspot\\.com",
-			"website": "www.blogger.com"
+			"website": "http://www.blogger.com"
 		},
 		"Bluefish": {
 			"cats": [
@@ -921,7 +921,7 @@
 			"meta": {
 				"generator": "Bluefish(?:\\s([\\d.]+))?\\;version:\\1"
 			},
-			"website": "sourceforge.net/projects/bluefish"
+			"website": "http://sourceforge.net/projects/bluefish"
 		},
 		"Boa": {
 			"cats": [
@@ -930,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": [
@@ -951,7 +951,7 @@
 			"meta": {
 				"generator": "Bolt"
 			},
-			"website": "bolt.cm"
+			"website": "http://bolt.cm"
 		},
 		"Bonfire": {
 			"cats": [
@@ -963,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": [
@@ -973,7 +973,7 @@
 			"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": [
@@ -984,7 +984,7 @@
 				"<TITLE>\n\\s*BROTHER "
 			],
 			"icon": "Brother.png",
-			"website": "www.brother.com"
+			"website": "http://www.brother.com"
 		},
 		"BrowserCMS": {
 			"cats": [
@@ -995,7 +995,7 @@
 			"meta": {
 				"generator": "BrowserCMS ([\\d.]+)\\;version:\\1"
 			},
-			"website": "browsercms.org"
+			"website": "http://browsercms.org"
 		},
 		"Bubble": {
 			"cats": [
@@ -1007,7 +1007,7 @@
 			"env": "^appquery$",
 			"icon": "bubble.png",
 			"implies": "Node.js",
-			"website": "bubble.is"
+			"website": "http://bubble.is"
 		},
 		"BugSense": {
 			"cats": [
@@ -1016,7 +1016,7 @@
 			"env": "^BugSense$",
 			"icon": "BugSense.png",
 			"script": "bugsense\\.js",
-			"website": "bugsense.com"
+			"website": "http://bugsense.com"
 		},
 		"BugSnag": {
 			"cats": [
@@ -1025,7 +1025,7 @@
 			"env": "^BugSnag$",
 			"icon": "BugSnag.png",
 			"script": "bugsnag.*\\.js",
-			"website": "bugsnag.com"
+			"website": "http://bugsnag.com"
 		},
 		"Bugzilla": {
 			"cats": [
@@ -1034,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": [
@@ -1046,7 +1046,7 @@
 				"PHP",
 				"Woltlab Community Framework"
 			],
-			"website": "www.woltlab.com"
+			"website": "http://www.woltlab.com"
 		},
 		"Business Catalyst": {
 			"cats": [
@@ -1055,7 +1055,7 @@
 			"html": "<!-- BC_OBNW -->",
 			"icon": "Business Catalyst.png",
 			"script": "CatalystScripts",
-			"website": "businesscatalyst.com"
+			"website": "http://businesscatalyst.com"
 		},
 		"BuySellAds": {
 			"cats": [
@@ -1065,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": [
@@ -1087,7 +1087,7 @@
 			],
 			"env": "^CKEDITOR$",
 			"icon": "CKEditor.png",
-			"website": "ckeditor.com"
+			"website": "http://ckeditor.com"
 		},
 		"CMS Made Simple": {
 			"cats": [
@@ -1101,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": [
@@ -1120,7 +1120,7 @@
 			],
 			"html": "src=[^>]+co2stats\\.com/propres\\.php",
 			"icon": "CO2Stats.png",
-			"website": "co2stats.com"
+			"website": "http://co2stats.com"
 		},
 		"CPG Dragonfly": {
 			"cats": [
@@ -1134,7 +1134,7 @@
 			"meta": {
 				"generator": "CPG Dragonfly"
 			},
-			"website": "dragonflycms.org"
+			"website": "http://dragonflycms.org"
 		},
 		"CS Cart": {
 			"cats": [
@@ -1147,7 +1147,7 @@
 			],
 			"icon": "CS Cart.png",
 			"implies": "PHP",
-			"website": "www.cs-cart.com"
+			"website": "http://www.cs-cart.com"
 		},
 		"CacheFly": {
 			"cats": [
@@ -1159,7 +1159,7 @@
 				"X-CF2": ""
 			},
 			"icon": "CacheFly.png",
-			"website": "www.cachefly.com"
+			"website": "http://www.cachefly.com"
 		},
 		"Caddy": {
 			"cats": [
@@ -1168,9 +1168,9 @@
 			"headers": {
 				"Server": "^Caddy$"
 			},
-			"implies": "Go",
 			"icon": "caddy.svg",
-			"website": "caddyserver.com"
+			"implies": "Go",
+			"website": "http://caddyserver.com"
 		},
 		"CakePHP": {
 			"cats": [
@@ -1184,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": [
@@ -1202,7 +1202,7 @@
 			},
 			"icon": "Canon HTTP Server.png",
 			"implies": "Canon",
-			"website": "www.canon.com"
+			"website": "http://www.canon.com"
 		},
 		"Captch Me": {
 			"cats": [
@@ -1212,7 +1212,7 @@
 			"env": "^Captchme",
 			"icon": "Captch Me.svg",
 			"script": "^https?://api\\.captchme\\.net/",
-			"website": "captchme.com"
+			"website": "http://captchme.com"
 		},
 		"Carbon Ads": {
 			"cats": [
@@ -1222,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": [
@@ -1235,7 +1235,7 @@
 				"cargo_title": ""
 			},
 			"script": "/cargo\\.",
-			"website": "cargocollective.com"
+			"website": "http://cargocollective.com"
 		},
 		"Catberry.js": {
 			"cats": [
@@ -1248,7 +1248,7 @@
 			},
 			"icon": "Catberry.js.png",
 			"implies": "Node.js",
-			"website": "catberry.org"
+			"website": "http://catberry.org"
 		},
 		"Catwalk": {
 			"cats": [
@@ -1259,7 +1259,7 @@
 			},
 			"icon": "Catwalk.png",
 			"implies": "Canon",
-			"website": "www.canon.com"
+			"website": "http://www.canon.com"
 		},
 		"CentOS": {
 			"cats": [
@@ -1270,7 +1270,7 @@
 				"X-Powered-By": "CentOS"
 			},
 			"icon": "CentOS.png",
-			"website": "centos.org"
+			"website": "http://centos.org"
 		},
 		"CenteHTTPd": {
 			"cats": [
@@ -1280,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": [
@@ -1294,7 +1294,7 @@
 			"meta": {
 				"generator": "chameleon-cms"
 			},
-			"website": "chameleon-system.de"
+			"website": "http://chameleon-system.de"
 		},
 		"Chamilo": {
 			"cats": [
@@ -1309,7 +1309,7 @@
 			"meta": {
 				"generator": "Chamilo ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.chamilo.org"
+			"website": "http://www.chamilo.org"
 		},
 		"Chartbeat": {
 			"cats": [
@@ -1318,7 +1318,7 @@
 			"env": "^_sf_(?:endpt|async_config)$",
 			"icon": "Chartbeat.png",
 			"script": "chartbeat\\.js",
-			"website": "chartbeat.com"
+			"website": "http://chartbeat.com"
 		},
 		"Cherokee": {
 			"cats": [
@@ -1328,7 +1328,7 @@
 				"Server": "Cherokee/([\\d.]+)\\;version:\\1"
 			},
 			"icon": "Cherokee.png",
-			"website": "www.cherokee-project.com"
+			"website": "http://www.cherokee-project.com"
 		},
 		"CherryPy": {
 			"cats": [
@@ -1340,7 +1340,7 @@
 			},
 			"icon": "CherryPy.png",
 			"implies": "Python",
-			"website": "www.cherrypy.org"
+			"website": "http://www.cherrypy.org"
 		},
 		"Chitika": {
 			"cats": [
@@ -1349,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": [
@@ -1379,7 +1379,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": [
@@ -1387,7 +1387,7 @@
 			],
 			"env": "^ClickTale",
 			"icon": "ClickTale.png",
-			"website": "www.clicktale.com"
+			"website": "http://www.clicktale.com"
 		},
 		"Clicky": {
 			"cats": [
@@ -1396,7 +1396,7 @@
 			"env": "^clicky$",
 			"icon": "Clicky.png",
 			"script": "static\\.getclicky\\.com",
-			"website": "getclicky.com"
+			"website": "http://getclicky.com"
 		},
 		"Clientexec": {
 			"cats": [
@@ -1404,7 +1404,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": [
@@ -1415,7 +1426,7 @@
 				"Server": "cloudflare"
 			},
 			"icon": "CloudFlare.svg",
-			"website": "www.cloudflare.com"
+			"website": "http://www.cloudflare.com"
 		},
 		"Cloudera": {
 			"cats": [
@@ -1425,7 +1436,7 @@
 				"Server": "cloudera"
 			},
 			"icon": "Cloudera.png",
-			"website": "www.cloudera.com"
+			"website": "http://www.cloudera.com"
 		},
 		"CodeIgniter": {
 			"cats": [
@@ -1437,7 +1448,7 @@
 			"html": "<input[^>]+name=\"ci_csrf_token\"\\;version:2+",
 			"icon": "CodeIgniter.png",
 			"implies": "PHP",
-			"website": "codeigniter.com"
+			"website": "http://codeigniter.com"
 		},
 		"CodeMirror": {
 			"cats": [
@@ -1445,7 +1456,7 @@
 			],
 			"env": "^CodeMirror$",
 			"icon": "CodeMirror.png",
-			"website": "codemirror.net"
+			"website": "http://codemirror.net"
 		},
 		"Comandia": {
 			"cats": [
@@ -1454,7 +1465,7 @@
 			"env": "^Comandia$",
 			"html": "<link[^>]+=['\"]//cdn\\.mycomandia\\.com",
 			"icon": "Comandia.svg",
-			"website": "comandia.com"
+			"website": "http://comandia.com"
 		},
 		"Commerce Server": {
 			"cats": [
@@ -1465,7 +1476,7 @@
 			},
 			"icon": "Commerce Server.png",
 			"implies": "Microsoft ASP.NET",
-			"website": "commerceserver.net"
+			"website": "http://commerceserver.net"
 		},
 		"CompaqHTTPServer": {
 			"cats": [
@@ -1475,7 +1486,7 @@
 				"Server": "CompaqHTTPServer\\/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "HP.svg",
-			"website": "www.hp.com"
+			"website": "http://www.hp.com"
 		},
 		"Concrete5": {
 			"cats": [
@@ -1488,7 +1499,7 @@
 				"generator": "concrete5 - ([\\d.ab]+)\\;version:\\1"
 			},
 			"script": "concrete/js/",
-			"website": "concrete5.org"
+			"website": "http://concrete5.org"
 		},
 		"Connect": {
 			"cats": [
@@ -1499,7 +1510,7 @@
 			},
 			"icon": "Connect.png",
 			"implies": "Node.js",
-			"website": "www.senchalabs.org/connect"
+			"website": "http://www.senchalabs.org/connect"
 		},
 		"Contao": {
 			"cats": [
@@ -1514,7 +1525,7 @@
 			"meta": {
 				"generator": "^Contao Open Source CMS$"
 			},
-			"website": "contao.org"
+			"website": "http://contao.org"
 		},
 		"Contenido": {
 			"cats": [
@@ -1525,7 +1536,7 @@
 			"meta": {
 				"generator": "Contenido ([\\d.]+)\\;version:\\1"
 			},
-			"website": "contenido.org/en"
+			"website": "http://contenido.org/en"
 		},
 		"Contens": {
 			"cats": [
@@ -1539,7 +1550,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": [
@@ -1551,7 +1562,7 @@
 			"meta": {
 				"generator": "ContentBox powered by ColdBox"
 			},
-			"website": "www.gocontentbox.org"
+			"website": "http://www.gocontentbox.org"
 		},
 		"ConversionLab": {
 			"cats": [
@@ -1559,7 +1570,7 @@
 			],
 			"icon": "ConversionLab.png",
 			"script": "conversionlab\\.trackset\\.com/track/tsend\\.js",
-			"website": "www.trackset.it/conversionlab"
+			"website": "http://www.trackset.it/conversionlab"
 		},
 		"Coppermine": {
 			"cats": [
@@ -1568,7 +1579,7 @@
 			"html": "<!--Coppermine Photo Gallery ([\\d.]+)\\;version:\\1",
 			"icon": "Coppermine.png",
 			"implies": "PHP",
-			"website": "coppermine-gallery.net"
+			"website": "http://coppermine-gallery.net"
 		},
 		"Cosmoshop": {
 			"cats": [
@@ -1576,7 +1587,7 @@
 			],
 			"icon": "Cosmoshop.png",
 			"script": "cosmoshop_functions\\.js",
-			"website": "cosmoshop.de"
+			"website": "http://cosmoshop.de"
 		},
 		"Cotonti": {
 			"cats": [
@@ -1587,7 +1598,7 @@
 			"meta": {
 				"generator": "Cotonti"
 			},
-			"website": "www.cotonti.com"
+			"website": "http://www.cotonti.com"
 		},
 		"CouchDB": {
 			"cats": [
@@ -1597,7 +1608,7 @@
 				"Server": "CouchDB/([\\d.]+)\\;version:\\1"
 			},
 			"icon": "CouchDB.png",
-			"website": "couchdb.apache.org"
+			"website": "http://couchdb.apache.org"
 		},
 		"Cowboy": {
 			"cats": [
@@ -1609,7 +1620,7 @@
 			},
 			"icon": "Cowboy.png",
 			"implies": "Erlang",
-			"website": "ninenines.eu"
+			"website": "http://ninenines.eu"
 		},
 		"CppCMS": {
 			"cats": [
@@ -1620,7 +1631,7 @@
 			},
 			"icon": "CppCMS.png",
 			"implies": "C++",
-			"website": "cppcms.com"
+			"website": "http://cppcms.com"
 		},
 		"Craft CMS": {
 			"cats": [
@@ -1632,7 +1643,7 @@
 			},
 			"icon": "Craft CMS.png",
 			"implies": "PHP",
-			"website": "buildwithcraft.com"
+			"website": "http://buildwithcraft.com"
 		},
 		"Crazy Egg": {
 			"cats": [
@@ -1641,7 +1652,7 @@
 			"env": "^CE2$",
 			"icon": "Crazy Egg.png",
 			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js",
-			"website": "crazyegg.com"
+			"website": "http://crazyegg.com"
 		},
 		"Criteo": {
 			"cats": [
@@ -1650,7 +1661,7 @@
 			"env": "^criteo",
 			"icon": "Criteo.svg",
 			"script": "[^/]*//(?:cas\\.criteo\\.com|(?:[^/]\\.)?criteo\\.net)/",
-			"website": "criteo.com"
+			"website": "http://criteo.com"
 		},
 		"Cross Pixel": {
 			"cats": [
@@ -1659,7 +1670,7 @@
 			"env": "^crsspxl$",
 			"icon": "Cross Pixel.png",
 			"script": "tag\\.crsspxl\\.com/s1\\.js",
-			"website": "datadesk.crsspxl.com"
+			"website": "http://datadesk.crsspxl.com"
 		},
 		"CubeCart": {
 			"cats": [
@@ -1671,7 +1682,7 @@
 			"meta": {
 				"generator": "cubecart"
 			},
-			"website": "www.cubecart.com"
+			"website": "http://www.cubecart.com"
 		},
 		"Cufon": {
 			"cats": [
@@ -1680,7 +1691,7 @@
 			"env": "^Cufon$",
 			"icon": "Cufon.png",
 			"script": "cufon-yui\\.js",
-			"website": "cufon.shoqolate.com"
+			"website": "http://cufon.shoqolate.com"
 		},
 		"D3": {
 			"cats": [
@@ -1689,7 +1700,7 @@
 			"env": "^d3$",
 			"icon": "D3.png",
 			"script": "d3(?:\\. v\\d+)?(?:\\.min)?\\.js",
-			"website": "d3js.org"
+			"website": "http://d3js.org"
 		},
 		"DHTMLX": {
 			"cats": [
@@ -1697,7 +1708,7 @@
 			],
 			"icon": "DHTMLX.png",
 			"script": "dhtmlxcommon\\.js",
-			"website": "dhtmlx.com"
+			"website": "http://dhtmlx.com"
 		},
 		"DM Polopoly": {
 			"cats": [
@@ -1706,7 +1717,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": [
@@ -1732,7 +1743,7 @@
 				"/js/dnncore\\.js",
 				"/js/dnn\\.js"
 			],
-			"website": "dnnsoftware.com"
+			"website": "http://dnnsoftware.com"
 		},
 		"DTG": {
 			"cats": [
@@ -1743,7 +1754,7 @@
 			],
 			"icon": "DTG.png",
 			"implies": "Mono.net",
-			"website": "www.dtg.nl"
+			"website": "http://www.dtg.nl"
 		},
 		"Dancer": {
 			"cats": [
@@ -1755,7 +1766,7 @@
 			},
 			"icon": "Dancer.png",
 			"implies": "Perl",
-			"website": "perldancer.org"
+			"website": "http://perldancer.org"
 		},
 		"Danneo CMS": {
 			"cats": [
@@ -1772,7 +1783,7 @@
 			"meta": {
 				"generator": "Danneo CMS ([\\d.]+)\\;version:\\1"
 			},
-			"website": "danneo.com"
+			"website": "http://danneo.com"
 		},
 		"Darwin": {
 			"cats": [
@@ -1783,7 +1794,7 @@
 				"X-Powered-By": "Darwin"
 			},
 			"icon": "Darwin.png",
-			"website": "opensource.apple.com"
+			"website": "http://opensource.apple.com"
 		},
 		"DataLife Engine": {
 			"cats": [
@@ -1798,7 +1809,7 @@
 			"meta": {
 				"generator": "DataLife Engine"
 			},
-			"website": "dle-news.ru"
+			"website": "http://dle-news.ru"
 		},
 		"DataTables": {
 			"cats": [
@@ -1807,7 +1818,7 @@
 			"icon": "DataTables.png",
 			"implies": "jQuery",
 			"script": "dataTables.*\\.js",
-			"website": "datatables.net"
+			"website": "http://datatables.net"
 		},
 		"David Webbox": {
 			"cats": [
@@ -1817,7 +1828,7 @@
 				"Server": "David-WebBox/([\\d.a]+ \\(\\d+\\))\\;version:\\1"
 			},
 			"icon": "David Webbox.png",
-			"website": "www.tobit.com"
+			"website": "http://www.tobit.com"
 		},
 		"Debian": {
 			"cats": [
@@ -1828,7 +1839,7 @@
 				"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": [
@@ -1837,8 +1848,8 @@
 			"headers": {
 				"Server": "DECORUM(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"DedeCMS": {
 			"cats": [
@@ -1848,14 +1859,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": [
@@ -1867,7 +1878,7 @@
 			},
 			"html": "<[^>]+demandware\\.edgesuite",
 			"icon": "Demandware.png",
-			"website": "demandware.com"
+			"website": "http://demandware.com"
 		},
 		"Deployd": {
 			"cats": [
@@ -1876,7 +1887,7 @@
 			"env": "^dpd$",
 			"icon": "Deployd.png",
 			"script": "dpd\\.js",
-			"website": "deployd.com"
+			"website": "http://deployd.com"
 		},
 		"DirectAdmin": {
 			"cats": [
@@ -1891,7 +1902,7 @@
 				"PHP",
 				"Apache"
 			],
-			"website": "www.directadmin.com"
+			"website": "http://www.directadmin.com"
 		},
 		"Discourse": {
 			"cats": [
@@ -1903,7 +1914,7 @@
 			"meta": {
 				"generator": "Discourse(?: ?/?([\\d.]+\\d))?\\;version:\\1"
 			},
-			"website": "discourse.org"
+			"website": "http://discourse.org"
 		},
 		"Discuz! X": {
 			"cats": [
@@ -1918,7 +1929,7 @@
 			"meta": {
 				"generator": "Discuz! X([\\d\\.]+)?\\;version:\\1"
 			},
-			"website": "discuz.com"
+			"website": "http://discuz.com"
 		},
 		"Disqus": {
 			"cats": [
@@ -1928,7 +1939,7 @@
 			"html": "<div[^>]+id=\"disqus_thread\"",
 			"icon": "Disqus.svg",
 			"script": "disqus_url",
-			"website": "disqus.com"
+			"website": "http://disqus.com"
 		},
 		"Django": {
 			"cats": [
@@ -1938,7 +1949,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": [
@@ -1946,7 +1957,7 @@
 			],
 			"icon": "Django CMS.png",
 			"implies": "Django",
-			"website": "django-cms.org"
+			"website": "http://django-cms.org"
 		},
 		"Dojo": {
 			"cats": [
@@ -1955,7 +1966,7 @@
 			"env": "^dojo$",
 			"icon": "Dojo.png",
 			"script": "([\\d.]+)/dojo/dojo(?:\\.xd)?\\.js\\;version:\\1",
-			"website": "dojotoolkit.org"
+			"website": "http://dojotoolkit.org"
 		},
 		"Dokeos": {
 			"cats": [
@@ -1975,7 +1986,7 @@
 			"meta": {
 				"generator": "Dokeos"
 			},
-			"website": "dokeos.com"
+			"website": "http://dokeos.com"
 		},
 		"DokuWiki": {
 			"cats": [
@@ -1989,7 +2000,7 @@
 			"meta": {
 				"generator": "DokuWiki( Release [\\-\\d]+)?\\;version:\\1"
 			},
-			"website": "www.dokuwiki.org"
+			"website": "http://www.dokuwiki.org"
 		},
 		"Dotclear": {
 			"cats": [
@@ -1997,7 +2008,7 @@
 			],
 			"icon": "Dotclear.png",
 			"implies": "PHP",
-			"website": "dotclear.org"
+			"website": "http://dotclear.org"
 		},
 		"DoubleClick Ad Exchange (AdX)": {
 			"cats": [
@@ -2009,7 +2020,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": [
@@ -2017,7 +2028,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": [
@@ -2025,7 +2036,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": [
@@ -2033,17 +2044,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\/",
+			"html": "<link[^>]* href=\"\\/DovetailWRP\\/",
 			"icon": "DovetailWRP.png",
 			"implies": "ASP.NET",
-			"script": "\/DovetailWRP\/",
-			"website": "www.dovetailinternet.com"
+			"script": "\\/DovetailWRP\\/",
+			"website": "http://www.dovetailinternet.com"
 		},
 		"Doxygen": {
 			"cats": [
@@ -2054,7 +2065,7 @@
 			"meta": {
 				"generator": "Doxygen ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.stack.nl/~dimitri/doxygen/"
+			"website": "http://www.stack.nl/~dimitri/doxygen/"
 		},
 		"DreamWeaver": {
 			"cats": [
@@ -2062,7 +2073,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": [
@@ -2081,7 +2092,7 @@
 				"generator": "Drupal(?:\\s([\\d.]+))?\\;version:\\1"
 			},
 			"script": "drupal\\.js",
-			"website": "drupal.org"
+			"website": "http://drupal.org"
 		},
 		"Drupal Commerce": {
 			"cats": [
@@ -2090,7 +2101,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": [
@@ -2106,7 +2117,7 @@
 			"meta": {
 				"generator": "Dynamicweb ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.dynamicweb.dk"
+			"website": "http://www.dynamicweb.dk"
 		},
 		"Dynatrace": {
 			"cats": [
@@ -2114,7 +2125,7 @@
 			],
 			"icon": "Dynatrace.png",
 			"script": "dtagent.*\\.js",
-			"website": "dynatrace.com"
+			"website": "http://dynatrace.com"
 		},
 		"E-Commerce Paraguay": {
 			"cats": [
@@ -2122,7 +2133,7 @@
 			],
 			"icon": "eCommercePy.png",
 			"script": "cdn\\.e-commerceparaguay\\.com",
-			"website": "e-commerceparaguay.com"
+			"website": "http://e-commerceparaguay.com"
 		},
 		"E-Merchant": {
 			"cats": [
@@ -2130,7 +2141,7 @@
 			],
 			"icon": "E-Merchant.png",
 			"script": "cdn\\.e-merchant\\.com",
-			"website": "e-merchant.com"
+			"website": "http://e-merchant.com"
 		},
 		"EC-CUBE": {
 			"cats": [
@@ -2142,7 +2153,7 @@
 				"eccube\\.js",
 				"win_op\\.js"
 			],
-			"website": "www.ec-cube.net"
+			"website": "http://www.ec-cube.net"
 		},
 		"ELOG": {
 			"cats": [
@@ -2150,7 +2161,7 @@
 			],
 			"html": "<title>ELOG Logbook Selection</title>",
 			"icon": "ELOG.png",
-			"website": "midas.psi.ch/elog"
+			"website": "http://midas.psi.ch/elog"
 		},
 		"ELOG HTTP": {
 			"cats": [
@@ -2161,7 +2172,7 @@
 			},
 			"icon": "ELOG HTTP.png",
 			"implies": "ELOG",
-			"website": "midas.psi.ch/elog"
+			"website": "http://midas.psi.ch/elog"
 		},
 		"EPages": {
 			"cats": [
@@ -2172,7 +2183,7 @@
 			},
 			"html": "<div class=\"BoxContainer\">",
 			"icon": "epages.png",
-			"website": "www.epages.com/"
+			"website": "http://www.epages.com/"
 		},
 		"EPiServer": {
 			"cats": [
@@ -2186,7 +2197,7 @@
 			"meta": {
 				"generator": "EPiServer"
 			},
-			"website": "episerver.com"
+			"website": "http://episerver.com"
 		},
 		"EPrints": {
 			"cats": [
@@ -2198,7 +2209,7 @@
 			"meta": {
 				"generator": "EPrints ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.eprints.org"
+			"website": "http://www.eprints.org"
 		},
 		"ESERV-10": {
 			"cats": [
@@ -2208,7 +2219,7 @@
 				"Server": "ESERV-10(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "ESERV-10.png",
-			"website": "www.violasystems.com"
+			"website": "http://www.violasystems.com"
 		},
 		"EWS-NIC4": {
 			"cats": [
@@ -2219,7 +2230,7 @@
 			},
 			"icon": "EWS-NIC4.png",
 			"implies": "Dell",
-			"website": "dell.com"
+			"website": "http://dell.com"
 		},
 		"EdgeCast": {
 			"cats": [
@@ -2230,7 +2241,7 @@
 			},
 			"icon": "EdgeCast.png",
 			"url": "https?://(?:[^/]+\\.)?edgecastcdn\\.net/",
-			"website": "www.edgecast.com"
+			"website": "http://www.edgecast.com"
 		},
 		"Elcodi": {
 			"cats": [
@@ -2244,7 +2255,7 @@
 				"PHP",
 				"Symfony"
 			],
-			"website": "elcodi.io"
+			"website": "http://elcodi.io"
 		},
 		"Eleanor CMS": {
 			"cats": [
@@ -2255,7 +2266,7 @@
 			"meta": {
 				"generator": "Eleanor"
 			},
-			"website": "eleanor-cms.ru"
+			"website": "http://eleanor-cms.ru"
 		},
 		"Elm": {
 			"cats": [
@@ -2264,7 +2275,7 @@
 			],
 			"env": "^Elm$",
 			"icon": "Elm.png",
-			"website": "elm-lang.org"
+			"website": "http://elm-lang.org"
 		},
 		"Eloqua": {
 			"cats": [
@@ -2273,7 +2284,7 @@
 			"env": "^elq(?:SiteID|Load|CurESite)$",
 			"icon": "Oracle.png",
 			"script": "elqCfg\\.js",
-			"website": "eloqua.com"
+			"website": "http://eloqua.com"
 		},
 		"EmbedThis Appweb": {
 			"cats": [
@@ -2282,8 +2293,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": [
@@ -2292,8 +2303,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": [
@@ -2302,7 +2313,7 @@
 			"env": "^Ember$",
 			"icon": "Ember.js.png",
 			"implies": "Handlebars",
-			"website": "emberjs.com"
+			"website": "http://emberjs.com"
 		},
 		"Enyo": {
 			"cats": [
@@ -2312,17 +2323,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": [
@@ -2331,7 +2342,7 @@
 			"env": "^Epom",
 			"icon": "Epom.png",
 			"url": "^https?://(?:[^/]+\\.)?ad(?:op)?shost1\\.com/",
-			"website": "epom.com"
+			"website": "http://epom.com"
 		},
 		"Erlang": {
 			"cats": [
@@ -2341,7 +2352,7 @@
 				"Server": "Erlang( OTP/(?:[\\-\\d\\.ABR]+))?\\;version:\\1"
 			},
 			"icon": "Erlang.png",
-			"website": "www.erlang.org"
+			"website": "http://www.erlang.org"
 		},
 		"Exagon Concept": {
 			"cats": [
@@ -2351,7 +2362,7 @@
 				"Server": "Exagon Server"
 			},
 			"icon": "ExagonConcept.svg",
-			"website": "www.exagon-concept.com"
+			"website": "http://www.exagon-concept.com"
 		},
 		"Exhibit": {
 			"cats": [
@@ -2360,7 +2371,7 @@
 			"env": "^Exhibit$",
 			"icon": "Exhibit.png",
 			"script": "exhibit.*\\.js",
-			"website": "simile-widgets.org/exhibit/"
+			"website": "http://simile-widgets.org/exhibit/"
 		},
 		"Express": {
 			"cats": [
@@ -2372,7 +2383,7 @@
 			},
 			"icon": "Express.png",
 			"implies": "Node.js",
-			"website": "expressjs.com"
+			"website": "http://expressjs.com"
 		},
 		"ExpressionEngine": {
 			"cats": [
@@ -2383,7 +2394,7 @@
 			},
 			"icon": "ExpressionEngine.png",
 			"implies": "PHP",
-			"website": "expressionengine.com"
+			"website": "http://expressionengine.com"
 		},
 		"ExtJS": {
 			"cats": [
@@ -2392,7 +2403,7 @@
 			"env": "^Ext$",
 			"icon": "ExtJS.png",
 			"script": "ext-base\\.js",
-			"website": "www.extjs.com"
+			"website": "http://www.extjs.com"
 		},
 		"FAST ESP": {
 			"cats": [
@@ -2400,7 +2411,7 @@
 			],
 			"html": "<form[^>]+id=\"fastsearch\"",
 			"icon": "FAST ESP.png",
-			"website": "microsoft.com/enterprisesearch"
+			"website": "http://microsoft.com/enterprisesearch"
 		},
 		"FAST Search for SharePoint": {
 			"cats": [
@@ -2413,7 +2424,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": [
@@ -2424,7 +2435,7 @@
 			"meta": {
 				"generator": "FWP Shop"
 			},
-			"website": "fwpshop.org"
+			"website": "http://fwpshop.org"
 		},
 		"Facebook": {
 			"cats": [
@@ -2432,7 +2443,7 @@
 			],
 			"icon": "Facebook.svg",
 			"script": "//connect\\.facebook\\.net/[^/]*/[a-z]*\\.js",
-			"website": "facebook.com"
+			"website": "http://facebook.com"
 		},
 		"Fact Finder": {
 			"cats": [
@@ -2442,7 +2453,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": [
@@ -2453,7 +2473,7 @@
 			},
 			"icon": "Fat-Free Framework.png",
 			"implies": "PHP",
-			"website": "fatfreeframework.com"
+			"website": "http://fatfreeframework.com"
 		},
 		"Fedora": {
 			"cats": [
@@ -2463,7 +2483,7 @@
 				"Server": "Fedora"
 			},
 			"icon": "Fedora.png",
-			"website": "fedoraproject.org"
+			"website": "http://fedoraproject.org"
 		},
 		"Firebase": {
 			"cats": [
@@ -2471,7 +2491,7 @@
 			],
 			"icon": "Firebase.png",
 			"script": "firebase.*\\.js",
-			"website": "firebase.com"
+			"website": "http://firebase.com"
 		},
 		"Fireblade": {
 			"cats": [
@@ -2481,7 +2501,7 @@
 				"Server": "fbs"
 			},
 			"icon": "Fireblade.png",
-			"website": "fireblade.com"
+			"website": "http://fireblade.com"
 		},
 		"FlashCom": {
 			"cats": [
@@ -2490,8 +2510,8 @@
 			"headers": {
 				"Server": "FlashCom/?([\\d\\.]+)?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"Flask": {
 			"cats": [
@@ -2503,7 +2523,7 @@
 			},
 			"icon": "Flask.png",
 			"implies": "Python",
-			"website": "flask.pocoo.org"
+			"website": "http://flask.pocoo.org"
 		},
 		"FlexCMP": {
 			"cats": [
@@ -2518,7 +2538,7 @@
 			"meta": {
 				"generator": "FlexCMP"
 			},
-			"website": "www.flexcmp.com/cms/home"
+			"website": "http://www.flexcmp.com/cms/home"
 		},
 		"FluxBB": {
 			"cats": [
@@ -2526,8 +2546,8 @@
 			],
 			"html": "Powered by (?:<strong>)?<a href=\"[^>]+fluxbb",
 			"icon": "FluxBB.png",
-			"website": "fluxbb.org",
-			"implies": "PHP"
+			"implies": "PHP",
+			"website": "http://fluxbb.org"
 		},
 		"Flyspray": {
 			"cats": [
@@ -2539,7 +2559,7 @@
 			"html": "(?:<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform)",
 			"icon": "Flyspray.png",
 			"implies": "PHP",
-			"website": "flyspray.org"
+			"website": "http://flyspray.org"
 		},
 		"Font Awesome": {
 			"cats": [
@@ -2550,7 +2570,7 @@
 				"<script[^>]* src=[^>]+fontawesome(?:\\.js)?"
 			],
 			"icon": "Font Awesome.png",
-			"website": "fontawesome.io"
+			"website": "http://fontawesome.io"
 		},
 		"Fortune3": {
 			"cats": [
@@ -2559,7 +2579,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": [
@@ -2569,7 +2610,7 @@
 				"Server": "FreeBSD(?: ([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "FreeBSD.png",
-			"website": "freebsd.org"
+			"website": "http://freebsd.org"
 		},
 		"FreeTextBox": {
 			"cats": [
@@ -2579,7 +2620,7 @@
 			"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": [
@@ -2589,7 +2630,7 @@
 			"implies": [
 				"jQuery"
 			],
-			"website": "froala.com/wysiwyg-editor"
+			"website": "http://froala.com/wysiwyg-editor"
 		},
 		"FrontPage": {
 			"cats": [
@@ -2600,7 +2641,7 @@
 			"meta": {
 				"generator": "Microsoft FrontPage(?:\\s((?:Express )?[\\d.]+))?\\;version:\\1"
 			},
-			"website": "office.microsoft.com/frontpage"
+			"website": "http://office.microsoft.com/frontpage"
 		},
 		"Fusion Ads": {
 			"cats": [
@@ -2609,7 +2650,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": [
@@ -2619,7 +2660,7 @@
 				"Server": "G-WAN"
 			},
 			"icon": "G-WAN.png",
-			"website": "gwan.com"
+			"website": "http://gwan.com"
 		},
 		"GX WebManager": {
 			"cats": [
@@ -2630,7 +2671,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": [
@@ -2639,7 +2680,7 @@
 			"env": "^galleryAuthToken$",
 			"html": "<div id=\"gsNavBar\" class=\"gcBorder1\">",
 			"icon": "Gallery.png",
-			"website": "gallery.menalto.com"
+			"website": "http://gallery.menalto.com"
 		},
 		"Gambio": {
 			"cats": [
@@ -2650,7 +2691,7 @@
 			"icon": "Gambio.png",
 			"implies": "PHP",
 			"script": "gm_javascript\\.js\\.php",
-			"website": "gambio.de"
+			"website": "http://gambio.de"
 		},
 		"Gauges": {
 			"cats": [
@@ -2661,7 +2702,7 @@
 				"Set-Cookie": "_gauges_[^;]+="
 			},
 			"icon": "Gauges.png",
-			"website": "get.gaug.es"
+			"website": "http://get.gaug.es"
 		},
 		"Gentoo": {
 			"cats": [
@@ -2671,24 +2712,24 @@
 				"X-Powered-By": "gentoo"
 			},
 			"icon": "Gentoo.png",
-			"website": "www.gentoo.org"
+			"website": "http://www.gentoo.org"
 		},
 		"Gerrit": {
 			"cats": [
 				47
 			],
-			"meta": {
-				"title": "^Gerrit Code Review$"
-			},
 			"env": "^gerrit_",
-			"script": "^gerrit_ui/gerrit_ui",
 			"html": "<(?:div|style) id=\"gerrit_",
+			"icon": "gerrit.svg",
 			"implies": [
 				"Java",
 				"git"
 			],
-			"icon": "gerrit.svg",
-			"website": "www.gerritcodereview.com"
+			"meta": {
+				"title": "^Gerrit Code Review$"
+			},
+			"script": "^gerrit_ui/gerrit_ui",
+			"website": "http://www.gerritcodereview.com"
 		},
 		"Get Satisfaction": {
 			"cats": [
@@ -2696,7 +2737,7 @@
 			],
 			"env": "^GSFN",
 			"icon": "Get Satisfaction.png",
-			"website": "getsatisfaction.com"
+			"website": "http://getsatisfaction.com"
 		},
 		"GetSimple CMS": {
 			"cats": [
@@ -2707,7 +2748,7 @@
 			"meta": {
 				"generator": "GetSimple"
 			},
-			"website": "get-simple.info"
+			"website": "http://get-simple.info"
 		},
 		"Ghost": {
 			"cats": [
@@ -2717,11 +2758,11 @@
 				"X-Ghost-Cache-Status": ""
 			},
 			"icon": "Ghost.png",
+			"implies": "Node.js",
 			"meta": {
 				"generator": "Ghost(?:\\s([\\d.]+))?\\;version:\\1"
 			},
-			"implies": "Node.js",
-			"website": "ghost.org"
+			"website": "http://ghost.org"
 		},
 		"GitBook": {
 			"cats": [
@@ -2731,42 +2772,29 @@
 			"meta": {
 				"generator": "GitBook(?:.([\\d.]+))?\\;version:\\1"
 			},
-			"website": "gitbook.io"
-		},
-		"Gitiles": {
-			"cats": [
-				47
-			],
-			"implies": [
-				"Java",
-				"git"
-			],
-			"html": "Powered by <a href=\"https://gerrit.googlesource.com/gitiles/\">Gitiles<",
-			"icon": "default.png",
-			"website": "gerrit.googlesource.com/gitiles/"
+			"website": "http://gitbook.io"
 		},
 		"GitLab": {
 			"cats": [
 				13,
 				47
 			],
+			"env": "^GitLab$",
 			"headers": {
 				"Set-cookie": "_gitlab_session"
 			},
-			"meta": {
-				"description": "^GitLab"
-			},
 			"html": [
-				"<meta content=\"GitLab\" property=\"og:site_name\">",
-				"<meta content=\"https?://[^/]+/assets/gitlab_logo-"
+				"<meta content=\"https?://[^/]+/assets/gitlab_logo-",
+				"GitLab</title>",
+				"<header class=\"navbar navbar-fixed-top navbar-gitlab with-horizontal-nav\">"
 			],
-			"env": "^GitLab$",
 			"icon": "GitLab.svg",
-			"implies": [
-				"Ruby",
-				"Ruby on Rails"
-			],
-			"website": "about.gitlab.com"
+			"implies": "Ruby on Rails",
+			"meta": {
+				"description": "^GitLab",
+				"og:site_name": "^GitLab$"
+			},
+			"website": "http://about.gitlab.com"
 		},
 		"GitLab CI": {
 			"cats": [
@@ -2774,26 +2802,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
 			],
-			"icon": "default.png",
-			"implies": "PHP",
 			"html": [
 				"<!-- gitphp web interface ([\\d.]+)\\;version:\\1",
 				"<a href=\"http://www.gitphp.org/\" target=\"_blank\">GitPHP by Chris Han"
 			],
-			"website": "gitphp.org"
+			"icon": "default.svg",
+			"implies": "PHP",
+			"website": "http://gitphp.org"
+		},
+		"Gitiles": {
+			"cats": [
+				47
+			],
+			"html": "Powered by <a href=\"https://gerrit.googlesource.com/gitiles/\">Gitiles<",
+			"icon": "default.svg",
+			"implies": [
+				"Java",
+				"git"
+			],
+			"website": "http://gerrit.googlesource.com/gitiles/"
 		},
 		"GlassFish": {
 			"cats": [
@@ -2806,7 +2843,7 @@
 			"implies": [
 				"Java"
 			],
-			"website": "glassfish.java.net"
+			"website": "http://glassfish.java.net"
 		},
 		"Glyphicons": {
 			"cats": [
@@ -2814,7 +2851,7 @@
 			],
 			"html": "(?:<link[^>]* href=[^>]+glyphicons(?:\\.min)?\\.css|<img[^>]* src=[^>]+glyphicons)",
 			"icon": "Glyphicons.png",
-			"website": "glyphicons.com"
+			"website": "http://glyphicons.com"
 		},
 		"GoAhead": {
 			"cats": [
@@ -2824,7 +2861,7 @@
 				"Server": "GoAhead"
 			},
 			"icon": "GoAhead.png",
-			"website": "embedthis.com/products/goahead/index.html"
+			"website": "http://embedthis.com/products/goahead/index.html"
 		},
 		"GoStats": {
 			"cats": [
@@ -2832,7 +2869,7 @@
 			],
 			"env": "^_go(?:stats|_track)",
 			"icon": "GoStats.png",
-			"website": "gostats.com"
+			"website": "http://gostats.com"
 		},
 		"Gogs": {
 			"cats": [
@@ -2850,7 +2887,7 @@
 				"keywords": "go, git, self-hosted, gogs"
 			},
 			"script": "js/gogs\\.js",
-			"website": "gogs.io"
+			"website": "http://gogs.io"
 		},
 		"Google AdSense": {
 			"cats": [
@@ -2868,7 +2905,7 @@
 				"2mdn\\.net",
 				"ad\\.ca\\.doubleclick\\.net"
 			],
-			"website": "google.com/adsense"
+			"website": "http://google.com/adsense"
 		},
 		"Google Analytics": {
 			"cats": [
@@ -2880,7 +2917,7 @@
 			},
 			"icon": "Google Analytics.svg",
 			"script": "google-analytics\\.com\\/(?:ga|urchin|(analytics))\\.js\\;version:\\1?UA:",
-			"website": "google.com/analytics"
+			"website": "http://google.com/analytics"
 		},
 		"Google App Engine": {
 			"cats": [
@@ -2890,7 +2927,7 @@
 				"Server": "Google Frontend"
 			},
 			"icon": "Google App Engine.png",
-			"website": "code.google.com/appengine"
+			"website": "http://code.google.com/appengine"
 		},
 		"Google Charts": {
 			"cats": [
@@ -2898,7 +2935,7 @@
 			],
 			"env": "^__g(?:oogleVisualizationAbstractRendererElementsCount|vizguard)__$",
 			"icon": "Google Charts.png",
-			"website": "developers.google.com/chart/"
+			"website": "http://developers.google.com/chart/"
 		},
 		"Google Code Prettify": {
 			"cats": [
@@ -2906,7 +2943,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": [
@@ -2916,7 +2953,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": [
@@ -2927,7 +2964,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": [
@@ -2939,7 +2976,7 @@
 				"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": [
@@ -2947,7 +2984,7 @@
 			],
 			"icon": "Google Plus.svg",
 			"script": "apis\\.google\\.com/js/[a-z]*\\.js",
-			"website": "plus.google.com"
+			"website": "http://plus.google.com"
 		},
 		"Google Sites": {
 			"cats": [
@@ -2955,7 +2992,7 @@
 			],
 			"icon": "Google Sites.png",
 			"url": "sites\\.google\\.com",
-			"website": "sites.google.com"
+			"website": "http://sites.google.com"
 		},
 		"Google Tag Manager": {
 			"cats": [
@@ -2964,7 +3001,7 @@
 			"env": "^googletag$",
 			"html": "googletagmanager\\.com/ns\\.html[^>]+></iframe>",
 			"icon": "Google Tag Manager.png",
-			"website": "www.google.com/tagmanager"
+			"website": "http://www.google.com/tagmanager"
 		},
 		"Google Wallet": {
 			"cats": [
@@ -2975,7 +3012,7 @@
 				"checkout\\.google\\.com",
 				"wallet\\.google\\.com"
 			],
-			"website": "wallet.google.com"
+			"website": "http://wallet.google.com"
 		},
 		"Google Web Server": {
 			"cats": [
@@ -2985,7 +3022,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": [
@@ -2997,7 +3034,7 @@
 			"meta": {
 				"gwt:property": ""
 			},
-			"website": "developers.google.com/web-toolkit"
+			"website": "http://developers.google.com/web-toolkit"
 		},
 		"Graffiti CMS": {
 			"cats": [
@@ -3007,12 +3044,12 @@
 				"Set-Cookie": "graffitibot[^;]="
 			},
 			"icon": "Graffiti CMS.png",
+			"implies": "Microsoft ASP.NET",
 			"meta": {
 				"generator": "Graffiti CMS ([^\"]+)\\;version:\\1"
 			},
 			"script": "/graffiti\\.js",
-			"implies": "Microsoft ASP.NET",
-			"website": "graffiticms.codeplex.com"
+			"website": "http://graffiticms.codeplex.com"
 		},
 		"Grandstream": {
 			"cats": [
@@ -3023,7 +3060,7 @@
 				"Server": "Grandstream\\/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "Grandstream.png",
-			"website": "www.grandstream.com"
+			"website": "http://www.grandstream.com"
 		},
 		"Grav": {
 			"cats": [
@@ -3034,7 +3071,7 @@
 			"meta": {
 				"generator": "GravCMS(?:\\s([\\d.]+))?\\;version:\\1"
 			},
-			"website": "getgrav.org"
+			"website": "http://getgrav.org"
 		},
 		"Gravatar": {
 			"cats": [
@@ -3043,7 +3080,7 @@
 			"env": "^Gravatar$",
 			"html": "<[^>]+gravatar\\.com/avatar/",
 			"icon": "Gravatar.png",
-			"website": "gravatar.com"
+			"website": "http://gravatar.com"
 		},
 		"Gravity Forms": {
 			"cats": [
@@ -3057,7 +3094,7 @@
 			],
 			"icon": "gravityforms.svg",
 			"implies": "WordPress",
-			"website": "gravityforms.com"
+			"website": "http://gravityforms.com"
 		},
 		"Gravity Insights": {
 			"cats": [
@@ -3065,7 +3102,7 @@
 			],
 			"env": "^GravityInsights$",
 			"icon": "Gravity Insights.png",
-			"website": "insights.gravity.com"
+			"website": "http://insights.gravity.com"
 		},
 		"Green Valley CMS": {
 			"cats": [
@@ -3077,7 +3114,7 @@
 			"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": [
@@ -3085,7 +3122,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": [
@@ -3096,14 +3133,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": [
@@ -3114,7 +3151,7 @@
 			},
 			"icon": "HP.svg",
 			"implies": "HP",
-			"website": "hp.com"
+			"website": "http://hp.com"
 		},
 		"HP Compact Server": {
 			"cats": [
@@ -3124,14 +3161,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": [
@@ -3141,7 +3178,7 @@
 				"Server": "HP System Management"
 			},
 			"icon": "HP.svg",
-			"website": "hp.com"
+			"website": "http://hp.com"
 		},
 		"HP iLO": {
 			"cats": [
@@ -3152,7 +3189,7 @@
 				"Server": "HP-iLO-Server(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "HP.svg",
-			"website": "hp.com"
+			"website": "http://hp.com"
 		},
 		"HTTP Kit": {
 			"cats": [
@@ -3161,9 +3198,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": [
@@ -3172,8 +3209,8 @@
 			"headers": {
 				"Server": "(?:^|[^-])\bHTTP-Server(?: ?/?V?([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"HTTP/2": {
 			"cats": [
@@ -3184,7 +3221,16 @@
 				"X-Firefox-Spdy": "h2"
 			},
 			"icon": "http2.png",
-			"website": "http2.github.io"
+			"website": "http://http2.github.io"
+		},
+		"Haddock": {
+			"cats": [
+				4
+			],
+			"html": "<p>Produced by <a href=\"http://www.haskell.org/haddock/\">Haddock</a> version ([0-9.]+)</p>\\;version:\\1",
+			"icon": "default.svg",
+			"script": "haddock-util\\.js",
+			"website": "http://www.haskell.org/haddock/"
 		},
 		"Hammer.js": {
 			"cats": [
@@ -3193,7 +3239,7 @@
 			"env": "^Hammer$",
 			"icon": "Hammer.js.png",
 			"script": "hammer(?:\\.min)?\\.js",
-			"website": "hammerjs.github.io"
+			"website": "http://hammerjs.github.io"
 		},
 		"Handlebars": {
 			"cats": [
@@ -3203,7 +3249,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": [
@@ -3212,16 +3258,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": [
@@ -3231,7 +3277,7 @@
 			"html": "<[^>]*data-headjs-load",
 			"icon": "HeadJS.png",
 			"script": "head\\.(?:core|load)(?:\\.min)?\\.js",
-			"website": "headjs.com"
+			"website": "http://headjs.com"
 		},
 		"Heap": {
 			"cats": [
@@ -3240,7 +3286,7 @@
 			"env": "^heap$",
 			"icon": "Heap.png",
 			"script": "heap-\\d+.js",
-			"website": "heapanalytics.com"
+			"website": "http://heapanalytics.com"
 		},
 		"Hello Bar": {
 			"cats": [
@@ -3249,7 +3295,7 @@
 			"env": "^HelloBar$",
 			"icon": "Hello Bar.png",
 			"script": "hellobar\\.js",
-			"website": "hellobar.com"
+			"website": "http://hellobar.com"
 		},
 		"Hiawatha": {
 			"cats": [
@@ -3259,7 +3305,7 @@
 				"Server": "Hiawatha v([\\d.]+)\\;version:\\1"
 			},
 			"icon": "Hiawatha.png",
-			"website": "hiawatha-webserver.org"
+			"website": "http://hiawatha-webserver.org"
 		},
 		"Highcharts": {
 			"cats": [
@@ -3269,7 +3315,7 @@
 			"html": "<svg[^>]*><desc>Created with Highcharts ([\\d.]*)\\;version:\\1",
 			"icon": "Highcharts.png",
 			"script": "highcharts.*\\.js",
-			"website": "highcharts.com"
+			"website": "http://highcharts.com"
 		},
 		"Highstock": {
 			"cats": [
@@ -3278,7 +3324,7 @@
 			"html": "<svg[^>]*><desc>Created with Highstock ([\\d.]*)\\;version:\\1",
 			"icon": "Highstock.png",
 			"script": "highstock(?:\\-|\\.)?([\\d\\.]*\\d).*\\.js\\;version:\\1",
-			"website": "highcharts.com/products/highstock"
+			"website": "http://highcharts.com/products/highstock"
 		},
 		"Hippo": {
 			"cats": [
@@ -3286,7 +3332,7 @@
 			],
 			"html": "<[^>]+/binaries/(?:[^/]+/)*content/gallery/",
 			"icon": "Hippo.png",
-			"website": "onehippo.org"
+			"website": "http://onehippo.org"
 		},
 		"Hogan.js": {
 			"cats": [
@@ -3298,7 +3344,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": [
@@ -3312,7 +3358,7 @@
 			"meta": {
 				"generator": "Hotaru CMS"
 			},
-			"website": "hotarucms.org"
+			"website": "http://hotarucms.org"
 		},
 		"HubSpot": {
 			"cats": [
@@ -3321,7 +3367,7 @@
 			"env": "^(?:_hsq|hubspot)$",
 			"html": "<!-- Start of Async HubSpot",
 			"icon": "HubSpot.png",
-			"website": "hubspot.com"
+			"website": "http://hubspot.com"
 		},
 		"Hugo": {
 			"cats": [
@@ -3332,7 +3378,7 @@
 			"meta": {
 				"generator": "Hugo ([\\d.]+)?\\;version:\\1"
 			},
-			"website": "gohugo.io"
+			"website": "http://gohugo.io"
 		},
 		"Hybris": {
 			"cats": [
@@ -3344,7 +3390,7 @@
 			"html": "<[^>]+(?:/sys_master/|/hybr/|/_ui/desktop/)",
 			"icon": "Hybris.png",
 			"implies": "Java",
-			"website": "hybris.com"
+			"website": "http://hybris.com"
 		},
 		"IBM Coremetrics": {
 			"cats": [
@@ -3352,7 +3398,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": [
@@ -3362,7 +3408,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": [
@@ -3372,17 +3418,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",
-			"html": "href=\"(?:\/|[^>]+)webapp\/wcs\/",
 			"implies": "Java",
 			"url": "/wcs/",
-			"website": "ibm.com/software/genservers/commerceproductline"
+			"website": "http://ibm.com/software/genservers/commerceproductline"
 		},
 		"IBM WebSphere Portal": {
 			"cats": [
@@ -3395,7 +3441,7 @@
 			"icon": "IBM.svg",
 			"implies": "Java",
 			"url": "/wps/",
-			"website": "ibm.com/software/websphere/portal"
+			"website": "http://ibm.com/software/websphere/portal"
 		},
 		"IIS": {
 			"cats": [
@@ -3406,7 +3452,7 @@
 			},
 			"icon": "IIS.png",
 			"implies": "Windows Server",
-			"website": "www.iis.net"
+			"website": "http://www.iis.net"
 		},
 		"INFOnline": {
 			"cats": [
@@ -3418,21 +3464,21 @@
 			],
 			"icon": "INFOnline.png",
 			"script": "^https?://(?:[^/]+\\.)?i(?:oam|v)wbox\\.de/",
-			"website": "infonline.de"
+			"website": "http://infonline.de"
 		},
 		"IPB": {
 			"cats": [
 				2
 			],
+			"env": "^(?:IPBoard$|ipb_var|ipsSettings)",
+			"html": "<link[^>]+ipb_[^>]+\\.css",
+			"icon": "IPB.png",
 			"implies": [
 				"PHP",
 				"MySQL"
 			],
-			"env": "^(?:IPBoard$|ipb_var|ipsSettings)",
-			"html": "<link[^>]+ipb_[^>]+\\.css",
-			"icon": "IPB.png",
 			"script": "jscripts/ips_",
-			"website": "www.invisionpower.com"
+			"website": "http://www.invisionpower.com"
 		},
 		"Immutable.js": {
 			"cats": [
@@ -3441,7 +3487,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": [
@@ -3457,7 +3503,7 @@
 				"generator": "ImpressCMS"
 			},
 			"script": "include/linkexternal\\.js",
-			"website": "www.impresscms.org"
+			"website": "http://www.impresscms.org"
 		},
 		"ImpressPages": {
 			"cats": [
@@ -3468,7 +3514,7 @@
 			"meta": {
 				"generator": "ImpressPages(?: CMS)?( [\\d.]*)\\;version:\\1"
 			},
-			"website": "impresspages.org"
+			"website": "http://impresspages.org"
 		},
 		"InProces": {
 			"cats": [
@@ -3477,7 +3523,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": [
@@ -3487,14 +3533,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",
@@ -3503,7 +3549,7 @@
 			"meta": {
 				"generator": "Indexhibit"
 			},
-			"website": "www.indexhibit.org"
+			"website": "http://www.indexhibit.org"
 		},
 		"Indico": {
 			"cats": [
@@ -3514,7 +3560,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": [
@@ -3523,8 +3569,8 @@
 			"headers": {
 				"Server": "Indy(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "indyproject.org"
+			"icon": "default.svg",
+			"website": "http://indyproject.org"
 		},
 		"Infusionsoft": {
 			"cats": [
@@ -3535,7 +3581,7 @@
 				"<input [^>]*value=\"([^>]*)\" [^>]*name=\"infusionsoft_version\" [^>]*\\/>\\;version:\\1"
 			],
 			"icon": "infusionsoft.svg",
-			"website": "infusionsoft.com"
+			"website": "http://infusionsoft.com"
 		},
 		"InstantCMS": {
 			"cats": [
@@ -3549,7 +3595,7 @@
 			"meta": {
 				"generator": "InstantCMS"
 			},
-			"website": "www.instantcms.ru"
+			"website": "http://www.instantcms.ru"
 		},
 		"Intel Active Management Technology": {
 			"cats": [
@@ -3560,7 +3606,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": [
@@ -3568,7 +3614,7 @@
 			],
 			"icon": "IntenseDebate.png",
 			"script": "intensedebate\\.com",
-			"website": "intensedebate.com"
+			"website": "http://intensedebate.com"
 		},
 		"Intercom": {
 			"cats": [
@@ -3577,7 +3623,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": [
@@ -3585,7 +3631,7 @@
 			],
 			"icon": "Intershop.png",
 			"script": "(?:is-bin|INTERSHOP)",
-			"website": "intershop.com"
+			"website": "http://intershop.com"
 		},
 		"Invenio": {
 			"cats": [
@@ -3596,7 +3642,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": [
@@ -3604,7 +3650,7 @@
 			],
 			"html": "<link[^>]* href=[^>]+ionicons(?:\\.min)?\\.css",
 			"icon": "Ionicons.png",
-			"website": "ionicons.com"
+			"website": "http://ionicons.com"
 		},
 		"JAlbum": {
 			"cats": [
@@ -3615,7 +3661,7 @@
 			"meta": {
 				"generator": "JAlbum( [\\d.]+)?\\;version:\\1"
 			},
-			"website": "jalbum.net/en"
+			"website": "http://jalbum.net/en"
 		},
 		"JBoss Application Server": {
 			"cats": [
@@ -3625,7 +3671,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": [
@@ -3637,7 +3683,7 @@
 			},
 			"icon": "JBoss Web.png",
 			"implies": "JBoss Application Server",
-			"website": "jboss.org/jbossweb"
+			"website": "http://jboss.org/jbossweb"
 		},
 		"JC-HTTPD": {
 			"cats": [
@@ -3649,7 +3695,7 @@
 			},
 			"icon": "JC-HTTPD.png",
 			"implies": "Canon",
-			"website": "canon.com"
+			"website": "http://canon.com"
 		},
 		"JS Charts": {
 			"cats": [
@@ -3658,7 +3704,7 @@
 			"env": "^JSChart$",
 			"icon": "JS Charts.png",
 			"script": "jscharts.*\\.js",
-			"website": "www.jscharts.com"
+			"website": "http://www.jscharts.com"
 		},
 		"JTL Shop": {
 			"cats": [
@@ -3669,7 +3715,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": [
@@ -3679,7 +3725,7 @@
 			"meta": {
 				"generator": "Jalios"
 			},
-			"website": "www.jalios.com"
+			"website": "http://www.jalios.com"
 		},
 		"Java": {
 			"cats": [
@@ -3689,7 +3735,7 @@
 				"Set-Cookie": "JSESSIONID"
 			},
 			"icon": "Java.png",
-			"website": "java.com"
+			"website": "http://java.com"
 		},
 		"Java Servlet": {
 			"cats": [
@@ -3700,7 +3746,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": [
@@ -3711,7 +3766,7 @@
 			},
 			"icon": "JavaServer Faces.png",
 			"implies": "Java",
-			"website": "javaserverfaces.java.net"
+			"website": "http://javaserverfaces.java.net"
 		},
 		"JavaServer Pages": {
 			"cats": [
@@ -3722,16 +3777,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": [
@@ -3742,7 +3788,7 @@
 			"meta": {
 				"generator": "Jekyll (v[\\d.]+)?\\;version:\\1"
 			},
-			"website": "jekyllrb.com"
+			"website": "http://jekyllrb.com"
 		},
 		"Jenkins": {
 			"cats": [
@@ -3753,7 +3799,7 @@
 			},
 			"icon": "Jenkins.png",
 			"implies": "Java",
-			"website": "jenkins-ci.org"
+			"website": "http://jenkins-ci.org"
 		},
 		"Jetty": {
 			"cats": [
@@ -3764,19 +3810,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": ""
 			},
-			"env": "^jimdo_(?:Data|Gen\\d+)$",
 			"icon": "jimdo.png",
-			"website": "www.jimdo.com/"
+			"website": "http://www.jimdo.com/"
 		},
 		"Jirafe": {
 			"cats": [
@@ -3786,21 +3832,21 @@
 			"env": "^jirafe$",
 			"icon": "Jirafe.png",
 			"script": "/jirafe\\.js",
-			"website": "jirafe.com"
+			"website": "http://jirafe.com"
 		},
 		"Jive": {
 			"cats": [
 				19
 			],
 			"headers": {
-				"x-jive-chrome-wrapped": "",
+				"X-JIVE-USER-ID": "",
+				"X-JSL": "",
 				"X-Jive-Flow-Id": "",
 				"X-Jive-Request-Id": "",
-				"X-JIVE-USER-ID": "",
-				"X-JSL": ""
+				"x-jive-chrome-wrapped": ""
 			},
 			"icon": "Jive.png",
-			"website": "www.jivesoftware.com"
+			"website": "http://www.jivesoftware.com"
 		},
 		"Jo": {
 			"cats": [
@@ -3809,7 +3855,7 @@
 			],
 			"env": "^jo(?:Cache|DOM|Event)$",
 			"icon": "Jo.png",
-			"website": "joapp.com"
+			"website": "http://joapp.com"
 		},
 		"JobberBase": {
 			"cats": [
@@ -3821,7 +3867,7 @@
 			"meta": {
 				"generator": "Jobberbase"
 			},
-			"website": "jobberbase.com"
+			"website": "http://jobberbase.com"
 		},
 		"Joomla": {
 			"cats": [
@@ -3838,7 +3884,7 @@
 				"generator": "Joomla!(?: ([\\d.]+))?\\;version:\\1"
 			},
 			"url": "option=com_",
-			"website": "joomla.org"
+			"website": "http://joomla.org"
 		},
 		"K2": {
 			"cats": [
@@ -3848,7 +3894,7 @@
 			"html": "<!--(?: JoomlaWorks \"K2\"| Start K2)",
 			"icon": "K2.png",
 			"implies": "Joomla",
-			"website": "getk2.org"
+			"website": "http://getk2.org"
 		},
 		"KISSmetrics": {
 			"cats": [
@@ -3856,7 +3902,7 @@
 			],
 			"env": "^KM_COOKIE_DOMAIN$",
 			"icon": "KISSmetrics.png",
-			"website": "www.kissmetrics.com"
+			"website": "http://www.kissmetrics.com"
 		},
 		"KS_HTTP": {
 			"cats": [
@@ -3867,7 +3913,7 @@
 			},
 			"icon": "KS_HTTP.png",
 			"implies": "Canon",
-			"website": "www.canon.com"
+			"website": "http://www.canon.com"
 		},
 		"Kampyle": {
 			"cats": [
@@ -3880,7 +3926,7 @@
 			},
 			"icon": "Kampyle.png",
 			"script": "cf\\.kampyle\\.com/k_button\\.js",
-			"website": "www.kampyle.com"
+			"website": "http://www.kampyle.com"
 		},
 		"Kamva": {
 			"cats": [
@@ -3892,7 +3938,7 @@
 				"generator": "[CK]amva"
 			},
 			"script": "cdn\\.mykamva\\.ir",
-			"website": "kamva.ir"
+			"website": "http://kamva.ir"
 		},
 		"Kendo UI": {
 			"cats": [
@@ -3902,7 +3948,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": [
@@ -3915,7 +3961,17 @@
 			"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": [
@@ -3930,7 +3986,7 @@
 			"icon": "kibana.svg",
 			"implies": "Node.js",
 			"url": "kibana#/dashboard/",
-			"website": "www.elastic.co/products/kibana"
+			"website": "http://www.elastic.co/products/kibana"
 		},
 		"KineticJS": {
 			"cats": [
@@ -3939,7 +3995,7 @@
 			"env": "^Kinetic$",
 			"icon": "KineticJS.png",
 			"script": "kinetic(?:-v?([\\d.]+))?(?:\\.min)?\\.js\\;version:\\1",
-			"website": "kineticjs.com"
+			"website": "http://kineticjs.com"
 		},
 		"Klarna Checkout": {
 			"cats": [
@@ -3949,7 +4005,7 @@
 			],
 			"env": "^_klarnaCheckout$",
 			"icon": "Klarna.svg",
-			"website": "klarna.com"
+			"website": "http://klarna.com"
 		},
 		"Knockout.js": {
 			"cats": [
@@ -3957,7 +4013,7 @@
 			],
 			"env": "^ko$",
 			"icon": "Knockout.js.png",
-			"website": "knockoutjs.com"
+			"website": "http://knockoutjs.com"
 		},
 		"Koa": {
 			"cats": [
@@ -3969,7 +4025,7 @@
 			},
 			"icon": "Koa.png",
 			"implies": "Node.js",
-			"website": "koajs.com"
+			"website": "http://koajs.com"
 		},
 		"Koala Framework": {
 			"cats": [
@@ -3982,7 +4038,7 @@
 			"meta": {
 				"generator": "^Koala Web Framework CMS"
 			},
-			"website": "koala-framework.org"
+			"website": "http://koala-framework.org"
 		},
 		"Koego": {
 			"cats": [
@@ -3991,7 +4047,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": [
@@ -4003,7 +4059,7 @@
 			},
 			"icon": "Kohana.png",
 			"implies": "PHP",
-			"website": "kohanaframework.org"
+			"website": "http://kohanaframework.org"
 		},
 		"Koken": {
 			"cats": [
@@ -4025,7 +4081,7 @@
 				"generator": "Koken ([\\d.]+)\\;version:\\1"
 			},
 			"script": "koken(?:\\.js\\?([\\d.]+)|/storage)\\;version:\\1",
-			"website": "koken.me"
+			"website": "http://koken.me"
 		},
 		"Kolibri CMS": {
 			"cats": [
@@ -4034,11 +4090,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": [
@@ -4049,7 +4105,7 @@
 			"meta": {
 				"generator": "^Komodo CMS"
 			},
-			"website": "www.komodocms.com"
+			"website": "http://www.komodocms.com"
 		},
 		"Koobi": {
 			"cats": [
@@ -4060,7 +4116,7 @@
 			"meta": {
 				"generator": "Koobi"
 			},
-			"website": "dream4.de/cms"
+			"website": "http://dream4.de/cms"
 		},
 		"Kooboo CMS": {
 			"cats": [
@@ -4072,7 +4128,7 @@
 			"icon": "Kooboo CMS.png",
 			"implies": "Microsoft ASP.NET",
 			"script": "/Kooboo",
-			"website": "kooboo.com"
+			"website": "http://kooboo.com"
 		},
 		"Kotisivukone": {
 			"cats": [
@@ -4080,7 +4136,7 @@
 			],
 			"icon": "Kotisivukone.png",
 			"script": "kotisivukone(?:\\.min)?\\.js",
-			"website": "www.kotisivukone.fi"
+			"website": "http://www.kotisivukone.fi"
 		},
 		"LEPTON": {
 			"cats": [
@@ -4094,7 +4150,7 @@
 			"meta": {
 				"generator": "LEPTON"
 			},
-			"website": "www.lepton-cms.org"
+			"website": "http://www.lepton-cms.org"
 		},
 		"LabVIEW": {
 			"cats": [
@@ -4104,7 +4160,7 @@
 				"Server": "LabVIEW(?:/([\\d\\.]+))?\\;version:\\1"
 			},
 			"icon": "LabVIEW.png",
-			"website": "ni.com/labview"
+			"website": "http://ni.com/labview"
 		},
 		"Laravel": {
 			"cats": [
@@ -4115,15 +4171,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": [
@@ -4131,7 +4187,7 @@
 			],
 			"icon": "Leaflet.png",
 			"script": "leaflet.*\\.js",
-			"website": "leafletjs.com"
+			"website": "http://leafletjs.com"
 		},
 		"Less": {
 			"cats": [
@@ -4139,7 +4195,7 @@
 			],
 			"html": "<link[^>]+ rel=\"stylesheet/less\"",
 			"icon": "Less.png",
-			"website": "lesscss.org"
+			"website": "http://lesscss.org"
 		},
 		"Liferay": {
 			"cats": [
@@ -4150,7 +4206,7 @@
 				"Liferay-Portal": "[a-z\\s]+([\\d.]+)\\;version:\\1"
 			},
 			"icon": "Liferay.png",
-			"website": "www.liferay.com"
+			"website": "http://www.liferay.com"
 		},
 		"Lift": {
 			"cats": [
@@ -4161,7 +4217,7 @@
 			},
 			"icon": "Lift.png",
 			"implies": "Scala",
-			"website": "liftweb.net"
+			"website": "http://liftweb.net"
 		},
 		"LightMon Engine": {
 			"cats": [
@@ -4176,7 +4232,7 @@
 			"meta": {
 				"generator": "LightMon Engine"
 			},
-			"website": "lightmon.ru"
+			"website": "http://lightmon.ru"
 		},
 		"Lightbox": {
 			"cats": [
@@ -4186,7 +4242,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": [
@@ -4196,7 +4252,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": [
@@ -4207,7 +4263,7 @@
 			},
 			"icon": "Lighty.png",
 			"implies": "PHP",
-			"website": "gitlab.com/lighty/framework"
+			"website": "http://gitlab.com/lighty/framework"
 		},
 		"LimeSurvey": {
 			"cats": [
@@ -4217,7 +4273,7 @@
 				"generator": "LimeSurvey"
 			},
 			"icon": "LimeSurvey.png",
-			"website": "limesurvey.org/"
+			"website": "http://limesurvey.org/"
 		},
 		"LinkSmart": {
 			"cats": [
@@ -4226,7 +4282,7 @@
 			"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": [
@@ -4234,7 +4290,7 @@
 			],
 			"icon": "Linkedin.svg",
 			"script": "//platform\\.linkedin\\.com/in\\.js",
-			"website": "linkedin.com"
+			"website": "http://linkedin.com"
 		},
 		"List.js": {
 			"cats": [
@@ -4243,7 +4299,7 @@
 			"env": "^List$",
 			"icon": "List.js.png",
 			"script": "^list\\.(?:min\\.)?js$",
-			"website": "www.listjs.com"
+			"website": "http://www.listjs.com"
 		},
 		"LiteSpeed": {
 			"cats": [
@@ -4253,7 +4309,7 @@
 				"Server": "^LiteSpeed$"
 			},
 			"icon": "LiteSpeed.png",
-			"website": "litespeedtech.com"
+			"website": "http://litespeedtech.com"
 		},
 		"Lithium": {
 			"cats": [
@@ -4268,7 +4324,7 @@
 			"html": " <a [^>]+Powered by Lithium",
 			"icon": "Lithium.png",
 			"implies": "PHP",
-			"website": "www.lithium.com"
+			"website": "http://www.lithium.com"
 		},
 		"LiveAgent": {
 			"cats": [
@@ -4276,7 +4332,7 @@
 			],
 			"env": "^LiveAgent$",
 			"icon": "LiveAgent.png",
-			"website": "www.ladesk.com"
+			"website": "http://www.ladesk.com"
 		},
 		"LiveChat": {
 			"cats": [
@@ -4284,7 +4340,7 @@
 			],
 			"icon": "LiveChat.png",
 			"script": "cdn\\.livechatinc\\.com/.*tracking\\.js",
-			"website": "livechatinc.com"
+			"website": "http://livechatinc.com"
 		},
 		"LiveJournal": {
 			"cats": [
@@ -4292,7 +4348,7 @@
 			],
 			"icon": "LiveJournal.png",
 			"url": "\\.livejournal\\.com",
-			"website": "www.livejournal.com"
+			"website": "http://www.livejournal.com"
 		},
 		"LiveStreet CMS": {
 			"cats": [
@@ -4304,7 +4360,7 @@
 			},
 			"icon": "LiveStreet CMS.png",
 			"implies": "PHP",
-			"website": "livestreetcms.com"
+			"website": "http://livestreetcms.com"
 		},
 		"Livefyre": {
 			"cats": [
@@ -4317,7 +4373,7 @@
 			"html": "<[^>]+(?:id|class)=\"livefyre",
 			"icon": "Livefyre.png",
 			"script": "livefyre_init\\.js",
-			"website": "livefyre.com"
+			"website": "http://livefyre.com"
 		},
 		"Liveinternet": {
 			"cats": [
@@ -4331,7 +4387,7 @@
 			],
 			"icon": "Liveinternet.png",
 			"script": "/js/al/common.js\\?[0-9_]+",
-			"website": "liveinternet.ru/rating/"
+			"website": "http://liveinternet.ru/rating/"
 		},
 		"Lo-dash": {
 			"cats": [
@@ -4339,7 +4395,7 @@
 			],
 			"icon": "Lo-dash.png",
 			"script": "lodash.*\\.js",
-			"website": "www.lodash.com"
+			"website": "http://www.lodash.com"
 		},
 		"Locomotive": {
 			"cats": [
@@ -4351,7 +4407,7 @@
 				"Ruby on Rails",
 				"MongoDB"
 			],
-			"website": "www.locomotivecms.com"
+			"website": "http://www.locomotivecms.com"
 		},
 		"Logitech Media Server": {
 			"cats": [
@@ -4362,7 +4418,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": [
@@ -4373,7 +4429,7 @@
 			},
 			"icon": "Lotus Domino.png",
 			"implies": "Java",
-			"website": "www-01.ibm.com/software/lotus/products/domino"
+			"website": "http://www-01.ibm.com/software/lotus/products/domino"
 		},
 		"Lua": {
 			"cats": [
@@ -4383,7 +4439,7 @@
 				"X-Powered-By": "\bLua(?: ([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Lua.png",
-			"website": "www.lua.org"
+			"website": "http://www.lua.org"
 		},
 		"Lucene": {
 			"cats": [
@@ -4391,14 +4447,14 @@
 			],
 			"icon": "Lucene.png",
 			"implies": "Java",
-			"website": "lucene.apache.org/core/"
+			"website": "http://lucene.apache.org/core/"
 		},
 		"M.R. Inc BoxyOS": {
 			"cats": [
 				28
 			],
 			"icon": "M.R. Inc BoxyOS.png",
-			"website": "mrincworld.com"
+			"website": "http://mrincworld.com"
 		},
 		"M.R. Inc SiteFrame": {
 			"cats": [
@@ -4408,7 +4464,7 @@
 				"Powered-By": "M\\.R\\. Inc SiteFrame"
 			},
 			"icon": "M.R. Inc SiteFrame.png",
-			"website": "mrincworld.com"
+			"website": "http://mrincworld.com"
 		},
 		"M.R. Inc Webserver": {
 			"cats": [
@@ -4421,7 +4477,15 @@
 			"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": [
@@ -4434,7 +4498,7 @@
 				"publisher": "MOBOTIX AG\\;confidence:40"
 			},
 			"url": "control/userimage\\.html\\;confidence:70",
-			"website": "mobotix.com"
+			"website": "http://mobotix.com"
 		},
 		"MODX": {
 			"cats": [
@@ -4453,7 +4517,7 @@
 			],
 			"icon": "MODX.png",
 			"implies": "PHP",
-			"website": "modx.com"
+			"website": "http://modx.com"
 		},
 		"MadAdsMedia": {
 			"cats": [
@@ -4462,7 +4526,7 @@
 			"env": "^setM(?:Iframe|RefURL)$",
 			"icon": "MadAdsMedia.png",
 			"script": "^https?://(?:ads-by|pixel)\\.madadsmedia.com/",
-			"website": "madadsmedia.com"
+			"website": "http://madadsmedia.com"
 		},
 		"Magento": {
 			"cats": [
@@ -4486,7 +4550,7 @@
 				"static/_requirejs\\;confidence:50\\;version:2",
 				"static/frontend\\;confidence:20\\;version:2"
 			],
-			"website": "www.magentocommerce.com"
+			"website": "http://www.magentocommerce.com"
 		},
 		"Mailchimp": {
 			"cats": [
@@ -4504,7 +4568,7 @@
 				"s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js",
 				"cdn-images.mailchimp.com/[^>]*.css"
 			],
-			"website": "mailchimp.com"
+			"website": "http://mailchimp.com"
 		},
 		"Mambo": {
 			"cats": [
@@ -4515,7 +4579,7 @@
 			"meta": {
 				"generator": "Mambo"
 			},
-			"website": "mambo-foundation.org"
+			"website": "http://mambo-foundation.org"
 		},
 		"MantisBT": {
 			"cats": [
@@ -4524,7 +4588,7 @@
 			"html": "<img[^>]+ alt=\"Powered by Mantis Bugtracker",
 			"icon": "MantisBT.png",
 			"implies": "PHP",
-			"website": "www.mantisbt.org"
+			"website": "http://www.mantisbt.org"
 		},
 		"ManyContacts": {
 			"cats": [
@@ -4532,7 +4596,7 @@
 			],
 			"icon": "ManyContacts.png",
 			"script": "\\/assets\\/js\\/manycontacts\\.min\\.js",
-			"website": "www.manycontacts.com"
+			"website": "http://www.manycontacts.com"
 		},
 		"Marionette.js": {
 			"cats": [
@@ -4545,7 +4609,7 @@
 				"Backbone.js"
 			],
 			"script": "backbone\\.marionette.*\\.js",
-			"website": "marionettejs.com"
+			"website": "http://marionettejs.com"
 		},
 		"Marketo": {
 			"cats": [
@@ -4554,7 +4618,7 @@
 			"env": "^Munchkin$",
 			"icon": "Marketo.png",
 			"script": "munchkin\\.marketo\\.net/munchkin\\.js",
-			"website": "www.marketo.com"
+			"website": "http://www.marketo.com"
 		},
 		"Materialize CSS": {
 			"cats": [
@@ -4564,7 +4628,7 @@
 			"icon": "Materialize CSS.png",
 			"implies": "jQuery",
 			"script": "materialize(?:\\.min)?\\.js",
-			"website": "materializecss.com"
+			"website": "http://materializecss.com"
 		},
 		"MathJax": {
 			"cats": [
@@ -4573,7 +4637,22 @@
 			"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": [
@@ -4584,7 +4663,7 @@
 				"X-CDN-Forward": "^maxcdn$"
 			},
 			"icon": "MaxCDN.png",
-			"website": "www.maxcdn.com"
+			"website": "http://www.maxcdn.com"
 		},
 		"MaxSite CMS": {
 			"cats": [
@@ -4595,7 +4674,7 @@
 			"meta": {
 				"generator": "MaxSite CMS"
 			},
-			"website": "max-3000.com"
+			"website": "http://max-3000.com"
 		},
 		"Mean.io": {
 			"cats": [
@@ -4611,7 +4690,7 @@
 				"AngularJS",
 				"Node.js"
 			],
-			"website": "mean.io"
+			"website": "http://mean.io"
 		},
 		"MediaElement.js": {
 			"cats": [
@@ -4619,7 +4698,7 @@
 			],
 			"env": "^mejs$",
 			"icon": "MediaElement.js.png",
-			"website": "mediaelementjs.com"
+			"website": "http://mediaelementjs.com"
 		},
 		"MediaTomb": {
 			"cats": [
@@ -4629,7 +4708,7 @@
 				"Server": "MediaTomb(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "MediaTomb.png",
-			"website": "mediatomb.cc"
+			"website": "http://mediatomb.cc"
 		},
 		"MediaWiki": {
 			"cats": [
@@ -4641,7 +4720,7 @@
 			"meta": {
 				"generator": "MediaWiki"
 			},
-			"website": "www.mediawiki.org"
+			"website": "http://www.mediawiki.org"
 		},
 		"Meebo": {
 			"cats": [
@@ -4649,7 +4728,7 @@
 			],
 			"html": "(?:<iframe id=\"meebo-iframe\"|Meebo\\('domReady'\\))",
 			"icon": "Meebo.png",
-			"website": "www.meebo.com"
+			"website": "http://www.meebo.com"
 		},
 		"Melis CMS V2": {
 			"cats": [
@@ -4657,11 +4736,11 @@
 				6
 			],
 			"html": "<!-- Rendered with Melics CMS V2",
+			"icon": "meliscmsv2.png",
 			"meta": {
 				"powered-by": "^Melis CMS"
 			},
-			"icon": "meliscmsv2.png",
-			"website": "www.melistechnology.com/"
+			"website": "http://www.melistechnology.com/"
 		},
 		"Meteor": {
 			"cats": [
@@ -4670,7 +4749,7 @@
 			"env": "^Meteor$",
 			"html": "<link[^>]+__meteor-css__",
 			"icon": "Meteor.png",
-			"website": "meteor.com"
+			"website": "http://meteor.com"
 		},
 		"Methode": {
 			"cats": [
@@ -4686,7 +4765,7 @@
 				"eomportal-loid": "[\\d.]+",
 				"eomportal-uuid": "[a-f\\d]+"
 			},
-			"website": "www.eidosmedia.com/solutions"
+			"website": "http://www.eidosmedia.com/solutions"
 		},
 		"Microsoft ASP.NET": {
 			"cats": [
@@ -4701,7 +4780,7 @@
 			"icon": "Microsoft ASP.NET.png",
 			"implies": "IIS\\;confidence:50",
 			"url": "\\.aspx(?:$|\\?)",
-			"website": "www.asp.net"
+			"website": "http://www.asp.net"
 		},
 		"Microsoft HTTPAPI": {
 			"cats": [
@@ -4711,7 +4790,7 @@
 				"Server": "Microsoft-HTTPAPI(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Microsoft.svg",
-			"website": "microsoft.com"
+			"website": "http://microsoft.com"
 		},
 		"Microsoft SharePoint": {
 			"cats": [
@@ -4728,7 +4807,7 @@
 			"meta": {
 				"generator": "Microsoft SharePoint"
 			},
-			"website": "sharepoint.microsoft.com"
+			"website": "http://sharepoint.microsoft.com"
 		},
 		"Mietshop": {
 			"cats": [
@@ -4739,7 +4818,7 @@
 			"meta": {
 				"generator": "Mietshop"
 			},
-			"website": "www.mietshop.de/"
+			"website": "http://www.mietshop.de/"
 		},
 		"Milligram": {
 			"cats": [
@@ -4749,7 +4828,7 @@
 				"<link[^>]+?href=\"[^\"]+milligram(?:\\.min)?\\.css"
 			],
 			"icon": "Milligram.png",
-			"website": "milligram.github.io"
+			"website": "http://milligram.github.io"
 		},
 		"MiniBB": {
 			"cats": [
@@ -4757,7 +4836,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": [
@@ -4766,8 +4845,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": [
@@ -4776,7 +4855,7 @@
 			"env": "^Mint$",
 			"icon": "Mint.png",
 			"script": "mint/\\?js",
-			"website": "haveamint.com"
+			"website": "http://haveamint.com"
 		},
 		"Mixpanel": {
 			"cats": [
@@ -4785,7 +4864,7 @@
 			"env": "^Mixpanel$",
 			"icon": "Mixpanel.png",
 			"script": "api\\.mixpanel\\.com/track",
-			"website": "mixpanel.com"
+			"website": "http://mixpanel.com"
 		},
 		"Mobify": {
 			"cats": [
@@ -4794,7 +4873,7 @@
 			"env": "^Mobify$",
 			"icon": "Mobify.png",
 			"script": "mobify\\.com",
-			"website": "www.mobify.com"
+			"website": "http://www.mobify.com"
 		},
 		"MochiKit": {
 			"cats": [
@@ -4803,7 +4882,7 @@
 			"env": "^MochiKit$",
 			"icon": "MochiKit.png",
 			"script": "MochiKit(?:\\.min)?\\.js",
-			"website": "mochikit.com"
+			"website": "http://mochikit.com"
 		},
 		"MochiWeb": {
 			"cats": [
@@ -4812,8 +4891,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": [
@@ -4822,7 +4901,7 @@
 			"env": "^Modernizr$",
 			"icon": "Modernizr.png",
 			"script": "modernizr(?:-([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
-			"website": "www.modernizr.com"
+			"website": "http://www.modernizr.com"
 		},
 		"Modified": {
 			"cats": [
@@ -4832,7 +4911,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": [
@@ -4842,7 +4921,7 @@
 			"html": "(?:<script|link)[^>]*mg-(?:core|plugins|templates)",
 			"icon": "Moguta.CMS.png",
 			"implies": "PHP",
-			"website": "moguta.ru"
+			"website": "http://moguta.ru"
 		},
 		"MoinMoin": {
 			"cats": [
@@ -4852,7 +4931,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": [
@@ -4863,7 +4942,7 @@
 			},
 			"icon": "Mojolicious.png",
 			"implies": "Perl",
-			"website": "mojolicio.us"
+			"website": "http://mojolicio.us"
 		},
 		"Mollom": {
 			"cats": [
@@ -4872,16 +4951,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": [
@@ -4890,7 +4969,7 @@
 			"env": "^moment$",
 			"icon": "Moment.js.png",
 			"script": "moment(?:\\.min)?\\.js",
-			"website": "momentjs.com"
+			"website": "http://momentjs.com"
 		},
 		"Mondo Media": {
 			"cats": [
@@ -4900,14 +4979,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": [
@@ -4918,7 +4997,7 @@
 			},
 			"icon": "Mongrel.png",
 			"implies": "Ruby",
-			"website": "mongrel2.org"
+			"website": "http://mongrel2.org"
 		},
 		"Monkey HTTP Server": {
 			"cats": [
@@ -4928,7 +5007,7 @@
 				"Server": "Monkey/?([\\d.]+)?\\;version:\\1"
 			},
 			"icon": "Monkey HTTP Server.png",
-			"website": "monkey-project.com"
+			"website": "http://monkey-project.com"
 		},
 		"Mono": {
 			"cats": [
@@ -4938,7 +5017,7 @@
 				"X-Powered-By": "Mono"
 			},
 			"icon": "Mono.png",
-			"website": "mono-project.com"
+			"website": "http://mono-project.com"
 		},
 		"Mono.net": {
 			"cats": [
@@ -4948,7 +5027,7 @@
 			"icon": "Mono.net.png",
 			"implies": "Piwik",
 			"script": "monotracker(?:\\.min)?\\.js",
-			"website": "www.mono.net"
+			"website": "http://www.mono.net"
 		},
 		"MooTools": {
 			"cats": [
@@ -4957,7 +5036,7 @@
 			"env": "^MooTools$",
 			"icon": "MooTools.png",
 			"script": "mootools.*\\.js",
-			"website": "mootools.net"
+			"website": "http://mootools.net"
 		},
 		"Moodle": {
 			"cats": [
@@ -4967,13 +5046,13 @@
 			"headers": {
 				"Set-Cookie": "(?:MoodleSession|MOODLEID_)"
 			},
-			"meta": {
-				"keywords": "^moodle"
-			},
 			"html": "<img[^>]+moodlelogo",
 			"icon": "Moodle.png",
 			"implies": "PHP",
-			"website": "moodle.org"
+			"meta": {
+				"keywords": "^moodle"
+			},
+			"website": "http://moodle.org"
 		},
 		"Motion-httpd": {
 			"cats": [
@@ -4983,8 +5062,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": [
@@ -4998,7 +5077,7 @@
 				"jQuery"
 			],
 			"script": ".*\\/mt-includes\\/[asetj]{2,6}\\/.*\\.js.*",
-			"website": "motocms.com"
+			"website": "http://motocms.com"
 		},
 		"Movable Type": {
 			"cats": [
@@ -5008,7 +5087,7 @@
 			"meta": {
 				"generator": "Movable Type"
 			},
-			"website": "movabletype.org"
+			"website": "http://movabletype.org"
 		},
 		"Moxa": {
 			"cats": [
@@ -5018,7 +5097,7 @@
 				"Server": "MoxaHttp(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Moxa.png",
-			"website": "moxa.com"
+			"website": "http://moxa.com"
 		},
 		"Mozard Suite": {
 			"cats": [
@@ -5029,7 +5108,7 @@
 				"author": "Mozard"
 			},
 			"url": "/mozard/!suite",
-			"website": "mozard.nl"
+			"website": "http://mozard.nl"
 		},
 		"Mura CMS": {
 			"cats": [
@@ -5041,7 +5120,7 @@
 			"meta": {
 				"generator": "Mura CMS ([\\d]+)\\;version:\\1"
 			},
-			"website": "www.getmura.com"
+			"website": "http://www.getmura.com"
 		},
 		"Mustache": {
 			"cats": [
@@ -5050,7 +5129,7 @@
 			"env": "^Mustache$",
 			"icon": "Mustache.png",
 			"script": "mustache(?:\\.min)?\\.js",
-			"website": "mustache.github.com"
+			"website": "http://mustache.github.com"
 		},
 		"MyBB": {
 			"cats": [
@@ -5063,7 +5142,7 @@
 				"PHP",
 				"MySQL"
 			],
-			"website": "www.mybb.com"
+			"website": "http://www.mybb.com"
 		},
 		"MyBlogLog": {
 			"cats": [
@@ -5071,14 +5150,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": [
@@ -5088,7 +5167,7 @@
 			"meta": {
 				"generator": "Mynetcap"
 			},
-			"website": "www.netcap-creation.fr"
+			"website": "http://www.netcap-creation.fr"
 		},
 		"NOIX": {
 			"cats": [
@@ -5096,7 +5175,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": [
@@ -5107,7 +5186,7 @@
 			"icon": "NVD3.png",
 			"implies": "D3",
 			"script": "nv\\.d3(?:\\.min)?\\.js",
-			"website": "nvd3.org"
+			"website": "http://nvd3.org"
 		},
 		"Nedstat": {
 			"cats": [
@@ -5115,7 +5194,7 @@
 			],
 			"env": "^sitestat$",
 			"icon": "Nedstat.png",
-			"website": "www.nedstat.com"
+			"website": "http://www.nedstat.com"
 		},
 		"Neos CMS": {
 			"cats": [
@@ -5128,7 +5207,7 @@
 			"icon": "Neos.svg",
 			"implies": "Neos Flow",
 			"url": "/neos/",
-			"website": "neos.io"
+			"website": "http://neos.io"
 		},
 		"Neos Flow": {
 			"cats": [
@@ -5140,7 +5219,7 @@
 			},
 			"icon": "Neos.svg",
 			"implies": "PHP",
-			"website": "flow.neos.io"
+			"website": "http://flow.neos.io"
 		},
 		"Nepso": {
 			"cats": [
@@ -5150,7 +5229,7 @@
 				"X-Powered-CMS": "Nepso"
 			},
 			"icon": "Nepso.png",
-			"website": "nepso.com"
+			"website": "http://nepso.com"
 		},
 		"Netmonitor": {
 			"cats": [
@@ -5159,7 +5238,7 @@
 			"env": "^netmonitor$",
 			"icon": "Netmonitor.png",
 			"script": "netmonitor\\.fi/nmtracker\\.js",
-			"website": "netmonitor.fi/en"
+			"website": "http://netmonitor.fi/en"
 		},
 		"Neto": {
 			"cats": [
@@ -5168,7 +5247,7 @@
 			"env": "^NETO$",
 			"icon": "Neto.svg",
 			"script": "jquery\\.neto.*\\.js",
-			"website": "www.neto.com.au"
+			"website": "http://www.neto.com.au"
 		},
 		"Netsuite": {
 			"cats": [
@@ -5178,25 +5257,25 @@
 				"Set-Cookie": "NS_VER="
 			},
 			"icon": "Netsuite.png",
-			"website": "netsuite.com"
+			"website": "http://netsuite.com"
 		},
 		"Nette Framework": {
 			"cats": [
-			  18
+				18
 			],
+			"env": "Nette",
 			"headers": {
-			  "X-Powered-By": "Nette Framework",
-			  "Set-Cookie": "nette-browser="
+				"Set-Cookie": "nette-browser=",
+				"X-Powered-By": "Nette Framework"
 			},
-			"env": "Nette",
 			"html": [
-			  "<input[^>]+data-nette-rules",
-			  "<div[^>]+id=\"snippet-",
-			  "<input[^>]+id=\"frm-"
+				"<input[^>]+data-nette-rules",
+				"<div[^>]+id=\"snippet-",
+				"<input[^>]+id=\"frm-"
 			],
 			"icon": "Nette Framework.png",
 			"implies": "PHP",
-			"website": "nette.org"
+			"website": "http://nette.org"
 		},
 		"New Relic": {
 			"cats": [
@@ -5204,7 +5283,7 @@
 			],
 			"env": "^NREUM",
 			"icon": "New Relic.png",
-			"website": "newrelic.com"
+			"website": "http://newrelic.com"
 		},
 		"Nginx": {
 			"cats": [
@@ -5214,14 +5293,14 @@
 				"Server": "nginx(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Nginx.svg",
-			"website": "nginx.org/en"
+			"website": "http://nginx.org/en"
 		},
 		"Node.js": {
 			"cats": [
 				27
 			],
 			"icon": "node.js.png",
-			"website": "nodejs.org"
+			"website": "http://nodejs.org"
 		},
 		"OWL Carousel": {
 			"cats": [
@@ -5232,7 +5311,7 @@
 			"icon": "OWL Carousel.png",
 			"implies": "jQuery",
 			"script": "owl.carousel.*\\.js",
-			"website": "owlgraphic.com/owlcarousel"
+			"website": "http://owlgraphic.com/owlcarousel"
 		},
 		"OXID eShop": {
 			"cats": [
@@ -5241,7 +5320,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": [
@@ -5252,7 +5331,7 @@
 			},
 			"icon": "October CMS.png",
 			"implies": "Laravel",
-			"website": "octobercms.com"
+			"website": "http://octobercms.com"
 		},
 		"Octopress": {
 			"cats": [
@@ -5260,12 +5339,12 @@
 				11
 			],
 			"html": "Powered by <a href=\"http://octopress.org\">",
+			"icon": "octopress.png",
 			"implies": "Jekyll",
 			"meta": {
 				"generator": "Octopress"
 			},
-			"icon": "octopress.png",
-			"website": "octopress.org"
+			"website": "http://octopress.org"
 		},
 		"Odoo": {
 			"cats": [
@@ -5284,14 +5363,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": [
@@ -5299,7 +5378,7 @@
 			],
 			"env": "^BWEUM",
 			"icon": "OneAPM.png",
-			"website": "www.oneapm.com"
+			"website": "http://www.oneapm.com"
 		},
 		"OneStat": {
 			"cats": [
@@ -5307,7 +5386,7 @@
 			],
 			"env": "^OneStat",
 			"icon": "OneStat.png",
-			"website": "www.onestat.com"
+			"website": "http://www.onestat.com"
 		},
 		"Open AdStream": {
 			"cats": [
@@ -5315,7 +5394,7 @@
 			],
 			"env": "^OAS_AD$",
 			"icon": "Open AdStream.png",
-			"website": "xaxis.com"
+			"website": "http://xaxis.com"
 		},
 		"Open Classifieds": {
 			"cats": [
@@ -5326,7 +5405,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": [
@@ -5340,7 +5419,7 @@
 			"meta": {
 				"generator": "Open Journal Systems(?: ([\\d.]+))?\\;version:\\1"
 			},
-			"website": "pkp.sfu.ca/ojs"
+			"website": "http://pkp.sfu.ca/ojs"
 		},
 		"Open Web Analytics": {
 			"cats": [
@@ -5349,7 +5428,7 @@
 			"env": "^_?owa_",
 			"html": "<!-- (?:Start|End) Open Web Analytics Tracker -->",
 			"icon": "Open Web Analytics.png",
-			"website": "openwebanalytics.com"
+			"website": "http://openwebanalytics.com"
 		},
 		"Open eShop": {
 			"cats": [
@@ -5361,7 +5440,7 @@
 				"author": "open-eshop\\.com",
 				"copyright": "Open eShop ?([0-9.]+)?\\;version:\\1"
 			},
-			"website": "open-eshop.com/"
+			"website": "http://open-eshop.com/"
 		},
 		"OpenCart": {
 			"cats": [
@@ -5370,7 +5449,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": [
@@ -5383,7 +5462,7 @@
 			"icon": "OpenCms.png",
 			"implies": "Java",
 			"script": "opencms",
-			"website": "www.opencms.org"
+			"website": "http://www.opencms.org"
 		},
 		"OpenGSE": {
 			"cats": [
@@ -5394,7 +5473,7 @@
 			},
 			"icon": "OpenGSE.png",
 			"implies": "Java",
-			"website": "code.google.com/p/opengse"
+			"website": "http://code.google.com/p/opengse"
 		},
 		"OpenGrok": {
 			"cats": [
@@ -5408,7 +5487,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": [
@@ -5417,7 +5496,7 @@
 			"env": "^OpenLayers$",
 			"icon": "OpenLayers.png",
 			"script": "openlayers",
-			"website": "openlayers.org"
+			"website": "http://openlayers.org"
 		},
 		"OpenNemas": {
 			"cats": [
@@ -5430,7 +5509,7 @@
 			"meta": {
 				"generator": "OpenNemas"
 			},
-			"website": "www.opennemas.com"
+			"website": "http://www.opennemas.com"
 		},
 		"OpenResty": {
 			"cats": [
@@ -5444,7 +5523,7 @@
 				"Nginx",
 				"Lua"
 			],
-			"website": "openresty.org"
+			"website": "http://openresty.org"
 		},
 		"OpenSSL": {
 			"cats": [
@@ -5454,7 +5533,7 @@
 				"Server": "OpenSSL(?:/([\\d.]+[a-z]?))?\\;version:\\1"
 			},
 			"icon": "OpenSSL.png",
-			"website": "openssl.org"
+			"website": "http://openssl.org"
 		},
 		"OpenText Web Solutions": {
 			"cats": [
@@ -5463,7 +5542,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": [
@@ -5474,7 +5553,7 @@
 				"https?://[^/]*\\.openx\\.net",
 				"https?://[^/]*\\.servedbyopenx\\.com"
 			],
-			"website": "openx.com"
+			"website": "http://openx.com"
 		},
 		"Ophal": {
 			"cats": [
@@ -5491,7 +5570,7 @@
 				"generator": "Ophal(?: (.*))? \\(ophal\\.org\\)\\;version:\\1"
 			},
 			"script": "ophal\\.js",
-			"website": "ophal.org"
+			"website": "http://ophal.org"
 		},
 		"Optimizely": {
 			"cats": [
@@ -5500,7 +5579,7 @@
 			"env": "^optimizely$",
 			"icon": "Optimizely.png",
 			"script": "optimizely\\.com.*\\.js",
-			"website": "optimizely.com"
+			"website": "http://optimizely.com"
 		},
 		"Oracle Application Server": {
 			"cats": [
@@ -5510,7 +5589,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": [
@@ -5521,7 +5600,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": [
@@ -5532,7 +5611,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": [
@@ -5542,7 +5621,7 @@
 				"x-oracle-dms-ecid": ""
 			},
 			"icon": "Oracle.png",
-			"website": "oracle.com"
+			"website": "http://oracle.com"
 		},
 		"Oracle HTTP Server": {
 			"cats": [
@@ -5552,7 +5631,7 @@
 				"Server": "Oracle-HTTP-Server(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Oracle.png",
-			"website": "oracle.com"
+			"website": "http://oracle.com"
 		},
 		"Oracle Recommendations On Demand": {
 			"cats": [
@@ -5560,7 +5639,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": [
@@ -5570,7 +5649,7 @@
 				"Server": "Oracle(?:AS)?[- ]Web[- ]Cache(?:[- /]([\\da-z./]+))?\\;version:\\1"
 			},
 			"icon": "Oracle.png",
-			"website": "oracle.com"
+			"website": "http://oracle.com"
 		},
 		"Orchard CMS": {
 			"cats": [
@@ -5581,7 +5660,7 @@
 			"meta": {
 				"generator": "Orchard"
 			},
-			"website": "orchardproject.net"
+			"website": "http://orchardproject.net"
 		},
 		"Outbrain": {
 			"cats": [
@@ -5590,18 +5669,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": [
@@ -5611,7 +5690,7 @@
 			"meta": {
 				"generator": "PANSITE"
 			},
-			"website": "panvision.de/Produkte/Content_Management/index.asp"
+			"website": "http://panvision.de/Produkte/Content_Management/index.asp"
 		},
 		"PDF.js": {
 			"cats": [
@@ -5621,7 +5700,7 @@
 			"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": [
@@ -5634,7 +5713,7 @@
 			},
 			"icon": "PHP.png",
 			"url": "\\.php(?:$|\\?)",
-			"website": "php.net"
+			"website": "http://php.net"
 		},
 		"PHP-Fusion": {
 			"cats": [
@@ -5643,7 +5722,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": [
@@ -5655,7 +5734,7 @@
 			"meta": {
 				"generator": "PHP-Nuke"
 			},
-			"website": "phpnuke.org"
+			"website": "http://phpnuke.org"
 		},
 		"Pagekit": {
 			"cats": [
@@ -5665,20 +5744,20 @@
 			"meta": {
 				"generator": "Pagekit"
 			},
-			"website": "pagekit.com"
+			"website": "http://pagekit.com"
 		},
 		"Pardot": {
 			"cats": [
 				32
 			],
 			"env": "^pi(?:Tracker|Hostname|Protocol|CId|AId)$",
-			"icon": "Pardot.png",
 			"headers": {
 				"X-Pardot-LB": "",
 				"X-Pardot-Route": "",
 				"X-Pardot-Rsp": ""
 			},
-			"website": "pardot.com"
+			"icon": "Pardot.png",
+			"website": "http://pardot.com"
 		},
 		"Parse.ly": {
 			"cats": [
@@ -5686,15 +5765,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": [
@@ -5704,7 +5783,7 @@
 			"html": "<input[^>]+_s-xclick",
 			"icon": "PayPal.png",
 			"script": "paypalobjects\\.com/js",
-			"website": "paypal.com"
+			"website": "http://paypal.com"
 		},
 		"PencilBlue": {
 			"cats": [
@@ -5716,7 +5795,7 @@
 			},
 			"icon": "PencilBlue.png",
 			"implies": "Node.js",
-			"website": "pencilblue.org"
+			"website": "http://pencilblue.org"
 		},
 		"Penguin": {
 			"cats": [
@@ -5726,7 +5805,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": [
@@ -5737,7 +5816,7 @@
 			"meta": {
 				"generator": "(?:Percussion|Rhythmyx)"
 			},
-			"website": "percussion.com"
+			"website": "http://percussion.com"
 		},
 		"PerfSONAR-PS": {
 			"cats": [
@@ -5747,7 +5826,7 @@
 				"User-agent": "perfSONAR-PS/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "PerfSONAR-PS.png",
-			"website": "psps.perfsonar.net"
+			"website": "http://psps.perfsonar.net"
 		},
 		"Perl": {
 			"cats": [
@@ -5758,7 +5837,7 @@
 			},
 			"icon": "Perl.png",
 			"url": "\\.pl(?:$|\\?)",
-			"website": "perl.org"
+			"website": "http://perl.org"
 		},
 		"Petrojs": {
 			"cats": [
@@ -5770,7 +5849,7 @@
 				"petrojs(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
 				"(?:/([\\d.]+)/)?petrojs(?:\\.min)?\\.js\\;version:\\1"
 			],
-			"website": "petrojs.thepetronics.com"
+			"website": "http://petrojs.thepetronics.com"
 		},
 		"Phabricator": {
 			"cats": [
@@ -5786,7 +5865,7 @@
 				"PHP"
 			],
 			"script": "/phabricator/[a-f0-9]{8}/rsrc/js/phui/[a-z-]+\\.js$",
-			"website": "phacility.com"
+			"website": "http://phacility.com"
 		},
 		"Phaser": {
 			"cats": [
@@ -5794,7 +5873,7 @@
 			],
 			"env": "Phaser",
 			"icon": "Phaser.png",
-			"website": "phaser.io"
+			"website": "http://phaser.io"
 		},
 		"Phusion Passenger": {
 			"cats": [
@@ -5804,7 +5883,7 @@
 				"X-Powered-By": "^Phusion Passenger"
 			},
 			"icon": "Phusion Passenger.png",
-			"website": "phusionpassenger.com"
+			"website": "http://phusionpassenger.com"
 		},
 		"Piano Solo": {
 			"cats": [
@@ -5815,7 +5894,7 @@
 				"Set-Cookie": "pianovisitkey"
 			},
 			"icon": "Piano Solo.png",
-			"website": "www.pianomedia.com/products"
+			"website": "http://www.pianomedia.com/products"
 		},
 		"Pimcore": {
 			"cats": [
@@ -5828,7 +5907,7 @@
 			},
 			"icon": "pimcore.svg",
 			"implies": "PHP",
-			"website": "pimcore.org"
+			"website": "http://pimcore.org"
 		},
 		"Pinterest": {
 			"cats": [
@@ -5836,7 +5915,7 @@
 			],
 			"icon": "Pinterest.svg",
 			"script": "//assets\\.pinterest\\.com/js/pinit\\.js",
-			"website": "pinterest.com"
+			"website": "http://pinterest.com"
 		},
 		"Piwik": {
 			"cats": [
@@ -5856,7 +5935,7 @@
 				"google-play-app": "app-id=org\\.piwik\\.mobile2"
 			},
 			"script": "piwik\\.js|piwik\\.php",
-			"website": "piwik.org"
+			"website": "http://piwik.org"
 		},
 		"Planet": {
 			"cats": [
@@ -5866,7 +5945,7 @@
 			"meta": {
 				"generator": "^Planet(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"website": "planetplanet.org"
+			"website": "http://planetplanet.org"
 		},
 		"Plentymarkets": {
 			"cats": [
@@ -5876,7 +5955,7 @@
 			"meta": {
 				"generator": "plentymarkets"
 			},
-			"website": "plentymarkets.eu"
+			"website": "http://plentymarkets.eu"
 		},
 		"Plesk": {
 			"cats": [
@@ -5888,7 +5967,7 @@
 			},
 			"icon": "Plesk.png",
 			"script": "common\\.js\\?plesk",
-			"website": "plesk.com"
+			"website": "http://plesk.com"
 		},
 		"Pligg": {
 			"cats": [
@@ -5900,7 +5979,7 @@
 			"meta": {
 				"generator": "Pligg"
 			},
-			"website": "pligg.com"
+			"website": "http://pligg.com"
 		},
 		"Plone": {
 			"cats": [
@@ -5911,17 +5990,17 @@
 			"meta": {
 				"generator": "Plone"
 			},
-			"website": "plone.org"
+			"website": "http://plone.org"
 		},
 		"Plotly": {
 			"cats": [
 				25
 			],
+			"env": "Plotly",
 			"icon": "Plotly.png",
 			"implies": "D3",
-			"env": "Plotly",
 			"script": "https?://cdn\\.plot\\.ly/plotly",
-			"website": "plot.ly/javascript/"
+			"website": "http://plot.ly/javascript/"
 		},
 		"Plura": {
 			"cats": [
@@ -5929,7 +6008,7 @@
 			],
 			"html": "<iframe src=\"[^>]+pluraserver\\.com",
 			"icon": "Plura.png",
-			"website": "www.pluraprocessing.com"
+			"website": "http://www.pluraprocessing.com"
 		},
 		"Po.st": {
 			"cats": [
@@ -5937,7 +6016,7 @@
 			],
 			"env": "^pwidget_config$",
 			"icon": "Po.st.png",
-			"website": "www.po.st/"
+			"website": "http://www.po.st/"
 		},
 		"Polymer": {
 			"cats": [
@@ -5947,7 +6026,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": [
@@ -5957,14 +6036,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": [
@@ -5975,7 +6054,7 @@
 				"<input type=\"hidden\" name=\"shopid\""
 			],
 			"icon": "Powergap.png",
-			"website": "powergap.de"
+			"website": "http://powergap.de"
 		},
 		"Prefix-Free": {
 			"cats": [
@@ -5984,7 +6063,7 @@
 			"env": "^PrefixFree$",
 			"icon": "Prefix-Free.png",
 			"script": "prefixfree\\.js",
-			"website": "leaverou.github.io/prefixfree/"
+			"website": "http://leaverou.github.io/prefixfree/"
 		},
 		"PrestaShop": {
 			"cats": [
@@ -6006,7 +6085,7 @@
 			"meta": {
 				"generator": "PrestaShop"
 			},
-			"website": "www.prestashop.com"
+			"website": "http://www.prestashop.com"
 		},
 		"Project Wonderful": {
 			"cats": [
@@ -6016,7 +6095,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": [
@@ -6025,7 +6104,7 @@
 			"html": "<[^>]+data-name=['\"]prospectscript",
 			"icon": "Prospector.png",
 			"script": "processprospector\\.js",
-			"website": "prospector.io"
+			"website": "http://prospector.io"
 		},
 		"Prototype": {
 			"cats": [
@@ -6034,16 +6113,16 @@
 			"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": [
@@ -6060,7 +6139,7 @@
 			"meta": {
 				"generator": "Proximis Omnichannel"
 			},
-			"website": "www.proximis.com"
+			"website": "http://www.proximis.com"
 		},
 		"PubMatic": {
 			"cats": [
@@ -6068,7 +6147,7 @@
 			],
 			"icon": "PubMatic.png",
 			"script": "https?://[^/]*\\.pubmatic\\.com",
-			"website": "www.pubmatic.com/"
+			"website": "http://www.pubmatic.com/"
 		},
 		"Public CMS": {
 			"cats": [
@@ -6080,7 +6159,7 @@
 			},
 			"icon": "Public CMS.png",
 			"implies": "Java",
-			"website": "www.publiccms.com"
+			"website": "http://www.publiccms.com"
 		},
 		"Pure CSS": {
 			"cats": [
@@ -6088,7 +6167,7 @@
 			],
 			"html": "<link[^>]+(?:([\\d.])+/)?pure(?:-min)?\\.css\\;version:\\1",
 			"icon": "Pure CSS.png",
-			"website": "purecss.io"
+			"website": "http://purecss.io"
 		},
 		"Pygments": {
 			"cats": [
@@ -6096,7 +6175,7 @@
 			],
 			"html": "<link[^>]+pygments.css[\"']",
 			"icon": "pygments.png",
-			"website": "pygments.org"
+			"website": "http://pygments.org"
 		},
 		"PyroCMS": {
 			"cats": [
@@ -6108,7 +6187,7 @@
 			},
 			"icon": "PyroCMS.png",
 			"implies": "Laravel",
-			"website": "pyrocms.com"
+			"website": "http://pyrocms.com"
 		},
 		"Python": {
 			"cats": [
@@ -6118,7 +6197,7 @@
 				"Server": "(?:^|\\s)Python(?:/([\\d.]+))?\\;confidence:50\\;version:\\1"
 			},
 			"icon": "Python.png",
-			"website": "python.org"
+			"website": "http://python.org"
 		},
 		"Quantcast": {
 			"cats": [
@@ -6127,7 +6206,7 @@
 			"env": "^quantserve$",
 			"icon": "Quantcast.png",
 			"script": "edge\\.quantserve\\.com/quant\\.js",
-			"website": "www.quantcast.com"
+			"website": "http://www.quantcast.com"
 		},
 		"Question2Answer": {
 			"cats": [
@@ -6137,7 +6216,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": [
@@ -6148,7 +6227,7 @@
 			"meta": {
 				"generator": "Quick\\.CMS(?: v([\\d.]+))?\\;version:\\1"
 			},
-			"website": "opensolution.org"
+			"website": "http://opensolution.org"
 		},
 		"Quick.Cart": {
 			"cats": [
@@ -6159,7 +6238,7 @@
 			"meta": {
 				"generator": "Quick\\.Cart(?: v([\\d.]+))?\\;version:\\1"
 			},
-			"website": "opensolution.org"
+			"website": "http://opensolution.org"
 		},
 		"Quill": {
 			"cats": [
@@ -6167,7 +6246,7 @@
 			],
 			"env": "^Quill$",
 			"icon": "Quill.png",
-			"website": "quilljs.com"
+			"website": "http://quilljs.com"
 		},
 		"RAID HTTPServer": {
 			"cats": [
@@ -6176,8 +6255,8 @@
 			"headers": {
 				"Server": "RAID HTTPServer(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"RBS Change": {
 			"cats": [
@@ -6190,7 +6269,7 @@
 			"meta": {
 				"generator": "RBS Change"
 			},
-			"website": "www.rbschange.fr"
+			"website": "http://www.rbschange.fr"
 		},
 		"RCMS": {
 			"cats": [
@@ -6200,7 +6279,7 @@
 			"meta": {
 				"generator": "^(?:RCMS|ReallyCMS)"
 			},
-			"website": "www.rcms.fi"
+			"website": "http://www.rcms.fi"
 		},
 		"RD Station": {
 			"cats": [
@@ -6209,7 +6288,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": [
@@ -6221,7 +6300,7 @@
 			],
 			"icon": "RDoc.png",
 			"implies": "Ruby",
-			"website": "github.com/RDoc/RDoc"
+			"website": "http://github.com/RDoc/RDoc"
 		},
 		"RackCache": {
 			"cats": [
@@ -6232,7 +6311,7 @@
 			},
 			"icon": "RackCache.png",
 			"implies": "Ruby",
-			"website": "github.com/rtomayko/rack-cache"
+			"website": "http://github.com/rtomayko/rack-cache"
 		},
 		"RainLoop": {
 			"cats": [
@@ -6249,7 +6328,7 @@
 			"icon": "RainLoop.png",
 			"implies": "PHP",
 			"script": "rainloop/v/([^/]+)\\;version:\\1",
-			"website": "rainloop.net"
+			"website": "http://rainloop.net"
 		},
 		"Rakuten DBCore": {
 			"cats": [
@@ -6260,7 +6339,7 @@
 				"generator": "Rakuten DBCore",
 				"generator:site": "http://ecservice.rakuten.com.br"
 			},
-			"website": "ecservice.rakuten.com.br"
+			"website": "http://ecservice.rakuten.com.br"
 		},
 		"Ramda": {
 			"cats": [
@@ -6268,7 +6347,7 @@
 			],
 			"icon": "Ramda.png",
 			"script": "ramda.*\\.js",
-			"website": "ramdajs.com"
+			"website": "http://ramdajs.com"
 		},
 		"Raphael": {
 			"cats": [
@@ -6277,7 +6356,7 @@
 			"env": "^Raphael$",
 			"icon": "Raphael.png",
 			"script": "raphael.*\\.js",
-			"website": "raphaeljs.com"
+			"website": "http://raphaeljs.com"
 		},
 		"Rapid Logic": {
 			"cats": [
@@ -6286,8 +6365,8 @@
 			"headers": {
 				"Server": "Rapid Logic(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"React": {
 			"cats": [
@@ -6301,7 +6380,7 @@
 				"/([\\d.]+)/react(?:\\.min)?\\.js\\;version:\\1",
 				"react.*\\.js"
 			],
-			"website": "facebook.github.io/react"
+			"website": "http://facebook.github.io/react"
 		},
 		"Red Hat": {
 			"cats": [
@@ -6312,7 +6391,7 @@
 				"X-Powered-By": "Red Hat"
 			},
 			"icon": "Red Hat.png",
-			"website": "redhat.com"
+			"website": "http://redhat.com"
 		},
 		"Reddit": {
 			"cats": [
@@ -6323,7 +6402,7 @@
 			"icon": "Reddit.png",
 			"implies": "Python",
 			"url": "^(?:www\\.)?reddit\\.com",
-			"website": "code.reddit.com"
+			"website": "http://code.reddit.com"
 		},
 		"Redmine": {
 			"cats": [
@@ -6335,7 +6414,7 @@
 			"meta": {
 				"description": "Redmine"
 			},
-			"website": "www.redmine.org"
+			"website": "http://www.redmine.org"
 		},
 		"Reinvigorate": {
 			"cats": [
@@ -6343,7 +6422,7 @@
 			],
 			"env": "^reinvigorate$",
 			"icon": "Reinvigorate.png",
-			"website": "www.reinvigorate.net"
+			"website": "http://www.reinvigorate.net"
 		},
 		"RequireJS": {
 			"cats": [
@@ -6352,7 +6431,7 @@
 			"env": "^requirejs$",
 			"icon": "RequireJS.png",
 			"script": "require.*\\.js",
-			"website": "requirejs.org"
+			"website": "http://requirejs.org"
 		},
 		"Resin": {
 			"cats": [
@@ -6363,7 +6442,7 @@
 			},
 			"icon": "Resin.png",
 			"implies": "Java",
-			"website": "caucho.com"
+			"website": "http://caucho.com"
 		},
 		"Reveal.js": {
 			"cats": [
@@ -6372,7 +6451,7 @@
 			"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": [
@@ -6383,17 +6462,17 @@
 			},
 			"icon": "Revel.png",
 			"implies": "Go",
-			"website": "revel.github.io"
+			"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": [
@@ -6402,7 +6481,7 @@
 			"env": "^RightJS$",
 			"icon": "RightJS.png",
 			"script": "right\\.js",
-			"website": "rightjs.org"
+			"website": "http://rightjs.org"
 		},
 		"Riot": {
 			"cats": [
@@ -6411,7 +6490,7 @@
 			"env": "^riot$",
 			"icon": "Riot.png",
 			"script": "riot(?:\\+compiler)?(?:\\.min)?\\.js",
-			"website": "muut.com/riotjs"
+			"website": "http://muut.com/riotjs"
 		},
 		"RiteCMS": {
 			"cats": [
@@ -6425,13 +6504,16 @@
 			"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",
@@ -6440,10 +6522,7 @@
 			"meta": {
 				"generator": "^Roadiz ([a-z0-9\\s\\.]+) - \\;version:\\1"
 			},
-			"headers": {
-				"X-Powered-By": "Roadiz CMS"
-			},
-			"website": "www.roadiz.io"
+			"website": "http://www.roadiz.io"
 		},
 		"Robin": {
 			"cats": [
@@ -6455,7 +6534,7 @@
 				"robin_storage_settings"
 			],
 			"icon": "Robin.png",
-			"website": "www.robinhq.com"
+			"website": "http://www.robinhq.com"
 		},
 		"RockRMS": {
 			"cats": [
@@ -6472,7 +6551,7 @@
 			"meta": {
 				"generator": "^Rock v.*"
 			},
-			"website": "www.rockrms.com"
+			"website": "http://www.rockrms.com"
 		},
 		"RoundCube": {
 			"cats": [
@@ -6482,7 +6561,7 @@
 			"html": "<title>RoundCube",
 			"icon": "RoundCube.png",
 			"implies": "PHP",
-			"website": "roundcube.net"
+			"website": "http://roundcube.net"
 		},
 		"Rubicon Project": {
 			"cats": [
@@ -6490,7 +6569,7 @@
 			],
 			"icon": "Rubicon Project.png",
 			"script": "https?://[^/]*\\.rubiconproject\\.com",
-			"website": "rubiconproject.com/"
+			"website": "http://rubiconproject.com/"
 		},
 		"Ruby": {
 			"cats": [
@@ -6500,7 +6579,7 @@
 				"Server": "(?:Mongrel|WEBrick|Ruby)"
 			},
 			"icon": "Ruby.png",
-			"website": "ruby-lang.org"
+			"website": "http://ruby-lang.org"
 		},
 		"Ruby on Rails": {
 			"cats": [
@@ -6516,7 +6595,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": [
@@ -6524,7 +6603,7 @@
 			],
 			"icon": "Ruxit.png",
 			"script": "ruxitagentjs",
-			"website": "ruxit.com"
+			"website": "http://ruxit.com"
 		},
 		"RxJS": {
 			"cats": [
@@ -6533,7 +6612,7 @@
 			"env": "^Rx$\\;confidence:20",
 			"icon": "RxJS.png",
 			"script": "rx(?:\\.\\w+)?(?:\\.compat)?(?:\\.min)?\\.js",
-			"website": "reactivex.io"
+			"website": "http://reactivex.io"
 		},
 		"S.Builder": {
 			"cats": [
@@ -6543,7 +6622,7 @@
 			"meta": {
 				"generator": "S\\.Builder"
 			},
-			"website": "www.sbuilder.ru"
+			"website": "http://www.sbuilder.ru"
 		},
 		"SAP": {
 			"cats": [
@@ -6553,7 +6632,7 @@
 				"Server": "SAP NetWeaver Application Server"
 			},
 			"icon": "SAP.png",
-			"website": "sap.com"
+			"website": "http://sap.com"
 		},
 		"SDL Tridion": {
 			"cats": [
@@ -6561,7 +6640,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": [
@@ -6572,7 +6651,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": [
@@ -6581,7 +6660,7 @@
 			"env": "^smf_",
 			"icon": "SMF.png",
 			"implies": "PHP",
-			"website": "www.simplemachines.org"
+			"website": "http://www.simplemachines.org"
 		},
 		"SOBI 2": {
 			"cats": [
@@ -6590,7 +6669,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": [
@@ -6601,7 +6680,7 @@
 				"X-Firefox-Spdy": "\\d\\.\\d"
 			},
 			"icon": "SPDY.png",
-			"website": "chromium.org/spdy"
+			"website": "http://chromium.org/spdy"
 		},
 		"SPIP": {
 			"cats": [
@@ -6615,23 +6694,23 @@
 			"meta": {
 				"generator": "(?:^|\\s)SPIP(?:\\s([\\d.]+(?:\\s\\[\\d+\\])?))?\\;version:\\1"
 			},
-			"website": "www.spip.net"
+			"website": "http://www.spip.net"
 		},
 		"SQL Buddy": {
 			"cats": [
 				3
 			],
-			"implies": "PHP",
 			"html": "(?:<title>SQL Buddy</title>|<[^>]+onclick=\"sideMainClick\\(\"home\\.php)",
 			"icon": "SQL Buddy.png",
-			"website": "www.sqlbuddy.com"
+			"implies": "PHP",
+			"website": "http://www.sqlbuddy.com"
 		},
 		"SQLite": {
 			"cats": [
 				34
 			],
 			"icon": "SQLite.png",
-			"website": "www.sqlite.org"
+			"website": "http://www.sqlite.org"
 		},
 		"SUSE": {
 			"cats": [
@@ -6642,7 +6721,7 @@
 				"X-Powered-By": "SUSE(?:/?\\s?-?([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "SUSE.png",
-			"website": "suse.com"
+			"website": "http://suse.com"
 		},
 		"SWFObject": {
 			"cats": [
@@ -6651,7 +6730,7 @@
 			"env": "^SWFObject$",
 			"icon": "SWFObject.png",
 			"script": "swfobject.*\\.js",
-			"website": "github.com/swfobject/swfobject"
+			"website": "http://github.com/swfobject/swfobject"
 		},
 		"Saia PCD": {
 			"cats": [
@@ -6661,7 +6740,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": [
@@ -6676,7 +6755,7 @@
 				"Node.js",
 				"Express"
 			],
-			"website": "sailsjs.org"
+			"website": "http://sailsjs.org"
 		},
 		"Sarka-SPIP": {
 			"cats": [
@@ -6687,21 +6766,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": [
@@ -6710,11 +6789,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": [
@@ -6725,7 +6804,7 @@
 				"X-Powered-By": "Scientific Linux"
 			},
 			"icon": "Scientific Linux.png",
-			"website": "scientificlinux.org"
+			"website": "http://scientificlinux.org"
 		},
 		"Segment": {
 			"cats": [
@@ -6735,16 +6814,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": [
@@ -6756,7 +6835,7 @@
 			],
 			"icon": "Semantic-ui.png",
 			"script": "(?:semantic(?:\\.js|\\.min\\.js))",
-			"website": "semantic-ui.com"
+			"website": "http://semantic-ui.com"
 		},
 		"Sencha Touch": {
 			"cats": [
@@ -6765,7 +6844,7 @@
 			],
 			"icon": "Sencha Touch.png",
 			"script": "sencha-touch.*\\.js",
-			"website": "sencha.com/products/touch"
+			"website": "http://sencha.com/products/touch"
 		},
 		"Sentinel Keys Server": {
 			"cats": [
@@ -6774,16 +6853,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": [
@@ -6792,8 +6871,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": [
@@ -6806,7 +6885,7 @@
 				"Powered-By": "Serendipity v\\.(.+)\\;version:\\1",
 				"generator": "Serendipity"
 			},
-			"website": "s9y.org"
+			"website": "http://s9y.org"
 		},
 		"Shadow": {
 			"cats": [
@@ -6817,7 +6896,7 @@
 			},
 			"icon": "Shadow.png",
 			"implies": "PHP",
-			"website": "shadow-technologies.co.uk"
+			"website": "http://shadow-technologies.co.uk"
 		},
 		"ShareThis": {
 			"cats": [
@@ -6826,19 +6905,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>"
 			],
-			"env": "^ShellInABox$",
 			"icon": "ShellInABox.png",
-			"website": "shellinabox.com"
+			"website": "http://shellinabox.com"
 		},
 		"ShinyStat": {
 			"cats": [
@@ -6848,7 +6927,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": [
@@ -6857,7 +6936,7 @@
 			],
 			"env": "^Shopalize$",
 			"icon": "Shopalize.png",
-			"website": "shopalize.com"
+			"website": "http://shopalize.com"
 		},
 		"Shopatron": {
 			"cats": [
@@ -6873,7 +6952,7 @@
 				"keywords": "Shopatron"
 			},
 			"script": "mediacdn\\.shopatron\\.com",
-			"website": "ecommerce.shopatron.com"
+			"website": "http://ecommerce.shopatron.com"
 		},
 		"Shopery": {
 			"cats": [
@@ -6888,7 +6967,7 @@
 				"Symfony",
 				"Elcodi"
 			],
-			"website": "shopery.com"
+			"website": "http://shopery.com"
 		},
 		"Shopify": {
 			"cats": [
@@ -6897,7 +6976,7 @@
 			"env": "^Shopify$",
 			"html": "<link[^>]+=['\"]//cdn\\.shopify\\.com",
 			"icon": "Shopify.svg",
-			"website": "shopify.com"
+			"website": "http://shopify.com"
 		},
 		"Shoptet": {
 			"cats": [
@@ -6913,7 +6992,7 @@
 			"script": [
 				"^https?://cdn\\.myshoptet\\.com/"
 			],
-			"website": "www.shoptet.cz"
+			"website": "http://www.shoptet.cz"
 		},
 		"Shopware": {
 			"cats": [
@@ -6930,7 +7009,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": [
@@ -6940,7 +7019,7 @@
 				"X-Powered-By": "SilvaCMS"
 			},
 			"icon": "Silva.png",
-			"website": "silvacms.org"
+			"website": "http://silvacms.org"
 		},
 		"SilverStripe": {
 			"cats": [
@@ -6951,7 +7030,7 @@
 			"meta": {
 				"generator": "SilverStripe"
 			},
-			"website": "www.silverstripe.org"
+			"website": "http://www.silverstripe.org"
 		},
 		"SimpleHTTP": {
 			"cats": [
@@ -6960,8 +7039,8 @@
 			"headers": {
 				"Server": "SimpleHTTP(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"Site Meter": {
 			"cats": [
@@ -6969,7 +7048,7 @@
 			],
 			"icon": "Site Meter.png",
 			"script": "sitemeter\\.com/js/counter\\.js\\?site=",
-			"website": "www.sitemeter.com"
+			"website": "http://www.sitemeter.com"
 		},
 		"SiteCatalyst": {
 			"cats": [
@@ -6978,7 +7057,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": [
@@ -6988,7 +7067,7 @@
 			"meta": {
 				"generator": "SiteEdit"
 			},
-			"website": "www.siteedit.ru"
+			"website": "http://www.siteedit.ru"
 		},
 		"Sitecore": {
 			"cats": [
@@ -6999,7 +7078,7 @@
 			},
 			"html": "<img[^>]+src=\"[^>]*/~/media/[^>]+\\.ashx",
 			"icon": "Sitecore.png",
-			"website": "sitecore.net"
+			"website": "http://sitecore.net"
 		},
 		"Sitefinity": {
 			"cats": [
@@ -7010,7 +7089,7 @@
 			"meta": {
 				"generator": "^Sitefinity (.+)$\\;version:\\1"
 			},
-			"website": "www.sitefinity.com"
+			"website": "http://www.sitefinity.com"
 		},
 		"Sivuviidakko": {
 			"cats": [
@@ -7020,7 +7099,7 @@
 			"meta": {
 				"generator": "Sivuviidakko"
 			},
-			"website": "sivuviidakko.fi"
+			"website": "http://sivuviidakko.fi"
 		},
 		"Sizmek": {
 			"cats": [
@@ -7029,7 +7108,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": [
@@ -7040,7 +7119,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": [
@@ -7051,7 +7130,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": [
@@ -7060,7 +7139,7 @@
 			"env": "^SmartAdServer$",
 			"html": "<img[^>]+smartadserver\\.com\\/call",
 			"icon": "Smart Ad Server.png",
-			"website": "smartadserver.com"
+			"website": "http://smartadserver.com"
 		},
 		"SmartSite": {
 			"cats": [
@@ -7071,7 +7150,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": [
@@ -7079,7 +7158,7 @@
 			],
 			"icon": "Smartstore.png",
 			"script": "smjslib\\.js",
-			"website": "smartstore.com"
+			"website": "http://smartstore.com"
 		},
 		"Snap": {
 			"cats": [
@@ -7091,7 +7170,7 @@
 			},
 			"icon": "Snap.png",
 			"implies": "Haskell",
-			"website": "snapframework.com"
+			"website": "http://snapframework.com"
 		},
 		"Snap.svg": {
 			"cats": [
@@ -7100,7 +7179,7 @@
 			"env": "^Snap$",
 			"icon": "Snap.svg.png",
 			"script": "snap\\.svg(?:-min)?\\.js",
-			"website": "snapsvg.io"
+			"website": "http://snapsvg.io"
 		},
 		"Snoobi": {
 			"cats": [
@@ -7109,7 +7188,7 @@
 			"env": "^snoobi$",
 			"icon": "Snoobi.png",
 			"script": "snoobi\\.com/snoop\\.php",
-			"website": "www.snoobi.com"
+			"website": "http://www.snoobi.com"
 		},
 		"SobiPro": {
 			"cats": [
@@ -7118,7 +7197,7 @@
 			"env": "^SobiProUrl$",
 			"icon": "SobiPro.png",
 			"implies": "Joomla",
-			"website": "sigsiu.net/sobipro.html"
+			"website": "http://sigsiu.net/sobipro.html"
 		},
 		"Socket.io": {
 			"cats": [
@@ -7128,7 +7207,7 @@
 			"icon": "Socket.io.png",
 			"implies": "Node.js",
 			"script": "socket.io.*\\.js",
-			"website": "socket.io"
+			"website": "http://socket.io"
 		},
 		"Solodev": {
 			"cats": [
@@ -7137,10 +7216,10 @@
 			"headers": {
 				"solodev_session": ""
 			},
-			"html": "<div class=(?:\"|')dynamicDiv(?:\"|') id=(?:\"|')dd\\.\\d\\.\\d(?:\\.\\d)?(?:\"|')>",
+			"html": "<div class=[\"']dynamicDiv[\"'] id=[\"']dd\\.\\d\\.\\d(?:\\.\\d)?[\"']>",
 			"icon": "Solodev.png",
 			"implies": "PHP",
-			"website": "www.solodev.com"
+			"website": "http://www.solodev.com"
 		},
 		"Solr": {
 			"cats": [
@@ -7148,7 +7227,7 @@
 			],
 			"icon": "Solr.png",
 			"implies": "Lucene",
-			"website": "lucene.apache.org/solr/"
+			"website": "http://lucene.apache.org/solr/"
 		},
 		"Solve Media": {
 			"cats": [
@@ -7158,7 +7237,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": [
@@ -7166,7 +7245,7 @@
 			],
 			"env": "^(?:SoundManager|BaconPlayer)$",
 			"icon": "SoundManager.png",
-			"website": "www.schillmania.com/projects/soundmanager2"
+			"website": "http://www.schillmania.com/projects/soundmanager2"
 		},
 		"Sphinx": {
 			"cats": [
@@ -7175,7 +7254,7 @@
 			"env": "^DOCUMENTATION_OPTIONS$",
 			"icon": "Sphinx.png",
 			"implies": "Python",
-			"website": "sphinx.pocoo.org"
+			"website": "http://sphinx.pocoo.org"
 		},
 		"SpiderControl iniNet": {
 			"cats": [
@@ -7185,7 +7264,7 @@
 			"meta": {
 				"generator": "iniNet SpiderControl"
 			},
-			"website": "spidercontrol.net/ininet"
+			"website": "http://spidercontrol.net/ininet"
 		},
 		"Splunk": {
 			"cats": [
@@ -7196,7 +7275,7 @@
 			"meta": {
 				"author": "Splunk Inc\\;confidence:50"
 			},
-			"website": "splunk.com"
+			"website": "http://splunk.com"
 		},
 		"Splunkd": {
 			"cats": [
@@ -7205,8 +7284,8 @@
 			"headers": {
 				"Server": "Splunkd"
 			},
-			"icon": "Splunkd.png",
-			"website": "splunk.com"
+			"icon": "Splunk.png",
+			"website": "http://splunk.com"
 		},
 		"Spree": {
 			"cats": [
@@ -7215,7 +7294,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": [
@@ -7226,7 +7305,7 @@
 				"X-ServedBy": "squarespace"
 			},
 			"icon": "Squarespace.png",
-			"website": "www.squarespace.com"
+			"website": "http://www.squarespace.com"
 		},
 		"SquirrelMail": {
 			"cats": [
@@ -7237,7 +7316,7 @@
 			"icon": "SquirrelMail.png",
 			"implies": "PHP",
 			"url": "/src/webmail\\.php(?:$|\\?)",
-			"website": "squirrelmail.org"
+			"website": "http://squirrelmail.org"
 		},
 		"Squiz Matrix": {
 			"cats": [
@@ -7252,7 +7331,7 @@
 			"meta": {
 				"generator": "Squiz Matrix"
 			},
-			"website": "squiz.net"
+			"website": "http://squiz.net"
 		},
 		"Stackla": {
 			"cats": [
@@ -7261,15 +7340,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": [
@@ -7281,7 +7360,7 @@
 			},
 			"icon": "Stamplay.png",
 			"script": "stamplay.*\\.js",
-			"website": "stamplay.com"
+			"website": "http://stamplay.com"
 		},
 		"Starlet": {
 			"cats": [
@@ -7292,7 +7371,7 @@
 			},
 			"icon": "Starlet.png",
 			"implies": "Perl",
-			"website": "metacpan.org/pod/Starlet"
+			"website": "http://metacpan.org/pod/Starlet"
 		},
 		"StatCounter": {
 			"cats": [
@@ -7300,7 +7379,7 @@
 			],
 			"icon": "StatCounter.png",
 			"script": "statcounter\\.com/counter/counter",
-			"website": "www.statcounter.com"
+			"website": "http://www.statcounter.com"
 		},
 		"Store Systems": {
 			"cats": [
@@ -7308,7 +7387,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": [
@@ -7320,7 +7399,7 @@
 				"Google Code Prettify"
 			],
 			"script": "strapdown\\.js",
-			"website": "strapdownjs.com"
+			"website": "http://strapdownjs.com"
 		},
 		"Strato": {
 			"cats": [
@@ -7328,7 +7407,7 @@
 			],
 			"html": "<a href=\"http://www.strato.de/\" target=\"_blank\">",
 			"icon": "strato.png",
-			"website": "shop.strato.com"
+			"website": "http://shop.strato.com"
 		},
 		"Stripe": {
 			"cats": [
@@ -7338,7 +7417,7 @@
 			"html": "<input[^>]+data-stripe",
 			"icon": "Stripe.png",
 			"script": "js\\.stripe\\.com",
-			"website": "stripe.com"
+			"website": "http://stripe.com"
 		},
 		"SublimeVideo": {
 			"cats": [
@@ -7347,7 +7426,7 @@
 			"env": "^sublimevideo$",
 			"icon": "SublimeVideo.png",
 			"script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
-			"website": "sublimevideo.net"
+			"website": "http://sublimevideo.net"
 		},
 		"Subrion": {
 			"cats": [
@@ -7361,7 +7440,7 @@
 			"meta": {
 				"generator": "^Subrion "
 			},
-			"website": "subrion.com"
+			"website": "http://subrion.com"
 		},
 		"Sulu": {
 			"cats": [
@@ -7372,7 +7451,7 @@
 			},
 			"icon": "Sulu.svg",
 			"implies": "Symfony",
-			"website": "sulu.io"
+			"website": "http://sulu.io"
 		},
 		"SumoMe": {
 			"cats": [
@@ -7381,7 +7460,7 @@
 			],
 			"icon": "SumoMe.png",
 			"script": "load\\.sumome\\.com",
-			"website": "sumome.com"
+			"website": "http://sumome.com"
 		},
 		"SunOS": {
 			"cats": [
@@ -7392,7 +7471,7 @@
 				"Servlet-engine": "SunOS( [\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "Oracle.png",
-			"website": "oracle.com/solaris"
+			"website": "http://oracle.com/solaris"
 		},
 		"Supersized": {
 			"cats": [
@@ -7401,7 +7480,7 @@
 			],
 			"icon": "Supersized.png",
 			"script": "supersized(?:\\.([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
-			"website": "buildinternet.com/project/supersized"
+			"website": "http://buildinternet.com/project/supersized"
 		},
 		"SweetAlert": {
 			"cats": [
@@ -7411,7 +7490,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": [
@@ -7428,7 +7507,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": [
@@ -7436,20 +7524,20 @@
 			],
 			"icon": "Symfony.png",
 			"implies": "PHP",
-			"website": "symfony.com"
+			"website": "http://symfony.com"
 		},
 		"Synology DiskStation": {
 			"cats": [
 				48
 			],
-			"icon": "Synology DiskStation.png",
 			"html": "<noscript><div class='syno-no-script'",
+			"icon": "Synology DiskStation.png",
 			"meta": {
 				"application-name": "Synology DiskStation",
 				"description": "^DiskStation provides a full-featured network attached storage"
 			},
 			"script": "webapi/entry\\.cgi\\?api=SYNO\\.(?:Core|Filestation)\\.Desktop\\.",
-			"website": "synology.com"
+			"website": "http://synology.com"
 		},
 		"SyntaxHighlighter": {
 			"cats": [
@@ -7458,7 +7546,7 @@
 			"env": "^SyntaxHighlighter$",
 			"html": "<(?:script|link)[^>]*sh(?:Core|Brush|ThemeDefault)",
 			"icon": "SyntaxHighlighter.png",
-			"website": "github.com/syntaxhighlighter"
+			"website": "http://github.com/syntaxhighlighter"
 		},
 		"TWiki": {
 			"cats": [
@@ -7471,7 +7559,7 @@
 			"icon": "TWiki.png",
 			"implies": "Perl",
 			"script": "(?:TWikiJavascripts|twikilib(?:\\.min)?\\.js)",
-			"website": "twiki.org"
+			"website": "http://twiki.org"
 		},
 		"TYPO3 CMS": {
 			"cats": [
@@ -7484,7 +7572,7 @@
 				"generator": "TYPO3\\s+(?:CMS\\s+)?([\\d.]+)?(?:\\s+CMS)?\\;version:\\1"
 			},
 			"url": "/typo3/",
-			"website": "www.typo3.org"
+			"website": "http://www.typo3.org"
 		},
 		"Taiga": {
 			"cats": [
@@ -7496,7 +7584,7 @@
 				"Django",
 				"AngularJS"
 			],
-			"website": "taiga.io"
+			"website": "http://taiga.io"
 		},
 		"Tawk.to": {
 			"cats": [
@@ -7504,7 +7592,7 @@
 			],
 			"icon": "TawkTo.png",
 			"script": "//embed\\.tawk\\.to",
-			"website": "tawk.to"
+			"website": "http://tawk.to"
 		},
 		"Tealeaf": {
 			"cats": [
@@ -7512,7 +7600,7 @@
 			],
 			"env": "^TeaLeaf$",
 			"icon": "Tealeaf.png",
-			"website": "www.tealeaf.com"
+			"website": "http://www.tealeaf.com"
 		},
 		"TeamCity": {
 			"cats": [
@@ -7527,7 +7615,7 @@
 			"meta": {
 				"application-name": "TeamCity"
 			},
-			"website": "jetbrains.com/teamcity"
+			"website": "http://jetbrains.com/teamcity"
 		},
 		"Telescope": {
 			"cats": [
@@ -7536,7 +7624,7 @@
 			"env": "Telescope",
 			"icon": "Telescope.png",
 			"implies": "Meteor",
-			"website": "telescopeapp.org"
+			"website": "http://telescopeapp.org"
 		},
 		"Tengine": {
 			"cats": [
@@ -7546,21 +7634,21 @@
 				"Server": "Tengine"
 			},
 			"icon": "Tengine.png",
-			"website": "tengine.taobao.org"
+			"website": "http://tengine.taobao.org"
 		},
 		"Textpattern CMS": {
 			"cats": [
 				1
 			],
 			"icon": "Textpattern CMS.png",
-			"meta": {
-				"generator": "Textpattern"
-			},
 			"implies": [
 				"PHP",
 				"MySQL"
 			],
-			"website": "textpattern.com"
+			"meta": {
+				"generator": "Textpattern"
+			},
+			"website": "http://textpattern.com"
 		},
 		"Thelia": {
 			"cats": [
@@ -7573,7 +7661,7 @@
 				"PHP",
 				"Symfony"
 			],
-			"website": "thelia.net"
+			"website": "http://thelia.net"
 		},
 		"ThinkPHP": {
 			"cats": [
@@ -7584,7 +7672,7 @@
 			},
 			"icon": "ThinkPHP.png",
 			"implies": "PHP",
-			"website": "www.thinkphp.cn"
+			"website": "http://www.thinkphp.cn"
 		},
 		"TiddlyWiki": {
 			"cats": [
@@ -7602,7 +7690,7 @@
 				"generator": "^TiddlyWiki$",
 				"tiddlywiki-version": "(.*)\\;version:\\1"
 			},
-			"website": "tiddlywiki.com"
+			"website": "http://tiddlywiki.com"
 		},
 		"Tiki Wiki CMS Groupware": {
 			"cats": [
@@ -7617,7 +7705,7 @@
 				"generator": "^Tiki"
 			},
 			"script": "(?:/|_)tiki",
-			"website": "tiki.org"
+			"website": "http://tiki.org"
 		},
 		"Timeplot": {
 			"cats": [
@@ -7626,7 +7714,7 @@
 			"env": "^Timeplot$",
 			"icon": "Timeplot.png",
 			"script": "timeplot.*\\.js",
-			"website": "www.simile-widgets.org/timeplot/"
+			"website": "http://www.simile-widgets.org/timeplot/"
 		},
 		"TinyMCE": {
 			"cats": [
@@ -7634,7 +7722,7 @@
 			],
 			"env": "^tinyMCE$",
 			"icon": "TinyMCE.png",
-			"website": "tinymce.com"
+			"website": "http://tinymce.com"
 		},
 		"Titan": {
 			"cats": [
@@ -7646,7 +7734,7 @@
 			],
 			"html": "<script[^>]+>var titan",
 			"icon": "Titan.png",
-			"website": "titan360.com"
+			"website": "http://titan360.com"
 		},
 		"TomatoCart": {
 			"cats": [
@@ -7657,7 +7745,7 @@
 			"meta": {
 				"generator": "TomatoCart"
 			},
-			"website": "tomatocart.com"
+			"website": "http://tomatocart.com"
 		},
 		"TornadoServer": {
 			"cats": [
@@ -7667,7 +7755,7 @@
 				"Server": "TornadoServer(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "TornadoServer.png",
-			"website": "tornadoweb.org"
+			"website": "http://tornadoweb.org"
 		},
 		"Trac": {
 			"cats": [
@@ -7679,7 +7767,7 @@
 			],
 			"icon": "Trac.png",
 			"implies": "Python",
-			"website": "trac.edgewall.org"
+			"website": "http://trac.edgewall.org"
 		},
 		"TrackJs": {
 			"cats": [
@@ -7688,7 +7776,7 @@
 			"env": "^TrackJs$",
 			"icon": "TrackJs.png",
 			"script": "tracker.js",
-			"website": "trackjs.com"
+			"website": "http://trackjs.com"
 		},
 		"Tumblr": {
 			"cats": [
@@ -7700,7 +7788,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": [
@@ -7709,7 +7797,7 @@
 			"env": "^TweenMax$",
 			"icon": "TweenMax.png",
 			"script": "TweenMax(?:\\.min)?\\.js",
-			"website": "greensock.com/tweenmax"
+			"website": "http://greensock.com/tweenmax"
 		},
 		"Twilight CMS": {
 			"cats": [
@@ -7719,7 +7807,7 @@
 				"X-Powered-CMS": "Twilight CMS"
 			},
 			"icon": "Twilight CMS.png",
-			"website": "www.twilightcms.com"
+			"website": "http://www.twilightcms.com"
 		},
 		"TwistPHP": {
 			"cats": [
@@ -7730,7 +7818,7 @@
 			},
 			"icon": "TwistPHP.png",
 			"implies": "PHP",
-			"website": "twistphp.com"
+			"website": "http://twistphp.com"
 		},
 		"TwistedWeb": {
 			"cats": [
@@ -7740,7 +7828,7 @@
 				"Server": "TwistedWeb(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "TwistedWeb.png",
-			"website": "twistedmatrix.com/trac/wiki/TwistedWeb"
+			"website": "http://twistedmatrix.com/trac/wiki/TwistedWeb"
 		},
 		"Twitter": {
 			"cats": [
@@ -7748,7 +7836,7 @@
 			],
 			"icon": "Twitter.svg",
 			"script": "//platform\\.twitter\\.com/widgets\\.js",
-			"website": "twitter.com"
+			"website": "http://twitter.com"
 		},
 		"Twitter Bootstrap": {
 			"cats": [
@@ -7762,16 +7850,16 @@
 			],
 			"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": [
@@ -7780,7 +7868,7 @@
 			"env": "^flight$",
 			"icon": "Twitter Flight.png",
 			"implies": "jQuery",
-			"website": "flightjs.github.io/"
+			"website": "http://flightjs.github.io/"
 		},
 		"Twitter typeahead.js": {
 			"cats": [
@@ -7790,7 +7878,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": [
@@ -7801,7 +7889,7 @@
 				"generator": "typepad"
 			},
 			"url": "typepad\\.com",
-			"website": "www.typepad.com"
+			"website": "http://www.typepad.com"
 		},
 		"Typekit": {
 			"cats": [
@@ -7810,7 +7898,7 @@
 			"env": "^Typekit$",
 			"icon": "Typekit.png",
 			"script": "use\\.typekit\\.com",
-			"website": "typekit.com"
+			"website": "http://typekit.com"
 		},
 		"UIKit": {
 			"cats": [
@@ -7818,7 +7906,7 @@
 			],
 			"icon": "UIKit.png",
 			"script": "uikit.*\\.js",
-			"website": "getuikit.com"
+			"website": "http://getuikit.com"
 		},
 		"UNIX": {
 			"cats": [
@@ -7828,7 +7916,7 @@
 				"Server": "Unix"
 			},
 			"icon": "UNIX.png",
-			"website": "unix.org"
+			"website": "http://unix.org"
 		},
 		"Ubercart": {
 			"cats": [
@@ -7837,7 +7925,7 @@
 			"icon": "Ubercart.png",
 			"implies": "Drupal",
 			"script": "uc_cart/uc_cart_block\\.js",
-			"website": "www.ubercart.org"
+			"website": "http://www.ubercart.org"
 		},
 		"Ubuntu": {
 			"cats": [
@@ -7848,7 +7936,7 @@
 				"X-Powered-By": "Ubuntu"
 			},
 			"icon": "Ubuntu.png",
-			"website": "www.ubuntu.com/server"
+			"website": "http://www.ubuntu.com/server"
 		},
 		"UltraCart": {
 			"cats": [
@@ -7859,7 +7947,7 @@
 			"icon": "UltraCart.png",
 			"script": "cgi-bin\\/UCJavaScript\\?(?:[^\"]*&)?merchantid=.",
 			"url": "/cgi-bin/UCEditor\\?(?:.*&)?merchantid=.",
-			"website": "ultracart.com"
+			"website": "http://ultracart.com"
 		},
 		"Umbraco": {
 			"cats": [
@@ -7876,7 +7964,7 @@
 				"generator": "umbraco"
 			},
 			"url": "/umbraco/login\\.aspx(?:$|\\?)",
-			"website": "umbraco.com"
+			"website": "http://umbraco.com"
 		},
 		"Unbounce": {
 			"cats": [
@@ -7887,7 +7975,7 @@
 				"X-Unbounce-PageId": ""
 			},
 			"icon": "Unbounce.png",
-			"website": "unbounce.com"
+			"website": "http://unbounce.com"
 		},
 		"Underscore.js": {
 			"cats": [
@@ -7895,7 +7983,7 @@
 			],
 			"icon": "Underscore.js.png",
 			"script": "underscore.*\\.js",
-			"website": "underscorejs.org"
+			"website": "http://underscorejs.org"
 		},
 		"Usabilla": {
 			"cats": [
@@ -7903,7 +7991,7 @@
 			],
 			"env": "^usabilla_live$",
 			"icon": "Usabilla.svg",
-			"website": "usabilla.com"
+			"website": "http://usabilla.com"
 		},
 		"UserLike": {
 			"cats": [
@@ -7914,7 +8002,7 @@
 				"userlike\\.min\\.js",
 				"userlikelib\\.min\\.js"
 			],
-			"website": "userlike.com"
+			"website": "http://userlike.com"
 		},
 		"UserRules": {
 			"cats": [
@@ -7922,7 +8010,7 @@
 			],
 			"env": "^_usrp$",
 			"icon": "UserRules.png",
-			"website": "www.userrules.com"
+			"website": "http://www.userrules.com"
 		},
 		"UserVoice": {
 			"cats": [
@@ -7930,7 +8018,7 @@
 			],
 			"env": "^UserVoice$",
 			"icon": "UserVoice.png",
-			"website": "uservoice.com"
+			"website": "http://uservoice.com"
 		},
 		"Ushahidi": {
 			"cats": [
@@ -7948,7 +8036,7 @@
 				"OpenLayers"
 			],
 			"script": "/js/ushahidi\\.js$",
-			"website": "www.ushahidi.com"
+			"website": "http://www.ushahidi.com"
 		},
 		"VIVVO": {
 			"cats": [
@@ -7959,7 +8047,7 @@
 				"Set-Cookie": "VivvoSessionId"
 			},
 			"icon": "VIVVO.png",
-			"website": "vivvo.net"
+			"website": "http://vivvo.net"
 		},
 		"VP-ASP": {
 			"cats": [
@@ -7969,7 +8057,7 @@
 			"icon": "VP-ASP.png",
 			"implies": "Microsoft ASP.NET",
 			"script": "vs350\\.js",
-			"website": "www.vpasp.com"
+			"website": "http://www.vpasp.com"
 		},
 		"VTEX Enterprise": {
 			"cats": [
@@ -7979,7 +8067,7 @@
 				"powered": "vtex"
 			},
 			"icon": "VTEX Enterprise.png",
-			"website": "vtex.com"
+			"website": "http://vtex.com"
 		},
 		"VTEX Integrated Store": {
 			"cats": [
@@ -7989,7 +8077,7 @@
 				"X-Powered-By": "vtex-integrated-store"
 			},
 			"icon": "VTEX Integrated Store.png",
-			"website": "lojaintegrada.com.br"
+			"website": "http://lojaintegrada.com.br"
 		},
 		"Vanilla": {
 			"cats": [
@@ -8001,7 +8089,7 @@
 			"html": "<body id=\"(?:DiscussionsPage|vanilla)",
 			"icon": "Vanilla.png",
 			"implies": "PHP",
-			"website": "vanillaforums.org"
+			"website": "http://vanillaforums.org"
 		},
 		"Varnish": {
 			"cats": [
@@ -8016,7 +8104,7 @@
 				"X-Varnish-Hostname": ""
 			},
 			"icon": "Varnish.svg",
-			"website": "www.varnish-cache.org"
+			"website": "http://www.varnish-cache.org"
 		},
 		"Venda": {
 			"cats": [
@@ -8026,7 +8114,7 @@
 				"X-venda-hitid": ""
 			},
 			"icon": "Venda.png",
-			"website": "venda.com"
+			"website": "http://venda.com"
 		},
 		"Veoxa": {
 			"cats": [
@@ -8036,7 +8124,7 @@
 			"html": "<img [^>]*src=\"[^\"]+tracking\\.veoxa\\.com",
 			"icon": "Veoxa.png",
 			"script": "tracking\\.veoxa\\.com",
-			"website": "veoxa.com"
+			"website": "http://veoxa.com"
 		},
 		"VideoJS": {
 			"cats": [
@@ -8046,7 +8134,7 @@
 			"html": "<div[^>]+class=\"video-js+\">",
 			"icon": "VideoJS.png",
 			"script": "zencdn\\.net/c/video\\.js",
-			"website": "videojs.com"
+			"website": "http://videojs.com"
 		},
 		"VigLink": {
 			"cats": [
@@ -8055,7 +8143,7 @@
 			"env": "^(?:vglnk(?:$|_)|vl_(?:cB|disable)$)",
 			"icon": "VigLink.png",
 			"script": "(?:^[^/]*//[^/]*viglink\\.com/api/|vglnk\\.js)",
-			"website": "viglink.com"
+			"website": "http://viglink.com"
 		},
 		"Vignette": {
 			"cats": [
@@ -8063,7 +8151,7 @@
 			],
 			"html": "<[^>]+=\"vgn-?ext",
 			"icon": "Vignette.png",
-			"website": "www.vignette.com"
+			"website": "http://www.vignette.com"
 		},
 		"Vimeo": {
 			"cats": [
@@ -8071,7 +8159,7 @@
 			],
 			"html": "(?:<(?:param|embed)[^>]+vimeo\\.com/moogaloop|<iframe[^>]player\\.vimeo\\.com)",
 			"icon": "Vimeo.png",
-			"website": "vimeo.com"
+			"website": "http://vimeo.com"
 		},
 		"Virata EmWeb": {
 			"cats": [
@@ -8080,11 +8168,11 @@
 			"headers": {
 				"Server": "Virata-EmWeb(?:/(R?[\\d._]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": [
 				"HP"
 			],
-			"website": "???"
+			"website": "http://example.com"
 		},
 		"VirtueMart": {
 			"cats": [
@@ -8093,7 +8181,7 @@
 			"html": "<div id=\"vmMainPage",
 			"icon": "VirtueMart.png",
 			"implies": "Joomla",
-			"website": "virtuemart.net"
+			"website": "http://virtuemart.net"
 		},
 		"Visual WebGUI": {
 			"cats": [
@@ -8107,7 +8195,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": [
@@ -8115,7 +8203,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": [
@@ -8125,7 +8213,7 @@
 			"html": "<link [^>]*href=\"[^\"]*/vspfiles/",
 			"icon": "Volusion.png",
 			"script": "/volusion\\.js(?:\\?([\\d.]*))?\\;version:\\1",
-			"website": "volusion.com"
+			"website": "http://volusion.com"
 		},
 		"Vox": {
 			"cats": [
@@ -8133,7 +8221,7 @@
 			],
 			"icon": "Vox.png",
 			"url": "\\.vox\\.com",
-			"website": "www.vox.com"
+			"website": "http://www.vox.com"
 		},
 		"Vue.js": {
 			"cats": [
@@ -8146,7 +8234,7 @@
 				"/([\\d.]+)/vue(?:\\.min)?\\.js\\;version:\\1",
 				"vue.*\\.js\\;confidence:20"
 			],
-			"website": "vuejs.org"
+			"website": "http://vuejs.org"
 		},
 		"W3 Total Cache": {
 			"cats": [
@@ -8158,7 +8246,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": [
@@ -8166,7 +8254,7 @@
 			],
 			"icon": "W3Counter.png",
 			"script": "w3counter\\.com/tracker\\.js",
-			"website": "www.w3counter.com"
+			"website": "http://www.w3counter.com"
 		},
 		"WHMCS": {
 			"cats": [
@@ -8176,7 +8264,7 @@
 				"Set-Cookie": "^WHMCS.*"
 			},
 			"icon": "WHMCS.png",
-			"website": "www.whmcs.com"
+			"website": "http://www.whmcs.com"
 		},
 		"WP Rocket": {
 			"cats": [
@@ -8188,7 +8276,7 @@
 			"html": "<!--[^>]+WP Rocket",
 			"icon": "WP Rocket.png",
 			"implies": "WordPress",
-			"website": "wp-rocket.me"
+			"website": "http://wp-rocket.me"
 		},
 		"Warp": {
 			"cats": [
@@ -8199,7 +8287,7 @@
 			},
 			"icon": "Warp.png",
 			"implies": "Haskell",
-			"website": "www.stackage.org/package/warp"
+			"website": "http://www.stackage.org/package/warp"
 		},
 		"Web Optimizer": {
 			"cats": [
@@ -8207,7 +8295,7 @@
 			],
 			"html": "<title [^>]*lang=\"wo\">",
 			"icon": "Web Optimizer.png",
-			"website": "www.web-optimizer.us"
+			"website": "http://www.web-optimizer.us"
 		},
 		"Web2py": {
 			"cats": [
@@ -8225,7 +8313,7 @@
 				"generator": "^Web2py"
 			},
 			"script": "web2py\\.js",
-			"website": "web2py.com"
+			"website": "http://web2py.com"
 		},
 		"WebGUI": {
 			"cats": [
@@ -8239,7 +8327,7 @@
 			"meta": {
 				"generator": "^WebGUI ([\\d.]+)\\;version:\\1"
 			},
-			"website": "www.webgui.org"
+			"website": "http://www.webgui.org"
 		},
 		"WebPublisher": {
 			"cats": [
@@ -8249,7 +8337,7 @@
 			"meta": {
 				"generator": "WEB\\|Publisher"
 			},
-			"website": "scannet.dk"
+			"website": "http://scannet.dk"
 		},
 		"Webix": {
 			"cats": [
@@ -8258,7 +8346,7 @@
 			"env": "^webix$",
 			"icon": "Webix.png",
 			"script": "\bwebix\\.js",
-			"website": "webix.com"
+			"website": "http://webix.com"
 		},
 		"Webs": {
 			"cats": [
@@ -8268,7 +8356,7 @@
 				"Server": "Webs\\.com/?([\\d\\.]+)?\\;version:\\1"
 			},
 			"icon": "Webs.png",
-			"website": "webs.com"
+			"website": "http://webs.com"
 		},
 		"WebsPlanet": {
 			"cats": [
@@ -8278,7 +8366,7 @@
 			"meta": {
 				"generator": "WebsPlanet"
 			},
-			"website": "websplanet.com"
+			"website": "http://websplanet.com"
 		},
 		"Websale": {
 			"cats": [
@@ -8286,7 +8374,7 @@
 			],
 			"icon": "Websale.png",
 			"url": "/websale7/",
-			"website": "websale.de"
+			"website": "http://websale.de"
 		},
 		"WebsiteBaker": {
 			"cats": [
@@ -8300,7 +8388,7 @@
 			"meta": {
 				"generator": "WebsiteBaker"
 			},
-			"website": "websitebaker2.org/en/home.php"
+			"website": "http://websitebaker2.org/en/home.php"
 		},
 		"Webtrekk": {
 			"cats": [
@@ -8308,7 +8396,7 @@
 			],
 			"env": "^webtrekk",
 			"icon": "Webtrekk.png",
-			"website": "www.webtrekk.com"
+			"website": "http://www.webtrekk.com"
 		},
 		"Webtrends": {
 			"cats": [
@@ -8317,7 +8405,7 @@
 			"env": "^(?:WTOptimize|WebTrends)",
 			"html": "<img[^>]+id=\"DCSIMG\"[^>]+webtrends",
 			"icon": "Webtrends.png",
-			"website": "worldwide.webtrends.com"
+			"website": "http://worldwide.webtrends.com"
 		},
 		"Weebly": {
 			"cats": [
@@ -8325,7 +8413,7 @@
 			],
 			"icon": "Weebly.png",
 			"script": "cdn\\d+\\.editmysite\\.com",
-			"website": "www.weebly.com"
+			"website": "http://www.weebly.com"
 		},
 		"Wikispaces": {
 			"cats": [
@@ -8336,7 +8424,7 @@
 				"<\\w+[^>]*\\s+class=\"[^\"]*WikispacesContent\\s+WikispacesBs3[^\"]*\""
 			],
 			"icon": "Wikispaces.png",
-			"website": "www.wikispaces.com"
+			"website": "http://www.wikispaces.com"
 		},
 		"WikkaWiki": {
 			"cats": [
@@ -8347,7 +8435,7 @@
 			"meta": {
 				"generator": "WikkaWiki"
 			},
-			"website": "wikkawiki.org"
+			"website": "http://wikkawiki.org"
 		},
 		"Windows CE": {
 			"cats": [
@@ -8357,7 +8445,7 @@
 				"Server": "\bWinCE\b"
 			},
 			"icon": "Microsoft.svg",
-			"website": "microsoft.com"
+			"website": "http://microsoft.com"
 		},
 		"Windows Server": {
 			"cats": [
@@ -8367,7 +8455,7 @@
 				"Server": "Win32|Win64"
 			},
 			"icon": "Microsoft.svg",
-			"website": "microsoft.com/windowsserver"
+			"website": "http://microsoft.com/windowsserver"
 		},
 		"Wink": {
 			"cats": [
@@ -8377,7 +8465,7 @@
 			"env": "^wink$",
 			"icon": "Wink.png",
 			"script": "(?:_base/js/base|wink).*\\.js",
-			"website": "winktoolkit.org"
+			"website": "http://winktoolkit.org"
 		},
 		"Winstone Servlet Container": {
 			"cats": [
@@ -8387,8 +8475,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": [
@@ -8399,12 +8487,12 @@
 				"Set-Cookie": "Domain=\\.wix\\.com",
 				"X-Wix-Dispatcher-Cache-Hit": ""
 			},
+			"icon": "Wix.png",
 			"meta": {
 				"X-Wix-Renderer-Server": ""
 			},
-			"icon": "Wix.png",
 			"script": "static\\.wixstatic\\.com",
-			"website": "wix.com"
+			"website": "http://wix.com"
 		},
 		"Wolf CMS": {
 			"cats": [
@@ -8413,7 +8501,7 @@
 			"html": "(?:<a href=\"[^>]+wolfcms\\.org[^>]+>Wolf CMS(?:</a>)? inside|Thank you for using <a[^>]+>Wolf CMS)",
 			"icon": "Wolf CMS.png",
 			"implies": "PHP",
-			"website": "www.wolfcms.org"
+			"website": "http://www.wolfcms.org"
 		},
 		"Woltlab Community Framework": {
 			"cats": [
@@ -8423,7 +8511,7 @@
 			"icon": "Woltlab Community Framework.png",
 			"implies": "PHP",
 			"script": "WCF\\..*\\.js",
-			"website": "www.woltlab.com"
+			"website": "http://www.woltlab.com"
 		},
 		"WooCommerce": {
 			"cats": [
@@ -8437,7 +8525,7 @@
 				"generator": "WooCommerce ([\\d.]+)\\;version:\\1"
 			},
 			"script": "woocommerce",
-			"website": "www.woothemes.com/woocommerce"
+			"website": "http://www.woothemes.com/woocommerce"
 		},
 		"Woopra": {
 			"cats": [
@@ -8445,7 +8533,7 @@
 			],
 			"icon": "Woopra.png",
 			"script": "static\\.woopra\\.com",
-			"website": "www.woopra.com"
+			"website": "http://www.woopra.com"
 		},
 		"WordPress": {
 			"cats": [
@@ -8463,16 +8551,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": [
@@ -8480,7 +8571,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": [
@@ -8500,7 +8591,7 @@
 				"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": [
@@ -8517,7 +8608,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": [
@@ -8525,7 +8616,7 @@
 			],
 			"html": "<!-- Powered by XMB",
 			"icon": "XMB.png",
-			"website": "www.xmbforum.com"
+			"website": "http://www.xmbforum.com"
 		},
 		"XOOPS": {
 			"cats": [
@@ -8537,7 +8628,7 @@
 			"meta": {
 				"generator": "XOOPS"
 			},
-			"website": "xoops.org"
+			"website": "http://xoops.org"
 		},
 		"XRegExp": {
 			"cats": [
@@ -8550,7 +8641,7 @@
 				"/([\\d.]+)/xregexp(?:\\.min)?\\.js\\;version:\\1",
 				"xregexp.*\\.js"
 			],
-			"website": "xregexp.com"
+			"website": "http://xregexp.com"
 		},
 		"Xajax": {
 			"cats": [
@@ -8558,7 +8649,7 @@
 			],
 			"icon": "Xajax.png",
 			"script": "xajax_core.*\\.js",
-			"website": "xajax-project.org"
+			"website": "http://xajax-project.org"
 		},
 		"Xanario": {
 			"cats": [
@@ -8568,7 +8659,7 @@
 			"meta": {
 				"generator": "xanario shopsoftware"
 			},
-			"website": "xanario.de"
+			"website": "http://xanario.de"
 		},
 		"XenForo": {
 			"cats": [
@@ -8576,7 +8667,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": [
@@ -8586,7 +8677,7 @@
 				"Server": "Xitami(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "Xitami.png",
-			"website": "xitami.com"
+			"website": "http://xitami.com"
 		},
 		"Xonic": {
 			"cats": [
@@ -8600,7 +8691,7 @@
 				"keywords": "xonic-solutions"
 			},
 			"script": "core/jslib/jquery\\.xonic\\.js\\.php",
-			"website": "www.xonic-solutions.de"
+			"website": "http://www.xonic-solutions.de"
 		},
 		"XpressEngine": {
 			"cats": [
@@ -8610,7 +8701,7 @@
 			"meta": {
 				"generator": "XpressEngine"
 			},
-			"website": "www.xpressengine.com/"
+			"website": "http://www.xpressengine.com/"
 		},
 		"YUI": {
 			"cats": [
@@ -8619,7 +8710,7 @@
 			"env": "^YAHOO$",
 			"icon": "YUI.png",
 			"script": "(?:/yui/|yui\\.yahooapis\\.com)",
-			"website": "yuilibrary.com"
+			"website": "http://yuilibrary.com"
 		},
 		"YUI Doc": {
 			"cats": [
@@ -8627,7 +8718,7 @@
 			],
 			"html": "(?:<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf|<body[^>]+class=\"yui3-skin-sam)",
 			"icon": "yahoo.png",
-			"website": "developer.yahoo.com/yui/yuidoc"
+			"website": "http://developer.yahoo.com/yui/yuidoc"
 		},
 		"YaBB": {
 			"cats": [
@@ -8635,7 +8726,7 @@
 			],
 			"html": "Powered by <a href=\"[^>]+yabbforum",
 			"icon": "YaBB.png",
-			"website": "www.yabbforum.com"
+			"website": "http://www.yabbforum.com"
 		},
 		"Yahoo Advertising": {
 			"cats": [
@@ -8648,7 +8739,7 @@
 			],
 			"icon": "yahoo.png",
 			"script": "adinterax\\.com",
-			"website": "advertising.yahoo.com"
+			"website": "http://advertising.yahoo.com"
 		},
 		"Yahoo! Ecommerce": {
 			"cats": [
@@ -8660,7 +8751,7 @@
 			},
 			"html": "<link[^>]+store\\.yahoo\\.net",
 			"icon": "yahoo.png",
-			"website": "smallbusiness.yahoo.com/ecommerce"
+			"website": "http://smallbusiness.yahoo.com/ecommerce"
 		},
 		"Yahoo! Web Analytics": {
 			"cats": [
@@ -8669,7 +8760,7 @@
 			"env": "^YWA$",
 			"icon": "yahoo.png",
 			"script": "d\\.yimg\\.com/mi/ywa\\.js",
-			"website": "web.analytics.yahoo.com"
+			"website": "http://web.analytics.yahoo.com"
 		},
 		"Yandex.Direct": {
 			"cats": [
@@ -8683,7 +8774,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": [
@@ -8692,7 +8783,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": [
@@ -8705,7 +8796,7 @@
 			"implies": [
 				"Erlang"
 			],
-			"website": "yaws.hyber.org"
+			"website": "http://yaws.hyber.org"
 		},
 		"Yieldlab": {
 			"cats": [
@@ -8713,20 +8804,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": [
@@ -8736,7 +8829,7 @@
 				"<!-- This site is optimized with the Yoast"
 			],
 			"icon": "Yoast SEO.png",
-			"website": "yoast.com"
+			"website": "http://yoast.com"
 		},
 		"YouTrack": {
 			"cats": [
@@ -8748,7 +8841,7 @@
 				"type=\"application/opensearchdescription\\+xml\" title=\"YouTrack\"/>"
 			],
 			"icon": "YouTrack.png",
-			"website": "www.jetbrains.com/youtrack/"
+			"website": "http://www.jetbrains.com/youtrack/"
 		},
 		"YouTube": {
 			"cats": [
@@ -8756,7 +8849,7 @@
 			],
 			"html": "<(?:param|embed|iframe)[^>]+youtube(?:-nocookie)?\\.com/(?:v|embed)",
 			"icon": "YouTube.png",
-			"website": "www.youtube.com"
+			"website": "http://www.youtube.com"
 		},
 		"ZK": {
 			"cats": [
@@ -8766,7 +8859,7 @@
 			"icon": "ZK.png",
 			"implies": "Java",
 			"script": "zkau/",
-			"website": "zkoss.org"
+			"website": "http://zkoss.org"
 		},
 		"ZURB Foundation": {
 			"cats": [
@@ -8777,7 +8870,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": [
@@ -8791,7 +8884,7 @@
 				"Author": "ZABBIX SIA\\;confidence:70"
 			},
 			"url": "\\/zabbix\\/\\;confidence:30",
-			"website": "zabbix.com"
+			"website": "http://zabbix.com"
 		},
 		"Zanox": {
 			"cats": [
@@ -8801,7 +8894,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": [
@@ -8811,7 +8904,7 @@
 			"meta": {
 				"generator": "Zen Cart"
 			},
-			"website": "www.zen-cart.com"
+			"website": "http://www.zen-cart.com"
 		},
 		"Zend": {
 			"cats": [
@@ -8822,7 +8915,7 @@
 				"X-Powered-By": "Zend"
 			},
 			"icon": "Zend.png",
-			"website": "zend.com"
+			"website": "http://zend.com"
 		},
 		"Zendesk Chat": {
 			"cats": [
@@ -8830,7 +8923,7 @@
 			],
 			"icon": "Zendesk Chat.png",
 			"script": "v2\\.zopim\\.com",
-			"website": "zopim.com"
+			"website": "http://zopim.com"
 		},
 		"Zepto": {
 			"cats": [
@@ -8839,7 +8932,7 @@
 			"env": "^Zepto$",
 			"icon": "Zepto.png",
 			"script": "zepto.*\\.js",
-			"website": "zeptojs.com"
+			"website": "http://zeptojs.com"
 		},
 		"Zeuscart": {
 			"cats": [
@@ -8849,7 +8942,7 @@
 			"icon": "Zeuscart.png",
 			"implies": "PHP",
 			"url": "\\?do=prodetail&action=show&prodid=\\d+",
-			"website": "zeuscart.com"
+			"website": "http://zeuscart.com"
 		},
 		"Zinnia": {
 			"cats": [
@@ -8860,7 +8953,7 @@
 			"meta": {
 				"generator": "Zinnia"
 			},
-			"website": "django-blog-zinnia.com"
+			"website": "http://django-blog-zinnia.com"
 		},
 		"Zope": {
 			"cats": [
@@ -8870,7 +8963,7 @@
 				"Server": "^Zope/"
 			},
 			"icon": "Zope.png",
-			"website": "zope.org"
+			"website": "http://zope.org"
 		},
 		"a-blog cms": {
 			"cats": [
@@ -8881,7 +8974,7 @@
 			"meta": {
 				"generator": "a-blog cms"
 			},
-			"website": "www.a-blogcms.jp"
+			"website": "http://www.a-blogcms.jp"
 		},
 		"actionhero.js": {
 			"cats": [
@@ -8896,7 +8989,7 @@
 			"icon": "actionhero.js.png",
 			"implies": "Node.js",
 			"script": "actionheroClient\\.js",
-			"website": "www.actionherojs.com"
+			"website": "http://www.actionherojs.com"
 		},
 		"amCharts": {
 			"cats": [
@@ -8905,7 +8998,7 @@
 			"env": "^AmCharts$",
 			"icon": "amCharts.png",
 			"script": "amcharts.*\\.js",
-			"website": "amcharts.com"
+			"website": "http://amcharts.com"
 		},
 		"basket.js": {
 			"cats": [
@@ -8914,7 +9007,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": [
@@ -8925,7 +9018,7 @@
 			},
 			"html": "<!-- cPanel",
 			"icon": "cPanel.png",
-			"website": "www.cpanel.net"
+			"website": "http://www.cpanel.net"
 		},
 		"cgit": {
 			"cats": [
@@ -8940,7 +9033,7 @@
 			"meta": {
 				"generator": "^cgit v([\\d.a-z-]+)$\\;version:\\1"
 			},
-			"website": "git.zx2c4.com/cgit"
+			"website": "http://git.zx2c4.com/cgit"
 		},
 		"comScore": {
 			"cats": [
@@ -8950,7 +9043,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": [
@@ -8961,7 +9054,7 @@
 			},
 			"icon": "debut.png",
 			"implies": "Brother",
-			"website": "www.brother.com"
+			"website": "http://www.brother.com"
 		},
 		"dwhttpd": {
 			"cats": [
@@ -8970,8 +9063,8 @@
 			"headers": {
 				"Server": "dwhttpd\\/?([\\d\\.a-z]+)?\\;version:\\1"
 			},
-			"icon": "default.png",
-			"website": "???"
+			"icon": "default.svg",
+			"website": "http://example.com"
 		},
 		"e107": {
 			"cats": [
@@ -8984,7 +9077,7 @@
 			"icon": "e107.png",
 			"implies": "PHP",
 			"script": "[^a-z\\d]e107\\.js",
-			"website": "e107.org"
+			"website": "http://e107.org"
 		},
 		"eDevice SmartStack": {
 			"cats": [
@@ -8994,7 +9087,7 @@
 				"Server": "eDevice SmartStack(?: ?/?([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "eDevice SmartStack.png",
-			"website": "edevice.com"
+			"website": "http://edevice.com"
 		},
 		"eHTTP": {
 			"cats": [
@@ -9003,9 +9096,9 @@
 			"headers": {
 				"Server": "\beHTTP(?: v?([\\d\\.]+))?\\;version:\\1"
 			},
-			"icon": "default.png",
+			"icon": "default.svg",
 			"implies": "HP ProCurve",
-			"website": "???"
+			"website": "http://example.com"
 		},
 		"eSyndiCat": {
 			"cats": [
@@ -9020,7 +9113,7 @@
 			"meta": {
 				"generator": "^eSyndiCat "
 			},
-			"website": "esyndicat.com"
+			"website": "http://esyndicat.com"
 		},
 		"eZ Publish": {
 			"cats": [
@@ -9035,7 +9128,7 @@
 			"meta": {
 				"generator": "eZ Publish"
 			},
-			"website": "ez.no"
+			"website": "http://ez.no"
 		},
 		"enduro.js": {
 			"cats": [
@@ -9048,7 +9141,7 @@
 			},
 			"icon": "enduro.js.svg",
 			"implies": "Node.js",
-			"website": "endurojs.com"
+			"website": "http://endurojs.com"
 		},
 		"git": {
 			"cats": [
@@ -9058,19 +9151,19 @@
 			"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"
 			],
-			"icon": "default.png",
-			"website": "gitlist.org"
+			"website": "http://gitlist.org"
 		},
 		"gitweb": {
 			"cats": [
@@ -9078,7 +9171,6 @@
 			],
 			"html": "<!-- git web interface version ([\\d.]+)?\\;version:\\1",
 			"icon": "gitweb.png",
-			"script": "static/gitweb.js$",
 			"implies": [
 				"Perl",
 				"git"
@@ -9086,7 +9178,8 @@
 			"meta": {
 				"generator": "gitweb(?:/([\\d.]+\\d))?\\;version:\\1"
 			},
-			"website": "git-scm.com"
+			"script": "static/gitweb.js$",
+			"website": "http://git-scm.com"
 		},
 		"gunicorn": {
 			"cats": [
@@ -9097,7 +9190,7 @@
 			},
 			"icon": "gunicorn.png",
 			"implies": "Python",
-			"website": "gunicorn.org"
+			"website": "http://gunicorn.org"
 		},
 		"hapi.js": {
 			"cats": [
@@ -9109,18 +9202,18 @@
 			},
 			"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": [
@@ -9132,7 +9225,7 @@
 			"meta": {
 				"designer": "iPresta"
 			},
-			"website": "ipresta.ir"
+			"website": "http://ipresta.ir"
 		},
 		"iWeb": {
 			"cats": [
@@ -9142,7 +9235,7 @@
 			"meta": {
 				"generator": "^iWeb( [\\d.]+)?\\;version:\\1"
 			},
-			"website": "apple.com/ilife/iweb"
+			"website": "http://apple.com/ilife/iweb"
 		},
 		"ikiwiki": {
 			"cats": [
@@ -9153,7 +9246,7 @@
 				"<a href=\"/ikiwiki\\.cgi\\?do=edit"
 			],
 			"icon": "ikiwiki.png",
-			"website": "ikiwiki.info"
+			"website": "http://ikiwiki.info"
 		},
 		"io4 CMS": {
 			"cats": [
@@ -9163,7 +9256,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": [
@@ -9172,7 +9265,7 @@
 			"env": "^jQT$",
 			"icon": "jQTouch.png",
 			"script": "jqtouch.*\\.js",
-			"website": "jqtouch.com"
+			"website": "http://jqtouch.com"
 		},
 		"jQuery": {
 			"cats": [
@@ -9185,7 +9278,7 @@
 				"/([\\d.]+)/jquery(?:\\.min)?\\.js\\;version:\\1",
 				"jquery.*\\.js"
 			],
-			"website": "jquery.com"
+			"website": "http://jquery.com"
 		},
 		"jQuery Mobile": {
 			"cats": [
@@ -9194,16 +9287,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": [
@@ -9216,7 +9309,7 @@
 				"([\\d.]+)/jquery-ui(?:\\.min)?\\.js\\;version:\\1",
 				"jquery-ui.*\\.js"
 			],
-			"website": "jqueryui.com"
+			"website": "http://jqueryui.com"
 		},
 		"jqPlot": {
 			"cats": [
@@ -9225,7 +9318,7 @@
 			"icon": "jqPlot.png",
 			"implies": "jQuery",
 			"script": "jqplot.*\\.js",
-			"website": "www.jqplot.com"
+			"website": "http://www.jqplot.com"
 		},
 		"libwww-perl-daemon": {
 			"cats": [
@@ -9236,7 +9329,7 @@
 			},
 			"icon": "libwww-perl-daemon.png",
 			"implies": "Perl",
-			"website": "metacpan.org/pod/HTTP::Daemon"
+			"website": "http://metacpan.org/pod/HTTP::Daemon"
 		},
 		"lighttpd": {
 			"cats": [
@@ -9246,7 +9339,7 @@
 				"Server": "lighttpd(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "lighttpd.png",
-			"website": "www.lighttpd.net"
+			"website": "http://www.lighttpd.net"
 		},
 		"math.js": {
 			"cats": [
@@ -9255,7 +9348,7 @@
 			"env": "^mathjs$",
 			"icon": "math.js.png",
 			"script": "math(?:\\.min)?\\.js",
-			"website": "mathjs.org"
+			"website": "http://mathjs.org"
 		},
 		"mini_httpd": {
 			"cats": [
@@ -9265,7 +9358,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": [
@@ -9276,7 +9369,7 @@
 			},
 			"icon": "Apache.svg",
 			"implies": "Apache",
-			"website": "pam.sourceforge.net/mod_auth_pam"
+			"website": "http://pam.sourceforge.net/mod_auth_pam"
 		},
 		"mod_dav": {
 			"cats": [
@@ -9287,7 +9380,7 @@
 			},
 			"icon": "Apache.svg",
 			"implies": "Apache",
-			"website": "webdav.org/mod_dav"
+			"website": "http://webdav.org/mod_dav"
 		},
 		"mod_fastcgi": {
 			"cats": [
@@ -9298,7 +9391,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": [
@@ -9312,7 +9405,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": [
@@ -9326,7 +9419,7 @@
 				"Perl",
 				"Apache"
 			],
-			"website": "perl.apache.org"
+			"website": "http://perl.apache.org"
 		},
 		"mod_python": {
 			"cats": [
@@ -9340,7 +9433,7 @@
 				"Python",
 				"Apache"
 			],
-			"website": "www.modpython.org"
+			"website": "http://www.modpython.org"
 		},
 		"mod_rack": {
 			"cats": [
@@ -9350,12 +9443,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": [
@@ -9365,12 +9458,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": [
@@ -9381,7 +9474,7 @@
 			},
 			"icon": "mod_ssl.png",
 			"implies": "Apache",
-			"website": "modssl.org"
+			"website": "http://modssl.org"
 		},
 		"mod_wsgi": {
 			"cats": [
@@ -9396,7 +9489,7 @@
 				"Python\\;confidence:50",
 				"Apache"
 			],
-			"website": "code.google.com/p/modwsgi"
+			"website": "http://code.google.com/p/modwsgi"
 		},
 		"nopCommerce": {
 			"cats": [
@@ -9405,7 +9498,7 @@
 			"html": "(?:<!--Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)",
 			"icon": "nopCommerce.png",
 			"implies": "Microsoft ASP.NET",
-			"website": "www.nopcommerce.com"
+			"website": "http://www.nopcommerce.com"
 		},
 		"openEngine": {
 			"cats": [
@@ -9415,7 +9508,7 @@
 			"meta": {
 				"openEngine": ""
 			},
-			"website": "openengine.de/html/pages/de/"
+			"website": "http://openengine.de/html/pages/de/"
 		},
 		"osCSS": {
 			"cats": [
@@ -9423,7 +9516,7 @@
 			],
 			"html": "<body onload=\"window\\.defaultStatus='oscss templates';\"",
 			"icon": "osCSS.png",
-			"website": "www.oscss.org"
+			"website": "http://www.oscss.org"
 		},
 		"osCommerce": {
 			"cats": [
@@ -9438,7 +9531,7 @@
 				"PHP",
 				"MySQL"
 			],
-			"website": "www.oscommerce.com"
+			"website": "http://www.oscommerce.com"
 		},
 		"osTicket": {
 			"cats": [
@@ -9452,7 +9545,7 @@
 				"PHP",
 				"MySQL"
 			],
-			"website": "osticket.com"
+			"website": "http://osticket.com"
 		},
 		"ownCloud": {
 			"cats": [
@@ -9464,7 +9557,7 @@
 			"meta": {
 				"apple-itunes-app": "app-id=543672169"
 			},
-			"website": "owncloud.org"
+			"website": "http://owncloud.org"
 		},
 		"papaya CMS": {
 			"cats": [
@@ -9473,7 +9566,7 @@
 			"html": "<link[^>]*/papaya-themes/",
 			"icon": "papaya CMS.png",
 			"implies": "PHP",
-			"website": "papaya-cms.com"
+			"website": "http://papaya-cms.com"
 		},
 		"phpAlbum": {
 			"cats": [
@@ -9482,7 +9575,7 @@
 			"html": "<!--phpalbum ([.\\d\\s]+)-->\\;version:\\1",
 			"icon": "phpAlbum.png",
 			"implies": "PHP",
-			"website": "phpalbum.net"
+			"website": "http://phpalbum.net"
 		},
 		"phpBB": {
 			"cats": [
@@ -9498,7 +9591,7 @@
 			"meta": {
 				"copyright": "phpBB Group"
 			},
-			"website": "phpbb.com"
+			"website": "http://phpbb.com"
 		},
 		"phpCMS": {
 			"cats": [
@@ -9507,7 +9600,7 @@
 			"env": "^phpcms",
 			"icon": "phpCMS.png",
 			"implies": "PHP",
-			"website": "phpcms.de"
+			"website": "http://phpcms.de"
 		},
 		"phpDocumentor": {
 			"cats": [
@@ -9516,23 +9609,7 @@
 			"html": "<!-- Generated by phpDocumentor",
 			"icon": "phpDocumentor.png",
 			"implies": "PHP",
-			"website": "www.phpdoc.org"
-		},
-		"phpliteadmin": {
-			"cats": [
-				3
-			],
-			"html": [
-				"<span id='logo'>phpLiteAdmin</span> <span id='version'>v([0-9.]+)<\\;version:\\1",
-				"<!-- Copyright [0-9]+ phpLiteAdmin (?:http://www.phpliteadmin.org/) -->",
-				"Powered by <a href='http://www.phpliteadmin\\.org/'"
-			],
-			"icon": "phpliteadmin.png",
-			"implies": [
-				"PHP",
-				"SQLite"
-			],
-			"website": "www.phpliteadmin.org/"
+			"website": "http://www.phpdoc.org"
 		},
 		"phpMyAdmin": {
 			"cats": [
@@ -9545,7 +9622,7 @@
 				"PHP",
 				"MySQL"
 			],
-			"website": "www.phpmyadmin.net"
+			"website": "http://www.phpmyadmin.net"
 		},
 		"phpPgAdmin": {
 			"cats": [
@@ -9554,7 +9631,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": [
@@ -9568,7 +9645,23 @@
 			"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": [
@@ -9581,7 +9674,7 @@
 			"meta": {
 				"generator": "^phpwind"
 			},
-			"website": "www.phpwind.net"
+			"website": "http://www.phpwind.net"
 		},
 		"prettyPhoto": {
 			"cats": [
@@ -9593,7 +9686,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": [
@@ -9602,7 +9695,7 @@
 			"html": "Powered by <a href=\"[^>]+punbb",
 			"icon": "punBB.png",
 			"implies": "PHP",
-			"website": "punbb.informer.com"
+			"website": "http://punbb.informer.com"
 		},
 		"reCAPTCHA": {
 			"cats": [
@@ -9612,7 +9705,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": [
@@ -9620,7 +9713,7 @@
 			],
 			"icon": "sIFR.png",
 			"script": "sifr\\.js",
-			"website": "www.mikeindustries.com/blog/sifr"
+			"website": "http://www.mikeindustries.com/blog/sifr"
 		},
 		"sNews": {
 			"cats": [
@@ -9630,7 +9723,7 @@
 			"meta": {
 				"generator": "sNews"
 			},
-			"website": "snewscms.com"
+			"website": "http://snewscms.com"
 		},
 		"script.aculo.us": {
 			"cats": [
@@ -9639,16 +9732,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": [
@@ -9658,7 +9751,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": [
@@ -9668,7 +9761,7 @@
 				"X-Powered-By": "swift\\.engine"
 			},
 			"icon": "swift.engine.png",
-			"website": "mittec.ru/default"
+			"website": "http://mittec.ru/default"
 		},
 		"three.js": {
 			"cats": [
@@ -9677,7 +9770,7 @@
 			"env": "^THREE$",
 			"icon": "three.js.png",
 			"script": "three(?:\\.min)?\\.js",
-			"website": "threejs.org"
+			"website": "http://threejs.org"
 		},
 		"thttpd": {
 			"cats": [
@@ -9687,7 +9780,7 @@
 				"Server": "\bthttpd(?:/([\\d.]+))?\\;version:\\1"
 			},
 			"icon": "thttpd.png",
-			"website": "acme.com/software/thttpd"
+			"website": "http://acme.com/software/thttpd"
 		},
 		"total.js": {
 			"cats": [
@@ -9698,7 +9791,7 @@
 			},
 			"icon": "total.js.png",
 			"implies": "Node.js",
-			"website": "totaljs.com"
+			"website": "http://totaljs.com"
 		},
 		"uCore": {
 			"cats": [
@@ -9713,7 +9806,7 @@
 			"meta": {
 				"generator": "uCore PHP Framework"
 			},
-			"website": "ucore.io"
+			"website": "http://ucore.io"
 		},
 		"uKnowva": {
 			"cats": [
@@ -9732,7 +9825,7 @@
 				"generator": "uKnowva (?: ([\\d.]+))?\\;version:\\1"
 			},
 			"script": "/media/conv/js/jquery.js",
-			"website": "uknowva.com"
+			"website": "http://uknowva.com"
 		},
 		"vBulletin": {
 			"cats": [
@@ -9744,15 +9837,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": [
@@ -9762,7 +9855,7 @@
 			"html": "<link[^>]+?href=\"[^\"]+vis(?:\\.min)?\\.css",
 			"icon": "vis.js.png",
 			"script": "vis(?:\\.min)?\\.js",
-			"website": "visjs.org"
+			"website": "http://visjs.org"
 		},
 		"webEdition": {
 			"cats": [
@@ -9773,7 +9866,7 @@
 				"DC.title": "webEdition",
 				"generator": "webEdition"
 			},
-			"website": "webedition.de/en"
+			"website": "http://webedition.de/en"
 		},
 		"webpack": {
 			"cats": [
@@ -9781,7 +9874,7 @@
 			],
 			"env": "^webpackJsonp$",
 			"icon": "webpack.svg",
-			"website": "webpack.github.io"
+			"website": "http://webpack.github.io"
 		},
 		"xCharts": {
 			"cats": [
@@ -9789,10 +9882,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": [
@@ -9803,7 +9896,7 @@
 			"meta": {
 				"generator": "xt:Commerce"
 			},
-			"website": "www.xt-commerce.com"
+			"website": "http://www.xt-commerce.com"
 		},
 		"xui": {
 			"cats": [
@@ -9813,7 +9906,7 @@
 			"env": "^xui$",
 			"icon": "xui.png",
 			"script": "[^a-z]xui.*\\.js",
-			"website": "xuijs.com"
+			"website": "http://xuijs.com"
 		}
 	},
 	"categories": {
diff --git a/src/drivers/bookmarklet/driver.js b/src/drivers/bookmarklet/driver.js
index 276cf6af5..5c5f0f368 100644
--- a/src/drivers/bookmarklet/driver.js
+++ b/src/drivers/bookmarklet/driver.js
@@ -13,7 +13,7 @@
 		d             = window.document,
 		container     = d.getElementById('wappalyzer-container'),
 		domain        = window.top.location.host,
-		url           = window.top.location.href,
+		url           = window.top.location.href.replace(/#.*$/, ''),
 		hasOwn        = Object.prototype.hasOwnProperty;
 
 	w.driver = {
diff --git a/src/drivers/chrome/images/header.png b/src/drivers/chrome/images/header.png
deleted file mode 100644
index 6dcce3087..000000000
Binary files a/src/drivers/chrome/images/header.png and /dev/null differ
diff --git a/src/drivers/chrome/images/icon_128.png b/src/drivers/chrome/images/icon_128.png
index 0e1e1fb0c..05ad20d8f 100644
Binary files a/src/drivers/chrome/images/icon_128.png and b/src/drivers/chrome/images/icon_128.png differ
diff --git a/src/drivers/chrome/images/icon_19.png b/src/drivers/chrome/images/icon_19.png
index 5bf2371c2..9668bc65a 100644
Binary files a/src/drivers/chrome/images/icon_19.png and b/src/drivers/chrome/images/icon_19.png differ
diff --git a/src/drivers/chrome/images/icon_32.png b/src/drivers/chrome/images/icon_32.png
index 5381e555a..cc9d30b15 100644
Binary files a/src/drivers/chrome/images/icon_32.png and b/src/drivers/chrome/images/icon_32.png differ
diff --git a/src/drivers/chrome/images/icon_38.png b/src/drivers/chrome/images/icon_38.png
index fb6ed7109..95f220ff3 100644
Binary files a/src/drivers/chrome/images/icon_38.png and b/src/drivers/chrome/images/icon_38.png differ
diff --git a/src/drivers/chrome/images/icon_hot.png b/src/drivers/chrome/images/icon_hot.png
index 06464af29..31e9b7c86 100644
Binary files a/src/drivers/chrome/images/icon_hot.png and b/src/drivers/chrome/images/icon_hot.png differ
diff --git a/src/drivers/chrome/js/driver.js b/src/drivers/chrome/js/driver.js
index 67ebd9cd9..3b0fa13ff 100644
--- a/src/drivers/chrome/js/driver.js
+++ b/src/drivers/chrome/js/driver.js
@@ -218,7 +218,7 @@
 		 */
 		ping: function() {
 			if ( Object.keys(w.ping.hostnames).length && parseInt(localStorage['tracking'], 10) ) {
-				w.driver.post('http://ping.wappalyzer.com/ping/v2/', w.ping);
+				w.driver.post('http://ping.wappalyzer.com/v2/', w.ping);
 
 				w.log('w.driver.ping: ' + JSON.stringify(w.ping));
 
diff --git a/src/drivers/chrome/manifest.json b/src/drivers/chrome/manifest.json
index fca9595db..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.50",
+	"version": "2.51",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
diff --git a/src/drivers/firefox/data/images/icon32.png b/src/drivers/firefox/data/images/icon32.png
index 7a9f9fe98..cc9d30b15 100644
Binary files a/src/drivers/firefox/data/images/icon32.png and b/src/drivers/firefox/data/images/icon32.png differ
diff --git a/src/drivers/firefox/data/images/icon32_hot.png b/src/drivers/firefox/data/images/icon32_hot.png
deleted file mode 100644
index 0c0cd90ca..000000000
Binary files a/src/drivers/firefox/data/images/icon32_hot.png and /dev/null differ
diff --git a/src/drivers/firefox/driver.js b/src/drivers/firefox/driver.js
index 4260e98dd..4eb7565c0 100644
--- a/src/drivers/firefox/driver.js
+++ b/src/drivers/firefox/driver.js
@@ -450,8 +450,7 @@
 					}).post();
 				};
 
-				//post('http://ping.wappalyzer.com/ping/v2/', w.ping);
-				post('http://wappalyzer.local/ping/v3/', w.ping);
+				post('http://ping.wappalyzer.com/v2/', w.ping);
 
 				w.log('w.driver.ping: ' + JSON.stringify(w.ping));
 
diff --git a/src/drivers/firefox/images/icon128.png b/src/drivers/firefox/images/icon128.png
deleted file mode 100644
index 00e8df6dc..000000000
Binary files a/src/drivers/firefox/images/icon128.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon128_hot.png b/src/drivers/firefox/images/icon128_hot.png
deleted file mode 100644
index 0e1e1fb0c..000000000
Binary files a/src/drivers/firefox/images/icon128_hot.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon16.png b/src/drivers/firefox/images/icon16.png
deleted file mode 100644
index 7ad880fcc..000000000
Binary files a/src/drivers/firefox/images/icon16.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon16_hot.png b/src/drivers/firefox/images/icon16_hot.png
deleted file mode 100644
index 06464af29..000000000
Binary files a/src/drivers/firefox/images/icon16_hot.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon32.png b/src/drivers/firefox/images/icon32.png
deleted file mode 100644
index 7a9f9fe98..000000000
Binary files a/src/drivers/firefox/images/icon32.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon32_hot.png b/src/drivers/firefox/images/icon32_hot.png
deleted file mode 100644
index 0c0cd90ca..000000000
Binary files a/src/drivers/firefox/images/icon32_hot.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon48.png b/src/drivers/firefox/images/icon48.png
index 5082284e1..82259f227 100644
Binary files a/src/drivers/firefox/images/icon48.png and b/src/drivers/firefox/images/icon48.png differ
diff --git a/src/drivers/firefox/images/icon48_hot.png b/src/drivers/firefox/images/icon48_hot.png
deleted file mode 100644
index 00bd19d77..000000000
Binary files a/src/drivers/firefox/images/icon48_hot.png and /dev/null differ
diff --git a/src/drivers/firefox/images/icon64.png b/src/drivers/firefox/images/icon64.png
index a74bf95d8..5817776b1 100644
Binary files a/src/drivers/firefox/images/icon64.png and b/src/drivers/firefox/images/icon64.png differ
diff --git a/src/drivers/firefox/images/icon64_hot.png b/src/drivers/firefox/images/icon64_hot.png
deleted file mode 100644
index 1954d72c1..000000000
Binary files a/src/drivers/firefox/images/icon64_hot.png and /dev/null differ
diff --git a/src/drivers/firefox/package.json b/src/drivers/firefox/package.json
index b92841e7b..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.8",
+  "version": "3.2.10",
 	"main": "driver.js",
 	"preferences": [{
 		"name": "tracking",
diff --git a/src/drivers/phantomjs/driver.js b/src/drivers/phantomjs/driver.js
index 06bb653fd..922e3cb05 100644
--- a/src/drivers/phantomjs/driver.js
+++ b/src/drivers/phantomjs/driver.js
@@ -88,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
diff --git a/src/drivers/phantomjs/package.json b/src/drivers/phantomjs/package.json
index 1d8d8efbd..a77059371 100644
--- a/src/drivers/phantomjs/package.json
+++ b/src/drivers/phantomjs/package.json
@@ -2,7 +2,7 @@
   "name": "wappalyzer",
   "description": "Uncovers the technologies used on websites",
   "homepage": "https://github.com/AliasIO/Wappalyzer",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "author": "Elbert Alias",
   "license": "GPL-3.0",
   "repository": {
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/EmbedThis Appweb.png b/src/icons/EmbedThis Appweb.png
deleted file mode 100644
index b1df2e5b0..000000000
Binary files a/src/icons/EmbedThis Appweb.png and /dev/null differ
diff --git a/src/icons/Embedthis-http.png b/src/icons/Embedthis.png
similarity index 100%
rename from src/icons/Embedthis-http.png
rename to src/icons/Embedthis.png
diff --git a/src/icons/FancyBox.png b/src/icons/FancyBox.png
new file mode 100755
index 000000000..3f764999b
Binary files /dev/null and b/src/icons/FancyBox.png differ
diff --git a/src/icons/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/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/Moment Timezone.png b/src/icons/Moment Timezone.png
deleted file mode 100644
index f368a3002..000000000
Binary files a/src/icons/Moment Timezone.png and /dev/null differ
diff --git a/src/icons/Schneider Web Server.png b/src/icons/Schneider Web Server.png
deleted file mode 100644
index d795ac7f5..000000000
Binary files a/src/icons/Schneider Web Server.png and /dev/null differ
diff --git a/src/icons/Sentinel License Monitor.png b/src/icons/Sentinel License Monitor.png
deleted file mode 100755
index 9fa007fc2..000000000
Binary files a/src/icons/Sentinel License Monitor.png and /dev/null differ
diff --git a/src/icons/Sentinel Protection Server.png b/src/icons/Sentinel Protection Server.png
deleted file mode 100755
index 9fa007fc2..000000000
Binary files a/src/icons/Sentinel Protection Server.png and /dev/null differ
diff --git a/src/icons/Sentinel Keys Server.png b/src/icons/Sentinel.png
similarity index 100%
rename from src/icons/Sentinel Keys Server.png
rename to src/icons/Sentinel.png
diff --git a/src/icons/Splunkd.png b/src/icons/Splunkd.png
deleted file mode 100755
index aec997697..000000000
Binary files a/src/icons/Splunkd.png and /dev/null differ
diff --git a/src/icons/Stackla Social Hub.png b/src/icons/Stackla Social Hub.png
deleted file mode 100644
index bd7dad114..000000000
Binary files a/src/icons/Stackla Social Hub.png and /dev/null differ
diff --git a/src/icons/a-blog cms.png b/src/icons/a-blog cms.png
deleted file mode 100644
index ed6b25e89..000000000
Binary files a/src/icons/a-blog cms.png and /dev/null differ
diff --git a/src/icons/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/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/iCongo.png b/src/icons/iCongo.png
deleted file mode 100644
index 842dd8343..000000000
Binary files a/src/icons/iCongo.png and /dev/null differ
diff --git a/src/icons/mattermost.png b/src/icons/mattermost.png
new file mode 100644
index 000000000..7375f3e61
Binary files /dev/null and b/src/icons/mattermost.png differ
diff --git a/src/icons/mhonarc.png b/src/icons/mhonarc.png
new file mode 100644
index 000000000..c808de423
Binary files /dev/null and b/src/icons/mhonarc.png differ
diff --git a/src/icons/mod_rack.png b/src/icons/mod_rack.png
deleted file mode 100644
index df046935b..000000000
Binary files a/src/icons/mod_rack.png and /dev/null differ
diff --git a/src/icons/mod_rails.png b/src/icons/mod_rails.png
deleted file mode 100644
index df046935b..000000000
Binary files a/src/icons/mod_rails.png and /dev/null differ
diff --git a/src/icons/swiftype.png b/src/icons/swiftype.png
new file mode 100644
index 000000000..69ab7d60f
Binary files /dev/null and b/src/icons/swiftype.png differ
diff --git a/src/icons/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