diff --git a/drivers/bookmarklet/images/icons/AT Internet.png b/drivers/bookmarklet/images/icons/AT Internet.png
new file mode 100644
index 000000000..d62370881
Binary files /dev/null and b/drivers/bookmarklet/images/icons/AT Internet.png differ
diff --git a/drivers/bookmarklet/images/icons/E-Merchant.png b/drivers/bookmarklet/images/icons/E-Merchant.png
new file mode 100644
index 000000000..c43e77b8c
Binary files /dev/null and b/drivers/bookmarklet/images/icons/E-Merchant.png differ
diff --git a/drivers/bookmarklet/images/icons/Eloqua.png b/drivers/bookmarklet/images/icons/Eloqua.png
new file mode 100644
index 000000000..725070080
Binary files /dev/null and b/drivers/bookmarklet/images/icons/Eloqua.png differ
diff --git a/drivers/bookmarklet/images/icons/Enyo.png b/drivers/bookmarklet/images/icons/Enyo.png
new file mode 100644
index 000000000..6eebb21c9
Binary files /dev/null and b/drivers/bookmarklet/images/icons/Enyo.png differ
diff --git a/drivers/bookmarklet/images/icons/HubSpot.png b/drivers/bookmarklet/images/icons/HubSpot.png
new file mode 100644
index 000000000..58f03bdd2
Binary files /dev/null and b/drivers/bookmarklet/images/icons/HubSpot.png differ
diff --git a/drivers/bookmarklet/images/icons/Pardot.png b/drivers/bookmarklet/images/icons/Pardot.png
new file mode 100644
index 000000000..084c4fb23
Binary files /dev/null and b/drivers/bookmarklet/images/icons/Pardot.png differ
diff --git a/drivers/bookmarklet/images/icons/amCharts.png b/drivers/bookmarklet/images/icons/amCharts.png
new file mode 100644
index 000000000..fc74c6d57
Binary files /dev/null and b/drivers/bookmarklet/images/icons/amCharts.png differ
diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index ea5db6e67..ad2eb9b45 100755
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -92,6 +92,11 @@
 			"cats": [ 20 ],
 			"meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" }
 		},
+		"amCharts": {
+			"cats": [ 25 ],
+			"script": "amcharts.*\\.js",
+			"env": "^AmCharts$"
+		},
 		"Ametys": {
 			"cats": [ 1 ],
 			"meta": { "generator": "(Ametys|Anyware Technologies)" },
@@ -453,7 +458,7 @@
 		},
 		"Debian": {
 			"cats": [ 28 ],
-			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|etch|lenny|squeeze|wheezy)" }
+			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|(sarge|etch|lenny|queeze|wheezy|jessie))\\;version:\\2" }
 		},
 		"DedeCMS": {
 			"cats": [ 1 ],
@@ -558,10 +563,24 @@
 			"cats": [ 31 ],
 			"headers": { "Server": "^ECS" }
 		},
+		"Eloqua": {
+			"cats": [ 32 ],
+			"script": "elqCfg\\.js",
+			"env": "^elq(SiteID|Load|CurESite)$"
+		},
 		"Embedthis-http": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Embedthis-http(/([\\d.]+))?\\;version:\\2" }
 		},
+		"E-Merchant": {
+			"cats": [ 6 ],
+			"script": "cdn.e-merchant.com"
+		},
+		"Enyo": {
+			"cats": [ 12 ],
+			"script": "enyo\\.js",
+			"env": "^enyo$"
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -1334,6 +1353,11 @@
 			"cats": [ 1 ],
 			"html": "<link[^>]*/papaya-themes/"
 		},
