From 12f18576a7b3fb2371cde33f934b7505c878ef79 Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sun, 24 Feb 2013 09:06:11 +1100
Subject: [PATCH] Minor pattern improvements and added icons

---
 .../images/icons/DataLife Engine.png            | Bin 714 -> 776 bytes
 drivers/bookmarklet/json                        |  12 ++++++------
 drivers/chrome/apps.json                        |  12 ++++++------
 drivers/chrome/images/icons/DataLife Engine.png | Bin 714 -> 776 bytes
 drivers/firefox-jetpack/data/apps.json          |  12 ++++++------
 .../images/icons/DataLife Engine.png            | Bin 714 -> 776 bytes
 drivers/firefox/content/apps.json               |  12 ++++++------
 .../skin/images/icons/DataLife Engine.png       | Bin 714 -> 776 bytes
 drivers/html/apps.json                          |  12 ++++++------
 drivers/html/images/icons/DataLife Engine.png   | Bin 714 -> 776 bytes
 drivers/php/apps.json                           |  12 ++++++------
 share/apps.json                                 |  12 ++++++------
 share/images/icons/DataLife Engine.png          | Bin 714 -> 776 bytes
 13 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/drivers/bookmarklet/images/icons/DataLife Engine.png b/drivers/bookmarklet/images/icons/DataLife Engine.png
