diff --git a/drivers/bookmarklet/images/icons/DataLife Engine.png b/drivers/bookmarklet/images/icons/DataLife Engine.png
index 7f74461f2..509e657cc 100644
Binary files a/drivers/bookmarklet/images/icons/DataLife Engine.png and b/drivers/bookmarklet/images/icons/DataLife Engine.png differ
diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index 7596158a9..00f241a33 100755
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -66,7 +66,7 @@
 		},
 		"AddThis": {
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js/(\\d+)?;version:\\1",
+			"script": "addthis\\.com/js/(\\d+)?\\;version:\\1",
 			"env": "^addthis"
 		},
 		"Adobe CQ5": {
@@ -213,7 +213,7 @@
 		},
 		"BittAds": {
 			"cats": [ 36 ],
-			"script": "^https://server\\.bittads\\.com/js/bitt\\.js$",
+			"script": "bittads\\.com/js/bitt\\.js$",
 			"env": "^bitt$"
 		},
 		"Blip.tv": {
@@ -1416,7 +1416,7 @@
 		},
 		"phpAlbum":	{
 			"cats":	[ 7 ],
-			"html":	"<!--phpalbum [.\\d\\s]+-->",
+			"html":	"<!--phpalbum ([.\\d\\s]+)-->\\;version:\\1",
 			"implies": "PHP"
 		},
 		"phpBB": {
@@ -1459,13 +1459,13 @@
 		},
 		"phpSQLiteCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "^phpSQLiteCMS" },
-			"implies": "PHP"
+			"meta": { "generator": "^phpSQLiteCMS( (.+))?$\\;version:\\2" },
+			"implies": [ "PHP", "SQLite\\;confidence:50" ]
 		},
 		"phpwind": {
 			"cats": [ 1, 2 ],
 			"meta": { "generator": "^phpwind" },
-			"html": "Powered by <a href=\".+phpwind\\.net",
+			"html": "Powered by <a href=\"[^\"]+phpwind\\.net",
 			"implies": "PHP"
 		},
 		"Piwik": {
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index 7596158a9..00f241a33 100755
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -66,7 +66,7 @@
 		},
 		"AddThis": {
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js/(\\d+)?;version:\\1",
+			"script": "addthis\\.com/js/(\\d+)?\\;version:\\1",
 			"env": "^addthis"
 		},
 		"Adobe CQ5": {
@@ -213,7 +213,7 @@
 		},
 		"BittAds": {
 			"cats": [ 36 ],
-			"script": "^https://server\\.bittads\\.com/js/bitt\\.js$",
+			"script": "bittads\\.com/js/bitt\\.js$",
 			"env": "^bitt$"
 		},
 		"Blip.tv": {
@@ -1416,7 +1416,7 @@
 		},
 		"phpAlbum":	{
 			"cats":	[ 7 ],
-			"html":	"<!--phpalbum [.\\d\\s]+-->",
+			"html":	"<!--phpalbum ([.\\d\\s]+)-->\\;version:\\1",
 			"implies": "PHP"
 		},
 		"phpBB": {
@@ -1459,13 +1459,13 @@
 		},
 		"phpSQLiteCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "^phpSQLiteCMS" },
-			"implies": "PHP"
+			"meta": { "generator": "^phpSQLiteCMS( (.+))?$\\;version:\\2" },
+			"implies": [ "PHP", "SQLite\\;confidence:50" ]
 		},
 		"phpwind": {
 			"cats": [ 1, 2 ],
 			"meta": { "generator": "^phpwind" },
-			"html": "Powered by <a href=\".+phpwind\\.net",
+			"html": "Powered by <a href=\"[^\"]+phpwind\\.net",
 			"implies": "PHP"
 		},
 		"Piwik": {
diff --git a/drivers/chrome/images/icons/DataLife Engine.png b/drivers/chrome/images/icons/DataLife Engine.png
index 7f74461f2..509e657cc 100644
Binary files a/drivers/chrome/images/icons/DataLife Engine.png and b/drivers/chrome/images/icons/DataLife Engine.png differ
diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index 7596158a9..00f241a33 100755
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -66,7 +66,7 @@
 		},
 		"AddThis": {
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js/(\\d+)?;version:\\1",
+			"script": "addthis\\.com/js/(\\d+)?\\;version:\\1",
 			"env": "^addthis"
 		},
 		"Adobe CQ5": {
@@ -213,7 +213,7 @@
 		},
 		"BittAds": {
 			"cats": [ 36 ],
-			"script": "^https://server\\.bittads\\.com/js/bitt\\.js$",
+			"script": "bittads\\.com/js/bitt\\.js$",
 			"env": "^bitt$"
 		},
 		"Blip.tv": {
@@ -1416,7 +1416,7 @@
 		},
 		"phpAlbum":	{
 			"cats":	[ 7 ],
-			"html":	"<!--phpalbum [.\\d\\s]+-->",
+			"html":	"<!--phpalbum ([.\\d\\s]+)-->\\;version:\\1",
 			"implies": "PHP"
 		},
 		"phpBB": {
@@ -1459,13 +1459,13 @@
 		},
 		"phpSQLiteCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "^phpSQLiteCMS" },