+		"Pardot": {
+			"cats": [ 32 ],
+			"html": "piProtocol + \"pi\\.pardot\\.com/pi\\.js",
+			"env": "^pi(Tracker|Hostname|Protocol|CId|AId)$"
+		},
 		"Parse.ly": {
 			"cats": [ 10 ],
 			"env": "^PARSELY$"
@@ -1348,7 +1372,7 @@
 		},
 		"PHP": {
 			"cats": [ 27 ],
-			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
+			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
 		"phpAlbum":	{
@@ -1470,7 +1494,7 @@
 		},
 		"Python": {
 			"cats": [ 27 ],
-			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;version:\\3" }
+			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;confidence:50\\;version:\\3" }
 		},
 		"Quantcast": {
 			"cats": [ 10 ],
@@ -1526,7 +1550,8 @@
 		},
 		"Reinvigorate": {
 			"cats": [ 10 ],
-			"html": "reinvigorate\\.track\\(\""
+			"html": "reinvigorate\\.track\\(\"",
+			"env": "^reinvigorate$"
 		},
 		"RequireJS": {
 			"cats": [ 12 ],
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index ea5db6e67..ad2eb9b45 100755
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -92,6 +92,11 @@
 			"cats": [ 20 ],
 			"meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" }
 		},
+		"amCharts": {
+			"cats": [ 25 ],
+			"script": "amcharts.*\\.js",
+			"env": "^AmCharts$"
+		},
 		"Ametys": {
 			"cats": [ 1 ],
 			"meta": { "generator": "(Ametys|Anyware Technologies)" },
@@ -453,7 +458,7 @@
 		},
 		"Debian": {
 			"cats": [ 28 ],
-			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|etch|lenny|squeeze|wheezy)" }
+			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|(sarge|etch|lenny|queeze|wheezy|jessie))\\;version:\\2" }
 		},
 		"DedeCMS": {
 			"cats": [ 1 ],
@@ -558,10 +563,24 @@
 			"cats": [ 31 ],
 			"headers": { "Server": "^ECS" }
 		},
+		"Eloqua": {
+			"cats": [ 32 ],
+			"script": "elqCfg\\.js",
+			"env": "^elq(SiteID|Load|CurESite)$"
+		},
 		"Embedthis-http": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Embedthis-http(/([\\d.]+))?\\;version:\\2" }
 		},
+		"E-Merchant": {
+			"cats": [ 6 ],
+			"script": "cdn.e-merchant.com"
+		},
+		"Enyo": {
+			"cats": [ 12 ],
+			"script": "enyo\\.js",
+			"env": "^enyo$"
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -1334,6 +1353,11 @@
 			"cats": [ 1 ],
 			"html": "<link[^>]*/papaya-themes/"
 		},
