diff --git a/drivers/bookmarklet/images/icons/3dCart.png b/drivers/bookmarklet/images/icons/3dCart.png
index 09cdd4ddd..b15b56a2f 100644
Binary files a/drivers/bookmarklet/images/icons/3dCart.png and b/drivers/bookmarklet/images/icons/3dCart.png differ
diff --git a/drivers/bookmarklet/images/icons/AMPcms.png b/drivers/bookmarklet/images/icons/AMPcms.png
index a3180de94..0987761e2 100644
Binary files a/drivers/bookmarklet/images/icons/AMPcms.png and b/drivers/bookmarklet/images/icons/AMPcms.png differ
diff --git a/drivers/bookmarklet/images/icons/Accessible Portal.png b/drivers/bookmarklet/images/icons/Accessible Portal.png
index 889f3f3d5..e1cfe569d 100644
Binary files a/drivers/bookmarklet/images/icons/Accessible Portal.png and b/drivers/bookmarklet/images/icons/Accessible Portal.png differ
diff --git a/drivers/bookmarklet/images/icons/AngularJS.png b/drivers/bookmarklet/images/icons/AngularJS.png
index f16ec73c7..182bc7031 100644
Binary files a/drivers/bookmarklet/images/icons/AngularJS.png and b/drivers/bookmarklet/images/icons/AngularJS.png differ
diff --git a/drivers/bookmarklet/images/icons/Apache JSPWiki.png b/drivers/bookmarklet/images/icons/Apache JSPWiki.png
index bb6f654ce..6849f34e7 100644
Binary files a/drivers/bookmarklet/images/icons/Apache JSPWiki.png and b/drivers/bookmarklet/images/icons/Apache JSPWiki.png differ
diff --git a/drivers/bookmarklet/images/icons/Bigcommerce.png b/drivers/bookmarklet/images/icons/Bigcommerce.png
index 08f163065..4b8e89824 100644
Binary files a/drivers/bookmarklet/images/icons/Bigcommerce.png and b/drivers/bookmarklet/images/icons/Bigcommerce.png differ
diff --git a/drivers/bookmarklet/images/icons/CacheFly.png b/drivers/bookmarklet/images/icons/CacheFly.png
index 324ca8024..49a304296 100644
Binary files a/drivers/bookmarklet/images/icons/CacheFly.png and b/drivers/bookmarklet/images/icons/CacheFly.png differ
diff --git a/drivers/bookmarklet/images/icons/CloudFlare.png b/drivers/bookmarklet/images/icons/CloudFlare.png
index 97af7859b..eeb87e02d 100644
Binary files a/drivers/bookmarklet/images/icons/CloudFlare.png and b/drivers/bookmarklet/images/icons/CloudFlare.png differ
diff --git a/drivers/bookmarklet/images/icons/Connect.png b/drivers/bookmarklet/images/icons/Connect.png
index fa700d5dd..994d06c7b 100644
Binary files a/drivers/bookmarklet/images/icons/Connect.png and b/drivers/bookmarklet/images/icons/Connect.png differ
diff --git a/drivers/bookmarklet/images/icons/Cross Pixel.png b/drivers/bookmarklet/images/icons/Cross Pixel.png
index ec6aa782b..7984e3dc0 100644
Binary files a/drivers/bookmarklet/images/icons/Cross Pixel.png and b/drivers/bookmarklet/images/icons/Cross Pixel.png differ
diff --git a/drivers/bookmarklet/images/icons/EdgeCast.png b/drivers/bookmarklet/images/icons/EdgeCast.png
index b7e8d310b..3a281edf2 100644
Binary files a/drivers/bookmarklet/images/icons/EdgeCast.png and b/drivers/bookmarklet/images/icons/EdgeCast.png differ
diff --git a/drivers/bookmarklet/images/icons/GX WebManager.png b/drivers/bookmarklet/images/icons/GX WebManager.png
index d2a221841..186863d27 100644
Binary files a/drivers/bookmarklet/images/icons/GX WebManager.png and b/drivers/bookmarklet/images/icons/GX WebManager.png differ
diff --git a/drivers/bookmarklet/images/icons/GetSimple CMS.png b/drivers/bookmarklet/images/icons/GetSimple CMS.png
index e505082d3..e47ab011f 100644
Binary files a/drivers/bookmarklet/images/icons/GetSimple CMS.png and b/drivers/bookmarklet/images/icons/GetSimple CMS.png differ
diff --git a/drivers/bookmarklet/images/icons/Google Code Prettify.png b/drivers/bookmarklet/images/icons/Google Code Prettify.png
index e183e5b68..198155206 100644
Binary files a/drivers/bookmarklet/images/icons/Google Code Prettify.png and b/drivers/bookmarklet/images/icons/Google Code Prettify.png differ
diff --git a/drivers/bookmarklet/images/icons/Google Tag Manager.png b/drivers/bookmarklet/images/icons/Google Tag Manager.png
index 314352322..1031c9054 100644
Binary files a/drivers/bookmarklet/images/icons/Google Tag Manager.png and b/drivers/bookmarklet/images/icons/Google Tag Manager.png differ
diff --git a/drivers/bookmarklet/images/icons/Google Web Toolkit.png b/drivers/bookmarklet/images/icons/Google Web Toolkit.png
index 4e1240e8f..e53c2a1cd 100644
Binary files a/drivers/bookmarklet/images/icons/Google Web Toolkit.png and b/drivers/bookmarklet/images/icons/Google Web Toolkit.png differ
diff --git a/drivers/bookmarklet/images/icons/Hiawatha.png b/drivers/bookmarklet/images/icons/Hiawatha.png
index 5f2dade9b..0d73677a9 100644
Binary files a/drivers/bookmarklet/images/icons/Hiawatha.png and b/drivers/bookmarklet/images/icons/Hiawatha.png differ
diff --git a/drivers/bookmarklet/images/icons/IBM HTTP Server.png b/drivers/bookmarklet/images/icons/IBM HTTP Server.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/bookmarklet/images/icons/IBM HTTP Server.png and b/drivers/bookmarklet/images/icons/IBM HTTP Server.png differ
diff --git a/drivers/bookmarklet/images/icons/IBM WebSphere Commerce.png b/drivers/bookmarklet/images/icons/IBM WebSphere Commerce.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/bookmarklet/images/icons/IBM WebSphere Commerce.png and b/drivers/bookmarklet/images/icons/IBM WebSphere Commerce.png differ
diff --git a/drivers/bookmarklet/images/icons/IBM WebSphere Portal.png b/drivers/bookmarklet/images/icons/IBM WebSphere Portal.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/bookmarklet/images/icons/IBM WebSphere Portal.png and b/drivers/bookmarklet/images/icons/IBM WebSphere Portal.png differ
diff --git a/drivers/bookmarklet/images/icons/ImpressCMS.png b/drivers/bookmarklet/images/icons/ImpressCMS.png
index bed579348..a61e4a629 100644
Binary files a/drivers/bookmarklet/images/icons/ImpressCMS.png and b/drivers/bookmarklet/images/icons/ImpressCMS.png differ
diff --git a/drivers/bookmarklet/images/icons/Jirafe.png b/drivers/bookmarklet/images/icons/Jirafe.png
index 9945db3d4..32edeafb4 100644
Binary files a/drivers/bookmarklet/images/icons/Jirafe.png and b/drivers/bookmarklet/images/icons/Jirafe.png differ
diff --git a/drivers/bookmarklet/images/icons/KISSmetrics.png b/drivers/bookmarklet/images/icons/KISSmetrics.png
index ed033fb91..ac6c23e5c 100644
Binary files a/drivers/bookmarklet/images/icons/KISSmetrics.png and b/drivers/bookmarklet/images/icons/KISSmetrics.png differ
diff --git a/drivers/bookmarklet/images/icons/LightMon Engine.png b/drivers/bookmarklet/images/icons/LightMon Engine.png
index bdce59d32..ec56e8c2b 100644
Binary files a/drivers/bookmarklet/images/icons/LightMon Engine.png and b/drivers/bookmarklet/images/icons/LightMon Engine.png differ
diff --git a/drivers/bookmarklet/images/icons/LimeSurvey.png b/drivers/bookmarklet/images/icons/LimeSurvey.png
index db0db22b1..8971f2fb1 100644
Binary files a/drivers/bookmarklet/images/icons/LimeSurvey.png and b/drivers/bookmarklet/images/icons/LimeSurvey.png differ
diff --git a/drivers/bookmarklet/images/icons/Marketo.png b/drivers/bookmarklet/images/icons/Marketo.png
index 0a3849289..0a7294c8f 100644
Binary files a/drivers/bookmarklet/images/icons/Marketo.png and b/drivers/bookmarklet/images/icons/Marketo.png differ
diff --git a/drivers/bookmarklet/images/icons/MediaElement.js.png b/drivers/bookmarklet/images/icons/MediaElement.js.png
index 2b7e74bff..f0eaa5d11 100644
Binary files a/drivers/bookmarklet/images/icons/MediaElement.js.png and b/drivers/bookmarklet/images/icons/MediaElement.js.png differ
diff --git a/drivers/bookmarklet/images/icons/New Relic.png b/drivers/bookmarklet/images/icons/New Relic.png
index c5f43470d..3a7c5bc6a 100644
Binary files a/drivers/bookmarklet/images/icons/New Relic.png and b/drivers/bookmarklet/images/icons/New Relic.png differ
diff --git a/drivers/bookmarklet/images/icons/OpenText Web Solutions.png b/drivers/bookmarklet/images/icons/OpenText Web Solutions.png
index 2a27d5762..961a7399b 100644
Binary files a/drivers/bookmarklet/images/icons/OpenText Web Solutions.png and b/drivers/bookmarklet/images/icons/OpenText Web Solutions.png differ
diff --git a/drivers/bookmarklet/images/icons/Outbrain.png b/drivers/bookmarklet/images/icons/Outbrain.png
index 727f064df..bee5a06f2 100644
Binary files a/drivers/bookmarklet/images/icons/Outbrain.png and b/drivers/bookmarklet/images/icons/Outbrain.png differ
diff --git a/drivers/bookmarklet/images/icons/Pligg.png b/drivers/bookmarklet/images/icons/Pligg.png
index 1bb774d4e..396c47bd7 100644
Binary files a/drivers/bookmarklet/images/icons/Pligg.png and b/drivers/bookmarklet/images/icons/Pligg.png differ
diff --git a/drivers/bookmarklet/images/icons/Po.st.png b/drivers/bookmarklet/images/icons/Po.st.png
index c1942a159..b523b4caa 100644
Binary files a/drivers/bookmarklet/images/icons/Po.st.png and b/drivers/bookmarklet/images/icons/Po.st.png differ
diff --git a/drivers/bookmarklet/images/icons/RBS Change.png b/drivers/bookmarklet/images/icons/RBS Change.png
index 04db4dc9c..31f73f194 100644
Binary files a/drivers/bookmarklet/images/icons/RBS Change.png and b/drivers/bookmarklet/images/icons/RBS Change.png differ
diff --git a/drivers/bookmarklet/images/icons/RackCache.png b/drivers/bookmarklet/images/icons/RackCache.png
index 67c4b8a23..cac13376d 100644
Binary files a/drivers/bookmarklet/images/icons/RackCache.png and b/drivers/bookmarklet/images/icons/RackCache.png differ
diff --git a/drivers/bookmarklet/images/icons/RoundCube.png b/drivers/bookmarklet/images/icons/RoundCube.png
index 3ce8b6bdd..a767a9712 100644
Binary files a/drivers/bookmarklet/images/icons/RoundCube.png and b/drivers/bookmarklet/images/icons/RoundCube.png differ
diff --git a/drivers/bookmarklet/images/icons/Ruby on Rails.png b/drivers/bookmarklet/images/icons/Ruby on Rails.png
index ca0ca559a..1b252a436 100644
Binary files a/drivers/bookmarklet/images/icons/Ruby on Rails.png and b/drivers/bookmarklet/images/icons/Ruby on Rails.png differ
diff --git a/drivers/bookmarklet/images/icons/SDL Tridion.png b/drivers/bookmarklet/images/icons/SDL Tridion.png
index 760c60644..cc6387bbe 100644
Binary files a/drivers/bookmarklet/images/icons/SDL Tridion.png and b/drivers/bookmarklet/images/icons/SDL Tridion.png differ
diff --git a/drivers/bookmarklet/images/icons/SPDY.png b/drivers/bookmarklet/images/icons/SPDY.png
index 80d6e2239..44b57f929 100644
Binary files a/drivers/bookmarklet/images/icons/SPDY.png and b/drivers/bookmarklet/images/icons/SPDY.png differ
diff --git a/drivers/bookmarklet/images/icons/Shopalize.png b/drivers/bookmarklet/images/icons/Shopalize.png
index cac9cec28..59e65126e 100644
Binary files a/drivers/bookmarklet/images/icons/Shopalize.png and b/drivers/bookmarklet/images/icons/Shopalize.png differ
diff --git a/drivers/bookmarklet/images/icons/SilverStripe.png b/drivers/bookmarklet/images/icons/SilverStripe.png
index df80d7a40..1bee739fe 100644
Binary files a/drivers/bookmarklet/images/icons/SilverStripe.png and b/drivers/bookmarklet/images/icons/SilverStripe.png differ
diff --git a/drivers/bookmarklet/images/icons/Snoobi.png b/drivers/bookmarklet/images/icons/Snoobi.png
index 0f046cb82..c3c2fd16f 100644
Binary files a/drivers/bookmarklet/images/icons/Snoobi.png and b/drivers/bookmarklet/images/icons/Snoobi.png differ
diff --git a/drivers/bookmarklet/images/icons/SoundManager.png b/drivers/bookmarklet/images/icons/SoundManager.png
index 39c954227..41f1321a3 100644
Binary files a/drivers/bookmarklet/images/icons/SoundManager.png and b/drivers/bookmarklet/images/icons/SoundManager.png differ
diff --git a/drivers/bookmarklet/images/icons/Sphinx.png b/drivers/bookmarklet/images/icons/Sphinx.png
index 7cd03a2a5..9d14dbcca 100644
Binary files a/drivers/bookmarklet/images/icons/Sphinx.png and b/drivers/bookmarklet/images/icons/Sphinx.png differ
diff --git a/drivers/bookmarklet/images/icons/SublimeVideo.png b/drivers/bookmarklet/images/icons/SublimeVideo.png
index d118ce5c1..2fce94a5a 100644
Binary files a/drivers/bookmarklet/images/icons/SublimeVideo.png and b/drivers/bookmarklet/images/icons/SublimeVideo.png differ
diff --git a/drivers/bookmarklet/images/icons/Tealeaf.png b/drivers/bookmarklet/images/icons/Tealeaf.png
index 8866a6eb3..f42c32867 100644
Binary files a/drivers/bookmarklet/images/icons/Tealeaf.png and b/drivers/bookmarklet/images/icons/Tealeaf.png differ
diff --git a/drivers/bookmarklet/images/icons/Volusion.png b/drivers/bookmarklet/images/icons/Volusion.png
index 2173dc29d..a5e655b23 100644
Binary files a/drivers/bookmarklet/images/icons/Volusion.png and b/drivers/bookmarklet/images/icons/Volusion.png differ
diff --git a/drivers/bookmarklet/images/icons/W3 Total Cache.png b/drivers/bookmarklet/images/icons/W3 Total Cache.png
index 4c253831f..a6267666c 100644
Binary files a/drivers/bookmarklet/images/icons/W3 Total Cache.png and b/drivers/bookmarklet/images/icons/W3 Total Cache.png differ
diff --git a/drivers/bookmarklet/images/icons/Zinnia.png b/drivers/bookmarklet/images/icons/Zinnia.png
index f6c7f5be6..3c3d7313c 100644
Binary files a/drivers/bookmarklet/images/icons/Zinnia.png and b/drivers/bookmarklet/images/icons/Zinnia.png differ
diff --git a/drivers/bookmarklet/images/icons/blip.tv.png b/drivers/bookmarklet/images/icons/blip.tv.png
index 74c111b7a..34dd8b44f 100644
Binary files a/drivers/bookmarklet/images/icons/blip.tv.png and b/drivers/bookmarklet/images/icons/blip.tv.png differ
diff --git a/drivers/bookmarklet/images/icons/node.js.png b/drivers/bookmarklet/images/icons/node.js.png
index 78894abec..b24da90cb 100644
Binary files a/drivers/bookmarklet/images/icons/node.js.png and b/drivers/bookmarklet/images/icons/node.js.png differ
diff --git a/drivers/bookmarklet/images/icons/phpSQLiteCMS.png b/drivers/bookmarklet/images/icons/phpSQLiteCMS.png
index 05867de64..695f34196 100644
Binary files a/drivers/bookmarklet/images/icons/phpSQLiteCMS.png and b/drivers/bookmarklet/images/icons/phpSQLiteCMS.png differ
diff --git a/drivers/bookmarklet/images/icons/three.js.png b/drivers/bookmarklet/images/icons/three.js.png
index e6376a93e..51614a48c 100644
Binary files a/drivers/bookmarklet/images/icons/three.js.png and b/drivers/bookmarklet/images/icons/three.js.png differ
diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index 34fe66485..71d0a67a0 100644
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -139,13 +139,13 @@
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/confluence",
+			"html": "Powered by <a href=.+atlassian\\.com/software/confluence",
 			"implies": [ "Java" ]
 		},
 		"Atlassian Jira": {
 			"cats": [ 13 ],
 			"env": "^jira$",
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/jira",
+			"html": "Powered by <a href=.+atlassian\\.com/software/jira",
 			"implies": [ "Java" ]
 		},
 		"AWStats": {
@@ -173,8 +173,8 @@
 		"Bigcommerce": {
 			"cats":	[ 6 ],
 			"url": ".+\\.mybigcommerce\\.com",
-			"html": "<link href=\\\"http://cdn[0-9]+\\.bigcommerce\\.com/v",
-			"script": "^http://cdn[0-9]+\\.bigcommerce\\.com/v",
+			"html": "<link href=+cdn\\d+\\.bigcommerce\\.com/v",
+			"script": "cdn\\d+\\.bigcommerce\\.com/v",
 			"env": "compareProducts"
 		},
 		"BigDump": {
@@ -184,8 +184,8 @@
 		},
 		"Bigware": {
 			"cats": [ 6 ],
-			"html": "Diese <a href=\\\"http://www\\.bigware\\.de\\\"|<center>[^<]+<a href=\\\"http://www\\.bigware\\.de[^\\\"]*\\\" target=\\\"_blank\\\">\\s*<u>Shopsoftware\\s*</u>\\s*</a>[^<]+</center>",
-			"url": "(\\?|&)bigWAdminID=[a-z0-9]+(&|$)",
+			"html": "Diese <a href=.+bigware\\.de|<a href=.+/main_bigware_\\d+\\.php",
+			"url": "(\\?|&)bigWAdminID=[a-z\v\d]+(&|$)",
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": [ "PHP" ]
 		},
@@ -293,7 +293,7 @@
 		},
 		"CO2Stats": {
 			"cats": [ 10 ],
-			"html": "src=\\\"http://www\\.co2stats\\.com/propres\\.php"
+			"html": "src=.+co2stats\\.com/propres\\.php"
 		},
 		"CodeIgniter": {
 			"cats": [ 18 ],
@@ -324,7 +324,7 @@
 		},
 		"Contao": {
 			"cats": [ 1, 6 ],
-			"html": "(<!--\\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)",
+			"html": "(<!--.+powered by (TYPOlight|Contao)-->|<link[^>]+(typolight|contao).css)",
 			"implies": [ "PHP" ]
 		},
 		"Contenido": {
@@ -373,22 +373,22 @@
 		"Crazy Egg": {
 			"cats": [ 10 ],
 			"env": "CE2",
-			"script": "cetrk\\.com/pages/scripts/[0-9]+/[0-9]+\\.js"
+			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js"
 		},
 		"Cross Pixel": {
 			"cats": [ 10 ],
 			"env": "^crsspxl$",
-			"script": "http://tag\\.crsspxl\\.com/s1\\.js"
+			"script": "tag\\.crsspxl\\.com/s1\\.js"
 		},
 		"CS Cart": {
 			"cats": [ 6 ],
 			"env": "fn_compare_strings",
-			"html": "&nbsp;Powered by (<a href=.http://www\\.cs-cart\\.com|CS-Cart)",
+			"html": "&nbsp;Powered by (<a href=.+cs-cart\\.com|CS-Cart)",
 			"implies": [ "PHP" ]
 		},
 		"CubeCart": {
 			"cats": [ 6 ],
-			"html": "(Powered by <a href=.http://www\\.cubecart\\.com|<p[^>]+>Powered by CubeCart)",
+			"html": "(Powered by <a href=.+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
 			"meta": { "generator": "cubecart" },
 			"implies": [ "PHP" ]
 		},
@@ -488,7 +488,7 @@
 		"DotNetNuke": {
 			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
-			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
+			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke",
 			"implies": [ "Microsoft ASP.NET" ]
@@ -504,7 +504,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "(jQuery\\.extend\\(Drupal\\.settings, \\{|Drupal\\.extend\\(\\{ settings: \\{|<link[^>]+sites/(default|all)/themes/|<style[^>]+sites/(default|all)/(themes|modules)/)",
+			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -591,7 +591,7 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=\\\"http://flyspray\\.org/\\\")"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=.+flyspray\\.org/\\\")"
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
@@ -613,7 +613,7 @@
 		},
 		"Gambio": {
 			"cats": [ 6 ],
-			"html": "<link+.*[^>] href=\\\"templates/gambio/|<a+.*[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
+			"html": "<link[^>] href=\\\"templates/gambio/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
 			"implies": [ "PHP" ]
 		},
 		"Gauges": {
@@ -652,7 +652,7 @@
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
-			"html": "<link[^>]* href=\\\"http://fonts\\.googleapis\\.com",
+			"html": "<link[^>]* href=.+fonts\\.googleapis\\.com",
 			"env": "^WebFont"
 		},
 		"Google Maps": {
@@ -665,7 +665,7 @@
 		},
 		"Google Tag Manager": {
 			"cats": [ 19 ],
-			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+			"html": "googletagmanager\\.com/ns\\.html[^>]+></iframe>"
 		},
 		"Google Web Toolkit": {
 			"cats": [ 18 ],
@@ -988,12 +988,15 @@
 		},
 		"MODx": {
 			"cats": [ 1 ],
-			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
+			"html": "<a[^>]+>Powered by MODx</a>|<(link|script)[^>]+assets/snippets/",
+			"env": "^MODX_MEDIA_PATH$",
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
+			"implies": [ "PHP" ]
 		},
 		"MoinMoin": {
 			"cats": [ 8 ],
 			"script": "moin.+/common/js/common\\.js",
-			"env": "show_switch2gui",
+			"env": "^show_switch2gui$",
 			"implies":[ "Python" ]
 		},
 		"Mojolicious": {
@@ -1054,7 +1057,7 @@
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
-			"html": "sitestat\\(\\\"http://nl\\.sitestat\\.com"
+			"html": "sitestat\\(\\\".+nl\\.sitestat\\.com"
 		},
 		"Netmonitor": {
 			"cats": [ 10 ],
@@ -1088,11 +1091,11 @@
 		},
 		"OneStat": {
 			"cats": [ 10 ],
-			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
+			"html": "var p==.+stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"html": "index\\.php\\?route=[a-z]+/|Powered By <a href=\\\"[^>]+OpenCart",
 			"implies": [ "PHP" ]
 		},
 		"openEngine": {
@@ -1128,7 +1131,8 @@
 		},
 		"osCommerce": {
 			"cats": [ 6 ],
-			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)"
+			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)",
+			"header": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1136,8 +1140,8 @@
 		},
 		"Outbrain": {
 			"cats": [ 5 ],
-			"html": "var OB_langJS = 'http://widgets\\.outbrain\\.com/lang_",
-			"script": "http://widgets\\.outbrain\\.com/outbrain\\.js",
+			"html": "var OB_langJS = '.+widgets\\.outbrain\\.com/lang_",
+			"script": "widgets\\.outbrain\\.com/outbrain\\.js",
 			"env": "^OutbrainPermaLink$"
 		},
 		"OXID eShop": {
@@ -1245,7 +1249,7 @@
 		},
 		"Plura": {
 			"cats": [ 19 ],
-			"html": "<iframe src=\\\"http://pluraserver\\.com"
+			"html": "<iframe src=\\\".+pluraserver\\.com"
 		},
 		"Po.st": {
 			"cats": [ 5 ],
@@ -1321,7 +1325,7 @@
 		},
 		"Red Hat": {
 			"cats": [ 28 ],
-			"headers": { "Server": "(Red Hat|rhel[0-9]+)", "X-Powered-By": "Red Hat" }
+			"headers": { "Server": "(Red Hat|rhel\\d+)", "X-Powered-By": "Red Hat" }
 		},
 		"Reddit": {
 			"cats": [ 2 ],
@@ -1357,7 +1361,7 @@
 		},
 		"Ruby on Rails": {
 			"cats": [ 18 ],
-			"script": "/assets/application-[a-z0-9]{32}/\\.js",
+			"script": "/assets/application-[a-z\\d]{32}/\\.js",
 			"meta": { "csrf-param": "authenticity_token" },
 			"headers": { "Server": "(mod_rails|mod_rack|Phusion.Passenger)", "X-Powered-By": "(mod_rails|mod_rack|Phusion.Passenger)" },
 			"implies": [ "Ruby" ]
@@ -1456,8 +1460,9 @@
 		},
 		"SobiPro": {
 			"cats":	[ 19 ],
-			"env":	"SobiProUrl",
-			"html":	" <(script|link)[^>].*com_sobipro.*>"
+			"env":	"^SobiProUrl$",
+			"html":	" <(script|link)[^>].*com_sobipro.*>",
+			"implies": [ "Joomla" ]
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1498,11 +1503,11 @@
 		},
 		"Store Systems": {
 			"cats": [ 6 ],
-			"html": "Shopsystem von <a href=\\\"http://www\\.store-systems\\.de\\\"|\\.mws_boxTop"
+			"html": "Shopsystem von <a href=.+store-systems\\.de\\\"|\\.mws_boxTop"
 		},
 		"SublimeVideo": {
 			"cats": [ 14 ],
-			"script": "http://cdn\\.sublimevideo\\.net/js/[a-z0-9]+\\.js",
+			"script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
 			"env": "^sublimevideo$"
 		},
 		"SWFObject": {
@@ -1560,7 +1565,7 @@
 		},
 		"Tumblr": {
 			"cats": [ 11 ],
-			"html": "<iframe src=\\\"http://www\\.tumblr\\.com",
+			"html": "<iframe src=\\\".+tumblr\\.com",
 			"url": "^(www.)?.+\\.tumblr\\.com",
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
@@ -1643,8 +1648,8 @@
 		},
 		"VideoJS": {
 			"cats": [ 14 ],
-			"env": "VideoJS",
-			"html": "<div+class=\\\"video-js+\\\">",
+			"env": "^VideoJS$",
+			"html": "<div.+class=\\\"video-js+\\\">",
 			"script": "zencdn\\.net/c/video\\.js"
 		},
 		"viennaCMS": {
@@ -1822,7 +1827,7 @@
 		},
 		"YUI Doc": {
 			"cats": [ 4 ],
-			"html": "<html[^>]* yuilibrary\\.com/rdf/[0-9.]+/yui\\.rdf"
+			"html": "<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf"
 		},
 		"YUI": {
 			"cats": [ 12 ],
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index 34fe66485..71d0a67a0 100644
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -139,13 +139,13 @@
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/confluence",
+			"html": "Powered by <a href=.+atlassian\\.com/software/confluence",
 			"implies": [ "Java" ]
 		},
 		"Atlassian Jira": {
 			"cats": [ 13 ],
 			"env": "^jira$",
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/jira",
+			"html": "Powered by <a href=.+atlassian\\.com/software/jira",
 			"implies": [ "Java" ]
 		},
 		"AWStats": {
@@ -173,8 +173,8 @@
 		"Bigcommerce": {
 			"cats":	[ 6 ],
 			"url": ".+\\.mybigcommerce\\.com",
-			"html": "<link href=\\\"http://cdn[0-9]+\\.bigcommerce\\.com/v",
-			"script": "^http://cdn[0-9]+\\.bigcommerce\\.com/v",
+			"html": "<link href=+cdn\\d+\\.bigcommerce\\.com/v",
+			"script": "cdn\\d+\\.bigcommerce\\.com/v",
 			"env": "compareProducts"
 		},
 		"BigDump": {
@@ -184,8 +184,8 @@
 		},
 		"Bigware": {
 			"cats": [ 6 ],
-			"html": "Diese <a href=\\\"http://www\\.bigware\\.de\\\"|<center>[^<]+<a href=\\\"http://www\\.bigware\\.de[^\\\"]*\\\" target=\\\"_blank\\\">\\s*<u>Shopsoftware\\s*</u>\\s*</a>[^<]+</center>",
-			"url": "(\\?|&)bigWAdminID=[a-z0-9]+(&|$)",
+			"html": "Diese <a href=.+bigware\\.de|<a href=.+/main_bigware_\\d+\\.php",
+			"url": "(\\?|&)bigWAdminID=[a-z\v\d]+(&|$)",
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": [ "PHP" ]
 		},
@@ -293,7 +293,7 @@
 		},
 		"CO2Stats": {
 			"cats": [ 10 ],
-			"html": "src=\\\"http://www\\.co2stats\\.com/propres\\.php"
+			"html": "src=.+co2stats\\.com/propres\\.php"
 		},
 		"CodeIgniter": {
 			"cats": [ 18 ],
@@ -324,7 +324,7 @@
 		},
 		"Contao": {
 			"cats": [ 1, 6 ],
-			"html": "(<!--\\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)",
+			"html": "(<!--.+powered by (TYPOlight|Contao)-->|<link[^>]+(typolight|contao).css)",
 			"implies": [ "PHP" ]
 		},
 		"Contenido": {
@@ -373,22 +373,22 @@
 		"Crazy Egg": {
 			"cats": [ 10 ],
 			"env": "CE2",
-			"script": "cetrk\\.com/pages/scripts/[0-9]+/[0-9]+\\.js"
+			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js"
 		},
 		"Cross Pixel": {
 			"cats": [ 10 ],
 			"env": "^crsspxl$",
-			"script": "http://tag\\.crsspxl\\.com/s1\\.js"
+			"script": "tag\\.crsspxl\\.com/s1\\.js"
 		},
 		"CS Cart": {
 			"cats": [ 6 ],
 			"env": "fn_compare_strings",
-			"html": "&nbsp;Powered by (<a href=.http://www\\.cs-cart\\.com|CS-Cart)",
+			"html": "&nbsp;Powered by (<a href=.+cs-cart\\.com|CS-Cart)",
 			"implies": [ "PHP" ]
 		},
 		"CubeCart": {
 			"cats": [ 6 ],
-			"html": "(Powered by <a href=.http://www\\.cubecart\\.com|<p[^>]+>Powered by CubeCart)",
+			"html": "(Powered by <a href=.+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
 			"meta": { "generator": "cubecart" },
 			"implies": [ "PHP" ]
 		},
@@ -488,7 +488,7 @@
 		"DotNetNuke": {
 			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
-			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
+			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke",
 			"implies": [ "Microsoft ASP.NET" ]
@@ -504,7 +504,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "(jQuery\\.extend\\(Drupal\\.settings, \\{|Drupal\\.extend\\(\\{ settings: \\{|<link[^>]+sites/(default|all)/themes/|<style[^>]+sites/(default|all)/(themes|modules)/)",
+			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -591,7 +591,7 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=\\\"http://flyspray\\.org/\\\")"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=.+flyspray\\.org/\\\")"
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
@@ -613,7 +613,7 @@
 		},
 		"Gambio": {
 			"cats": [ 6 ],
-			"html": "<link+.*[^>] href=\\\"templates/gambio/|<a+.*[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
+			"html": "<link[^>] href=\\\"templates/gambio/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
 			"implies": [ "PHP" ]
 		},
 		"Gauges": {
@@ -652,7 +652,7 @@
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
-			"html": "<link[^>]* href=\\\"http://fonts\\.googleapis\\.com",
+			"html": "<link[^>]* href=.+fonts\\.googleapis\\.com",
 			"env": "^WebFont"
 		},
 		"Google Maps": {
@@ -665,7 +665,7 @@
 		},
 		"Google Tag Manager": {
 			"cats": [ 19 ],
-			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+			"html": "googletagmanager\\.com/ns\\.html[^>]+></iframe>"
 		},
 		"Google Web Toolkit": {
 			"cats": [ 18 ],
@@ -988,12 +988,15 @@
 		},
 		"MODx": {
 			"cats": [ 1 ],
-			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
+			"html": "<a[^>]+>Powered by MODx</a>|<(link|script)[^>]+assets/snippets/",
+			"env": "^MODX_MEDIA_PATH$",
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
+			"implies": [ "PHP" ]
 		},
 		"MoinMoin": {
 			"cats": [ 8 ],
 			"script": "moin.+/common/js/common\\.js",
-			"env": "show_switch2gui",
+			"env": "^show_switch2gui$",
 			"implies":[ "Python" ]
 		},
 		"Mojolicious": {
@@ -1054,7 +1057,7 @@
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
-			"html": "sitestat\\(\\\"http://nl\\.sitestat\\.com"
+			"html": "sitestat\\(\\\".+nl\\.sitestat\\.com"
 		},
 		"Netmonitor": {
 			"cats": [ 10 ],
@@ -1088,11 +1091,11 @@
 		},
 		"OneStat": {
 			"cats": [ 10 ],
-			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
+			"html": "var p==.+stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"html": "index\\.php\\?route=[a-z]+/|Powered By <a href=\\\"[^>]+OpenCart",
 			"implies": [ "PHP" ]
 		},
 		"openEngine": {
@@ -1128,7 +1131,8 @@
 		},
 		"osCommerce": {
 			"cats": [ 6 ],
-			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)"
+			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)",
+			"header": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1136,8 +1140,8 @@
 		},
 		"Outbrain": {
 			"cats": [ 5 ],
-			"html": "var OB_langJS = 'http://widgets\\.outbrain\\.com/lang_",
-			"script": "http://widgets\\.outbrain\\.com/outbrain\\.js",
+			"html": "var OB_langJS = '.+widgets\\.outbrain\\.com/lang_",
+			"script": "widgets\\.outbrain\\.com/outbrain\\.js",
 			"env": "^OutbrainPermaLink$"
 		},
 		"OXID eShop": {
@@ -1245,7 +1249,7 @@
 		},
 		"Plura": {
 			"cats": [ 19 ],
-			"html": "<iframe src=\\\"http://pluraserver\\.com"
+			"html": "<iframe src=\\\".+pluraserver\\.com"
 		},
 		"Po.st": {
 			"cats": [ 5 ],
@@ -1321,7 +1325,7 @@
 		},
 		"Red Hat": {
 			"cats": [ 28 ],
-			"headers": { "Server": "(Red Hat|rhel[0-9]+)", "X-Powered-By": "Red Hat" }
+			"headers": { "Server": "(Red Hat|rhel\\d+)", "X-Powered-By": "Red Hat" }
 		},
 		"Reddit": {
 			"cats": [ 2 ],
@@ -1357,7 +1361,7 @@
 		},
 		"Ruby on Rails": {
 			"cats": [ 18 ],
-			"script": "/assets/application-[a-z0-9]{32}/\\.js",
+			"script": "/assets/application-[a-z\\d]{32}/\\.js",
 			"meta": { "csrf-param": "authenticity_token" },
 			"headers": { "Server": "(mod_rails|mod_rack|Phusion.Passenger)", "X-Powered-By": "(mod_rails|mod_rack|Phusion.Passenger)" },
 			"implies": [ "Ruby" ]
@@ -1456,8 +1460,9 @@
 		},
 		"SobiPro": {
 			"cats":	[ 19 ],
-			"env":	"SobiProUrl",
-			"html":	" <(script|link)[^>].*com_sobipro.*>"
+			"env":	"^SobiProUrl$",
+			"html":	" <(script|link)[^>].*com_sobipro.*>",
+			"implies": [ "Joomla" ]
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1498,11 +1503,11 @@
 		},
 		"Store Systems": {
 			"cats": [ 6 ],
-			"html": "Shopsystem von <a href=\\\"http://www\\.store-systems\\.de\\\"|\\.mws_boxTop"
+			"html": "Shopsystem von <a href=.+store-systems\\.de\\\"|\\.mws_boxTop"
 		},
 		"SublimeVideo": {
 			"cats": [ 14 ],
-			"script": "http://cdn\\.sublimevideo\\.net/js/[a-z0-9]+\\.js",
+			"script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
 			"env": "^sublimevideo$"
 		},
 		"SWFObject": {
@@ -1560,7 +1565,7 @@
 		},
 		"Tumblr": {
 			"cats": [ 11 ],
-			"html": "<iframe src=\\\"http://www\\.tumblr\\.com",
+			"html": "<iframe src=\\\".+tumblr\\.com",
 			"url": "^(www.)?.+\\.tumblr\\.com",
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
@@ -1643,8 +1648,8 @@
 		},
 		"VideoJS": {
 			"cats": [ 14 ],
-			"env": "VideoJS",
-			"html": "<div+class=\\\"video-js+\\\">",
+			"env": "^VideoJS$",
+			"html": "<div.+class=\\\"video-js+\\\">",
 			"script": "zencdn\\.net/c/video\\.js"
 		},
 		"viennaCMS": {
@@ -1822,7 +1827,7 @@
 		},
 		"YUI Doc": {
 			"cats": [ 4 ],
-			"html": "<html[^>]* yuilibrary\\.com/rdf/[0-9.]+/yui\\.rdf"
+			"html": "<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf"
 		},
 		"YUI": {
 			"cats": [ 12 ],
diff --git a/drivers/chrome/images/icons/3dCart.png b/drivers/chrome/images/icons/3dCart.png
index 09cdd4ddd..b15b56a2f 100644
Binary files a/drivers/chrome/images/icons/3dCart.png and b/drivers/chrome/images/icons/3dCart.png differ
diff --git a/drivers/chrome/images/icons/AMPcms.png b/drivers/chrome/images/icons/AMPcms.png
index a3180de94..0987761e2 100644
Binary files a/drivers/chrome/images/icons/AMPcms.png and b/drivers/chrome/images/icons/AMPcms.png differ
diff --git a/drivers/chrome/images/icons/Accessible Portal.png b/drivers/chrome/images/icons/Accessible Portal.png
index 889f3f3d5..e1cfe569d 100644
Binary files a/drivers/chrome/images/icons/Accessible Portal.png and b/drivers/chrome/images/icons/Accessible Portal.png differ
diff --git a/drivers/chrome/images/icons/AngularJS.png b/drivers/chrome/images/icons/AngularJS.png
index f16ec73c7..182bc7031 100644
Binary files a/drivers/chrome/images/icons/AngularJS.png and b/drivers/chrome/images/icons/AngularJS.png differ
diff --git a/drivers/chrome/images/icons/Apache JSPWiki.png b/drivers/chrome/images/icons/Apache JSPWiki.png
index bb6f654ce..6849f34e7 100644
Binary files a/drivers/chrome/images/icons/Apache JSPWiki.png and b/drivers/chrome/images/icons/Apache JSPWiki.png differ
diff --git a/drivers/chrome/images/icons/Bigcommerce.png b/drivers/chrome/images/icons/Bigcommerce.png
index 08f163065..4b8e89824 100644
Binary files a/drivers/chrome/images/icons/Bigcommerce.png and b/drivers/chrome/images/icons/Bigcommerce.png differ
diff --git a/drivers/chrome/images/icons/CacheFly.png b/drivers/chrome/images/icons/CacheFly.png
index 324ca8024..49a304296 100644
Binary files a/drivers/chrome/images/icons/CacheFly.png and b/drivers/chrome/images/icons/CacheFly.png differ
diff --git a/drivers/chrome/images/icons/CloudFlare.png b/drivers/chrome/images/icons/CloudFlare.png
index 97af7859b..eeb87e02d 100644
Binary files a/drivers/chrome/images/icons/CloudFlare.png and b/drivers/chrome/images/icons/CloudFlare.png differ
diff --git a/drivers/chrome/images/icons/Connect.png b/drivers/chrome/images/icons/Connect.png
index fa700d5dd..994d06c7b 100644
Binary files a/drivers/chrome/images/icons/Connect.png and b/drivers/chrome/images/icons/Connect.png differ
diff --git a/drivers/chrome/images/icons/Cross Pixel.png b/drivers/chrome/images/icons/Cross Pixel.png
index ec6aa782b..7984e3dc0 100644
Binary files a/drivers/chrome/images/icons/Cross Pixel.png and b/drivers/chrome/images/icons/Cross Pixel.png differ
diff --git a/drivers/chrome/images/icons/EdgeCast.png b/drivers/chrome/images/icons/EdgeCast.png
index b7e8d310b..3a281edf2 100644
Binary files a/drivers/chrome/images/icons/EdgeCast.png and b/drivers/chrome/images/icons/EdgeCast.png differ
diff --git a/drivers/chrome/images/icons/GX WebManager.png b/drivers/chrome/images/icons/GX WebManager.png
index d2a221841..186863d27 100644
Binary files a/drivers/chrome/images/icons/GX WebManager.png and b/drivers/chrome/images/icons/GX WebManager.png differ
diff --git a/drivers/chrome/images/icons/GetSimple CMS.png b/drivers/chrome/images/icons/GetSimple CMS.png
index e505082d3..e47ab011f 100644
Binary files a/drivers/chrome/images/icons/GetSimple CMS.png and b/drivers/chrome/images/icons/GetSimple CMS.png differ
diff --git a/drivers/chrome/images/icons/Google Code Prettify.png b/drivers/chrome/images/icons/Google Code Prettify.png
index e183e5b68..198155206 100644
Binary files a/drivers/chrome/images/icons/Google Code Prettify.png and b/drivers/chrome/images/icons/Google Code Prettify.png differ
diff --git a/drivers/chrome/images/icons/Google Tag Manager.png b/drivers/chrome/images/icons/Google Tag Manager.png
index 314352322..1031c9054 100644
Binary files a/drivers/chrome/images/icons/Google Tag Manager.png and b/drivers/chrome/images/icons/Google Tag Manager.png differ
diff --git a/drivers/chrome/images/icons/Google Web Toolkit.png b/drivers/chrome/images/icons/Google Web Toolkit.png
index 4e1240e8f..e53c2a1cd 100644
Binary files a/drivers/chrome/images/icons/Google Web Toolkit.png and b/drivers/chrome/images/icons/Google Web Toolkit.png differ
diff --git a/drivers/chrome/images/icons/Hiawatha.png b/drivers/chrome/images/icons/Hiawatha.png
index 5f2dade9b..0d73677a9 100644
Binary files a/drivers/chrome/images/icons/Hiawatha.png and b/drivers/chrome/images/icons/Hiawatha.png differ
diff --git a/drivers/chrome/images/icons/IBM HTTP Server.png b/drivers/chrome/images/icons/IBM HTTP Server.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/chrome/images/icons/IBM HTTP Server.png and b/drivers/chrome/images/icons/IBM HTTP Server.png differ
diff --git a/drivers/chrome/images/icons/IBM WebSphere Commerce.png b/drivers/chrome/images/icons/IBM WebSphere Commerce.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/chrome/images/icons/IBM WebSphere Commerce.png and b/drivers/chrome/images/icons/IBM WebSphere Commerce.png differ
diff --git a/drivers/chrome/images/icons/IBM WebSphere Portal.png b/drivers/chrome/images/icons/IBM WebSphere Portal.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/chrome/images/icons/IBM WebSphere Portal.png and b/drivers/chrome/images/icons/IBM WebSphere Portal.png differ
diff --git a/drivers/chrome/images/icons/ImpressCMS.png b/drivers/chrome/images/icons/ImpressCMS.png
index bed579348..a61e4a629 100644
Binary files a/drivers/chrome/images/icons/ImpressCMS.png and b/drivers/chrome/images/icons/ImpressCMS.png differ
diff --git a/drivers/chrome/images/icons/Jirafe.png b/drivers/chrome/images/icons/Jirafe.png
index 9945db3d4..32edeafb4 100644
Binary files a/drivers/chrome/images/icons/Jirafe.png and b/drivers/chrome/images/icons/Jirafe.png differ
diff --git a/drivers/chrome/images/icons/KISSmetrics.png b/drivers/chrome/images/icons/KISSmetrics.png
index ed033fb91..ac6c23e5c 100644
Binary files a/drivers/chrome/images/icons/KISSmetrics.png and b/drivers/chrome/images/icons/KISSmetrics.png differ
diff --git a/drivers/chrome/images/icons/LightMon Engine.png b/drivers/chrome/images/icons/LightMon Engine.png
index bdce59d32..ec56e8c2b 100644
Binary files a/drivers/chrome/images/icons/LightMon Engine.png and b/drivers/chrome/images/icons/LightMon Engine.png differ
diff --git a/drivers/chrome/images/icons/LimeSurvey.png b/drivers/chrome/images/icons/LimeSurvey.png
index db0db22b1..8971f2fb1 100644
Binary files a/drivers/chrome/images/icons/LimeSurvey.png and b/drivers/chrome/images/icons/LimeSurvey.png differ
diff --git a/drivers/chrome/images/icons/Marketo.png b/drivers/chrome/images/icons/Marketo.png
index 0a3849289..0a7294c8f 100644
Binary files a/drivers/chrome/images/icons/Marketo.png and b/drivers/chrome/images/icons/Marketo.png differ
diff --git a/drivers/chrome/images/icons/MediaElement.js.png b/drivers/chrome/images/icons/MediaElement.js.png
index 2b7e74bff..f0eaa5d11 100644
Binary files a/drivers/chrome/images/icons/MediaElement.js.png and b/drivers/chrome/images/icons/MediaElement.js.png differ
diff --git a/drivers/chrome/images/icons/New Relic.png b/drivers/chrome/images/icons/New Relic.png
index c5f43470d..3a7c5bc6a 100644
Binary files a/drivers/chrome/images/icons/New Relic.png and b/drivers/chrome/images/icons/New Relic.png differ
diff --git a/drivers/chrome/images/icons/OpenText Web Solutions.png b/drivers/chrome/images/icons/OpenText Web Solutions.png
index 2a27d5762..961a7399b 100644
Binary files a/drivers/chrome/images/icons/OpenText Web Solutions.png and b/drivers/chrome/images/icons/OpenText Web Solutions.png differ
diff --git a/drivers/chrome/images/icons/Outbrain.png b/drivers/chrome/images/icons/Outbrain.png
index 727f064df..bee5a06f2 100644
Binary files a/drivers/chrome/images/icons/Outbrain.png and b/drivers/chrome/images/icons/Outbrain.png differ
diff --git a/drivers/chrome/images/icons/Pligg.png b/drivers/chrome/images/icons/Pligg.png
index 1bb774d4e..396c47bd7 100644
Binary files a/drivers/chrome/images/icons/Pligg.png and b/drivers/chrome/images/icons/Pligg.png differ
diff --git a/drivers/chrome/images/icons/Po.st.png b/drivers/chrome/images/icons/Po.st.png
index c1942a159..b523b4caa 100644
Binary files a/drivers/chrome/images/icons/Po.st.png and b/drivers/chrome/images/icons/Po.st.png differ
diff --git a/drivers/chrome/images/icons/RBS Change.png b/drivers/chrome/images/icons/RBS Change.png
index 04db4dc9c..31f73f194 100644
Binary files a/drivers/chrome/images/icons/RBS Change.png and b/drivers/chrome/images/icons/RBS Change.png differ
diff --git a/drivers/chrome/images/icons/RackCache.png b/drivers/chrome/images/icons/RackCache.png
index 67c4b8a23..cac13376d 100644
Binary files a/drivers/chrome/images/icons/RackCache.png and b/drivers/chrome/images/icons/RackCache.png differ
diff --git a/drivers/chrome/images/icons/RoundCube.png b/drivers/chrome/images/icons/RoundCube.png
index 3ce8b6bdd..a767a9712 100644
Binary files a/drivers/chrome/images/icons/RoundCube.png and b/drivers/chrome/images/icons/RoundCube.png differ
diff --git a/drivers/chrome/images/icons/Ruby on Rails.png b/drivers/chrome/images/icons/Ruby on Rails.png
index ca0ca559a..1b252a436 100644
Binary files a/drivers/chrome/images/icons/Ruby on Rails.png and b/drivers/chrome/images/icons/Ruby on Rails.png differ
diff --git a/drivers/chrome/images/icons/SDL Tridion.png b/drivers/chrome/images/icons/SDL Tridion.png
index 760c60644..cc6387bbe 100644
Binary files a/drivers/chrome/images/icons/SDL Tridion.png and b/drivers/chrome/images/icons/SDL Tridion.png differ
diff --git a/drivers/chrome/images/icons/SPDY.png b/drivers/chrome/images/icons/SPDY.png
index 80d6e2239..44b57f929 100644
Binary files a/drivers/chrome/images/icons/SPDY.png and b/drivers/chrome/images/icons/SPDY.png differ
diff --git a/drivers/chrome/images/icons/Shopalize.png b/drivers/chrome/images/icons/Shopalize.png
index cac9cec28..59e65126e 100644
Binary files a/drivers/chrome/images/icons/Shopalize.png and b/drivers/chrome/images/icons/Shopalize.png differ
diff --git a/drivers/chrome/images/icons/SilverStripe.png b/drivers/chrome/images/icons/SilverStripe.png
index df80d7a40..1bee739fe 100644
Binary files a/drivers/chrome/images/icons/SilverStripe.png and b/drivers/chrome/images/icons/SilverStripe.png differ
diff --git a/drivers/chrome/images/icons/Snoobi.png b/drivers/chrome/images/icons/Snoobi.png
index 0f046cb82..c3c2fd16f 100644
Binary files a/drivers/chrome/images/icons/Snoobi.png and b/drivers/chrome/images/icons/Snoobi.png differ
diff --git a/drivers/chrome/images/icons/SoundManager.png b/drivers/chrome/images/icons/SoundManager.png
index 39c954227..41f1321a3 100644
Binary files a/drivers/chrome/images/icons/SoundManager.png and b/drivers/chrome/images/icons/SoundManager.png differ
diff --git a/drivers/chrome/images/icons/Sphinx.png b/drivers/chrome/images/icons/Sphinx.png
index 7cd03a2a5..9d14dbcca 100644
Binary files a/drivers/chrome/images/icons/Sphinx.png and b/drivers/chrome/images/icons/Sphinx.png differ
diff --git a/drivers/chrome/images/icons/SublimeVideo.png b/drivers/chrome/images/icons/SublimeVideo.png
index d118ce5c1..2fce94a5a 100644
Binary files a/drivers/chrome/images/icons/SublimeVideo.png and b/drivers/chrome/images/icons/SublimeVideo.png differ
diff --git a/drivers/chrome/images/icons/Tealeaf.png b/drivers/chrome/images/icons/Tealeaf.png
index 8866a6eb3..f42c32867 100644
Binary files a/drivers/chrome/images/icons/Tealeaf.png and b/drivers/chrome/images/icons/Tealeaf.png differ
diff --git a/drivers/chrome/images/icons/Volusion.png b/drivers/chrome/images/icons/Volusion.png
index 2173dc29d..a5e655b23 100644
Binary files a/drivers/chrome/images/icons/Volusion.png and b/drivers/chrome/images/icons/Volusion.png differ
diff --git a/drivers/chrome/images/icons/W3 Total Cache.png b/drivers/chrome/images/icons/W3 Total Cache.png
index 4c253831f..a6267666c 100644
Binary files a/drivers/chrome/images/icons/W3 Total Cache.png and b/drivers/chrome/images/icons/W3 Total Cache.png differ
diff --git a/drivers/chrome/images/icons/Zinnia.png b/drivers/chrome/images/icons/Zinnia.png
index f6c7f5be6..3c3d7313c 100644
Binary files a/drivers/chrome/images/icons/Zinnia.png and b/drivers/chrome/images/icons/Zinnia.png differ
diff --git a/drivers/chrome/images/icons/blip.tv.png b/drivers/chrome/images/icons/blip.tv.png
index 74c111b7a..34dd8b44f 100644
Binary files a/drivers/chrome/images/icons/blip.tv.png and b/drivers/chrome/images/icons/blip.tv.png differ
diff --git a/drivers/chrome/images/icons/node.js.png b/drivers/chrome/images/icons/node.js.png
index 78894abec..b24da90cb 100644
Binary files a/drivers/chrome/images/icons/node.js.png and b/drivers/chrome/images/icons/node.js.png differ
diff --git a/drivers/chrome/images/icons/phpSQLiteCMS.png b/drivers/chrome/images/icons/phpSQLiteCMS.png
index 05867de64..695f34196 100644
Binary files a/drivers/chrome/images/icons/phpSQLiteCMS.png and b/drivers/chrome/images/icons/phpSQLiteCMS.png differ
diff --git a/drivers/chrome/images/icons/three.js.png b/drivers/chrome/images/icons/three.js.png
index e6376a93e..51614a48c 100644
Binary files a/drivers/chrome/images/icons/three.js.png and b/drivers/chrome/images/icons/three.js.png differ
diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index 34fe66485..71d0a67a0 100644
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -139,13 +139,13 @@
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/confluence",
+			"html": "Powered by <a href=.+atlassian\\.com/software/confluence",
 			"implies": [ "Java" ]
 		},
 		"Atlassian Jira": {
 			"cats": [ 13 ],
 			"env": "^jira$",
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/jira",
+			"html": "Powered by <a href=.+atlassian\\.com/software/jira",
 			"implies": [ "Java" ]
 		},
 		"AWStats": {
@@ -173,8 +173,8 @@
 		"Bigcommerce": {
 			"cats":	[ 6 ],
 			"url": ".+\\.mybigcommerce\\.com",
-			"html": "<link href=\\\"http://cdn[0-9]+\\.bigcommerce\\.com/v",
-			"script": "^http://cdn[0-9]+\\.bigcommerce\\.com/v",
+			"html": "<link href=+cdn\\d+\\.bigcommerce\\.com/v",
+			"script": "cdn\\d+\\.bigcommerce\\.com/v",
 			"env": "compareProducts"
 		},
 		"BigDump": {
@@ -184,8 +184,8 @@
 		},
 		"Bigware": {
 			"cats": [ 6 ],
-			"html": "Diese <a href=\\\"http://www\\.bigware\\.de\\\"|<center>[^<]+<a href=\\\"http://www\\.bigware\\.de[^\\\"]*\\\" target=\\\"_blank\\\">\\s*<u>Shopsoftware\\s*</u>\\s*</a>[^<]+</center>",
-			"url": "(\\?|&)bigWAdminID=[a-z0-9]+(&|$)",
+			"html": "Diese <a href=.+bigware\\.de|<a href=.+/main_bigware_\\d+\\.php",
+			"url": "(\\?|&)bigWAdminID=[a-z\v\d]+(&|$)",
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": [ "PHP" ]
 		},
@@ -293,7 +293,7 @@
 		},
 		"CO2Stats": {
 			"cats": [ 10 ],
-			"html": "src=\\\"http://www\\.co2stats\\.com/propres\\.php"
+			"html": "src=.+co2stats\\.com/propres\\.php"
 		},
 		"CodeIgniter": {
 			"cats": [ 18 ],
@@ -324,7 +324,7 @@
 		},
 		"Contao": {
 			"cats": [ 1, 6 ],
-			"html": "(<!--\\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)",
+			"html": "(<!--.+powered by (TYPOlight|Contao)-->|<link[^>]+(typolight|contao).css)",
 			"implies": [ "PHP" ]
 		},
 		"Contenido": {
@@ -373,22 +373,22 @@
 		"Crazy Egg": {
 			"cats": [ 10 ],
 			"env": "CE2",
-			"script": "cetrk\\.com/pages/scripts/[0-9]+/[0-9]+\\.js"
+			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js"
 		},
 		"Cross Pixel": {
 			"cats": [ 10 ],
 			"env": "^crsspxl$",
-			"script": "http://tag\\.crsspxl\\.com/s1\\.js"
+			"script": "tag\\.crsspxl\\.com/s1\\.js"
 		},
 		"CS Cart": {
 			"cats": [ 6 ],
 			"env": "fn_compare_strings",
-			"html": "&nbsp;Powered by (<a href=.http://www\\.cs-cart\\.com|CS-Cart)",
+			"html": "&nbsp;Powered by (<a href=.+cs-cart\\.com|CS-Cart)",
 			"implies": [ "PHP" ]
 		},
 		"CubeCart": {
 			"cats": [ 6 ],
-			"html": "(Powered by <a href=.http://www\\.cubecart\\.com|<p[^>]+>Powered by CubeCart)",
+			"html": "(Powered by <a href=.+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
 			"meta": { "generator": "cubecart" },
 			"implies": [ "PHP" ]
 		},
@@ -488,7 +488,7 @@
 		"DotNetNuke": {
 			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
-			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
+			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke",
 			"implies": [ "Microsoft ASP.NET" ]
@@ -504,7 +504,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "(jQuery\\.extend\\(Drupal\\.settings, \\{|Drupal\\.extend\\(\\{ settings: \\{|<link[^>]+sites/(default|all)/themes/|<style[^>]+sites/(default|all)/(themes|modules)/)",
+			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -591,7 +591,7 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=\\\"http://flyspray\\.org/\\\")"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=.+flyspray\\.org/\\\")"
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
@@ -613,7 +613,7 @@
 		},
 		"Gambio": {
 			"cats": [ 6 ],
-			"html": "<link+.*[^>] href=\\\"templates/gambio/|<a+.*[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
+			"html": "<link[^>] href=\\\"templates/gambio/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
 			"implies": [ "PHP" ]
 		},
 		"Gauges": {
@@ -652,7 +652,7 @@
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
-			"html": "<link[^>]* href=\\\"http://fonts\\.googleapis\\.com",
+			"html": "<link[^>]* href=.+fonts\\.googleapis\\.com",
 			"env": "^WebFont"
 		},
 		"Google Maps": {
@@ -665,7 +665,7 @@
 		},
 		"Google Tag Manager": {
 			"cats": [ 19 ],
-			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+			"html": "googletagmanager\\.com/ns\\.html[^>]+></iframe>"
 		},
 		"Google Web Toolkit": {
 			"cats": [ 18 ],
@@ -988,12 +988,15 @@
 		},
 		"MODx": {
 			"cats": [ 1 ],
-			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
+			"html": "<a[^>]+>Powered by MODx</a>|<(link|script)[^>]+assets/snippets/",
+			"env": "^MODX_MEDIA_PATH$",
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
+			"implies": [ "PHP" ]
 		},
 		"MoinMoin": {
 			"cats": [ 8 ],
 			"script": "moin.+/common/js/common\\.js",
-			"env": "show_switch2gui",
+			"env": "^show_switch2gui$",
 			"implies":[ "Python" ]
 		},
 		"Mojolicious": {
@@ -1054,7 +1057,7 @@
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
-			"html": "sitestat\\(\\\"http://nl\\.sitestat\\.com"
+			"html": "sitestat\\(\\\".+nl\\.sitestat\\.com"
 		},
 		"Netmonitor": {
 			"cats": [ 10 ],
@@ -1088,11 +1091,11 @@
 		},
 		"OneStat": {
 			"cats": [ 10 ],
-			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
+			"html": "var p==.+stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"html": "index\\.php\\?route=[a-z]+/|Powered By <a href=\\\"[^>]+OpenCart",
 			"implies": [ "PHP" ]
 		},
 		"openEngine": {
@@ -1128,7 +1131,8 @@
 		},
 		"osCommerce": {
 			"cats": [ 6 ],
-			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)"
+			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)",
+			"header": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1136,8 +1140,8 @@
 		},
 		"Outbrain": {
 			"cats": [ 5 ],
-			"html": "var OB_langJS = 'http://widgets\\.outbrain\\.com/lang_",
-			"script": "http://widgets\\.outbrain\\.com/outbrain\\.js",
+			"html": "var OB_langJS = '.+widgets\\.outbrain\\.com/lang_",
+			"script": "widgets\\.outbrain\\.com/outbrain\\.js",
 			"env": "^OutbrainPermaLink$"
 		},
 		"OXID eShop": {
@@ -1245,7 +1249,7 @@
 		},
 		"Plura": {
 			"cats": [ 19 ],
-			"html": "<iframe src=\\\"http://pluraserver\\.com"
+			"html": "<iframe src=\\\".+pluraserver\\.com"
 		},
 		"Po.st": {
 			"cats": [ 5 ],
@@ -1321,7 +1325,7 @@
 		},
 		"Red Hat": {
 			"cats": [ 28 ],
-			"headers": { "Server": "(Red Hat|rhel[0-9]+)", "X-Powered-By": "Red Hat" }
+			"headers": { "Server": "(Red Hat|rhel\\d+)", "X-Powered-By": "Red Hat" }
 		},
 		"Reddit": {
 			"cats": [ 2 ],
@@ -1357,7 +1361,7 @@
 		},
 		"Ruby on Rails": {
 			"cats": [ 18 ],
-			"script": "/assets/application-[a-z0-9]{32}/\\.js",
+			"script": "/assets/application-[a-z\\d]{32}/\\.js",
 			"meta": { "csrf-param": "authenticity_token" },
 			"headers": { "Server": "(mod_rails|mod_rack|Phusion.Passenger)", "X-Powered-By": "(mod_rails|mod_rack|Phusion.Passenger)" },
 			"implies": [ "Ruby" ]
@@ -1456,8 +1460,9 @@
 		},
 		"SobiPro": {
 			"cats":	[ 19 ],
-			"env":	"SobiProUrl",
-			"html":	" <(script|link)[^>].*com_sobipro.*>"
+			"env":	"^SobiProUrl$",
+			"html":	" <(script|link)[^>].*com_sobipro.*>",
+			"implies": [ "Joomla" ]
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1498,11 +1503,11 @@
 		},
 		"Store Systems": {
 			"cats": [ 6 ],
-			"html": "Shopsystem von <a href=\\\"http://www\\.store-systems\\.de\\\"|\\.mws_boxTop"
+			"html": "Shopsystem von <a href=.+store-systems\\.de\\\"|\\.mws_boxTop"
 		},
 		"SublimeVideo": {
 			"cats": [ 14 ],
-			"script": "http://cdn\\.sublimevideo\\.net/js/[a-z0-9]+\\.js",
+			"script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
 			"env": "^sublimevideo$"
 		},
 		"SWFObject": {
@@ -1560,7 +1565,7 @@
 		},
 		"Tumblr": {
 			"cats": [ 11 ],
-			"html": "<iframe src=\\\"http://www\\.tumblr\\.com",
+			"html": "<iframe src=\\\".+tumblr\\.com",
 			"url": "^(www.)?.+\\.tumblr\\.com",
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
@@ -1643,8 +1648,8 @@
 		},
 		"VideoJS": {
 			"cats": [ 14 ],
-			"env": "VideoJS",
-			"html": "<div+class=\\\"video-js+\\\">",
+			"env": "^VideoJS$",
+			"html": "<div.+class=\\\"video-js+\\\">",
 			"script": "zencdn\\.net/c/video\\.js"
 		},
 		"viennaCMS": {
@@ -1822,7 +1827,7 @@
 		},
 		"YUI Doc": {
 			"cats": [ 4 ],
-			"html": "<html[^>]* yuilibrary\\.com/rdf/[0-9.]+/yui\\.rdf"
+			"html": "<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf"
 		},
 		"YUI": {
 			"cats": [ 12 ],
diff --git a/drivers/firefox-jetpack/images/icons/3dCart.png b/drivers/firefox-jetpack/images/icons/3dCart.png
index 09cdd4ddd..b15b56a2f 100644
Binary files a/drivers/firefox-jetpack/images/icons/3dCart.png and b/drivers/firefox-jetpack/images/icons/3dCart.png differ
diff --git a/drivers/firefox-jetpack/images/icons/AMPcms.png b/drivers/firefox-jetpack/images/icons/AMPcms.png
index a3180de94..0987761e2 100644
Binary files a/drivers/firefox-jetpack/images/icons/AMPcms.png and b/drivers/firefox-jetpack/images/icons/AMPcms.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Accessible Portal.png b/drivers/firefox-jetpack/images/icons/Accessible Portal.png
index 889f3f3d5..e1cfe569d 100644
Binary files a/drivers/firefox-jetpack/images/icons/Accessible Portal.png and b/drivers/firefox-jetpack/images/icons/Accessible Portal.png differ
diff --git a/drivers/firefox-jetpack/images/icons/AngularJS.png b/drivers/firefox-jetpack/images/icons/AngularJS.png
index f16ec73c7..182bc7031 100644
Binary files a/drivers/firefox-jetpack/images/icons/AngularJS.png and b/drivers/firefox-jetpack/images/icons/AngularJS.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Apache JSPWiki.png b/drivers/firefox-jetpack/images/icons/Apache JSPWiki.png
index bb6f654ce..6849f34e7 100644
Binary files a/drivers/firefox-jetpack/images/icons/Apache JSPWiki.png and b/drivers/firefox-jetpack/images/icons/Apache JSPWiki.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Bigcommerce.png b/drivers/firefox-jetpack/images/icons/Bigcommerce.png
index 08f163065..4b8e89824 100644
Binary files a/drivers/firefox-jetpack/images/icons/Bigcommerce.png and b/drivers/firefox-jetpack/images/icons/Bigcommerce.png differ
diff --git a/drivers/firefox-jetpack/images/icons/CacheFly.png b/drivers/firefox-jetpack/images/icons/CacheFly.png
index 324ca8024..49a304296 100644
Binary files a/drivers/firefox-jetpack/images/icons/CacheFly.png and b/drivers/firefox-jetpack/images/icons/CacheFly.png differ
diff --git a/drivers/firefox-jetpack/images/icons/CloudFlare.png b/drivers/firefox-jetpack/images/icons/CloudFlare.png
index 97af7859b..eeb87e02d 100644
Binary files a/drivers/firefox-jetpack/images/icons/CloudFlare.png and b/drivers/firefox-jetpack/images/icons/CloudFlare.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Connect.png b/drivers/firefox-jetpack/images/icons/Connect.png
index fa700d5dd..994d06c7b 100644
Binary files a/drivers/firefox-jetpack/images/icons/Connect.png and b/drivers/firefox-jetpack/images/icons/Connect.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Cross Pixel.png b/drivers/firefox-jetpack/images/icons/Cross Pixel.png
index ec6aa782b..7984e3dc0 100644
Binary files a/drivers/firefox-jetpack/images/icons/Cross Pixel.png and b/drivers/firefox-jetpack/images/icons/Cross Pixel.png differ
diff --git a/drivers/firefox-jetpack/images/icons/EdgeCast.png b/drivers/firefox-jetpack/images/icons/EdgeCast.png
index b7e8d310b..3a281edf2 100644
Binary files a/drivers/firefox-jetpack/images/icons/EdgeCast.png and b/drivers/firefox-jetpack/images/icons/EdgeCast.png differ
diff --git a/drivers/firefox-jetpack/images/icons/GX WebManager.png b/drivers/firefox-jetpack/images/icons/GX WebManager.png
index d2a221841..186863d27 100644
Binary files a/drivers/firefox-jetpack/images/icons/GX WebManager.png and b/drivers/firefox-jetpack/images/icons/GX WebManager.png differ
diff --git a/drivers/firefox-jetpack/images/icons/GetSimple CMS.png b/drivers/firefox-jetpack/images/icons/GetSimple CMS.png
index e505082d3..e47ab011f 100644
Binary files a/drivers/firefox-jetpack/images/icons/GetSimple CMS.png and b/drivers/firefox-jetpack/images/icons/GetSimple CMS.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Google Code Prettify.png b/drivers/firefox-jetpack/images/icons/Google Code Prettify.png
index e183e5b68..198155206 100644
Binary files a/drivers/firefox-jetpack/images/icons/Google Code Prettify.png and b/drivers/firefox-jetpack/images/icons/Google Code Prettify.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Google Tag Manager.png b/drivers/firefox-jetpack/images/icons/Google Tag Manager.png
index 314352322..1031c9054 100644
Binary files a/drivers/firefox-jetpack/images/icons/Google Tag Manager.png and b/drivers/firefox-jetpack/images/icons/Google Tag Manager.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Google Web Toolkit.png b/drivers/firefox-jetpack/images/icons/Google Web Toolkit.png
index 4e1240e8f..e53c2a1cd 100644
Binary files a/drivers/firefox-jetpack/images/icons/Google Web Toolkit.png and b/drivers/firefox-jetpack/images/icons/Google Web Toolkit.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Hiawatha.png b/drivers/firefox-jetpack/images/icons/Hiawatha.png
index 5f2dade9b..0d73677a9 100644
Binary files a/drivers/firefox-jetpack/images/icons/Hiawatha.png and b/drivers/firefox-jetpack/images/icons/Hiawatha.png differ
diff --git a/drivers/firefox-jetpack/images/icons/IBM HTTP Server.png b/drivers/firefox-jetpack/images/icons/IBM HTTP Server.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/firefox-jetpack/images/icons/IBM HTTP Server.png and b/drivers/firefox-jetpack/images/icons/IBM HTTP Server.png differ
diff --git a/drivers/firefox-jetpack/images/icons/IBM WebSphere Commerce.png b/drivers/firefox-jetpack/images/icons/IBM WebSphere Commerce.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/firefox-jetpack/images/icons/IBM WebSphere Commerce.png and b/drivers/firefox-jetpack/images/icons/IBM WebSphere Commerce.png differ
diff --git a/drivers/firefox-jetpack/images/icons/IBM WebSphere Portal.png b/drivers/firefox-jetpack/images/icons/IBM WebSphere Portal.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/firefox-jetpack/images/icons/IBM WebSphere Portal.png and b/drivers/firefox-jetpack/images/icons/IBM WebSphere Portal.png differ
diff --git a/drivers/firefox-jetpack/images/icons/ImpressCMS.png b/drivers/firefox-jetpack/images/icons/ImpressCMS.png
index bed579348..a61e4a629 100644
Binary files a/drivers/firefox-jetpack/images/icons/ImpressCMS.png and b/drivers/firefox-jetpack/images/icons/ImpressCMS.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Jirafe.png b/drivers/firefox-jetpack/images/icons/Jirafe.png
index 9945db3d4..32edeafb4 100644
Binary files a/drivers/firefox-jetpack/images/icons/Jirafe.png and b/drivers/firefox-jetpack/images/icons/Jirafe.png differ
diff --git a/drivers/firefox-jetpack/images/icons/KISSmetrics.png b/drivers/firefox-jetpack/images/icons/KISSmetrics.png
index ed033fb91..ac6c23e5c 100644
Binary files a/drivers/firefox-jetpack/images/icons/KISSmetrics.png and b/drivers/firefox-jetpack/images/icons/KISSmetrics.png differ
diff --git a/drivers/firefox-jetpack/images/icons/LightMon Engine.png b/drivers/firefox-jetpack/images/icons/LightMon Engine.png
index bdce59d32..ec56e8c2b 100644
Binary files a/drivers/firefox-jetpack/images/icons/LightMon Engine.png and b/drivers/firefox-jetpack/images/icons/LightMon Engine.png differ
diff --git a/drivers/firefox-jetpack/images/icons/LimeSurvey.png b/drivers/firefox-jetpack/images/icons/LimeSurvey.png
index db0db22b1..8971f2fb1 100644
Binary files a/drivers/firefox-jetpack/images/icons/LimeSurvey.png and b/drivers/firefox-jetpack/images/icons/LimeSurvey.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Marketo.png b/drivers/firefox-jetpack/images/icons/Marketo.png
index 0a3849289..0a7294c8f 100644
Binary files a/drivers/firefox-jetpack/images/icons/Marketo.png and b/drivers/firefox-jetpack/images/icons/Marketo.png differ
diff --git a/drivers/firefox-jetpack/images/icons/MediaElement.js.png b/drivers/firefox-jetpack/images/icons/MediaElement.js.png
index 2b7e74bff..f0eaa5d11 100644
Binary files a/drivers/firefox-jetpack/images/icons/MediaElement.js.png and b/drivers/firefox-jetpack/images/icons/MediaElement.js.png differ
diff --git a/drivers/firefox-jetpack/images/icons/New Relic.png b/drivers/firefox-jetpack/images/icons/New Relic.png
index c5f43470d..3a7c5bc6a 100644
Binary files a/drivers/firefox-jetpack/images/icons/New Relic.png and b/drivers/firefox-jetpack/images/icons/New Relic.png differ
diff --git a/drivers/firefox-jetpack/images/icons/OpenText Web Solutions.png b/drivers/firefox-jetpack/images/icons/OpenText Web Solutions.png
index 2a27d5762..961a7399b 100644
Binary files a/drivers/firefox-jetpack/images/icons/OpenText Web Solutions.png and b/drivers/firefox-jetpack/images/icons/OpenText Web Solutions.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Outbrain.png b/drivers/firefox-jetpack/images/icons/Outbrain.png
index 727f064df..bee5a06f2 100644
Binary files a/drivers/firefox-jetpack/images/icons/Outbrain.png and b/drivers/firefox-jetpack/images/icons/Outbrain.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Pligg.png b/drivers/firefox-jetpack/images/icons/Pligg.png
index 1bb774d4e..396c47bd7 100644
Binary files a/drivers/firefox-jetpack/images/icons/Pligg.png and b/drivers/firefox-jetpack/images/icons/Pligg.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Po.st.png b/drivers/firefox-jetpack/images/icons/Po.st.png
index c1942a159..b523b4caa 100644
Binary files a/drivers/firefox-jetpack/images/icons/Po.st.png and b/drivers/firefox-jetpack/images/icons/Po.st.png differ
diff --git a/drivers/firefox-jetpack/images/icons/RBS Change.png b/drivers/firefox-jetpack/images/icons/RBS Change.png
index 04db4dc9c..31f73f194 100644
Binary files a/drivers/firefox-jetpack/images/icons/RBS Change.png and b/drivers/firefox-jetpack/images/icons/RBS Change.png differ
diff --git a/drivers/firefox-jetpack/images/icons/RackCache.png b/drivers/firefox-jetpack/images/icons/RackCache.png
index 67c4b8a23..cac13376d 100644
Binary files a/drivers/firefox-jetpack/images/icons/RackCache.png and b/drivers/firefox-jetpack/images/icons/RackCache.png differ
diff --git a/drivers/firefox-jetpack/images/icons/RoundCube.png b/drivers/firefox-jetpack/images/icons/RoundCube.png
index 3ce8b6bdd..a767a9712 100644
Binary files a/drivers/firefox-jetpack/images/icons/RoundCube.png and b/drivers/firefox-jetpack/images/icons/RoundCube.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Ruby on Rails.png b/drivers/firefox-jetpack/images/icons/Ruby on Rails.png
index ca0ca559a..1b252a436 100644
Binary files a/drivers/firefox-jetpack/images/icons/Ruby on Rails.png and b/drivers/firefox-jetpack/images/icons/Ruby on Rails.png differ
diff --git a/drivers/firefox-jetpack/images/icons/SDL Tridion.png b/drivers/firefox-jetpack/images/icons/SDL Tridion.png
index 760c60644..cc6387bbe 100644
Binary files a/drivers/firefox-jetpack/images/icons/SDL Tridion.png and b/drivers/firefox-jetpack/images/icons/SDL Tridion.png differ
diff --git a/drivers/firefox-jetpack/images/icons/SPDY.png b/drivers/firefox-jetpack/images/icons/SPDY.png
index 80d6e2239..44b57f929 100644
Binary files a/drivers/firefox-jetpack/images/icons/SPDY.png and b/drivers/firefox-jetpack/images/icons/SPDY.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Shopalize.png b/drivers/firefox-jetpack/images/icons/Shopalize.png
index cac9cec28..59e65126e 100644
Binary files a/drivers/firefox-jetpack/images/icons/Shopalize.png and b/drivers/firefox-jetpack/images/icons/Shopalize.png differ
diff --git a/drivers/firefox-jetpack/images/icons/SilverStripe.png b/drivers/firefox-jetpack/images/icons/SilverStripe.png
index df80d7a40..1bee739fe 100644
Binary files a/drivers/firefox-jetpack/images/icons/SilverStripe.png and b/drivers/firefox-jetpack/images/icons/SilverStripe.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Snoobi.png b/drivers/firefox-jetpack/images/icons/Snoobi.png
index 0f046cb82..c3c2fd16f 100644
Binary files a/drivers/firefox-jetpack/images/icons/Snoobi.png and b/drivers/firefox-jetpack/images/icons/Snoobi.png differ
diff --git a/drivers/firefox-jetpack/images/icons/SoundManager.png b/drivers/firefox-jetpack/images/icons/SoundManager.png
index 39c954227..41f1321a3 100644
Binary files a/drivers/firefox-jetpack/images/icons/SoundManager.png and b/drivers/firefox-jetpack/images/icons/SoundManager.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Sphinx.png b/drivers/firefox-jetpack/images/icons/Sphinx.png
index 7cd03a2a5..9d14dbcca 100644
Binary files a/drivers/firefox-jetpack/images/icons/Sphinx.png and b/drivers/firefox-jetpack/images/icons/Sphinx.png differ
diff --git a/drivers/firefox-jetpack/images/icons/SublimeVideo.png b/drivers/firefox-jetpack/images/icons/SublimeVideo.png
index d118ce5c1..2fce94a5a 100644
Binary files a/drivers/firefox-jetpack/images/icons/SublimeVideo.png and b/drivers/firefox-jetpack/images/icons/SublimeVideo.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Tealeaf.png b/drivers/firefox-jetpack/images/icons/Tealeaf.png
index 8866a6eb3..f42c32867 100644
Binary files a/drivers/firefox-jetpack/images/icons/Tealeaf.png and b/drivers/firefox-jetpack/images/icons/Tealeaf.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Volusion.png b/drivers/firefox-jetpack/images/icons/Volusion.png
index 2173dc29d..a5e655b23 100644
Binary files a/drivers/firefox-jetpack/images/icons/Volusion.png and b/drivers/firefox-jetpack/images/icons/Volusion.png differ
diff --git a/drivers/firefox-jetpack/images/icons/W3 Total Cache.png b/drivers/firefox-jetpack/images/icons/W3 Total Cache.png
index 4c253831f..a6267666c 100644
Binary files a/drivers/firefox-jetpack/images/icons/W3 Total Cache.png and b/drivers/firefox-jetpack/images/icons/W3 Total Cache.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Zinnia.png b/drivers/firefox-jetpack/images/icons/Zinnia.png
index f6c7f5be6..3c3d7313c 100644
Binary files a/drivers/firefox-jetpack/images/icons/Zinnia.png and b/drivers/firefox-jetpack/images/icons/Zinnia.png differ
diff --git a/drivers/firefox-jetpack/images/icons/blip.tv.png b/drivers/firefox-jetpack/images/icons/blip.tv.png
index 74c111b7a..34dd8b44f 100644
Binary files a/drivers/firefox-jetpack/images/icons/blip.tv.png and b/drivers/firefox-jetpack/images/icons/blip.tv.png differ
diff --git a/drivers/firefox-jetpack/images/icons/node.js.png b/drivers/firefox-jetpack/images/icons/node.js.png
index 78894abec..b24da90cb 100644
Binary files a/drivers/firefox-jetpack/images/icons/node.js.png and b/drivers/firefox-jetpack/images/icons/node.js.png differ
diff --git a/drivers/firefox-jetpack/images/icons/phpSQLiteCMS.png b/drivers/firefox-jetpack/images/icons/phpSQLiteCMS.png
index 05867de64..695f34196 100644
Binary files a/drivers/firefox-jetpack/images/icons/phpSQLiteCMS.png and b/drivers/firefox-jetpack/images/icons/phpSQLiteCMS.png differ
diff --git a/drivers/firefox-jetpack/images/icons/three.js.png b/drivers/firefox-jetpack/images/icons/three.js.png
index e6376a93e..51614a48c 100644
Binary files a/drivers/firefox-jetpack/images/icons/three.js.png and b/drivers/firefox-jetpack/images/icons/three.js.png differ
diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index 34fe66485..71d0a67a0 100644
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -139,13 +139,13 @@
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/confluence",
+			"html": "Powered by <a href=.+atlassian\\.com/software/confluence",
 			"implies": [ "Java" ]
 		},
 		"Atlassian Jira": {
 			"cats": [ 13 ],
 			"env": "^jira$",
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/jira",
+			"html": "Powered by <a href=.+atlassian\\.com/software/jira",
 			"implies": [ "Java" ]
 		},
 		"AWStats": {
@@ -173,8 +173,8 @@
 		"Bigcommerce": {
 			"cats":	[ 6 ],
 			"url": ".+\\.mybigcommerce\\.com",
-			"html": "<link href=\\\"http://cdn[0-9]+\\.bigcommerce\\.com/v",
-			"script": "^http://cdn[0-9]+\\.bigcommerce\\.com/v",
+			"html": "<link href=+cdn\\d+\\.bigcommerce\\.com/v",
+			"script": "cdn\\d+\\.bigcommerce\\.com/v",
 			"env": "compareProducts"
 		},
 		"BigDump": {
@@ -184,8 +184,8 @@
 		},
 		"Bigware": {
 			"cats": [ 6 ],
-			"html": "Diese <a href=\\\"http://www\\.bigware\\.de\\\"|<center>[^<]+<a href=\\\"http://www\\.bigware\\.de[^\\\"]*\\\" target=\\\"_blank\\\">\\s*<u>Shopsoftware\\s*</u>\\s*</a>[^<]+</center>",
-			"url": "(\\?|&)bigWAdminID=[a-z0-9]+(&|$)",
+			"html": "Diese <a href=.+bigware\\.de|<a href=.+/main_bigware_\\d+\\.php",
+			"url": "(\\?|&)bigWAdminID=[a-z\v\d]+(&|$)",
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": [ "PHP" ]
 		},
@@ -293,7 +293,7 @@
 		},
 		"CO2Stats": {
 			"cats": [ 10 ],
-			"html": "src=\\\"http://www\\.co2stats\\.com/propres\\.php"
+			"html": "src=.+co2stats\\.com/propres\\.php"
 		},
 		"CodeIgniter": {
 			"cats": [ 18 ],
@@ -324,7 +324,7 @@
 		},
 		"Contao": {
 			"cats": [ 1, 6 ],
-			"html": "(<!--\\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)",
+			"html": "(<!--.+powered by (TYPOlight|Contao)-->|<link[^>]+(typolight|contao).css)",
 			"implies": [ "PHP" ]
 		},
 		"Contenido": {
@@ -373,22 +373,22 @@
 		"Crazy Egg": {
 			"cats": [ 10 ],
 			"env": "CE2",
-			"script": "cetrk\\.com/pages/scripts/[0-9]+/[0-9]+\\.js"
+			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js"
 		},
 		"Cross Pixel": {
 			"cats": [ 10 ],
 			"env": "^crsspxl$",
-			"script": "http://tag\\.crsspxl\\.com/s1\\.js"
+			"script": "tag\\.crsspxl\\.com/s1\\.js"
 		},
 		"CS Cart": {
 			"cats": [ 6 ],
 			"env": "fn_compare_strings",
-			"html": "&nbsp;Powered by (<a href=.http://www\\.cs-cart\\.com|CS-Cart)",
+			"html": "&nbsp;Powered by (<a href=.+cs-cart\\.com|CS-Cart)",
 			"implies": [ "PHP" ]
 		},
 		"CubeCart": {
 			"cats": [ 6 ],
-			"html": "(Powered by <a href=.http://www\\.cubecart\\.com|<p[^>]+>Powered by CubeCart)",
+			"html": "(Powered by <a href=.+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
 			"meta": { "generator": "cubecart" },
 			"implies": [ "PHP" ]
 		},
@@ -488,7 +488,7 @@
 		"DotNetNuke": {
 			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
-			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
+			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke",
 			"implies": [ "Microsoft ASP.NET" ]
@@ -504,7 +504,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "(jQuery\\.extend\\(Drupal\\.settings, \\{|Drupal\\.extend\\(\\{ settings: \\{|<link[^>]+sites/(default|all)/themes/|<style[^>]+sites/(default|all)/(themes|modules)/)",
+			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -591,7 +591,7 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=\\\"http://flyspray\\.org/\\\")"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=.+flyspray\\.org/\\\")"
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
@@ -613,7 +613,7 @@
 		},
 		"Gambio": {
 			"cats": [ 6 ],
-			"html": "<link+.*[^>] href=\\\"templates/gambio/|<a+.*[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
+			"html": "<link[^>] href=\\\"templates/gambio/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
 			"implies": [ "PHP" ]
 		},
 		"Gauges": {
@@ -652,7 +652,7 @@
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
-			"html": "<link[^>]* href=\\\"http://fonts\\.googleapis\\.com",
+			"html": "<link[^>]* href=.+fonts\\.googleapis\\.com",
 			"env": "^WebFont"
 		},
 		"Google Maps": {
@@ -665,7 +665,7 @@
 		},
 		"Google Tag Manager": {
 			"cats": [ 19 ],
-			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+			"html": "googletagmanager\\.com/ns\\.html[^>]+></iframe>"
 		},
 		"Google Web Toolkit": {
 			"cats": [ 18 ],
@@ -988,12 +988,15 @@
 		},
 		"MODx": {
 			"cats": [ 1 ],
-			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
+			"html": "<a[^>]+>Powered by MODx</a>|<(link|script)[^>]+assets/snippets/",
+			"env": "^MODX_MEDIA_PATH$",
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
+			"implies": [ "PHP" ]
 		},
 		"MoinMoin": {
 			"cats": [ 8 ],
 			"script": "moin.+/common/js/common\\.js",
-			"env": "show_switch2gui",
+			"env": "^show_switch2gui$",
 			"implies":[ "Python" ]
 		},
 		"Mojolicious": {
@@ -1054,7 +1057,7 @@
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
-			"html": "sitestat\\(\\\"http://nl\\.sitestat\\.com"
+			"html": "sitestat\\(\\\".+nl\\.sitestat\\.com"
 		},
 		"Netmonitor": {
 			"cats": [ 10 ],
@@ -1088,11 +1091,11 @@
 		},
 		"OneStat": {
 			"cats": [ 10 ],
-			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
+			"html": "var p==.+stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"html": "index\\.php\\?route=[a-z]+/|Powered By <a href=\\\"[^>]+OpenCart",
 			"implies": [ "PHP" ]
 		},
 		"openEngine": {
@@ -1128,7 +1131,8 @@
 		},
 		"osCommerce": {
 			"cats": [ 6 ],
-			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)"
+			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)",
+			"header": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1136,8 +1140,8 @@
 		},
 		"Outbrain": {
 			"cats": [ 5 ],
-			"html": "var OB_langJS = 'http://widgets\\.outbrain\\.com/lang_",
-			"script": "http://widgets\\.outbrain\\.com/outbrain\\.js",
+			"html": "var OB_langJS = '.+widgets\\.outbrain\\.com/lang_",
+			"script": "widgets\\.outbrain\\.com/outbrain\\.js",
 			"env": "^OutbrainPermaLink$"
 		},
 		"OXID eShop": {
@@ -1245,7 +1249,7 @@
 		},
 		"Plura": {
 			"cats": [ 19 ],
-			"html": "<iframe src=\\\"http://pluraserver\\.com"
+			"html": "<iframe src=\\\".+pluraserver\\.com"
 		},
 		"Po.st": {
 			"cats": [ 5 ],
@@ -1321,7 +1325,7 @@
 		},
 		"Red Hat": {
 			"cats": [ 28 ],
-			"headers": { "Server": "(Red Hat|rhel[0-9]+)", "X-Powered-By": "Red Hat" }
+			"headers": { "Server": "(Red Hat|rhel\\d+)", "X-Powered-By": "Red Hat" }
 		},
 		"Reddit": {
 			"cats": [ 2 ],
@@ -1357,7 +1361,7 @@
 		},
 		"Ruby on Rails": {
 			"cats": [ 18 ],
-			"script": "/assets/application-[a-z0-9]{32}/\\.js",
+			"script": "/assets/application-[a-z\\d]{32}/\\.js",
 			"meta": { "csrf-param": "authenticity_token" },
 			"headers": { "Server": "(mod_rails|mod_rack|Phusion.Passenger)", "X-Powered-By": "(mod_rails|mod_rack|Phusion.Passenger)" },
 			"implies": [ "Ruby" ]
@@ -1456,8 +1460,9 @@
 		},
 		"SobiPro": {
 			"cats":	[ 19 ],
-			"env":	"SobiProUrl",
-			"html":	" <(script|link)[^>].*com_sobipro.*>"
+			"env":	"^SobiProUrl$",
+			"html":	" <(script|link)[^>].*com_sobipro.*>",
+			"implies": [ "Joomla" ]
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1498,11 +1503,11 @@
 		},
 		"Store Systems": {
 			"cats": [ 6 ],
-			"html": "Shopsystem von <a href=\\\"http://www\\.store-systems\\.de\\\"|\\.mws_boxTop"
+			"html": "Shopsystem von <a href=.+store-systems\\.de\\\"|\\.mws_boxTop"
 		},
 		"SublimeVideo": {
 			"cats": [ 14 ],
-			"script": "http://cdn\\.sublimevideo\\.net/js/[a-z0-9]+\\.js",
+			"script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
 			"env": "^sublimevideo$"
 		},
 		"SWFObject": {
@@ -1560,7 +1565,7 @@
 		},
 		"Tumblr": {
 			"cats": [ 11 ],
-			"html": "<iframe src=\\\"http://www\\.tumblr\\.com",
+			"html": "<iframe src=\\\".+tumblr\\.com",
 			"url": "^(www.)?.+\\.tumblr\\.com",
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
@@ -1643,8 +1648,8 @@
 		},
 		"VideoJS": {
 			"cats": [ 14 ],
-			"env": "VideoJS",
-			"html": "<div+class=\\\"video-js+\\\">",
+			"env": "^VideoJS$",
+			"html": "<div.+class=\\\"video-js+\\\">",
 			"script": "zencdn\\.net/c/video\\.js"
 		},
 		"viennaCMS": {
@@ -1822,7 +1827,7 @@
 		},
 		"YUI Doc": {
 			"cats": [ 4 ],
-			"html": "<html[^>]* yuilibrary\\.com/rdf/[0-9.]+/yui\\.rdf"
+			"html": "<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf"
 		},
 		"YUI": {
 			"cats": [ 12 ],
diff --git a/drivers/firefox/skin/images/icons/3dCart.png b/drivers/firefox/skin/images/icons/3dCart.png
index 09cdd4ddd..b15b56a2f 100644
Binary files a/drivers/firefox/skin/images/icons/3dCart.png and b/drivers/firefox/skin/images/icons/3dCart.png differ
diff --git a/drivers/firefox/skin/images/icons/AMPcms.png b/drivers/firefox/skin/images/icons/AMPcms.png
index a3180de94..0987761e2 100644
Binary files a/drivers/firefox/skin/images/icons/AMPcms.png and b/drivers/firefox/skin/images/icons/AMPcms.png differ
diff --git a/drivers/firefox/skin/images/icons/Accessible Portal.png b/drivers/firefox/skin/images/icons/Accessible Portal.png
index 889f3f3d5..e1cfe569d 100644
Binary files a/drivers/firefox/skin/images/icons/Accessible Portal.png and b/drivers/firefox/skin/images/icons/Accessible Portal.png differ
diff --git a/drivers/firefox/skin/images/icons/AngularJS.png b/drivers/firefox/skin/images/icons/AngularJS.png
index f16ec73c7..182bc7031 100644
Binary files a/drivers/firefox/skin/images/icons/AngularJS.png and b/drivers/firefox/skin/images/icons/AngularJS.png differ
diff --git a/drivers/firefox/skin/images/icons/Apache JSPWiki.png b/drivers/firefox/skin/images/icons/Apache JSPWiki.png
index bb6f654ce..6849f34e7 100644
Binary files a/drivers/firefox/skin/images/icons/Apache JSPWiki.png and b/drivers/firefox/skin/images/icons/Apache JSPWiki.png differ
diff --git a/drivers/firefox/skin/images/icons/Bigcommerce.png b/drivers/firefox/skin/images/icons/Bigcommerce.png
index 08f163065..4b8e89824 100644
Binary files a/drivers/firefox/skin/images/icons/Bigcommerce.png and b/drivers/firefox/skin/images/icons/Bigcommerce.png differ
diff --git a/drivers/firefox/skin/images/icons/CacheFly.png b/drivers/firefox/skin/images/icons/CacheFly.png
index 324ca8024..49a304296 100644
Binary files a/drivers/firefox/skin/images/icons/CacheFly.png and b/drivers/firefox/skin/images/icons/CacheFly.png differ
diff --git a/drivers/firefox/skin/images/icons/CloudFlare.png b/drivers/firefox/skin/images/icons/CloudFlare.png
index 97af7859b..eeb87e02d 100644
Binary files a/drivers/firefox/skin/images/icons/CloudFlare.png and b/drivers/firefox/skin/images/icons/CloudFlare.png differ
diff --git a/drivers/firefox/skin/images/icons/Connect.png b/drivers/firefox/skin/images/icons/Connect.png
index fa700d5dd..994d06c7b 100644
Binary files a/drivers/firefox/skin/images/icons/Connect.png and b/drivers/firefox/skin/images/icons/Connect.png differ
diff --git a/drivers/firefox/skin/images/icons/Cross Pixel.png b/drivers/firefox/skin/images/icons/Cross Pixel.png
index ec6aa782b..7984e3dc0 100644
Binary files a/drivers/firefox/skin/images/icons/Cross Pixel.png and b/drivers/firefox/skin/images/icons/Cross Pixel.png differ
diff --git a/drivers/firefox/skin/images/icons/EdgeCast.png b/drivers/firefox/skin/images/icons/EdgeCast.png
index b7e8d310b..3a281edf2 100644
Binary files a/drivers/firefox/skin/images/icons/EdgeCast.png and b/drivers/firefox/skin/images/icons/EdgeCast.png differ
diff --git a/drivers/firefox/skin/images/icons/GX WebManager.png b/drivers/firefox/skin/images/icons/GX WebManager.png
index d2a221841..186863d27 100644
Binary files a/drivers/firefox/skin/images/icons/GX WebManager.png and b/drivers/firefox/skin/images/icons/GX WebManager.png differ
diff --git a/drivers/firefox/skin/images/icons/GetSimple CMS.png b/drivers/firefox/skin/images/icons/GetSimple CMS.png
index e505082d3..e47ab011f 100644
Binary files a/drivers/firefox/skin/images/icons/GetSimple CMS.png and b/drivers/firefox/skin/images/icons/GetSimple CMS.png differ
diff --git a/drivers/firefox/skin/images/icons/Google Code Prettify.png b/drivers/firefox/skin/images/icons/Google Code Prettify.png
index e183e5b68..198155206 100644
Binary files a/drivers/firefox/skin/images/icons/Google Code Prettify.png and b/drivers/firefox/skin/images/icons/Google Code Prettify.png differ
diff --git a/drivers/firefox/skin/images/icons/Google Tag Manager.png b/drivers/firefox/skin/images/icons/Google Tag Manager.png
index 314352322..1031c9054 100644
Binary files a/drivers/firefox/skin/images/icons/Google Tag Manager.png and b/drivers/firefox/skin/images/icons/Google Tag Manager.png differ
diff --git a/drivers/firefox/skin/images/icons/Google Web Toolkit.png b/drivers/firefox/skin/images/icons/Google Web Toolkit.png
index 4e1240e8f..e53c2a1cd 100644
Binary files a/drivers/firefox/skin/images/icons/Google Web Toolkit.png and b/drivers/firefox/skin/images/icons/Google Web Toolkit.png differ
diff --git a/drivers/firefox/skin/images/icons/Hiawatha.png b/drivers/firefox/skin/images/icons/Hiawatha.png
index 5f2dade9b..0d73677a9 100644
Binary files a/drivers/firefox/skin/images/icons/Hiawatha.png and b/drivers/firefox/skin/images/icons/Hiawatha.png differ
diff --git a/drivers/firefox/skin/images/icons/IBM HTTP Server.png b/drivers/firefox/skin/images/icons/IBM HTTP Server.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/firefox/skin/images/icons/IBM HTTP Server.png and b/drivers/firefox/skin/images/icons/IBM HTTP Server.png differ
diff --git a/drivers/firefox/skin/images/icons/IBM WebSphere Commerce.png b/drivers/firefox/skin/images/icons/IBM WebSphere Commerce.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/firefox/skin/images/icons/IBM WebSphere Commerce.png and b/drivers/firefox/skin/images/icons/IBM WebSphere Commerce.png differ
diff --git a/drivers/firefox/skin/images/icons/IBM WebSphere Portal.png b/drivers/firefox/skin/images/icons/IBM WebSphere Portal.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/firefox/skin/images/icons/IBM WebSphere Portal.png and b/drivers/firefox/skin/images/icons/IBM WebSphere Portal.png differ
diff --git a/drivers/firefox/skin/images/icons/ImpressCMS.png b/drivers/firefox/skin/images/icons/ImpressCMS.png
index bed579348..a61e4a629 100644
Binary files a/drivers/firefox/skin/images/icons/ImpressCMS.png and b/drivers/firefox/skin/images/icons/ImpressCMS.png differ
diff --git a/drivers/firefox/skin/images/icons/Jirafe.png b/drivers/firefox/skin/images/icons/Jirafe.png
index 9945db3d4..32edeafb4 100644
Binary files a/drivers/firefox/skin/images/icons/Jirafe.png and b/drivers/firefox/skin/images/icons/Jirafe.png differ
diff --git a/drivers/firefox/skin/images/icons/KISSmetrics.png b/drivers/firefox/skin/images/icons/KISSmetrics.png
index ed033fb91..ac6c23e5c 100644
Binary files a/drivers/firefox/skin/images/icons/KISSmetrics.png and b/drivers/firefox/skin/images/icons/KISSmetrics.png differ
diff --git a/drivers/firefox/skin/images/icons/LightMon Engine.png b/drivers/firefox/skin/images/icons/LightMon Engine.png
index bdce59d32..ec56e8c2b 100644
Binary files a/drivers/firefox/skin/images/icons/LightMon Engine.png and b/drivers/firefox/skin/images/icons/LightMon Engine.png differ
diff --git a/drivers/firefox/skin/images/icons/LimeSurvey.png b/drivers/firefox/skin/images/icons/LimeSurvey.png
index db0db22b1..8971f2fb1 100644
Binary files a/drivers/firefox/skin/images/icons/LimeSurvey.png and b/drivers/firefox/skin/images/icons/LimeSurvey.png differ
diff --git a/drivers/firefox/skin/images/icons/Marketo.png b/drivers/firefox/skin/images/icons/Marketo.png
index 0a3849289..0a7294c8f 100644
Binary files a/drivers/firefox/skin/images/icons/Marketo.png and b/drivers/firefox/skin/images/icons/Marketo.png differ
diff --git a/drivers/firefox/skin/images/icons/MediaElement.js.png b/drivers/firefox/skin/images/icons/MediaElement.js.png
index 2b7e74bff..f0eaa5d11 100644
Binary files a/drivers/firefox/skin/images/icons/MediaElement.js.png and b/drivers/firefox/skin/images/icons/MediaElement.js.png differ
diff --git a/drivers/firefox/skin/images/icons/New Relic.png b/drivers/firefox/skin/images/icons/New Relic.png
index c5f43470d..3a7c5bc6a 100644
Binary files a/drivers/firefox/skin/images/icons/New Relic.png and b/drivers/firefox/skin/images/icons/New Relic.png differ
diff --git a/drivers/firefox/skin/images/icons/OpenText Web Solutions.png b/drivers/firefox/skin/images/icons/OpenText Web Solutions.png
index 2a27d5762..961a7399b 100644
Binary files a/drivers/firefox/skin/images/icons/OpenText Web Solutions.png and b/drivers/firefox/skin/images/icons/OpenText Web Solutions.png differ
diff --git a/drivers/firefox/skin/images/icons/Outbrain.png b/drivers/firefox/skin/images/icons/Outbrain.png
index 727f064df..bee5a06f2 100644
Binary files a/drivers/firefox/skin/images/icons/Outbrain.png and b/drivers/firefox/skin/images/icons/Outbrain.png differ
diff --git a/drivers/firefox/skin/images/icons/Pligg.png b/drivers/firefox/skin/images/icons/Pligg.png
index 1bb774d4e..396c47bd7 100644
Binary files a/drivers/firefox/skin/images/icons/Pligg.png and b/drivers/firefox/skin/images/icons/Pligg.png differ
diff --git a/drivers/firefox/skin/images/icons/Po.st.png b/drivers/firefox/skin/images/icons/Po.st.png
index c1942a159..b523b4caa 100644
Binary files a/drivers/firefox/skin/images/icons/Po.st.png and b/drivers/firefox/skin/images/icons/Po.st.png differ
diff --git a/drivers/firefox/skin/images/icons/RBS Change.png b/drivers/firefox/skin/images/icons/RBS Change.png
index 04db4dc9c..31f73f194 100644
Binary files a/drivers/firefox/skin/images/icons/RBS Change.png and b/drivers/firefox/skin/images/icons/RBS Change.png differ
diff --git a/drivers/firefox/skin/images/icons/RackCache.png b/drivers/firefox/skin/images/icons/RackCache.png
index 67c4b8a23..cac13376d 100644
Binary files a/drivers/firefox/skin/images/icons/RackCache.png and b/drivers/firefox/skin/images/icons/RackCache.png differ
diff --git a/drivers/firefox/skin/images/icons/ReallyCMS.png b/drivers/firefox/skin/images/icons/ReallyCMS.png
new file mode 100644
index 000000000..4ff082f41
Binary files /dev/null and b/drivers/firefox/skin/images/icons/ReallyCMS.png differ
diff --git a/drivers/firefox/skin/images/icons/RoundCube.png b/drivers/firefox/skin/images/icons/RoundCube.png
index 3ce8b6bdd..a767a9712 100644
Binary files a/drivers/firefox/skin/images/icons/RoundCube.png and b/drivers/firefox/skin/images/icons/RoundCube.png differ
diff --git a/drivers/firefox/skin/images/icons/Ruby on Rails.png b/drivers/firefox/skin/images/icons/Ruby on Rails.png
index ca0ca559a..1b252a436 100644
Binary files a/drivers/firefox/skin/images/icons/Ruby on Rails.png and b/drivers/firefox/skin/images/icons/Ruby on Rails.png differ
diff --git a/drivers/firefox/skin/images/icons/SDL Tridion.png b/drivers/firefox/skin/images/icons/SDL Tridion.png
index 760c60644..cc6387bbe 100644
Binary files a/drivers/firefox/skin/images/icons/SDL Tridion.png and b/drivers/firefox/skin/images/icons/SDL Tridion.png differ
diff --git a/drivers/firefox/skin/images/icons/SPDY.png b/drivers/firefox/skin/images/icons/SPDY.png
index 80d6e2239..44b57f929 100644
Binary files a/drivers/firefox/skin/images/icons/SPDY.png and b/drivers/firefox/skin/images/icons/SPDY.png differ
diff --git a/drivers/firefox/skin/images/icons/Shopalize.png b/drivers/firefox/skin/images/icons/Shopalize.png
index cac9cec28..59e65126e 100644
Binary files a/drivers/firefox/skin/images/icons/Shopalize.png and b/drivers/firefox/skin/images/icons/Shopalize.png differ
diff --git a/drivers/firefox/skin/images/icons/SilverStripe.png b/drivers/firefox/skin/images/icons/SilverStripe.png
index df80d7a40..1bee739fe 100644
Binary files a/drivers/firefox/skin/images/icons/SilverStripe.png and b/drivers/firefox/skin/images/icons/SilverStripe.png differ
diff --git a/drivers/firefox/skin/images/icons/Snoobi.png b/drivers/firefox/skin/images/icons/Snoobi.png
index 0f046cb82..c3c2fd16f 100644
Binary files a/drivers/firefox/skin/images/icons/Snoobi.png and b/drivers/firefox/skin/images/icons/Snoobi.png differ
diff --git a/drivers/firefox/skin/images/icons/SoundManager.png b/drivers/firefox/skin/images/icons/SoundManager.png
index 39c954227..41f1321a3 100644
Binary files a/drivers/firefox/skin/images/icons/SoundManager.png and b/drivers/firefox/skin/images/icons/SoundManager.png differ
diff --git a/drivers/firefox/skin/images/icons/Sphinx.png b/drivers/firefox/skin/images/icons/Sphinx.png
index 7cd03a2a5..9d14dbcca 100644
Binary files a/drivers/firefox/skin/images/icons/Sphinx.png and b/drivers/firefox/skin/images/icons/Sphinx.png differ
diff --git a/drivers/firefox/skin/images/icons/SublimeVideo.png b/drivers/firefox/skin/images/icons/SublimeVideo.png
index d118ce5c1..2fce94a5a 100644
Binary files a/drivers/firefox/skin/images/icons/SublimeVideo.png and b/drivers/firefox/skin/images/icons/SublimeVideo.png differ
diff --git a/drivers/firefox/skin/images/icons/Tealeaf.png b/drivers/firefox/skin/images/icons/Tealeaf.png
index 8866a6eb3..f42c32867 100644
Binary files a/drivers/firefox/skin/images/icons/Tealeaf.png and b/drivers/firefox/skin/images/icons/Tealeaf.png differ
diff --git a/drivers/firefox/skin/images/icons/Volusion.png b/drivers/firefox/skin/images/icons/Volusion.png
index 2173dc29d..a5e655b23 100644
Binary files a/drivers/firefox/skin/images/icons/Volusion.png and b/drivers/firefox/skin/images/icons/Volusion.png differ
diff --git a/drivers/firefox/skin/images/icons/W3 Total Cache.png b/drivers/firefox/skin/images/icons/W3 Total Cache.png
index 4c253831f..a6267666c 100644
Binary files a/drivers/firefox/skin/images/icons/W3 Total Cache.png and b/drivers/firefox/skin/images/icons/W3 Total Cache.png differ
diff --git a/drivers/firefox/skin/images/icons/Zinnia.png b/drivers/firefox/skin/images/icons/Zinnia.png
index f6c7f5be6..3c3d7313c 100644
Binary files a/drivers/firefox/skin/images/icons/Zinnia.png and b/drivers/firefox/skin/images/icons/Zinnia.png differ
diff --git a/drivers/firefox/skin/images/icons/blip.tv.png b/drivers/firefox/skin/images/icons/blip.tv.png
index 74c111b7a..34dd8b44f 100644
Binary files a/drivers/firefox/skin/images/icons/blip.tv.png and b/drivers/firefox/skin/images/icons/blip.tv.png differ
diff --git a/drivers/firefox/skin/images/icons/node.js.png b/drivers/firefox/skin/images/icons/node.js.png
index 78894abec..b24da90cb 100644
Binary files a/drivers/firefox/skin/images/icons/node.js.png and b/drivers/firefox/skin/images/icons/node.js.png differ
diff --git a/drivers/firefox/skin/images/icons/phpSQLiteCMS.png b/drivers/firefox/skin/images/icons/phpSQLiteCMS.png
index 05867de64..695f34196 100644
Binary files a/drivers/firefox/skin/images/icons/phpSQLiteCMS.png and b/drivers/firefox/skin/images/icons/phpSQLiteCMS.png differ
diff --git a/drivers/firefox/skin/images/icons/three.js.png b/drivers/firefox/skin/images/icons/three.js.png
index e6376a93e..51614a48c 100644
Binary files a/drivers/firefox/skin/images/icons/three.js.png and b/drivers/firefox/skin/images/icons/three.js.png differ
diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index 34fe66485..71d0a67a0 100644
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -139,13 +139,13 @@
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/confluence",
+			"html": "Powered by <a href=.+atlassian\\.com/software/confluence",
 			"implies": [ "Java" ]
 		},
 		"Atlassian Jira": {
 			"cats": [ 13 ],
 			"env": "^jira$",
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/jira",
+			"html": "Powered by <a href=.+atlassian\\.com/software/jira",
 			"implies": [ "Java" ]
 		},
 		"AWStats": {
@@ -173,8 +173,8 @@
 		"Bigcommerce": {
 			"cats":	[ 6 ],
 			"url": ".+\\.mybigcommerce\\.com",
-			"html": "<link href=\\\"http://cdn[0-9]+\\.bigcommerce\\.com/v",
-			"script": "^http://cdn[0-9]+\\.bigcommerce\\.com/v",
+			"html": "<link href=+cdn\\d+\\.bigcommerce\\.com/v",
+			"script": "cdn\\d+\\.bigcommerce\\.com/v",
 			"env": "compareProducts"
 		},
 		"BigDump": {
@@ -184,8 +184,8 @@
 		},
 		"Bigware": {
 			"cats": [ 6 ],
-			"html": "Diese <a href=\\\"http://www\\.bigware\\.de\\\"|<center>[^<]+<a href=\\\"http://www\\.bigware\\.de[^\\\"]*\\\" target=\\\"_blank\\\">\\s*<u>Shopsoftware\\s*</u>\\s*</a>[^<]+</center>",
-			"url": "(\\?|&)bigWAdminID=[a-z0-9]+(&|$)",
+			"html": "Diese <a href=.+bigware\\.de|<a href=.+/main_bigware_\\d+\\.php",
+			"url": "(\\?|&)bigWAdminID=[a-z\v\d]+(&|$)",
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": [ "PHP" ]
 		},
@@ -293,7 +293,7 @@
 		},
 		"CO2Stats": {
 			"cats": [ 10 ],
-			"html": "src=\\\"http://www\\.co2stats\\.com/propres\\.php"
+			"html": "src=.+co2stats\\.com/propres\\.php"
 		},
 		"CodeIgniter": {
 			"cats": [ 18 ],
@@ -324,7 +324,7 @@
 		},
 		"Contao": {
 			"cats": [ 1, 6 ],
-			"html": "(<!--\\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)",
+			"html": "(<!--.+powered by (TYPOlight|Contao)-->|<link[^>]+(typolight|contao).css)",
 			"implies": [ "PHP" ]
 		},
 		"Contenido": {
@@ -373,22 +373,22 @@
 		"Crazy Egg": {
 			"cats": [ 10 ],
 			"env": "CE2",
-			"script": "cetrk\\.com/pages/scripts/[0-9]+/[0-9]+\\.js"
+			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js"
 		},
 		"Cross Pixel": {
 			"cats": [ 10 ],
 			"env": "^crsspxl$",
-			"script": "http://tag\\.crsspxl\\.com/s1\\.js"
+			"script": "tag\\.crsspxl\\.com/s1\\.js"
 		},
 		"CS Cart": {
 			"cats": [ 6 ],
 			"env": "fn_compare_strings",
-			"html": "&nbsp;Powered by (<a href=.http://www\\.cs-cart\\.com|CS-Cart)",
+			"html": "&nbsp;Powered by (<a href=.+cs-cart\\.com|CS-Cart)",
 			"implies": [ "PHP" ]
 		},
 		"CubeCart": {
 			"cats": [ 6 ],
-			"html": "(Powered by <a href=.http://www\\.cubecart\\.com|<p[^>]+>Powered by CubeCart)",
+			"html": "(Powered by <a href=.+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
 			"meta": { "generator": "cubecart" },
 			"implies": [ "PHP" ]
 		},
@@ -488,7 +488,7 @@
 		"DotNetNuke": {
 			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
-			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
+			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke",
 			"implies": [ "Microsoft ASP.NET" ]
@@ -504,7 +504,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "(jQuery\\.extend\\(Drupal\\.settings, \\{|Drupal\\.extend\\(\\{ settings: \\{|<link[^>]+sites/(default|all)/themes/|<style[^>]+sites/(default|all)/(themes|modules)/)",
+			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -591,7 +591,7 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=\\\"http://flyspray\\.org/\\\")"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=.+flyspray\\.org/\\\")"
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
@@ -613,7 +613,7 @@
 		},
 		"Gambio": {
 			"cats": [ 6 ],
-			"html": "<link+.*[^>] href=\\\"templates/gambio/|<a+.*[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
+			"html": "<link[^>] href=\\\"templates/gambio/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
 			"implies": [ "PHP" ]
 		},
 		"Gauges": {
@@ -652,7 +652,7 @@
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
-			"html": "<link[^>]* href=\\\"http://fonts\\.googleapis\\.com",
+			"html": "<link[^>]* href=.+fonts\\.googleapis\\.com",
 			"env": "^WebFont"
 		},
 		"Google Maps": {
@@ -665,7 +665,7 @@
 		},
 		"Google Tag Manager": {
 			"cats": [ 19 ],
-			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+			"html": "googletagmanager\\.com/ns\\.html[^>]+></iframe>"
 		},
 		"Google Web Toolkit": {
 			"cats": [ 18 ],
@@ -988,12 +988,15 @@
 		},
 		"MODx": {
 			"cats": [ 1 ],
-			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
+			"html": "<a[^>]+>Powered by MODx</a>|<(link|script)[^>]+assets/snippets/",
+			"env": "^MODX_MEDIA_PATH$",
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
+			"implies": [ "PHP" ]
 		},
 		"MoinMoin": {
 			"cats": [ 8 ],
 			"script": "moin.+/common/js/common\\.js",
-			"env": "show_switch2gui",
+			"env": "^show_switch2gui$",
 			"implies":[ "Python" ]
 		},
 		"Mojolicious": {
@@ -1054,7 +1057,7 @@
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
-			"html": "sitestat\\(\\\"http://nl\\.sitestat\\.com"
+			"html": "sitestat\\(\\\".+nl\\.sitestat\\.com"
 		},
 		"Netmonitor": {
 			"cats": [ 10 ],
@@ -1088,11 +1091,11 @@
 		},
 		"OneStat": {
 			"cats": [ 10 ],
-			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
+			"html": "var p==.+stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"html": "index\\.php\\?route=[a-z]+/|Powered By <a href=\\\"[^>]+OpenCart",
 			"implies": [ "PHP" ]
 		},
 		"openEngine": {
@@ -1128,7 +1131,8 @@
 		},
 		"osCommerce": {
 			"cats": [ 6 ],
-			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)"
+			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)",
+			"header": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1136,8 +1140,8 @@
 		},
 		"Outbrain": {
 			"cats": [ 5 ],
-			"html": "var OB_langJS = 'http://widgets\\.outbrain\\.com/lang_",
-			"script": "http://widgets\\.outbrain\\.com/outbrain\\.js",
+			"html": "var OB_langJS = '.+widgets\\.outbrain\\.com/lang_",
+			"script": "widgets\\.outbrain\\.com/outbrain\\.js",
 			"env": "^OutbrainPermaLink$"
 		},
 		"OXID eShop": {
@@ -1245,7 +1249,7 @@
 		},
 		"Plura": {
 			"cats": [ 19 ],
-			"html": "<iframe src=\\\"http://pluraserver\\.com"
+			"html": "<iframe src=\\\".+pluraserver\\.com"
 		},
 		"Po.st": {
 			"cats": [ 5 ],
@@ -1321,7 +1325,7 @@
 		},
 		"Red Hat": {
 			"cats": [ 28 ],
-			"headers": { "Server": "(Red Hat|rhel[0-9]+)", "X-Powered-By": "Red Hat" }
+			"headers": { "Server": "(Red Hat|rhel\\d+)", "X-Powered-By": "Red Hat" }
 		},
 		"Reddit": {
 			"cats": [ 2 ],
@@ -1357,7 +1361,7 @@
 		},
 		"Ruby on Rails": {
 			"cats": [ 18 ],
-			"script": "/assets/application-[a-z0-9]{32}/\\.js",
+			"script": "/assets/application-[a-z\\d]{32}/\\.js",
 			"meta": { "csrf-param": "authenticity_token" },
 			"headers": { "Server": "(mod_rails|mod_rack|Phusion.Passenger)", "X-Powered-By": "(mod_rails|mod_rack|Phusion.Passenger)" },
 			"implies": [ "Ruby" ]
@@ -1456,8 +1460,9 @@
 		},
 		"SobiPro": {
 			"cats":	[ 19 ],
-			"env":	"SobiProUrl",
-			"html":	" <(script|link)[^>].*com_sobipro.*>"
+			"env":	"^SobiProUrl$",
+			"html":	" <(script|link)[^>].*com_sobipro.*>",
+			"implies": [ "Joomla" ]
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1498,11 +1503,11 @@
 		},
 		"Store Systems": {
 			"cats": [ 6 ],
-			"html": "Shopsystem von <a href=\\\"http://www\\.store-systems\\.de\\\"|\\.mws_boxTop"
+			"html": "Shopsystem von <a href=.+store-systems\\.de\\\"|\\.mws_boxTop"
 		},
 		"SublimeVideo": {
 			"cats": [ 14 ],
-			"script": "http://cdn\\.sublimevideo\\.net/js/[a-z0-9]+\\.js",
+			"script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
 			"env": "^sublimevideo$"
 		},
 		"SWFObject": {
@@ -1560,7 +1565,7 @@
 		},
 		"Tumblr": {
 			"cats": [ 11 ],
-			"html": "<iframe src=\\\"http://www\\.tumblr\\.com",
+			"html": "<iframe src=\\\".+tumblr\\.com",
 			"url": "^(www.)?.+\\.tumblr\\.com",
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
@@ -1643,8 +1648,8 @@
 		},
 		"VideoJS": {
 			"cats": [ 14 ],
-			"env": "VideoJS",
-			"html": "<div+class=\\\"video-js+\\\">",
+			"env": "^VideoJS$",
+			"html": "<div.+class=\\\"video-js+\\\">",
 			"script": "zencdn\\.net/c/video\\.js"
 		},
 		"viennaCMS": {
@@ -1822,7 +1827,7 @@
 		},
 		"YUI Doc": {
 			"cats": [ 4 ],
-			"html": "<html[^>]* yuilibrary\\.com/rdf/[0-9.]+/yui\\.rdf"
+			"html": "<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf"
 		},
 		"YUI": {
 			"cats": [ 12 ],
diff --git a/drivers/html/images/icons/3dCart.png b/drivers/html/images/icons/3dCart.png
index 09cdd4ddd..b15b56a2f 100644
Binary files a/drivers/html/images/icons/3dCart.png and b/drivers/html/images/icons/3dCart.png differ
diff --git a/drivers/html/images/icons/AMPcms.png b/drivers/html/images/icons/AMPcms.png
index a3180de94..0987761e2 100644
Binary files a/drivers/html/images/icons/AMPcms.png and b/drivers/html/images/icons/AMPcms.png differ
diff --git a/drivers/html/images/icons/Accessible Portal.png b/drivers/html/images/icons/Accessible Portal.png
index 889f3f3d5..e1cfe569d 100644
Binary files a/drivers/html/images/icons/Accessible Portal.png and b/drivers/html/images/icons/Accessible Portal.png differ
diff --git a/drivers/html/images/icons/AngularJS.png b/drivers/html/images/icons/AngularJS.png
index f16ec73c7..182bc7031 100644
Binary files a/drivers/html/images/icons/AngularJS.png and b/drivers/html/images/icons/AngularJS.png differ
diff --git a/drivers/html/images/icons/Apache JSPWiki.png b/drivers/html/images/icons/Apache JSPWiki.png
index bb6f654ce..6849f34e7 100644
Binary files a/drivers/html/images/icons/Apache JSPWiki.png and b/drivers/html/images/icons/Apache JSPWiki.png differ
diff --git a/drivers/html/images/icons/Bigcommerce.png b/drivers/html/images/icons/Bigcommerce.png
index 08f163065..4b8e89824 100644
Binary files a/drivers/html/images/icons/Bigcommerce.png and b/drivers/html/images/icons/Bigcommerce.png differ
diff --git a/drivers/html/images/icons/CacheFly.png b/drivers/html/images/icons/CacheFly.png
index 324ca8024..49a304296 100644
Binary files a/drivers/html/images/icons/CacheFly.png and b/drivers/html/images/icons/CacheFly.png differ
diff --git a/drivers/html/images/icons/CloudFlare.png b/drivers/html/images/icons/CloudFlare.png
index 97af7859b..eeb87e02d 100644
Binary files a/drivers/html/images/icons/CloudFlare.png and b/drivers/html/images/icons/CloudFlare.png differ
diff --git a/drivers/html/images/icons/Connect.png b/drivers/html/images/icons/Connect.png
index fa700d5dd..994d06c7b 100644
Binary files a/drivers/html/images/icons/Connect.png and b/drivers/html/images/icons/Connect.png differ
diff --git a/drivers/html/images/icons/Cross Pixel.png b/drivers/html/images/icons/Cross Pixel.png
index ec6aa782b..7984e3dc0 100644
Binary files a/drivers/html/images/icons/Cross Pixel.png and b/drivers/html/images/icons/Cross Pixel.png differ
diff --git a/drivers/html/images/icons/EdgeCast.png b/drivers/html/images/icons/EdgeCast.png
index b7e8d310b..3a281edf2 100644
Binary files a/drivers/html/images/icons/EdgeCast.png and b/drivers/html/images/icons/EdgeCast.png differ
diff --git a/drivers/html/images/icons/GX WebManager.png b/drivers/html/images/icons/GX WebManager.png
index d2a221841..186863d27 100644
Binary files a/drivers/html/images/icons/GX WebManager.png and b/drivers/html/images/icons/GX WebManager.png differ
diff --git a/drivers/html/images/icons/GetSimple CMS.png b/drivers/html/images/icons/GetSimple CMS.png
index e505082d3..e47ab011f 100644
Binary files a/drivers/html/images/icons/GetSimple CMS.png and b/drivers/html/images/icons/GetSimple CMS.png differ
diff --git a/drivers/html/images/icons/Google Code Prettify.png b/drivers/html/images/icons/Google Code Prettify.png
index e183e5b68..198155206 100644
Binary files a/drivers/html/images/icons/Google Code Prettify.png and b/drivers/html/images/icons/Google Code Prettify.png differ
diff --git a/drivers/html/images/icons/Google Tag Manager.png b/drivers/html/images/icons/Google Tag Manager.png
index 314352322..1031c9054 100644
Binary files a/drivers/html/images/icons/Google Tag Manager.png and b/drivers/html/images/icons/Google Tag Manager.png differ
diff --git a/drivers/html/images/icons/Google Web Toolkit.png b/drivers/html/images/icons/Google Web Toolkit.png
index 4e1240e8f..e53c2a1cd 100644
Binary files a/drivers/html/images/icons/Google Web Toolkit.png and b/drivers/html/images/icons/Google Web Toolkit.png differ
diff --git a/drivers/html/images/icons/Hiawatha.png b/drivers/html/images/icons/Hiawatha.png
index 5f2dade9b..0d73677a9 100644
Binary files a/drivers/html/images/icons/Hiawatha.png and b/drivers/html/images/icons/Hiawatha.png differ
diff --git a/drivers/html/images/icons/IBM HTTP Server.png b/drivers/html/images/icons/IBM HTTP Server.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/html/images/icons/IBM HTTP Server.png and b/drivers/html/images/icons/IBM HTTP Server.png differ
diff --git a/drivers/html/images/icons/IBM WebSphere Commerce.png b/drivers/html/images/icons/IBM WebSphere Commerce.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/html/images/icons/IBM WebSphere Commerce.png and b/drivers/html/images/icons/IBM WebSphere Commerce.png differ
diff --git a/drivers/html/images/icons/IBM WebSphere Portal.png b/drivers/html/images/icons/IBM WebSphere Portal.png
index 0197c3ed5..35948a368 100644
Binary files a/drivers/html/images/icons/IBM WebSphere Portal.png and b/drivers/html/images/icons/IBM WebSphere Portal.png differ
diff --git a/drivers/html/images/icons/ImpressCMS.png b/drivers/html/images/icons/ImpressCMS.png
index bed579348..a61e4a629 100644
Binary files a/drivers/html/images/icons/ImpressCMS.png and b/drivers/html/images/icons/ImpressCMS.png differ
diff --git a/drivers/html/images/icons/Jirafe.png b/drivers/html/images/icons/Jirafe.png
index 9945db3d4..32edeafb4 100644
Binary files a/drivers/html/images/icons/Jirafe.png and b/drivers/html/images/icons/Jirafe.png differ
diff --git a/drivers/html/images/icons/KISSmetrics.png b/drivers/html/images/icons/KISSmetrics.png
index ed033fb91..ac6c23e5c 100644
Binary files a/drivers/html/images/icons/KISSmetrics.png and b/drivers/html/images/icons/KISSmetrics.png differ
diff --git a/drivers/html/images/icons/LightMon Engine.png b/drivers/html/images/icons/LightMon Engine.png
index bdce59d32..ec56e8c2b 100644
Binary files a/drivers/html/images/icons/LightMon Engine.png and b/drivers/html/images/icons/LightMon Engine.png differ
diff --git a/drivers/html/images/icons/LimeSurvey.png b/drivers/html/images/icons/LimeSurvey.png
index db0db22b1..8971f2fb1 100644
Binary files a/drivers/html/images/icons/LimeSurvey.png and b/drivers/html/images/icons/LimeSurvey.png differ
diff --git a/drivers/html/images/icons/Marketo.png b/drivers/html/images/icons/Marketo.png
index 0a3849289..0a7294c8f 100644
Binary files a/drivers/html/images/icons/Marketo.png and b/drivers/html/images/icons/Marketo.png differ
diff --git a/drivers/html/images/icons/MediaElement.js.png b/drivers/html/images/icons/MediaElement.js.png
index 2b7e74bff..f0eaa5d11 100644
Binary files a/drivers/html/images/icons/MediaElement.js.png and b/drivers/html/images/icons/MediaElement.js.png differ
diff --git a/drivers/html/images/icons/New Relic.png b/drivers/html/images/icons/New Relic.png
index c5f43470d..3a7c5bc6a 100644
Binary files a/drivers/html/images/icons/New Relic.png and b/drivers/html/images/icons/New Relic.png differ
diff --git a/drivers/html/images/icons/OpenText Web Solutions.png b/drivers/html/images/icons/OpenText Web Solutions.png
index 2a27d5762..961a7399b 100644
Binary files a/drivers/html/images/icons/OpenText Web Solutions.png and b/drivers/html/images/icons/OpenText Web Solutions.png differ
diff --git a/drivers/html/images/icons/Outbrain.png b/drivers/html/images/icons/Outbrain.png
index 727f064df..bee5a06f2 100644
Binary files a/drivers/html/images/icons/Outbrain.png and b/drivers/html/images/icons/Outbrain.png differ
diff --git a/drivers/html/images/icons/Pligg.png b/drivers/html/images/icons/Pligg.png
index 1bb774d4e..396c47bd7 100644
Binary files a/drivers/html/images/icons/Pligg.png and b/drivers/html/images/icons/Pligg.png differ
diff --git a/drivers/html/images/icons/Po.st.png b/drivers/html/images/icons/Po.st.png
index c1942a159..b523b4caa 100644
Binary files a/drivers/html/images/icons/Po.st.png and b/drivers/html/images/icons/Po.st.png differ
diff --git a/drivers/html/images/icons/RBS Change.png b/drivers/html/images/icons/RBS Change.png
index 04db4dc9c..31f73f194 100644
Binary files a/drivers/html/images/icons/RBS Change.png and b/drivers/html/images/icons/RBS Change.png differ
diff --git a/drivers/html/images/icons/RackCache.png b/drivers/html/images/icons/RackCache.png
index 67c4b8a23..cac13376d 100644
Binary files a/drivers/html/images/icons/RackCache.png and b/drivers/html/images/icons/RackCache.png differ
diff --git a/drivers/html/images/icons/RoundCube.png b/drivers/html/images/icons/RoundCube.png
index 3ce8b6bdd..a767a9712 100644
Binary files a/drivers/html/images/icons/RoundCube.png and b/drivers/html/images/icons/RoundCube.png differ
diff --git a/drivers/html/images/icons/Ruby on Rails.png b/drivers/html/images/icons/Ruby on Rails.png
index ca0ca559a..1b252a436 100644
Binary files a/drivers/html/images/icons/Ruby on Rails.png and b/drivers/html/images/icons/Ruby on Rails.png differ
diff --git a/drivers/html/images/icons/SDL Tridion.png b/drivers/html/images/icons/SDL Tridion.png
index 760c60644..cc6387bbe 100644
Binary files a/drivers/html/images/icons/SDL Tridion.png and b/drivers/html/images/icons/SDL Tridion.png differ
diff --git a/drivers/html/images/icons/SPDY.png b/drivers/html/images/icons/SPDY.png
index 80d6e2239..44b57f929 100644
Binary files a/drivers/html/images/icons/SPDY.png and b/drivers/html/images/icons/SPDY.png differ
diff --git a/drivers/html/images/icons/Shopalize.png b/drivers/html/images/icons/Shopalize.png
index cac9cec28..59e65126e 100644
Binary files a/drivers/html/images/icons/Shopalize.png and b/drivers/html/images/icons/Shopalize.png differ
diff --git a/drivers/html/images/icons/SilverStripe.png b/drivers/html/images/icons/SilverStripe.png
index df80d7a40..1bee739fe 100644
Binary files a/drivers/html/images/icons/SilverStripe.png and b/drivers/html/images/icons/SilverStripe.png differ
diff --git a/drivers/html/images/icons/Snoobi.png b/drivers/html/images/icons/Snoobi.png
index 0f046cb82..c3c2fd16f 100644
Binary files a/drivers/html/images/icons/Snoobi.png and b/drivers/html/images/icons/Snoobi.png differ
diff --git a/drivers/html/images/icons/SoundManager.png b/drivers/html/images/icons/SoundManager.png
index 39c954227..41f1321a3 100644
Binary files a/drivers/html/images/icons/SoundManager.png and b/drivers/html/images/icons/SoundManager.png differ
diff --git a/drivers/html/images/icons/Sphinx.png b/drivers/html/images/icons/Sphinx.png
index 7cd03a2a5..9d14dbcca 100644
Binary files a/drivers/html/images/icons/Sphinx.png and b/drivers/html/images/icons/Sphinx.png differ
diff --git a/drivers/html/images/icons/SublimeVideo.png b/drivers/html/images/icons/SublimeVideo.png
index d118ce5c1..2fce94a5a 100644
Binary files a/drivers/html/images/icons/SublimeVideo.png and b/drivers/html/images/icons/SublimeVideo.png differ
diff --git a/drivers/html/images/icons/Tealeaf.png b/drivers/html/images/icons/Tealeaf.png
index 8866a6eb3..f42c32867 100644
Binary files a/drivers/html/images/icons/Tealeaf.png and b/drivers/html/images/icons/Tealeaf.png differ
diff --git a/drivers/html/images/icons/Volusion.png b/drivers/html/images/icons/Volusion.png
index 2173dc29d..a5e655b23 100644
Binary files a/drivers/html/images/icons/Volusion.png and b/drivers/html/images/icons/Volusion.png differ
diff --git a/drivers/html/images/icons/W3 Total Cache.png b/drivers/html/images/icons/W3 Total Cache.png
index 4c253831f..a6267666c 100644
Binary files a/drivers/html/images/icons/W3 Total Cache.png and b/drivers/html/images/icons/W3 Total Cache.png differ
diff --git a/drivers/html/images/icons/Zinnia.png b/drivers/html/images/icons/Zinnia.png
index f6c7f5be6..3c3d7313c 100644
Binary files a/drivers/html/images/icons/Zinnia.png and b/drivers/html/images/icons/Zinnia.png differ
diff --git a/drivers/html/images/icons/blip.tv.png b/drivers/html/images/icons/blip.tv.png
index 74c111b7a..34dd8b44f 100644
Binary files a/drivers/html/images/icons/blip.tv.png and b/drivers/html/images/icons/blip.tv.png differ
diff --git a/drivers/html/images/icons/node.js.png b/drivers/html/images/icons/node.js.png
index 78894abec..b24da90cb 100644
Binary files a/drivers/html/images/icons/node.js.png and b/drivers/html/images/icons/node.js.png differ
diff --git a/drivers/html/images/icons/phpSQLiteCMS.png b/drivers/html/images/icons/phpSQLiteCMS.png
index 05867de64..695f34196 100644
Binary files a/drivers/html/images/icons/phpSQLiteCMS.png and b/drivers/html/images/icons/phpSQLiteCMS.png differ
diff --git a/drivers/html/images/icons/three.js.png b/drivers/html/images/icons/three.js.png
index e6376a93e..51614a48c 100644
Binary files a/drivers/html/images/icons/three.js.png and b/drivers/html/images/icons/three.js.png differ
diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index 34fe66485..71d0a67a0 100644
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -139,13 +139,13 @@
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/confluence",
+			"html": "Powered by <a href=.+atlassian\\.com/software/confluence",
 			"implies": [ "Java" ]
 		},
 		"Atlassian Jira": {
 			"cats": [ 13 ],
 			"env": "^jira$",
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/jira",
+			"html": "Powered by <a href=.+atlassian\\.com/software/jira",
 			"implies": [ "Java" ]
 		},
 		"AWStats": {
@@ -173,8 +173,8 @@
 		"Bigcommerce": {
 			"cats":	[ 6 ],
 			"url": ".+\\.mybigcommerce\\.com",
-			"html": "<link href=\\\"http://cdn[0-9]+\\.bigcommerce\\.com/v",
-			"script": "^http://cdn[0-9]+\\.bigcommerce\\.com/v",
+			"html": "<link href=+cdn\\d+\\.bigcommerce\\.com/v",
+			"script": "cdn\\d+\\.bigcommerce\\.com/v",
 			"env": "compareProducts"
 		},
 		"BigDump": {
@@ -184,8 +184,8 @@
 		},
 		"Bigware": {
 			"cats": [ 6 ],
-			"html": "Diese <a href=\\\"http://www\\.bigware\\.de\\\"|<center>[^<]+<a href=\\\"http://www\\.bigware\\.de[^\\\"]*\\\" target=\\\"_blank\\\">\\s*<u>Shopsoftware\\s*</u>\\s*</a>[^<]+</center>",
-			"url": "(\\?|&)bigWAdminID=[a-z0-9]+(&|$)",
+			"html": "Diese <a href=.+bigware\\.de|<a href=.+/main_bigware_\\d+\\.php",
+			"url": "(\\?|&)bigWAdminID=[a-z\v\d]+(&|$)",
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": [ "PHP" ]
 		},
@@ -293,7 +293,7 @@
 		},
 		"CO2Stats": {
 			"cats": [ 10 ],
-			"html": "src=\\\"http://www\\.co2stats\\.com/propres\\.php"
+			"html": "src=.+co2stats\\.com/propres\\.php"
 		},
 		"CodeIgniter": {
 			"cats": [ 18 ],
@@ -324,7 +324,7 @@
 		},
 		"Contao": {
 			"cats": [ 1, 6 ],
-			"html": "(<!--\\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)",
+			"html": "(<!--.+powered by (TYPOlight|Contao)-->|<link[^>]+(typolight|contao).css)",
 			"implies": [ "PHP" ]
 		},
 		"Contenido": {
@@ -373,22 +373,22 @@
 		"Crazy Egg": {
 			"cats": [ 10 ],
 			"env": "CE2",
-			"script": "cetrk\\.com/pages/scripts/[0-9]+/[0-9]+\\.js"
+			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js"
 		},
 		"Cross Pixel": {
 			"cats": [ 10 ],
 			"env": "^crsspxl$",
-			"script": "http://tag\\.crsspxl\\.com/s1\\.js"
+			"script": "tag\\.crsspxl\\.com/s1\\.js"
 		},
 		"CS Cart": {
 			"cats": [ 6 ],
 			"env": "fn_compare_strings",
-			"html": "&nbsp;Powered by (<a href=.http://www\\.cs-cart\\.com|CS-Cart)",
+			"html": "&nbsp;Powered by (<a href=.+cs-cart\\.com|CS-Cart)",
 			"implies": [ "PHP" ]
 		},
 		"CubeCart": {
 			"cats": [ 6 ],
-			"html": "(Powered by <a href=.http://www\\.cubecart\\.com|<p[^>]+>Powered by CubeCart)",
+			"html": "(Powered by <a href=.+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
 			"meta": { "generator": "cubecart" },
 			"implies": [ "PHP" ]
 		},
@@ -488,7 +488,7 @@
 		"DotNetNuke": {
 			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
-			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
+			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke",
 			"implies": [ "Microsoft ASP.NET" ]
@@ -504,7 +504,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "(jQuery\\.extend\\(Drupal\\.settings, \\{|Drupal\\.extend\\(\\{ settings: \\{|<link[^>]+sites/(default|all)/themes/|<style[^>]+sites/(default|all)/(themes|modules)/)",
+			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -591,7 +591,7 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=\\\"http://flyspray\\.org/\\\")"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=.+flyspray\\.org/\\\")"
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
@@ -613,7 +613,7 @@
 		},
 		"Gambio": {
 			"cats": [ 6 ],
-			"html": "<link+.*[^>] href=\\\"templates/gambio/|<a+.*[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
+			"html": "<link[^>] href=\\\"templates/gambio/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
 			"implies": [ "PHP" ]
 		},
 		"Gauges": {
@@ -652,7 +652,7 @@
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
-			"html": "<link[^>]* href=\\\"http://fonts\\.googleapis\\.com",
+			"html": "<link[^>]* href=.+fonts\\.googleapis\\.com",
 			"env": "^WebFont"
 		},
 		"Google Maps": {
@@ -665,7 +665,7 @@
 		},
 		"Google Tag Manager": {
 			"cats": [ 19 ],
-			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+			"html": "googletagmanager\\.com/ns\\.html[^>]+></iframe>"
 		},
 		"Google Web Toolkit": {
 			"cats": [ 18 ],
@@ -988,12 +988,15 @@
 		},
 		"MODx": {
 			"cats": [ 1 ],
-			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
+			"html": "<a[^>]+>Powered by MODx</a>|<(link|script)[^>]+assets/snippets/",
+			"env": "^MODX_MEDIA_PATH$",
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
+			"implies": [ "PHP" ]
 		},
 		"MoinMoin": {
 			"cats": [ 8 ],
 			"script": "moin.+/common/js/common\\.js",
-			"env": "show_switch2gui",
+			"env": "^show_switch2gui$",
 			"implies":[ "Python" ]
 		},
 		"Mojolicious": {
@@ -1054,7 +1057,7 @@
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
-			"html": "sitestat\\(\\\"http://nl\\.sitestat\\.com"
+			"html": "sitestat\\(\\\".+nl\\.sitestat\\.com"
 		},
 		"Netmonitor": {
 			"cats": [ 10 ],
@@ -1088,11 +1091,11 @@
 		},
 		"OneStat": {
 			"cats": [ 10 ],
-			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
+			"html": "var p==.+stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"html": "index\\.php\\?route=[a-z]+/|Powered By <a href=\\\"[^>]+OpenCart",
 			"implies": [ "PHP" ]
 		},
 		"openEngine": {
@@ -1128,7 +1131,8 @@
 		},
 		"osCommerce": {
 			"cats": [ 6 ],
-			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)"
+			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)",
+			"header": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1136,8 +1140,8 @@
 		},
 		"Outbrain": {
 			"cats": [ 5 ],
-			"html": "var OB_langJS = 'http://widgets\\.outbrain\\.com/lang_",
-			"script": "http://widgets\\.outbrain\\.com/outbrain\\.js",
+			"html": "var OB_langJS = '.+widgets\\.outbrain\\.com/lang_",
+			"script": "widgets\\.outbrain\\.com/outbrain\\.js",
 			"env": "^OutbrainPermaLink$"
 		},
 		"OXID eShop": {
@@ -1245,7 +1249,7 @@
 		},
 		"Plura": {
 			"cats": [ 19 ],
-			"html": "<iframe src=\\\"http://pluraserver\\.com"
+			"html": "<iframe src=\\\".+pluraserver\\.com"
 		},
 		"Po.st": {
 			"cats": [ 5 ],
@@ -1321,7 +1325,7 @@
 		},
 		"Red Hat": {
 			"cats": [ 28 ],
-			"headers": { "Server": "(Red Hat|rhel[0-9]+)", "X-Powered-By": "Red Hat" }
+			"headers": { "Server": "(Red Hat|rhel\\d+)", "X-Powered-By": "Red Hat" }
 		},
 		"Reddit": {
 			"cats": [ 2 ],
@@ -1357,7 +1361,7 @@
 		},
 		"Ruby on Rails": {
 			"cats": [ 18 ],
-			"script": "/assets/application-[a-z0-9]{32}/\\.js",
+			"script": "/assets/application-[a-z\\d]{32}/\\.js",
 			"meta": { "csrf-param": "authenticity_token" },
 			"headers": { "Server": "(mod_rails|mod_rack|Phusion.Passenger)", "X-Powered-By": "(mod_rails|mod_rack|Phusion.Passenger)" },
 			"implies": [ "Ruby" ]
@@ -1456,8 +1460,9 @@
 		},
 		"SobiPro": {
 			"cats":	[ 19 ],
-			"env":	"SobiProUrl",
-			"html":	" <(script|link)[^>].*com_sobipro.*>"
+			"env":	"^SobiProUrl$",
+			"html":	" <(script|link)[^>].*com_sobipro.*>",
+			"implies": [ "Joomla" ]
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1498,11 +1503,11 @@
 		},
 		"Store Systems": {
 			"cats": [ 6 ],
-			"html": "Shopsystem von <a href=\\\"http://www\\.store-systems\\.de\\\"|\\.mws_boxTop"
+			"html": "Shopsystem von <a href=.+store-systems\\.de\\\"|\\.mws_boxTop"
 		},
 		"SublimeVideo": {
 			"cats": [ 14 ],
-			"script": "http://cdn\\.sublimevideo\\.net/js/[a-z0-9]+\\.js",
+			"script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
 			"env": "^sublimevideo$"
 		},
 		"SWFObject": {
@@ -1560,7 +1565,7 @@
 		},
 		"Tumblr": {
 			"cats": [ 11 ],
-			"html": "<iframe src=\\\"http://www\\.tumblr\\.com",
+			"html": "<iframe src=\\\".+tumblr\\.com",
 			"url": "^(www.)?.+\\.tumblr\\.com",
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
@@ -1643,8 +1648,8 @@
 		},
 		"VideoJS": {
 			"cats": [ 14 ],
-			"env": "VideoJS",
-			"html": "<div+class=\\\"video-js+\\\">",
+			"env": "^VideoJS$",
+			"html": "<div.+class=\\\"video-js+\\\">",
 			"script": "zencdn\\.net/c/video\\.js"
 		},
 		"viennaCMS": {
@@ -1822,7 +1827,7 @@
 		},
 		"YUI Doc": {
 			"cats": [ 4 ],
-			"html": "<html[^>]* yuilibrary\\.com/rdf/[0-9.]+/yui\\.rdf"
+			"html": "<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf"
 		},
 		"YUI": {
 			"cats": [ 12 ],
diff --git a/share/apps.json b/share/apps.json
index 34fe66485..71d0a67a0 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -139,13 +139,13 @@
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/confluence",
+			"html": "Powered by <a href=.+atlassian\\.com/software/confluence",
 			"implies": [ "Java" ]
 		},
 		"Atlassian Jira": {
 			"cats": [ 13 ],
 			"env": "^jira$",
-			"html": "Powered by <a href=.http://www\\.atlassian\\.com/software/jira",
+			"html": "Powered by <a href=.+atlassian\\.com/software/jira",
 			"implies": [ "Java" ]
 		},
 		"AWStats": {
@@ -173,8 +173,8 @@
 		"Bigcommerce": {
 			"cats":	[ 6 ],
 			"url": ".+\\.mybigcommerce\\.com",
-			"html": "<link href=\\\"http://cdn[0-9]+\\.bigcommerce\\.com/v",
-			"script": "^http://cdn[0-9]+\\.bigcommerce\\.com/v",
+			"html": "<link href=+cdn\\d+\\.bigcommerce\\.com/v",
+			"script": "cdn\\d+\\.bigcommerce\\.com/v",
 			"env": "compareProducts"
 		},
 		"BigDump": {
@@ -184,8 +184,8 @@
 		},
 		"Bigware": {
 			"cats": [ 6 ],
-			"html": "Diese <a href=\\\"http://www\\.bigware\\.de\\\"|<center>[^<]+<a href=\\\"http://www\\.bigware\\.de[^\\\"]*\\\" target=\\\"_blank\\\">\\s*<u>Shopsoftware\\s*</u>\\s*</a>[^<]+</center>",
-			"url": "(\\?|&)bigWAdminID=[a-z0-9]+(&|$)",
+			"html": "Diese <a href=.+bigware\\.de|<a href=.+/main_bigware_\\d+\\.php",
+			"url": "(\\?|&)bigWAdminID=[a-z\v\d]+(&|$)",
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": [ "PHP" ]
 		},
@@ -293,7 +293,7 @@
 		},
 		"CO2Stats": {
 			"cats": [ 10 ],
-			"html": "src=\\\"http://www\\.co2stats\\.com/propres\\.php"
+			"html": "src=.+co2stats\\.com/propres\\.php"
 		},
 		"CodeIgniter": {
 			"cats": [ 18 ],
@@ -324,7 +324,7 @@
 		},
 		"Contao": {
 			"cats": [ 1, 6 ],
-			"html": "(<!--\\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)",
+			"html": "(<!--.+powered by (TYPOlight|Contao)-->|<link[^>]+(typolight|contao).css)",
 			"implies": [ "PHP" ]
 		},
 		"Contenido": {
@@ -373,22 +373,22 @@
 		"Crazy Egg": {
 			"cats": [ 10 ],
 			"env": "CE2",
-			"script": "cetrk\\.com/pages/scripts/[0-9]+/[0-9]+\\.js"
+			"script": "cetrk\\.com/pages/scripts/\\d+/\\d+\\.js"
 		},
 		"Cross Pixel": {
 			"cats": [ 10 ],
 			"env": "^crsspxl$",
-			"script": "http://tag\\.crsspxl\\.com/s1\\.js"
+			"script": "tag\\.crsspxl\\.com/s1\\.js"
 		},
 		"CS Cart": {
 			"cats": [ 6 ],
 			"env": "fn_compare_strings",
-			"html": "&nbsp;Powered by (<a href=.http://www\\.cs-cart\\.com|CS-Cart)",
+			"html": "&nbsp;Powered by (<a href=.+cs-cart\\.com|CS-Cart)",
 			"implies": [ "PHP" ]
 		},
 		"CubeCart": {
 			"cats": [ 6 ],
-			"html": "(Powered by <a href=.http://www\\.cubecart\\.com|<p[^>]+>Powered by CubeCart)",
+			"html": "(Powered by <a href=.+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
 			"meta": { "generator": "cubecart" },
 			"implies": [ "PHP" ]
 		},
@@ -488,7 +488,7 @@
 		"DotNetNuke": {
 			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
-			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
+			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke",
 			"implies": [ "Microsoft ASP.NET" ]
@@ -504,7 +504,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "(jQuery\\.extend\\(Drupal\\.settings, \\{|Drupal\\.extend\\(\\{ settings: \\{|<link[^>]+sites/(default|all)/themes/|<style[^>]+sites/(default|all)/(themes|modules)/)",
+			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -591,7 +591,7 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=\\\"http://flyspray\\.org/\\\")"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\\\"projectsearchform|Powered by <a href=.+flyspray\\.org/\\\")"
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
@@ -613,7 +613,7 @@
 		},
 		"Gambio": {
 			"cats": [ 6 ],
-			"html": "<link+.*[^>] href=\\\"templates/gambio/|<a+.*[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
+			"html": "<link[^>] href=\\\"templates/gambio/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
 			"implies": [ "PHP" ]
 		},
 		"Gauges": {
@@ -652,7 +652,7 @@
 		"Google Font API": {
 			"cats": [ 17 ],
 			"script": "googleapis.com/.+webfont",
-			"html": "<link[^>]* href=\\\"http://fonts\\.googleapis\\.com",
+			"html": "<link[^>]* href=.+fonts\\.googleapis\\.com",
 			"env": "^WebFont"
 		},
 		"Google Maps": {
@@ -665,7 +665,7 @@
 		},
 		"Google Tag Manager": {
 			"cats": [ 19 ],
-			"html": "//www\\.googletagmanager\\.com/ns\\.html[^>]+></iframe>"
+			"html": "googletagmanager\\.com/ns\\.html[^>]+></iframe>"
 		},
 		"Google Web Toolkit": {
 			"cats": [ 18 ],
@@ -988,12 +988,15 @@
 		},
 		"MODx": {
 			"cats": [ 1 ],
-			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
+			"html": "<a[^>]+>Powered by MODx</a>|<(link|script)[^>]+assets/snippets/",
+			"env": "^MODX_MEDIA_PATH$",
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
+			"implies": [ "PHP" ]
 		},
 		"MoinMoin": {
 			"cats": [ 8 ],
 			"script": "moin.+/common/js/common\\.js",
-			"env": "show_switch2gui",
+			"env": "^show_switch2gui$",
 			"implies":[ "Python" ]
 		},
 		"Mojolicious": {
@@ -1054,7 +1057,7 @@
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
-			"html": "sitestat\\(\\\"http://nl\\.sitestat\\.com"
+			"html": "sitestat\\(\\\".+nl\\.sitestat\\.com"
 		},
 		"Netmonitor": {
 			"cats": [ 10 ],
@@ -1088,11 +1091,11 @@
 		},
 		"OneStat": {
 			"cats": [ 10 ],
-			"html": "var p=\\\"http\\\"\\+\\(d\\.URL\\.indexOf\\('https:'\\)==0\\?'s':''\\)\\+\\\"://stat\\.onestat\\.com/stat\\.aspx\\?tagver"
+			"html": "var p==.+stat\\.onestat\\.com/stat\\.aspx\\?tagver"
 		},
 		"OpenCart": {
 			"cats": [ 6 ],
-			"html": "(Powered By <a href=\\\"[^>]+OpenCart|route = getURLVar\\(\\\"route|OpenCart is open source software and you are free to remove the powered by OpenCart if you want)",
+			"html": "index\\.php\\?route=[a-z]+/|Powered By <a href=\\\"[^>]+OpenCart",
 			"implies": [ "PHP" ]
 		},
 		"openEngine": {
@@ -1128,7 +1131,8 @@
 		},
 		"osCommerce": {
 			"cats": [ 6 ],
-			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)"
+			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\\\"[^>]*infoBoxHeading)",
+			"header": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1136,8 +1140,8 @@
 		},
 		"Outbrain": {
 			"cats": [ 5 ],
-			"html": "var OB_langJS = 'http://widgets\\.outbrain\\.com/lang_",
-			"script": "http://widgets\\.outbrain\\.com/outbrain\\.js",
+			"html": "var OB_langJS = '.+widgets\\.outbrain\\.com/lang_",
+			"script": "widgets\\.outbrain\\.com/outbrain\\.js",
 			"env": "^OutbrainPermaLink$"
 		},
 		"OXID eShop": {
@@ -1245,7 +1249,7 @@
 		},
 		"Plura": {
 			"cats": [ 19 ],
-			"html": "<iframe src=\\\"http://pluraserver\\.com"
+			"html": "<iframe src=\\\".+pluraserver\\.com"
 		},
 		"Po.st": {
 			"cats": [ 5 ],
@@ -1321,7 +1325,7 @@
 		},
 		"Red Hat": {
 			"cats": [ 28 ],
-			"headers": { "Server": "(Red Hat|rhel[0-9]+)", "X-Powered-By": "Red Hat" }
+			"headers": { "Server": "(Red Hat|rhel\\d+)", "X-Powered-By": "Red Hat" }
 		},
 		"Reddit": {
 			"cats": [ 2 ],
@@ -1357,7 +1361,7 @@
 		},
 		"Ruby on Rails": {
 			"cats": [ 18 ],
-			"script": "/assets/application-[a-z0-9]{32}/\\.js",
+			"script": "/assets/application-[a-z\\d]{32}/\\.js",
 			"meta": { "csrf-param": "authenticity_token" },
 			"headers": { "Server": "(mod_rails|mod_rack|Phusion.Passenger)", "X-Powered-By": "(mod_rails|mod_rack|Phusion.Passenger)" },
 			"implies": [ "Ruby" ]
@@ -1456,8 +1460,9 @@
 		},
 		"SobiPro": {
 			"cats":	[ 19 ],
-			"env":	"SobiProUrl",
-			"html":	" <(script|link)[^>].*com_sobipro.*>"
+			"env":	"^SobiProUrl$",
+			"html":	" <(script|link)[^>].*com_sobipro.*>",
+			"implies": [ "Joomla" ]
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1498,11 +1503,11 @@
 		},
 		"Store Systems": {
 			"cats": [ 6 ],
-			"html": "Shopsystem von <a href=\\\"http://www\\.store-systems\\.de\\\"|\\.mws_boxTop"
+			"html": "Shopsystem von <a href=.+store-systems\\.de\\\"|\\.mws_boxTop"
 		},
 		"SublimeVideo": {
 			"cats": [ 14 ],
-			"script": "http://cdn\\.sublimevideo\\.net/js/[a-z0-9]+\\.js",
+			"script": "cdn\\.sublimevideo\\.net/js/[a-z\\d]+\\.js",
 			"env": "^sublimevideo$"
 		},
 		"SWFObject": {
@@ -1560,7 +1565,7 @@
 		},
 		"Tumblr": {
 			"cats": [ 11 ],
-			"html": "<iframe src=\\\"http://www\\.tumblr\\.com",
+			"html": "<iframe src=\\\".+tumblr\\.com",
 			"url": "^(www.)?.+\\.tumblr\\.com",
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
@@ -1643,8 +1648,8 @@
 		},
 		"VideoJS": {
 			"cats": [ 14 ],
-			"env": "VideoJS",
-			"html": "<div+class=\\\"video-js+\\\">",
+			"env": "^VideoJS$",
+			"html": "<div.+class=\\\"video-js+\\\">",
 			"script": "zencdn\\.net/c/video\\.js"
 		},
 		"viennaCMS": {
@@ -1822,7 +1827,7 @@
 		},
 		"YUI Doc": {
 			"cats": [ 4 ],
-			"html": "<html[^>]* yuilibrary\\.com/rdf/[0-9.]+/yui\\.rdf"
+			"html": "<html[^>]* yuilibrary\\.com/rdf/[\\d.]+/yui\\.rdf"
 		},
 		"YUI": {
 			"cats": [ 12 ],
diff --git a/share/images/icons/3dCart.png b/share/images/icons/3dCart.png
index 09cdd4ddd..b15b56a2f 100644
Binary files a/share/images/icons/3dCart.png and b/share/images/icons/3dCart.png differ
diff --git a/share/images/icons/AMPcms.png b/share/images/icons/AMPcms.png
index a3180de94..0987761e2 100644
Binary files a/share/images/icons/AMPcms.png and b/share/images/icons/AMPcms.png differ
diff --git a/share/images/icons/Accessible Portal.png b/share/images/icons/Accessible Portal.png
index 889f3f3d5..e1cfe569d 100644
Binary files a/share/images/icons/Accessible Portal.png and b/share/images/icons/Accessible Portal.png differ
diff --git a/share/images/icons/AngularJS.png b/share/images/icons/AngularJS.png
index f16ec73c7..182bc7031 100644
Binary files a/share/images/icons/AngularJS.png and b/share/images/icons/AngularJS.png differ
diff --git a/share/images/icons/Apache JSPWiki.png b/share/images/icons/Apache JSPWiki.png
index bb6f654ce..6849f34e7 100644
Binary files a/share/images/icons/Apache JSPWiki.png and b/share/images/icons/Apache JSPWiki.png differ
diff --git a/share/images/icons/Bigcommerce.png b/share/images/icons/Bigcommerce.png
index 08f163065..4b8e89824 100644
Binary files a/share/images/icons/Bigcommerce.png and b/share/images/icons/Bigcommerce.png differ
diff --git a/share/images/icons/CacheFly.png b/share/images/icons/CacheFly.png
index 324ca8024..49a304296 100644
Binary files a/share/images/icons/CacheFly.png and b/share/images/icons/CacheFly.png differ
diff --git a/share/images/icons/CloudFlare.png b/share/images/icons/CloudFlare.png
index 97af7859b..eeb87e02d 100644
Binary files a/share/images/icons/CloudFlare.png and b/share/images/icons/CloudFlare.png differ
diff --git a/share/images/icons/Connect.png b/share/images/icons/Connect.png
index fa700d5dd..994d06c7b 100644
Binary files a/share/images/icons/Connect.png and b/share/images/icons/Connect.png differ
diff --git a/share/images/icons/Cross Pixel.png b/share/images/icons/Cross Pixel.png
index ec6aa782b..7984e3dc0 100644
Binary files a/share/images/icons/Cross Pixel.png and b/share/images/icons/Cross Pixel.png differ
diff --git a/share/images/icons/EdgeCast.png b/share/images/icons/EdgeCast.png
index b7e8d310b..3a281edf2 100644
Binary files a/share/images/icons/EdgeCast.png and b/share/images/icons/EdgeCast.png differ
diff --git a/share/images/icons/GX WebManager.png b/share/images/icons/GX WebManager.png
index d2a221841..186863d27 100644
Binary files a/share/images/icons/GX WebManager.png and b/share/images/icons/GX WebManager.png differ
diff --git a/share/images/icons/GetSimple CMS.png b/share/images/icons/GetSimple CMS.png
index e505082d3..e47ab011f 100644
Binary files a/share/images/icons/GetSimple CMS.png and b/share/images/icons/GetSimple CMS.png differ
diff --git a/share/images/icons/Google Code Prettify.png b/share/images/icons/Google Code Prettify.png
index e183e5b68..198155206 100644
Binary files a/share/images/icons/Google Code Prettify.png and b/share/images/icons/Google Code Prettify.png differ
diff --git a/share/images/icons/Google Tag Manager.png b/share/images/icons/Google Tag Manager.png
index 314352322..1031c9054 100644
Binary files a/share/images/icons/Google Tag Manager.png and b/share/images/icons/Google Tag Manager.png differ
diff --git a/share/images/icons/Google Web Toolkit.png b/share/images/icons/Google Web Toolkit.png
index 4e1240e8f..e53c2a1cd 100644
Binary files a/share/images/icons/Google Web Toolkit.png and b/share/images/icons/Google Web Toolkit.png differ
diff --git a/share/images/icons/Hiawatha.png b/share/images/icons/Hiawatha.png
index 5f2dade9b..0d73677a9 100644
Binary files a/share/images/icons/Hiawatha.png and b/share/images/icons/Hiawatha.png differ
diff --git a/share/images/icons/IBM HTTP Server.png b/share/images/icons/IBM HTTP Server.png
index 0197c3ed5..35948a368 100644
Binary files a/share/images/icons/IBM HTTP Server.png and b/share/images/icons/IBM HTTP Server.png differ
diff --git a/share/images/icons/IBM WebSphere Commerce.png b/share/images/icons/IBM WebSphere Commerce.png
index 0197c3ed5..35948a368 100644
Binary files a/share/images/icons/IBM WebSphere Commerce.png and b/share/images/icons/IBM WebSphere Commerce.png differ
diff --git a/share/images/icons/IBM WebSphere Portal.png b/share/images/icons/IBM WebSphere Portal.png
index 0197c3ed5..35948a368 100644
Binary files a/share/images/icons/IBM WebSphere Portal.png and b/share/images/icons/IBM WebSphere Portal.png differ
diff --git a/share/images/icons/ImpressCMS.png b/share/images/icons/ImpressCMS.png
index bed579348..a61e4a629 100644
Binary files a/share/images/icons/ImpressCMS.png and b/share/images/icons/ImpressCMS.png differ
diff --git a/share/images/icons/Jirafe.png b/share/images/icons/Jirafe.png
index 9945db3d4..32edeafb4 100644
Binary files a/share/images/icons/Jirafe.png and b/share/images/icons/Jirafe.png differ
diff --git a/share/images/icons/KISSmetrics.png b/share/images/icons/KISSmetrics.png
index ed033fb91..ac6c23e5c 100644
Binary files a/share/images/icons/KISSmetrics.png and b/share/images/icons/KISSmetrics.png differ
diff --git a/share/images/icons/LightMon Engine.png b/share/images/icons/LightMon Engine.png
index bdce59d32..ec56e8c2b 100644
Binary files a/share/images/icons/LightMon Engine.png and b/share/images/icons/LightMon Engine.png differ
diff --git a/share/images/icons/LimeSurvey.png b/share/images/icons/LimeSurvey.png
index db0db22b1..8971f2fb1 100644
Binary files a/share/images/icons/LimeSurvey.png and b/share/images/icons/LimeSurvey.png differ
diff --git a/share/images/icons/Marketo.png b/share/images/icons/Marketo.png
index 0a3849289..0a7294c8f 100644
Binary files a/share/images/icons/Marketo.png and b/share/images/icons/Marketo.png differ
diff --git a/share/images/icons/MediaElement.js.png b/share/images/icons/MediaElement.js.png
index 2b7e74bff..f0eaa5d11 100644
Binary files a/share/images/icons/MediaElement.js.png and b/share/images/icons/MediaElement.js.png differ
diff --git a/share/images/icons/New Relic.png b/share/images/icons/New Relic.png
index c5f43470d..3a7c5bc6a 100644
Binary files a/share/images/icons/New Relic.png and b/share/images/icons/New Relic.png differ
diff --git a/share/images/icons/OpenText Web Solutions.png b/share/images/icons/OpenText Web Solutions.png
index 2a27d5762..961a7399b 100644
Binary files a/share/images/icons/OpenText Web Solutions.png and b/share/images/icons/OpenText Web Solutions.png differ
diff --git a/share/images/icons/Outbrain.png b/share/images/icons/Outbrain.png
index 727f064df..bee5a06f2 100644
Binary files a/share/images/icons/Outbrain.png and b/share/images/icons/Outbrain.png differ
diff --git a/share/images/icons/Pligg.png b/share/images/icons/Pligg.png
index 1bb774d4e..396c47bd7 100644
Binary files a/share/images/icons/Pligg.png and b/share/images/icons/Pligg.png differ
diff --git a/share/images/icons/Po.st.png b/share/images/icons/Po.st.png
index c1942a159..b523b4caa 100644
Binary files a/share/images/icons/Po.st.png and b/share/images/icons/Po.st.png differ
diff --git a/share/images/icons/RBS Change.png b/share/images/icons/RBS Change.png
index 04db4dc9c..31f73f194 100644
Binary files a/share/images/icons/RBS Change.png and b/share/images/icons/RBS Change.png differ
diff --git a/share/images/icons/RackCache.png b/share/images/icons/RackCache.png
index 67c4b8a23..cac13376d 100644
Binary files a/share/images/icons/RackCache.png and b/share/images/icons/RackCache.png differ
diff --git a/share/images/icons/RoundCube.png b/share/images/icons/RoundCube.png
index 3ce8b6bdd..a767a9712 100644
Binary files a/share/images/icons/RoundCube.png and b/share/images/icons/RoundCube.png differ
diff --git a/share/images/icons/Ruby on Rails.png b/share/images/icons/Ruby on Rails.png
index ca0ca559a..1b252a436 100644
Binary files a/share/images/icons/Ruby on Rails.png and b/share/images/icons/Ruby on Rails.png differ
diff --git a/share/images/icons/SDL Tridion.png b/share/images/icons/SDL Tridion.png
index 760c60644..cc6387bbe 100644
Binary files a/share/images/icons/SDL Tridion.png and b/share/images/icons/SDL Tridion.png differ
diff --git a/share/images/icons/SPDY.png b/share/images/icons/SPDY.png
index 80d6e2239..44b57f929 100644
Binary files a/share/images/icons/SPDY.png and b/share/images/icons/SPDY.png differ
diff --git a/share/images/icons/Shopalize.png b/share/images/icons/Shopalize.png
index cac9cec28..59e65126e 100644
Binary files a/share/images/icons/Shopalize.png and b/share/images/icons/Shopalize.png differ
diff --git a/share/images/icons/SilverStripe.png b/share/images/icons/SilverStripe.png
index df80d7a40..1bee739fe 100644
Binary files a/share/images/icons/SilverStripe.png and b/share/images/icons/SilverStripe.png differ
diff --git a/share/images/icons/Snoobi.png b/share/images/icons/Snoobi.png
index 0f046cb82..c3c2fd16f 100644
Binary files a/share/images/icons/Snoobi.png and b/share/images/icons/Snoobi.png differ
diff --git a/share/images/icons/SoundManager.png b/share/images/icons/SoundManager.png
index 39c954227..41f1321a3 100644
Binary files a/share/images/icons/SoundManager.png and b/share/images/icons/SoundManager.png differ
diff --git a/share/images/icons/Sphinx.png b/share/images/icons/Sphinx.png
index 7cd03a2a5..9d14dbcca 100644
Binary files a/share/images/icons/Sphinx.png and b/share/images/icons/Sphinx.png differ
diff --git a/share/images/icons/SublimeVideo.png b/share/images/icons/SublimeVideo.png
index d118ce5c1..2fce94a5a 100644
Binary files a/share/images/icons/SublimeVideo.png and b/share/images/icons/SublimeVideo.png differ
diff --git a/share/images/icons/Tealeaf.png b/share/images/icons/Tealeaf.png
index 8866a6eb3..f42c32867 100644
Binary files a/share/images/icons/Tealeaf.png and b/share/images/icons/Tealeaf.png differ
diff --git a/share/images/icons/Volusion.png b/share/images/icons/Volusion.png
index 2173dc29d..a5e655b23 100644
Binary files a/share/images/icons/Volusion.png and b/share/images/icons/Volusion.png differ
diff --git a/share/images/icons/W3 Total Cache.png b/share/images/icons/W3 Total Cache.png
index 4c253831f..a6267666c 100644
Binary files a/share/images/icons/W3 Total Cache.png and b/share/images/icons/W3 Total Cache.png differ
diff --git a/share/images/icons/Zinnia.png b/share/images/icons/Zinnia.png
index f6c7f5be6..3c3d7313c 100644
Binary files a/share/images/icons/Zinnia.png and b/share/images/icons/Zinnia.png differ
diff --git a/share/images/icons/blip.tv.png b/share/images/icons/blip.tv.png
index 74c111b7a..34dd8b44f 100644
Binary files a/share/images/icons/blip.tv.png and b/share/images/icons/blip.tv.png differ
diff --git a/share/images/icons/node.js.png b/share/images/icons/node.js.png
index 78894abec..b24da90cb 100644
Binary files a/share/images/icons/node.js.png and b/share/images/icons/node.js.png differ
diff --git a/share/images/icons/phpSQLiteCMS.png b/share/images/icons/phpSQLiteCMS.png
index 05867de64..695f34196 100644
Binary files a/share/images/icons/phpSQLiteCMS.png and b/share/images/icons/phpSQLiteCMS.png differ
diff --git a/share/images/icons/three.js.png b/share/images/icons/three.js.png
index e6376a93e..51614a48c 100644
Binary files a/share/images/icons/three.js.png and b/share/images/icons/three.js.png differ