-			"implies": "PHP"
+			"meta": { "generator": "^phpSQLiteCMS( (.+))?$\\;version:\\2" },
+			"implies": [ "PHP", "SQLite\\;confidence:50" ]
 		},
 		"phpwind": {
 			"cats": [ 1, 2 ],
 			"meta": { "generator": "^phpwind" },
-			"html": "Powered by <a href=\".+phpwind\\.net",
+			"html": "Powered by <a href=\"[^\"]+phpwind\\.net",
 			"implies": "PHP"
 		},
 		"Piwik": {
diff --git a/drivers/firefox-jetpack/images/icons/DataLife Engine.png b/drivers/firefox-jetpack/images/icons/DataLife Engine.png
index 7f74461f2..509e657cc 100644
Binary files a/drivers/firefox-jetpack/images/icons/DataLife Engine.png and b/drivers/firefox-jetpack/images/icons/DataLife Engine.png differ
diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index 7596158a9..00f241a33 100755
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -66,7 +66,7 @@
 		},
 		"AddThis": {
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js/(\\d+)?;version:\\1",
+			"script": "addthis\\.com/js/(\\d+)?\\;version:\\1",
 			"env": "^addthis"
 		},
 		"Adobe CQ5": {
@@ -213,7 +213,7 @@
 		},
 		"BittAds": {
 			"cats": [ 36 ],
-			"script": "^https://server\\.bittads\\.com/js/bitt\\.js$",
+			"script": "bittads\\.com/js/bitt\\.js$",
 			"env": "^bitt$"
 		},
 		"Blip.tv": {
@@ -1416,7 +1416,7 @@
 		},
 		"phpAlbum":	{
 			"cats":	[ 7 ],
-			"html":	"<!--phpalbum [.\\d\\s]+-->",
+			"html":	"<!--phpalbum ([.\\d\\s]+)-->\\;version:\\1",
 			"implies": "PHP"
 		},
 		"phpBB": {
@@ -1459,13 +1459,13 @@
 		},
 		"phpSQLiteCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "^phpSQLiteCMS" },
-			"implies": "PHP"
+			"meta": { "generator": "^phpSQLiteCMS( (.+))?$\\;version:\\2" },
+			"implies": [ "PHP", "SQLite\\;confidence:50" ]
 		},
 		"phpwind": {
 			"cats": [ 1, 2 ],
 			"meta": { "generator": "^phpwind" },
-			"html": "Powered by <a href=\".+phpwind\\.net",
+			"html": "Powered by <a href=\"[^\"]+phpwind\\.net",
 			"implies": "PHP"
 		},
 		"Piwik": {
diff --git a/drivers/firefox/skin/images/icons/DataLife Engine.png b/drivers/firefox/skin/images/icons/DataLife Engine.png
index 7f74461f2..509e657cc 100644
Binary files a/drivers/firefox/skin/images/icons/DataLife Engine.png and b/drivers/firefox/skin/images/icons/DataLife Engine.png differ
diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index 7596158a9..00f241a33 100755
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -66,7 +66,7 @@
 		},
 		"AddThis": {
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js/(\\d+)?;version:\\1",
+			"script": "addthis\\.com/js/(\\d+)?\\;version:\\1",
 			"env": "^addthis"
 		},
 		"Adobe CQ5": {
@@ -213,7 +213,7 @@
 		},
 		"BittAds": {
 			"cats": [ 36 ],
-			"script": "^https://server\\.bittads\\.com/js/bitt\\.js$",
+			"script": "bittads\\.com/js/bitt\\.js$",
 			"env": "^bitt$"
 		},
 		"Blip.tv": {
@@ -1416,7 +1416,7 @@
 		},
 		"phpAlbum":	{
 			"cats":	[ 7 ],
-			"html":	"<!--phpalbum [.\\d\\s]+-->",
+			"html":	"<!--phpalbum ([.\\d\\s]+)-->\\;version:\\1",
 			"implies": "PHP"
 		},
 		"phpBB": {
@@ -1459,13 +1459,13 @@
 		},
 		"phpSQLiteCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "^phpSQLiteCMS" },