+		"Pardot": {
+			"cats": [ 32 ],
+			"html": "piProtocol + \"pi\\.pardot\\.com/pi\\.js",
+			"env": "^pi(Tracker|Hostname|Protocol|CId|AId)$"
+		},
 		"Parse.ly": {
 			"cats": [ 10 ],
 			"env": "^PARSELY$"
@@ -1348,7 +1372,7 @@
 		},
 		"PHP": {
 			"cats": [ 27 ],
-			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
+			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
 		"phpAlbum":	{
@@ -1470,7 +1494,7 @@
 		},
 		"Python": {
 			"cats": [ 27 ],
-			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;version:\\3" }
+			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;confidence:50\\;version:\\3" }
 		},
 		"Quantcast": {
 			"cats": [ 10 ],
@@ -1526,7 +1550,8 @@
 		},
 		"Reinvigorate": {
 			"cats": [ 10 ],
-			"html": "reinvigorate\\.track\\(\""
+			"html": "reinvigorate\\.track\\(\"",
+			"env": "^reinvigorate$"
 		},
 		"RequireJS": {
 			"cats": [ 12 ],
diff --git a/drivers/chrome/images/icons/AT Internet.png b/drivers/chrome/images/icons/AT Internet.png
new file mode 100644
index 000000000..d62370881
Binary files /dev/null and b/drivers/chrome/images/icons/AT Internet.png differ
diff --git a/drivers/chrome/images/icons/E-Merchant.png b/drivers/chrome/images/icons/E-Merchant.png
new file mode 100644
index 000000000..c43e77b8c
Binary files /dev/null and b/drivers/chrome/images/icons/E-Merchant.png differ
diff --git a/drivers/chrome/images/icons/Eloqua.png b/drivers/chrome/images/icons/Eloqua.png
new file mode 100644
index 000000000..725070080
Binary files /dev/null and b/drivers/chrome/images/icons/Eloqua.png differ
diff --git a/drivers/chrome/images/icons/Enyo.png b/drivers/chrome/images/icons/Enyo.png
new file mode 100644
index 000000000..6eebb21c9
Binary files /dev/null and b/drivers/chrome/images/icons/Enyo.png differ
diff --git a/drivers/chrome/images/icons/HubSpot.png b/drivers/chrome/images/icons/HubSpot.png
new file mode 100644
index 000000000..58f03bdd2
Binary files /dev/null and b/drivers/chrome/images/icons/HubSpot.png differ
diff --git a/drivers/chrome/images/icons/Pardot.png b/drivers/chrome/images/icons/Pardot.png
new file mode 100644
index 000000000..084c4fb23
Binary files /dev/null and b/drivers/chrome/images/icons/Pardot.png differ
diff --git a/drivers/chrome/images/icons/amCharts.png b/drivers/chrome/images/icons/amCharts.png
new file mode 100644
index 000000000..fc74c6d57
Binary files /dev/null and b/drivers/chrome/images/icons/amCharts.png differ
diff --git a/drivers/chrome/js/driver.js b/drivers/chrome/js/driver.js
index 02e3651ae..b2178dd71 100644
--- a/drivers/chrome/js/driver.js
+++ b/drivers/chrome/js/driver.js
@@ -125,7 +125,7 @@
 		 * Display apps
 		 */
 		displayApps: function() {
-			var count = Object.keys(w.detected[tab.url]).length.toString();
+			var count = w.detected[tab.url] ? Object.keys(w.detected[tab.url]).length.toString() : '0';
 
 			if ( tabCache[tab.id] == null ) {
 				tabCache[tab.id] = {
diff --git a/drivers/chrome/manifest.json b/drivers/chrome/manifest.json
index b0289a304..74d24e9ef 100644
--- a/drivers/chrome/manifest.json
+++ b/drivers/chrome/manifest.json
@@ -1,7 +1,7 @@
 { "name": "Wappalyzer",
 	"homepage_url": "http://wappalyzer.com?utm_source=chrome&utm_medium=context&utm_campaign=extensions",
 	"description": "Identifies software on the web",
-	"version": "2.18",
+	"version": "2.19",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index ea5db6e67..ad2eb9b45 100755
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -92,6 +92,11 @@
 			"cats": [ 20 ],
 			"meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" }
 		},
+		"amCharts": {
+			"cats": [ 25 ],
+			"script": "amcharts.*\\.js",
+			"env": "^AmCharts$"
+		},
 		"Ametys": {
 			"cats": [ 1 ],
 			"meta": { "generator": "(Ametys|Anyware Technologies)" },
@@ -453,7 +458,7 @@
 		},
 		"Debian": {
 			"cats": [ 28 ],
-			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|etch|lenny|squeeze|wheezy)" }
+			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|(sarge|etch|lenny|queeze|wheezy|jessie))\\;version:\\2" }
 		},
 		"DedeCMS": {
 			"cats": [ 1 ],
@@ -558,10 +563,24 @@
 			"cats": [ 31 ],
 			"headers": { "Server": "^ECS" }
 		},
+		"Eloqua": {
+			"cats": [ 32 ],
+			"script": "elqCfg\\.js",
+			"env": "^elq(SiteID|Load|CurESite)$"
+		},
 		"Embedthis-http": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Embedthis-http(/([\\d.]+))?\\;version:\\2" }
 		},
+		"E-Merchant": {
+			"cats": [ 6 ],
+			"script": "cdn.e-merchant.com"
+		},
+		"Enyo": {
+			"cats": [ 12 ],
+			"script": "enyo\\.js",
+			"env": "^enyo$"
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -1334,6 +1353,11 @@
 			"cats": [ 1 ],
 			"html": "<link[^>]*/papaya-themes/"
 		},
+		"Pardot": {
+			"cats": [ 32 ],
+			"html": "piProtocol + \"pi\\.pardot\\.com/pi\\.js",
+			"env": "^pi(Tracker|Hostname|Protocol|CId|AId)$"
+		},
 		"Parse.ly": {
 			"cats": [ 10 ],
 			"env": "^PARSELY$"
@@ -1348,7 +1372,7 @@
 		},
 		"PHP": {
 			"cats": [ 27 ],
-			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
+			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
 		"phpAlbum":	{
@@ -1470,7 +1494,7 @@
 		},
 		"Python": {
 			"cats": [ 27 ],
-			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;version:\\3" }
+			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;confidence:50\\;version:\\3" }
 		},
 		"Quantcast": {
 			"cats": [ 10 ],
@@ -1526,7 +1550,8 @@
 		},
 		"Reinvigorate": {
 			"cats": [ 10 ],
-			"html": "reinvigorate\\.track\\(\""
+			"html": "reinvigorate\\.track\\(\"",
+			"env": "^reinvigorate$"
 		},
 		"RequireJS": {
 			"cats": [ 12 ],
diff --git a/drivers/firefox-jetpack/images/icons/AT Internet.png b/drivers/firefox-jetpack/images/icons/AT Internet.png
new file mode 100644
index 000000000..d62370881
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/AT Internet.png differ
diff --git a/drivers/firefox-jetpack/images/icons/E-Merchant.png b/drivers/firefox-jetpack/images/icons/E-Merchant.png
new file mode 100644
index 000000000..c43e77b8c
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/E-Merchant.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Eloqua.png b/drivers/firefox-jetpack/images/icons/Eloqua.png
new file mode 100644
index 000000000..725070080
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/Eloqua.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Enyo.png b/drivers/firefox-jetpack/images/icons/Enyo.png
new file mode 100644
index 000000000..6eebb21c9
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/Enyo.png differ
diff --git a/drivers/firefox-jetpack/images/icons/HubSpot.png b/drivers/firefox-jetpack/images/icons/HubSpot.png
new file mode 100644
index 000000000..58f03bdd2
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/HubSpot.png differ
diff --git a/drivers/firefox-jetpack/images/icons/Pardot.png b/drivers/firefox-jetpack/images/icons/Pardot.png
new file mode 100644
index 000000000..084c4fb23
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/Pardot.png differ
diff --git a/drivers/firefox-jetpack/images/icons/amCharts.png b/drivers/firefox-jetpack/images/icons/amCharts.png
new file mode 100644
index 000000000..fc74c6d57
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/amCharts.png differ
diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index ea5db6e67..ad2eb9b45 100755
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -92,6 +92,11 @@
 			"cats": [ 20 ],
 			"meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" }
 		},
+		"amCharts": {
+			"cats": [ 25 ],
+			"script": "amcharts.*\\.js",
+			"env": "^AmCharts$"
+		},
 		"Ametys": {
 			"cats": [ 1 ],
 			"meta": { "generator": "(Ametys|Anyware Technologies)" },
@@ -453,7 +458,7 @@
 		},
 		"Debian": {
 			"cats": [ 28 ],
-			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|etch|lenny|squeeze|wheezy)" }
+			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|(sarge|etch|lenny|queeze|wheezy|jessie))\\;version:\\2" }
 		},
 		"DedeCMS": {
 			"cats": [ 1 ],
@@ -558,10 +563,24 @@
 			"cats": [ 31 ],
 			"headers": { "Server": "^ECS" }
 		},