index 7f74461f2f733e56c4579aa7d854c3bc70536386..509e657cc99222ce4cf2c91f3353247f35e2da87 100644
GIT binary patch
delta 753
zcmV<N0uKGk1&9WaBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xXCHWR`%C?@~_0+mTbK~y-)rISf$Qvnc$zqcfP*-1!S8)I#av9>C1
z)q@+jAc_|^aOt546~UY6QSszO1&Jb}R1q&;R1mBShzc%6P=6@aC|DtyG__6J#576M
zyu8IjL>ttTbDLr2XPEyR_|FigCz(mjyz*k0-q-}mY#B}0sddUM3A#DBx}I>IP57rk
z&-=7_>d_$aw2D;{sF5r6k_M`7;<Jl%tf=G6<6&{^bh}w4(DOcR9=j7GSE@8_Y4fpk
zmJ_!k@-|W6;eUq=!`U(b+ZK8`x2p+R5(NNZJYP09UFc^tZ_qZw%EdilV&f(5z8fVs
z1<M*8>~HsTvM0enY6^fw0fjR=nvo?@kT1U+VKi^xsuAe!XyN+n6xVxG6x7O=iSH`U
zKj*l#x0%S(Z;a$LawRy~lR(oAQ`mGqYW5Emu}H8s<bUS%mmEQ_g3m7CRxAKmWf4^~
zIJ<K;-LFz;hRMPPJISny7|*C!B$(s3F`O$C^eW8sSh&?SpBtTFVV2iQp`<gERoQcG
zfUZ?_0DMW8NTf^19-D~YDWMrUO+FiC-K?@{Qq_3!X#xP<fZg2#END=;)0d&%B_gbk
zM9uzWk$-*dKC(rf`_U`_OM*569xIPNX3-5;6SC7An?yH262V~=IJBl7aZ9V`CkGi$
zYz?w~u@`{8!6NsgmEq-$4sIT3VZ%H(&3+33kI3d$7e_Y+DmJb-{f>z#lePvMS3BnL
zCSKq{G($l(SRHcFxw4ky_u?e8d2|Dse0CzcLu$y9DEtEH$nCF4f`L<!Ss(UPf%GPx
z#;u3|cx^SD+coz$NYhb{JRQX6l#oTE>X4ct;<OqxdR?4<HufjV)1T?Wvq3(M=Bfm0
j9d-_{3;gw&{yTmE6y+6FoU5v!00000NkvXXu0mjfpc_@K

delta 691
zcmV;k0!;mg2FeAHBYy&sNkl<ZILoDzJ7`l;9L9g=<lZDTO`6oUHrljRE0%T=Q3t`n
zO&4Eu5*(ZyTwFwOP{Bb32T^bm+`9M}1P2#82%;e3AX*e3eZ(ZS)|=P8_ndR@ai|8x
zO~3v7@qc`uu-5WFascMPEP-%|6KRZ_#wNg3q_WjVd!+Ju>VL)kkJOq>T}0rj5aIw~
z6{TW7;`a$YENdrMf3<7v{QZNXeE$H;Z?<58{7{(<haawt9=#hBwm&ZB6X7pU2N2EP
zyps5EZHn^j2oVC;0k;bT5Qh*bu)x6Ntlf6z!BXzf`GG>FC9Ji4YXna3v!iq9*G1Nk
zf>(xG84O@0$bT5J1sEtnUjYn3C3AgZu(<xC1JIjI8<Q+)N43FQ2R)l$L_&2Il!oE0
zkW54CJG4FU9o<Mo^}%09Yy;Ay>P}=q8{+vnsHKplN$5*~SB2$8NOyyEAkO%$KnI;K
zgh0ZNYiZwr6C<1+V!r{4pFyO+XmGkfWFS}plWItr41WP6fHn|l@eO6b*9ar9#$t5@
zVFW=8aSDP6{18IN8yX!l9YDJUerOsf4Jw4tkT5Rz0W{jsjv<iH^ubqHUwd9%(E*&^
zE!?-2){4~um=@>&VI@MdYEppjL)e6{#avZaFYQY?og4@u#Ic>^#>aP@+B*`T*frL*
zj${smhJS7!(s_v6v_CdireDeFcNOpA<$G@`)>_*Mk`O{1-_4q0K0nsmKX&rKR(WJ|
zNfzjf2o@8~J1^AC`%3NV!k2}Yx1LhBKaHyZZvk8fx?C>EKDo4$Y<^_(#P*FF&UPo`
z^pm#>H)>x$Js*VXxyQ>9v4WO@>~Lp=zgjjmg)AIiA}5l_uZrgF88oY5?#NpEXPN#*
ZKL8TJNY)S}G@Sqd002ovPDHLkV1g)zLH7Uv

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 7f74461f2f733e56c4579aa7d854c3bc70536386..509e657cc99222ce4cf2c91f3353247f35e2da87 100644
GIT binary patch
delta 753
zcmV<N0uKGk1&9WaBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xXCHWR`%C?@~_0+mTbK~y-)rISf$Qvnc$zqcfP*-1!S8)I#av9>C1
z)q@+jAc_|^aOt546~UY6QSszO1&Jb}R1q&;R1mBShzc%6P=6@aC|DtyG__6J#576M
zyu8IjL>ttTbDLr2XPEyR_|FigCz(mjyz*k0-q-}mY#B}0sddUM3A#DBx}I>IP57rk
z&-=7_>d_$aw2D;{sF5r6k_M`7;<Jl%tf=G6<6&{^bh}w4(DOcR9=j7GSE@8_Y4fpk
zmJ_!k@-|W6;eUq=!`U(b+ZK8`x2p+R5(NNZJYP09UFc^tZ_qZw%EdilV&f(5z8fVs
z1<M*8>~HsTvM0enY6^fw0fjR=nvo?@kT1U+VKi^xsuAe!XyN+n6xVxG6x7O=iSH`U
zKj*l#x0%S(Z;a$LawRy~lR(oAQ`mGqYW5Emu}H8s<bUS%mmEQ_g3m7CRxAKmWf4^~
zIJ<K;-LFz;hRMPPJISny7|*C!B$(s3F`O$C^eW8sSh&?SpBtTFVV2iQp`<gERoQcG
zfUZ?_0DMW8NTf^19-D~YDWMrUO+FiC-K?@{Qq_3!X#xP<fZg2#END=;)0d&%B_gbk
zM9uzWk$-*dKC(rf`_U`_OM*569xIPNX3-5;6SC7An?yH262V~=IJBl7aZ9V`CkGi$
zYz?w~u@`{8!6NsgmEq-$4sIT3VZ%H(&3+33kI3d$7e_Y+DmJb-{f>z#lePvMS3BnL
zCSKq{G($l(SRHcFxw4ky_u?e8d2|Dse0CzcLu$y9DEtEH$nCF4f`L<!Ss(UPf%GPx
z#;u3|cx^SD+coz$NYhb{JRQX6l#oTE>X4ct;<OqxdR?4<HufjV)1T?Wvq3(M=Bfm0
j9d-_{3;gw&{yTmE6y+6FoU5v!00000NkvXXu0mjfpc_@K

delta 691
zcmV;k0!;mg2FeAHBYy&sNkl<ZILoDzJ7`l;9L9g=<lZDTO`6oUHrljRE0%T=Q3t`n
zO&4Eu5*(ZyTwFwOP{Bb32T^bm+`9M}1P2#82%;e3AX*e3eZ(ZS)|=P8_ndR@ai|8x
zO~3v7@qc`uu-5WFascMPEP-%|6KRZ_#wNg3q_WjVd!+Ju>VL)kkJOq>T}0rj5aIw~
z6{TW7;`a$YENdrMf3<7v{QZNXeE$H;Z?<58{7{(<haawt9=#hBwm&ZB6X7pU2N2EP
zyps5EZHn^j2oVC;0k;bT5Qh*bu)x6Ntlf6z!BXzf`GG>FC9Ji4YXna3v!iq9*G1Nk
zf>(xG84O@0$bT5J1sEtnUjYn3C3AgZu(<xC1JIjI8<Q+)N43FQ2R)l$L_&2Il!oE0
zkW54CJG4FU9o<Mo^}%09Yy;Ay>P}=q8{+vnsHKplN$5*~SB2$8NOyyEAkO%$KnI;K
zgh0ZNYiZwr6C<1+V!r{4pFyO+XmGkfWFS}plWItr41WP6fHn|l@eO6b*9ar9#$t5@
zVFW=8aSDP6{18IN8yX!l9YDJUerOsf4Jw4tkT5Rz0W{jsjv<iH^ubqHUwd9%(E*&^
zE!?-2){4~um=@>&VI@MdYEppjL)e6{#avZaFYQY?og4@u#Ic>^#>aP@+B*`T*frL*
zj${smhJS7!(s_v6v_CdireDeFcNOpA<$G@`)>_*Mk`O{1-_4q0K0nsmKX&rKR(WJ|
zNfzjf2o@8~J1^AC`%3NV!k2}Yx1LhBKaHyZZvk8fx?C>EKDo4$Y<^_(#P*FF&UPo`
z^pm#>H)>x$Js*VXxyQ>9v4WO@>~Lp=zgjjmg)AIiA}5l_uZrgF88oY5?#NpEXPN#*
ZKL8TJNY)S}G@Sqd002ovPDHLkV1g)zLH7Uv

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 7f74461f2f733e56c4579aa7d854c3bc70536386..509e657cc99222ce4cf2c91f3353247f35e2da87 100644
GIT binary patch
delta 753
zcmV<N0uKGk1&9WaBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xXCHWR`%C?@~_0+mTbK~y-)rISf$Qvnc$zqcfP*-1!S8)I#av9>C1
z)q@+jAc_|^aOt546~UY6QSszO1&Jb}R1q&;R1mBShzc%6P=6@aC|DtyG__6J#576M
zyu8IjL>ttTbDLr2XPEyR_|FigCz(mjyz*k0-q-}mY#B}0sddUM3A#DBx}I>IP57rk
z&-=7_>d_$aw2D;{sF5r6k_M`7;<Jl%tf=G6<6&{^bh}w4(DOcR9=j7GSE@8_Y4fpk
zmJ_!k@-|W6;eUq=!`U(b+ZK8`x2p+R5(NNZJYP09UFc^tZ_qZw%EdilV&f(5z8fVs
z1<M*8>~HsTvM0enY6^fw0fjR=nvo?@kT1U+VKi^xsuAe!XyN+n6xVxG6x7O=iSH`U
zKj*l#x0%S(Z;a$LawRy~lR(oAQ`mGqYW5Emu}H8s<bUS%mmEQ_g3m7CRxAKmWf4^~
zIJ<K;-LFz;hRMPPJISny7|*C!B$(s3F`O$C^eW8sSh&?SpBtTFVV2iQp`<gERoQcG
zfUZ?_0DMW8NTf^19-D~YDWMrUO+FiC-K?@{Qq_3!X#xP<fZg2#END=;)0d&%B_gbk
zM9uzWk$-*dKC(rf`_U`_OM*569xIPNX3-5;6SC7An?yH262V~=IJBl7aZ9V`CkGi$
zYz?w~u@`{8!6NsgmEq-$4sIT3VZ%H(&3+33kI3d$7e_Y+DmJb-{f>z#lePvMS3BnL
zCSKq{G($l(SRHcFxw4ky_u?e8d2|Dse0CzcLu$y9DEtEH$nCF4f`L<!Ss(UPf%GPx
z#;u3|cx^SD+coz$NYhb{JRQX6l#oTE>X4ct;<OqxdR?4<HufjV)1T?Wvq3(M=Bfm0
j9d-_{3;gw&{yTmE6y+6FoU5v!00000NkvXXu0mjfpc_@K

delta 691
zcmV;k0!;mg2FeAHBYy&sNkl<ZILoDzJ7`l;9L9g=<lZDTO`6oUHrljRE0%T=Q3t`n
zO&4Eu5*(ZyTwFwOP{Bb32T^bm+`9M}1P2#82%;e3AX*e3eZ(ZS)|=P8_ndR@ai|8x
zO~3v7@qc`uu-5WFascMPEP-%|6KRZ_#wNg3q_WjVd!+Ju>VL)kkJOq>T}0rj5aIw~
z6{TW7;`a$YENdrMf3<7v{QZNXeE$H;Z?<58{7{(<haawt9=#hBwm&ZB6X7pU2N2EP
zyps5EZHn^j2oVC;0k;bT5Qh*bu)x6Ntlf6z!BXzf`GG>FC9Ji4YXna3v!iq9*G1Nk
zf>(xG84O@0$bT5J1sEtnUjYn3C3AgZu(<xC1JIjI8<Q+)N43FQ2R)l$L_&2Il!oE0
zkW54CJG4FU9o<Mo^}%09Yy;Ay>P}=q8{+vnsHKplN$5*~SB2$8NOyyEAkO%$KnI;K
zgh0ZNYiZwr6C<1+V!r{4pFyO+XmGkfWFS}plWItr41WP6fHn|l@eO6b*9ar9#$t5@
zVFW=8aSDP6{18IN8yX!l9YDJUerOsf4Jw4tkT5Rz0W{jsjv<iH^ubqHUwd9%(E*&^
zE!?-2){4~um=@>&VI@MdYEppjL)e6{#avZaFYQY?og4@u#Ic>^#>aP@+B*`T*frL*
zj${smhJS7!(s_v6v_CdireDeFcNOpA<$G@`)>_*Mk`O{1-_4q0K0nsmKX&rKR(WJ|
zNfzjf2o@8~J1^AC`%3NV!k2}Yx1LhBKaHyZZvk8fx?C>EKDo4$Y<^_(#P*FF&UPo`
z^pm#>H)>x$Js*VXxyQ>9v4WO@>~Lp=zgjjmg)AIiA}5l_uZrgF88oY5?#NpEXPN#*
ZKL8TJNY)S}G@Sqd002ovPDHLkV1g)zLH7Uv

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 7f74461f2f733e56c4579aa7d854c3bc70536386..509e657cc99222ce4cf2c91f3353247f35e2da87 100644
GIT binary patch
delta 753
zcmV<N0uKGk1&9WaBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xXCHWR`%C?@~_0+mTbK~y-)rISf$Qvnc$zqcfP*-1!S8)I#av9>C1
z)q@+jAc_|^aOt546~UY6QSszO1&Jb}R1q&;R1mBShzc%6P=6@aC|DtyG__6J#576M
zyu8IjL>ttTbDLr2XPEyR_|FigCz(mjyz*k0-q-}mY#B}0sddUM3A#DBx}I>IP57rk
z&-=7_>d_$aw2D;{sF5r6k_M`7;<Jl%tf=G6<6&{^bh}w4(DOcR9=j7GSE@8_Y4fpk
zmJ_!k@-|W6;eUq=!`U(b+ZK8`x2p+R5(NNZJYP09UFc^tZ_qZw%EdilV&f(5z8fVs
z1<M*8>~HsTvM0enY6^fw0fjR=nvo?@kT1U+VKi^xsuAe!XyN+n6xVxG6x7O=iSH`U
zKj*l#x0%S(Z;a$LawRy~lR(oAQ`mGqYW5Emu}H8s<bUS%mmEQ_g3m7CRxAKmWf4^~
zIJ<K;-LFz;hRMPPJISny7|*C!B$(s3F`O$C^eW8sSh&?SpBtTFVV2iQp`<gERoQcG
zfUZ?_0DMW8NTf^19-D~YDWMrUO+FiC-K?@{Qq_3!X#xP<fZg2#END=;)0d&%B_gbk
zM9uzWk$-*dKC(rf`_U`_OM*569xIPNX3-5;6SC7An?yH262V~=IJBl7aZ9V`CkGi$
zYz?w~u@`{8!6NsgmEq-$4sIT3VZ%H(&3+33kI3d$7e_Y+DmJb-{f>z#lePvMS3BnL
zCSKq{G($l(SRHcFxw4ky_u?e8d2|Dse0CzcLu$y9DEtEH$nCF4f`L<!Ss(UPf%GPx
z#;u3|cx^SD+coz$NYhb{JRQX6l#oTE>X4ct;<OqxdR?4<HufjV)1T?Wvq3(M=Bfm0
j9d-_{3;gw&{yTmE6y+6FoU5v!00000NkvXXu0mjfpc_@K

delta 691
zcmV;k0!;mg2FeAHBYy&sNkl<ZILoDzJ7`l;9L9g=<lZDTO`6oUHrljRE0%T=Q3t`n
zO&4Eu5*(ZyTwFwOP{Bb32T^bm+`9M}1P2#82%;e3AX*e3eZ(ZS)|=P8_ndR@ai|8x
zO~3v7@qc`uu-5WFascMPEP-%|6KRZ_#wNg3q_WjVd!+Ju>VL)kkJOq>T}0rj5aIw~
z6{TW7;`a$YENdrMf3<7v{QZNXeE$H;Z?<58{7{(<haawt9=#hBwm&ZB6X7pU2N2EP
zyps5EZHn^j2oVC;0k;bT5Qh*bu)x6Ntlf6z!BXzf`GG>FC9Ji4YXna3v!iq9*G1Nk
zf>(xG84O@0$bT5J1sEtnUjYn3C3AgZu(<xC1JIjI8<Q+)N43FQ2R)l$L_&2Il!oE0
zkW54CJG4FU9o<Mo^}%09Yy;Ay>P}=q8{+vnsHKplN$5*~SB2$8NOyyEAkO%$KnI;K
zgh0ZNYiZwr6C<1+V!r{4pFyO+XmGkfWFS}plWItr41WP6fHn|l@eO6b*9ar9#$t5@
zVFW=8aSDP6{18IN8yX!l9YDJUerOsf4Jw4tkT5Rz0W{jsjv<iH^ubqHUwd9%(E*&^
zE!?-2){4~um=@>&VI@MdYEppjL)e6{#avZaFYQY?og4@u#Ic>^#>aP@+B*`T*frL*
zj${smhJS7!(s_v6v_CdireDeFcNOpA<$G@`)>_*Mk`O{1-_4q0K0nsmKX&rKR(WJ|
zNfzjf2o@8~J1^AC`%3NV!k2}Yx1LhBKaHyZZvk8fx?C>EKDo4$Y<^_(#P*FF&UPo`
z^pm#>H)>x$Js*VXxyQ>9v4WO@>~Lp=zgjjmg)AIiA}5l_uZrgF88oY5?#NpEXPN#*
ZKL8TJNY)S}G@Sqd002ovPDHLkV1g)zLH7Uv

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 7f74461f2f733e56c4579aa7d854c3bc70536386..509e657cc99222ce4cf2c91f3353247f35e2da87 100644
GIT binary patch
delta 753
zcmV<N0uKGk1&9WaBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xXCHWR`%C?@~_0+mTbK~y-)rISf$Qvnc$zqcfP*-1!S8)I#av9>C1
z)q@+jAc_|^aOt546~UY6QSszO1&Jb}R1q&;R1mBShzc%6P=6@aC|DtyG__6J#576M
zyu8IjL>ttTbDLr2XPEyR_|FigCz(mjyz*k0-q-}mY#B}0sddUM3A#DBx}I>IP57rk
z&-=7_>d_$aw2D;{sF5r6k_M`7;<Jl%tf=G6<6&{^bh}w4(DOcR9=j7GSE@8_Y4fpk
zmJ_!k@-|W6;eUq=!`U(b+ZK8`x2p+R5(NNZJYP09UFc^tZ_qZw%EdilV&f(5z8fVs
z1<M*8>~HsTvM0enY6^fw0fjR=nvo?@kT1U+VKi^xsuAe!XyN+n6xVxG6x7O=iSH`U
zKj*l#x0%S(Z;a$LawRy~lR(oAQ`mGqYW5Emu}H8s<bUS%mmEQ_g3m7CRxAKmWf4^~
zIJ<K;-LFz;hRMPPJISny7|*C!B$(s3F`O$C^eW8sSh&?SpBtTFVV2iQp`<gERoQcG
zfUZ?_0DMW8NTf^19-D~YDWMrUO+FiC-K?@{Qq_3!X#xP<fZg2#END=;)0d&%B_gbk
zM9uzWk$-*dKC(rf`_U`_OM*569xIPNX3-5;6SC7An?yH262V~=IJBl7aZ9V`CkGi$
zYz?w~u@`{8!6NsgmEq-$4sIT3VZ%H(&3+33kI3d$7e_Y+DmJb-{f>z#lePvMS3BnL
zCSKq{G($l(SRHcFxw4ky_u?e8d2|Dse0CzcLu$y9DEtEH$nCF4f`L<!Ss(UPf%GPx
z#;u3|cx^SD+coz$NYhb{JRQX6l#oTE>X4ct;<OqxdR?4<HufjV)1T?Wvq3(M=Bfm0
j9d-_{3;gw&{yTmE6y+6FoU5v!00000NkvXXu0mjfpc_@K

delta 691
zcmV;k0!;mg2FeAHBYy&sNkl<ZILoDzJ7`l;9L9g=<lZDTO`6oUHrljRE0%T=Q3t`n
zO&4Eu5*(ZyTwFwOP{Bb32T^bm+`9M}1P2#82%;e3AX*e3eZ(ZS)|=P8_ndR@ai|8x
zO~3v7@qc`uu-5WFascMPEP-%|6KRZ_#wNg3q_WjVd!+Ju>VL)kkJOq>T}0rj5aIw~
z6{TW7;`a$YENdrMf3<7v{QZNXeE$H;Z?<58{7{(<haawt9=#hBwm&ZB6X7pU2N2EP
zyps5EZHn^j2oVC;0k;bT5Qh*bu)x6Ntlf6z!BXzf`GG>FC9Ji4YXna3v!iq9*G1Nk
zf>(xG84O@0$bT5J1sEtnUjYn3C3AgZu(<xC1JIjI8<Q+)N43FQ2R)l$L_&2Il!oE0
zkW54CJG4FU9o<Mo^}%09Yy;Ay>P}=q8{+vnsHKplN$5*~SB2$8NOyyEAkO%$KnI;K
zgh0ZNYiZwr6C<1+V!r{4pFyO+XmGkfWFS}plWItr41WP6fHn|l@eO6b*9ar9#$t5@
zVFW=8aSDP6{18IN8yX!l9YDJUerOsf4Jw4tkT5Rz0W{jsjv<iH^ubqHUwd9%(E*&^
zE!?-2){4~um=@>&VI@MdYEppjL)e6{#avZaFYQY?og4@u#Ic>^#>aP@+B*`T*frL*
zj${smhJS7!(s_v6v_CdireDeFcNOpA<$G@`)>_*Mk`O{1-_4q0K0nsmKX&rKR(WJ|
zNfzjf2o@8~J1^AC`%3NV!k2}Yx1LhBKaHyZZvk8fx?C>EKDo4$Y<^_(#P*FF&UPo`
z^pm#>H)>x$Js*VXxyQ>9v4WO@>~Lp=zgjjmg)AIiA}5l_uZrgF88oY5?#NpEXPN#*
ZKL8TJNY)S}G@Sqd002ovPDHLkV1g)zLH7Uv

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 7f74461f2f733e56c4579aa7d854c3bc70536386..509e657cc99222ce4cf2c91f3353247f35e2da87 100644
GIT binary patch
delta 753
zcmV<N0uKGk1&9WaBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xXCHWR`%C?@~_0+mTbK~y-)rISf$Qvnc$zqcfP*-1!S8)I#av9>C1
z)q@+jAc_|^aOt546~UY6QSszO1&Jb}R1q&;R1mBShzc%6P=6@aC|DtyG__6J#576M
zyu8IjL>ttTbDLr2XPEyR_|FigCz(mjyz*k0-q-}mY#B}0sddUM3A#DBx}I>IP57rk
z&-=7_>d_$aw2D;{sF5r6k_M`7;<Jl%tf=G6<6&{^bh}w4(DOcR9=j7GSE@8_Y4fpk
zmJ_!k@-|W6;eUq=!`U(b+ZK8`x2p+R5(NNZJYP09UFc^tZ_qZw%EdilV&f(5z8fVs
z1<M*8>~HsTvM0enY6^fw0fjR=nvo?@kT1U+VKi^xsuAe!XyN+n6xVxG6x7O=iSH`U
zKj*l#x0%S(Z;a$LawRy~lR(oAQ`mGqYW5Emu}H8s<bUS%mmEQ_g3m7CRxAKmWf4^~
zIJ<K;-LFz;hRMPPJISny7|*C!B$(s3F`O$C^eW8sSh&?SpBtTFVV2iQp`<gERoQcG
zfUZ?_0DMW8NTf^19-D~YDWMrUO+FiC-K?@{Qq_3!X#xP<fZg2#END=;)0d&%B_gbk
zM9uzWk$-*dKC(rf`_U`_OM*569xIPNX3-5;6SC7An?yH262V~=IJBl7aZ9V`CkGi$
zYz?w~u@`{8!6NsgmEq-$4sIT3VZ%H(&3+33kI3d$7e_Y+DmJb-{f>z#lePvMS3BnL
zCSKq{G($l(SRHcFxw4ky_u?e8d2|Dse0CzcLu$y9DEtEH$nCF4f`L<!Ss(UPf%GPx
z#;u3|cx^SD+coz$NYhb{JRQX6l#oTE>X4ct;<OqxdR?4<HufjV)1T?Wvq3(M=Bfm0
j9d-_{3;gw&{yTmE6y+6FoU5v!00000NkvXXu0mjfpc_@K

delta 691
zcmV;k0!;mg2FeAHBYy&sNkl<ZILoDzJ7`l;9L9g=<lZDTO`6oUHrljRE0%T=Q3t`n
zO&4Eu5*(ZyTwFwOP{Bb32T^bm+`9M}1P2#82%;e3AX*e3eZ(ZS)|=P8_ndR@ai|8x
zO~3v7@qc`uu-5WFascMPEP-%|6KRZ_#wNg3q_WjVd!+Ju>VL)kkJOq>T}0rj5aIw~
z6{TW7;`a$YENdrMf3<7v{QZNXeE$H;Z?<58{7{(<haawt9=#hBwm&ZB6X7pU2N2EP
zyps5EZHn^j2oVC;0k;bT5Qh*bu)x6Ntlf6z!BXzf`GG>FC9Ji4YXna3v!iq9*G1Nk
zf>(xG84O@0$bT5J1sEtnUjYn3C3AgZu(<xC1JIjI8<Q+)N43FQ2R)l$L_&2Il!oE0
zkW54CJG4FU9o<Mo^}%09Yy;Ay>P}=q8{+vnsHKplN$5*~SB2$8NOyyEAkO%$KnI;K
zgh0ZNYiZwr6C<1+V!r{4pFyO+XmGkfWFS}plWItr41WP6fHn|l@eO6b*9ar9#$t5@
zVFW=8aSDP6{18IN8yX!l9YDJUerOsf4Jw4tkT5Rz0W{jsjv<iH^ubqHUwd9%(E*&^
zE!?-2){4~um=@>&VI@MdYEppjL)e6{#avZaFYQY?og4@u#Ic>^#>aP@+B*`T*frL*
zj${smhJS7!(s_v6v_CdireDeFcNOpA<$G@`)>_*Mk`O{1-_4q0K0nsmKX&rKR(WJ|
zNfzjf2o@8~J1^AC`%3NV!k2}Yx1LhBKaHyZZvk8fx?C>EKDo4$Y<^_(#P*FF&UPo`
z^pm#>H)>x$Js*VXxyQ>9v4WO@>~Lp=zgjjmg)AIiA}5l_uZrgF88oY5?#NpEXPN#*
ZKL8TJNY)S}G@Sqd002ovPDHLkV1g)zLH7Uv