-			"implies": "PHP"
+			"meta": { "generator": "^phpSQLiteCMS( (.+))?$\\;version:\\2" },
+			"implies": [ "PHP", "SQLite\\;confidence:50" ]
 		},
 		"phpwind": {
 			"cats": [ 1, 2 ],
 			"meta": { "generator": "^phpwind" },
-			"html": "Powered by <a href=\".+phpwind\\.net",
+			"html": "Powered by <a href=\"[^\"]+phpwind\\.net",
 			"implies": "PHP"
 		},
 		"Piwik": {
diff --git a/drivers/html/images/icons/DataLife Engine.png b/drivers/html/images/icons/DataLife Engine.png
index 7f74461f2..509e657cc 100644
Binary files a/drivers/html/images/icons/DataLife Engine.png and b/drivers/html/images/icons/DataLife Engine.png differ
diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index 7596158a9..00f241a33 100755
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -66,7 +66,7 @@
 		},
 		"AddThis": {
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js/(\\d+)?;version:\\1",
+			"script": "addthis\\.com/js/(\\d+)?\\;version:\\1",
 			"env": "^addthis"
 		},
 		"Adobe CQ5": {
@@ -213,7 +213,7 @@
 		},
 		"BittAds": {
 			"cats": [ 36 ],
-			"script": "^https://server\\.bittads\\.com/js/bitt\\.js$",
+			"script": "bittads\\.com/js/bitt\\.js$",
 			"env": "^bitt$"
 		},
 		"Blip.tv": {
@@ -1416,7 +1416,7 @@
 		},
 		"phpAlbum":	{
 			"cats":	[ 7 ],
-			"html":	"<!--phpalbum [.\\d\\s]+-->",
+			"html":	"<!--phpalbum ([.\\d\\s]+)-->\\;version:\\1",
 			"implies": "PHP"
 		},
 		"phpBB": {
@@ -1459,13 +1459,13 @@
 		},
 		"phpSQLiteCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "^phpSQLiteCMS" },
-			"implies": "PHP"
+			"meta": { "generator": "^phpSQLiteCMS( (.+))?$\\;version:\\2" },
+			"implies": [ "PHP", "SQLite\\;confidence:50" ]
 		},
 		"phpwind": {
 			"cats": [ 1, 2 ],
 			"meta": { "generator": "^phpwind" },
-			"html": "Powered by <a href=\".+phpwind\\.net",
+			"html": "Powered by <a href=\"[^\"]+phpwind\\.net",
 			"implies": "PHP"
 		},
 		"Piwik": {
diff --git a/share/apps.json b/share/apps.json
index 7596158a9..00f241a33 100755
--- a/share/apps.json
+++ b/share/apps.json
@@ -66,7 +66,7 @@
 		},
 		"AddThis": {
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js/(\\d+)?;version:\\1",
+			"script": "addthis\\.com/js/(\\d+)?\\;version:\\1",
 			"env": "^addthis"
 		},
 		"Adobe CQ5": {
@@ -213,7 +213,7 @@
 		},
 		"BittAds": {
 			"cats": [ 36 ],
-			"script": "^https://server\\.bittads\\.com/js/bitt\\.js$",
+			"script": "bittads\\.com/js/bitt\\.js$",
 			"env": "^bitt$"
 		},
 		"Blip.tv": {
@@ -1416,7 +1416,7 @@
 		},
 		"phpAlbum":	{
 			"cats":	[ 7 ],
-			"html":	"<!--phpalbum [.\\d\\s]+-->",
+			"html":	"<!--phpalbum ([.\\d\\s]+)-->\\;version:\\1",
 			"implies": "PHP"
 		},
 		"phpBB": {
@@ -1459,13 +1459,13 @@
 		},
 		"phpSQLiteCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "^phpSQLiteCMS" },
-			"implies": "PHP"
+			"meta": { "generator": "^phpSQLiteCMS( (.+))?$\\;version:\\2" },
+			"implies": [ "PHP", "SQLite\\;confidence:50" ]
 		},
 		"phpwind": {
 			"cats": [ 1, 2 ],
 			"meta": { "generator": "^phpwind" },
-			"html": "Powered by <a href=\".+phpwind\\.net",
+			"html": "Powered by <a href=\"[^\"]+phpwind\\.net",
 			"implies": "PHP"
 		},
 		"Piwik": {
diff --git a/share/images/icons/DataLife Engine.png b/share/images/icons/DataLife Engine.png
index 7f74461f2..509e657cc 100644
Binary files a/share/images/icons/DataLife Engine.png and b/share/images/icons/DataLife Engine.png differ