+		"Eloqua": {
+			"cats": [ 32 ],
+			"script": "elqCfg\\.js",
+			"env": "^elq(SiteID|Load|CurESite)$"
+		},
 		"Embedthis-http": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Embedthis-http(/([\\d.]+))?\\;version:\\2" }
 		},
+		"E-Merchant": {
+			"cats": [ 6 ],
+			"script": "cdn.e-merchant.com"
+		},
+		"Enyo": {
+			"cats": [ 12 ],
+			"script": "enyo\\.js",
+			"env": "^enyo$"
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -1334,6 +1353,11 @@
 			"cats": [ 1 ],
 			"html": "<link[^>]*/papaya-themes/"
 		},
+		"Pardot": {
+			"cats": [ 32 ],
+			"html": "piProtocol + \"pi\\.pardot\\.com/pi\\.js",
+			"env": "^pi(Tracker|Hostname|Protocol|CId|AId)$"
+		},
 		"Parse.ly": {
 			"cats": [ 10 ],
 			"env": "^PARSELY$"
@@ -1348,7 +1372,7 @@
 		},
 		"PHP": {
 			"cats": [ 27 ],
-			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
+			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
 		"phpAlbum":	{
@@ -1470,7 +1494,7 @@
 		},
 		"Python": {
 			"cats": [ 27 ],
-			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;version:\\3" }
+			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;confidence:50\\;version:\\3" }
 		},
 		"Quantcast": {
 			"cats": [ 10 ],
@@ -1526,7 +1550,8 @@
 		},
 		"Reinvigorate": {
 			"cats": [ 10 ],
-			"html": "reinvigorate\\.track\\(\""
+			"html": "reinvigorate\\.track\\(\"",
+			"env": "^reinvigorate$"
 		},
 		"RequireJS": {
 			"cats": [ 12 ],
diff --git a/drivers/firefox/skin/images/icons/AT Internet.png b/drivers/firefox/skin/images/icons/AT Internet.png
new file mode 100644
index 000000000..d62370881
Binary files /dev/null and b/drivers/firefox/skin/images/icons/AT Internet.png differ
diff --git a/drivers/firefox/skin/images/icons/E-Merchant.png b/drivers/firefox/skin/images/icons/E-Merchant.png
new file mode 100644
index 000000000..c43e77b8c
Binary files /dev/null and b/drivers/firefox/skin/images/icons/E-Merchant.png differ
diff --git a/drivers/firefox/skin/images/icons/Eloqua.png b/drivers/firefox/skin/images/icons/Eloqua.png
new file mode 100644
index 000000000..725070080
Binary files /dev/null and b/drivers/firefox/skin/images/icons/Eloqua.png differ
diff --git a/drivers/firefox/skin/images/icons/Enyo.png b/drivers/firefox/skin/images/icons/Enyo.png
new file mode 100644
index 000000000..6eebb21c9
Binary files /dev/null and b/drivers/firefox/skin/images/icons/Enyo.png differ
diff --git a/drivers/firefox/skin/images/icons/HubSpot.png b/drivers/firefox/skin/images/icons/HubSpot.png
new file mode 100644
index 000000000..58f03bdd2
Binary files /dev/null and b/drivers/firefox/skin/images/icons/HubSpot.png differ
diff --git a/drivers/firefox/skin/images/icons/Pardot.png b/drivers/firefox/skin/images/icons/Pardot.png
new file mode 100644
index 000000000..084c4fb23
Binary files /dev/null and b/drivers/firefox/skin/images/icons/Pardot.png differ
diff --git a/drivers/firefox/skin/images/icons/amCharts.png b/drivers/firefox/skin/images/icons/amCharts.png
new file mode 100644
index 000000000..fc74c6d57
Binary files /dev/null and b/drivers/firefox/skin/images/icons/amCharts.png differ
diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index ea5db6e67..ad2eb9b45 100755
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -92,6 +92,11 @@
 			"cats": [ 20 ],
 			"meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" }
 		},
+		"amCharts": {
+			"cats": [ 25 ],
+			"script": "amcharts.*\\.js",
+			"env": "^AmCharts$"
+		},
 		"Ametys": {
 			"cats": [ 1 ],
 			"meta": { "generator": "(Ametys|Anyware Technologies)" },
@@ -453,7 +458,7 @@
 		},
 		"Debian": {
 			"cats": [ 28 ],
-			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|etch|lenny|squeeze|wheezy)" }
+			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|(sarge|etch|lenny|queeze|wheezy|jessie))\\;version:\\2" }
 		},
 		"DedeCMS": {
 			"cats": [ 1 ],
@@ -558,10 +563,24 @@
 			"cats": [ 31 ],
 			"headers": { "Server": "^ECS" }
 		},
+		"Eloqua": {
+			"cats": [ 32 ],
+			"script": "elqCfg\\.js",
+			"env": "^elq(SiteID|Load|CurESite)$"
+		},
 		"Embedthis-http": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Embedthis-http(/([\\d.]+))?\\;version:\\2" }
 		},
+		"E-Merchant": {
+			"cats": [ 6 ],
+			"script": "cdn.e-merchant.com"
+		},
+		"Enyo": {
+			"cats": [ 12 ],
+			"script": "enyo\\.js",
+			"env": "^enyo$"
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -1334,6 +1353,11 @@
 			"cats": [ 1 ],
 			"html": "<link[^>]*/papaya-themes/"
 		},
+		"Pardot": {
+			"cats": [ 32 ],
+			"html": "piProtocol + \"pi\\.pardot\\.com/pi\\.js",
+			"env": "^pi(Tracker|Hostname|Protocol|CId|AId)$"
+		},
 		"Parse.ly": {
 			"cats": [ 10 ],
 			"env": "^PARSELY$"
@@ -1348,7 +1372,7 @@
 		},
 		"PHP": {
 			"cats": [ 27 ],
-			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
+			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
 		"phpAlbum":	{
@@ -1470,7 +1494,7 @@
 		},
 		"Python": {
 			"cats": [ 27 ],
-			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;version:\\3" }
+			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;confidence:50\\;version:\\3" }
 		},
 		"Quantcast": {
 			"cats": [ 10 ],
@@ -1526,7 +1550,8 @@
 		},
 		"Reinvigorate": {
 			"cats": [ 10 ],
-			"html": "reinvigorate\\.track\\(\""
+			"html": "reinvigorate\\.track\\(\"",
+			"env": "^reinvigorate$"
 		},
 		"RequireJS": {
 			"cats": [ 12 ],
diff --git a/drivers/html/images/icons/AT Internet.png b/drivers/html/images/icons/AT Internet.png
new file mode 100644
index 000000000..d62370881
Binary files /dev/null and b/drivers/html/images/icons/AT Internet.png differ
diff --git a/drivers/html/images/icons/E-Merchant.png b/drivers/html/images/icons/E-Merchant.png
new file mode 100644
index 000000000..c43e77b8c
Binary files /dev/null and b/drivers/html/images/icons/E-Merchant.png differ
diff --git a/drivers/html/images/icons/Eloqua.png b/drivers/html/images/icons/Eloqua.png
new file mode 100644
index 000000000..725070080
Binary files /dev/null and b/drivers/html/images/icons/Eloqua.png differ
diff --git a/drivers/html/images/icons/Enyo.png b/drivers/html/images/icons/Enyo.png
new file mode 100644
index 000000000..6eebb21c9
Binary files /dev/null and b/drivers/html/images/icons/Enyo.png differ
diff --git a/drivers/html/images/icons/HubSpot.png b/drivers/html/images/icons/HubSpot.png
new file mode 100644
index 000000000..58f03bdd2
Binary files /dev/null and b/drivers/html/images/icons/HubSpot.png differ
diff --git a/drivers/html/images/icons/Pardot.png b/drivers/html/images/icons/Pardot.png
new file mode 100644
index 000000000..084c4fb23
Binary files /dev/null and b/drivers/html/images/icons/Pardot.png differ
diff --git a/drivers/html/images/icons/amCharts.png b/drivers/html/images/icons/amCharts.png
new file mode 100644
index 000000000..fc74c6d57
Binary files /dev/null and b/drivers/html/images/icons/amCharts.png differ
diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index ea5db6e67..ad2eb9b45 100755
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -92,6 +92,11 @@
 			"cats": [ 20 ],
 			"meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" }
 		},
+		"amCharts": {
+			"cats": [ 25 ],
+			"script": "amcharts.*\\.js",
+			"env": "^AmCharts$"
+		},
 		"Ametys": {
 			"cats": [ 1 ],
 			"meta": { "generator": "(Ametys|Anyware Technologies)" },
@@ -453,7 +458,7 @@
 		},
 		"Debian": {
 			"cats": [ 28 ],
-			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|etch|lenny|squeeze|wheezy)" }
+			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|(sarge|etch|lenny|queeze|wheezy|jessie))\\;version:\\2" }
 		},
 		"DedeCMS": {
 			"cats": [ 1 ],
@@ -558,10 +563,24 @@
 			"cats": [ 31 ],
 			"headers": { "Server": "^ECS" }
 		},
+		"Eloqua": {
+			"cats": [ 32 ],
+			"script": "elqCfg\\.js",
+			"env": "^elq(SiteID|Load|CurESite)$"
+		},
 		"Embedthis-http": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Embedthis-http(/([\\d.]+))?\\;version:\\2" }
 		},
+		"E-Merchant": {
+			"cats": [ 6 ],
+			"script": "cdn.e-merchant.com"
+		},
+		"Enyo": {
+			"cats": [ 12 ],
+			"script": "enyo\\.js",
+			"env": "^enyo$"
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -1334,6 +1353,11 @@
 			"cats": [ 1 ],
 			"html": "<link[^>]*/papaya-themes/"
 		},
+		"Pardot": {
+			"cats": [ 32 ],
+			"html": "piProtocol + \"pi\\.pardot\\.com/pi\\.js",
+			"env": "^pi(Tracker|Hostname|Protocol|CId|AId)$"
+		},
 		"Parse.ly": {
 			"cats": [ 10 ],
 			"env": "^PARSELY$"
@@ -1348,7 +1372,7 @@
 		},
 		"PHP": {
 			"cats": [ 27 ],
-			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
+			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
 		"phpAlbum":	{
@@ -1470,7 +1494,7 @@
 		},
 		"Python": {
 			"cats": [ 27 ],
-			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;version:\\3" }
+			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;confidence:50\\;version:\\3" }
 		},
 		"Quantcast": {
 			"cats": [ 10 ],
@@ -1526,7 +1550,8 @@
 		},
 		"Reinvigorate": {
 			"cats": [ 10 ],
-			"html": "reinvigorate\\.track\\(\""
+			"html": "reinvigorate\\.track\\(\"",
+			"env": "^reinvigorate$"
 		},
 		"RequireJS": {
 			"cats": [ 12 ],
diff --git a/share/apps.json b/share/apps.json
index ea5db6e67..ad2eb9b45 100755
--- a/share/apps.json
+++ b/share/apps.json
@@ -92,6 +92,11 @@
 			"cats": [ 20 ],
 			"meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" }
 		},
+		"amCharts": {
+			"cats": [ 25 ],
+			"script": "amcharts.*\\.js",
+			"env": "^AmCharts$"
+		},
 		"Ametys": {
 			"cats": [ 1 ],
 			"meta": { "generator": "(Ametys|Anyware Technologies)" },
@@ -453,7 +458,7 @@
 		},
 		"Debian": {
 			"cats": [ 28 ],
-			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|etch|lenny|squeeze|wheezy)" }
+			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|(sarge|etch|lenny|queeze|wheezy|jessie))\\;version:\\2" }
 		},
 		"DedeCMS": {
 			"cats": [ 1 ],
@@ -558,10 +563,24 @@
 			"cats": [ 31 ],
 			"headers": { "Server": "^ECS" }
 		},
+		"Eloqua": {
+			"cats": [ 32 ],
+			"script": "elqCfg\\.js",
+			"env": "^elq(SiteID|Load|CurESite)$"
+		},
 		"Embedthis-http": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Embedthis-http(/([\\d.]+))?\\;version:\\2" }
 		},
+		"E-Merchant": {
+			"cats": [ 6 ],
+			"script": "cdn.e-merchant.com"
+		},
+		"Enyo": {
+			"cats": [ 12 ],
+			"script": "enyo\\.js",
+			"env": "^enyo$"
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -1334,6 +1353,11 @@
 			"cats": [ 1 ],
 			"html": "<link[^>]*/papaya-themes/"
 		},
+		"Pardot": {
+			"cats": [ 32 ],
+			"html": "piProtocol + \"pi\\.pardot\\.com/pi\\.js",
+			"env": "^pi(Tracker|Hostname|Protocol|CId|AId)$"
+		},
 		"Parse.ly": {
 			"cats": [ 10 ],
 			"env": "^PARSELY$"
@@ -1348,7 +1372,7 @@
 		},
 		"PHP": {
 			"cats": [ 27 ],
-			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
+			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;confidence:40\\;version:\\1", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
 		"phpAlbum":	{
@@ -1470,7 +1494,7 @@
 		},
 		"Python": {
 			"cats": [ 27 ],
-			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;version:\\3" }
+			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;confidence:50\\;version:\\3" }
 		},
 		"Quantcast": {
 			"cats": [ 10 ],
@@ -1526,7 +1550,8 @@
 		},
 		"Reinvigorate": {
 			"cats": [ 10 ],
-			"html": "reinvigorate\\.track\\(\""
+			"html": "reinvigorate\\.track\\(\"",
+			"env": "^reinvigorate$"
 		},
 		"RequireJS": {
 			"cats": [ 12 ],
diff --git a/share/images/icons/AT Internet.png b/share/images/icons/AT Internet.png
new file mode 100644
index 000000000..d62370881
Binary files /dev/null and b/share/images/icons/AT Internet.png differ
diff --git a/share/images/icons/E-Merchant.png b/share/images/icons/E-Merchant.png
new file mode 100644
index 000000000..c43e77b8c
Binary files /dev/null and b/share/images/icons/E-Merchant.png differ
diff --git a/share/images/icons/Eloqua.png b/share/images/icons/Eloqua.png
new file mode 100644
index 000000000..725070080
Binary files /dev/null and b/share/images/icons/Eloqua.png differ
diff --git a/share/images/icons/Enyo.png b/share/images/icons/Enyo.png
new file mode 100644
index 000000000..6eebb21c9
Binary files /dev/null and b/share/images/icons/Enyo.png differ
diff --git a/share/images/icons/HubSpot.png b/share/images/icons/HubSpot.png
new file mode 100644
index 000000000..58f03bdd2
Binary files /dev/null and b/share/images/icons/HubSpot.png differ
diff --git a/share/images/icons/Pardot.png b/share/images/icons/Pardot.png
new file mode 100644
index 000000000..084c4fb23
Binary files /dev/null and b/share/images/icons/Pardot.png differ
diff --git a/share/images/icons/amCharts.png b/share/images/icons/amCharts.png
new file mode 100644
index 000000000..fc74c6d57
Binary files /dev/null and b/share/images/icons/amCharts.png differ