From 08ffb01e654a031c18c565cad947726424cc283d Mon Sep 17 00:00:00 2001
From: ElbertF <elbert@alias.io>
Date: Sun, 16 Sep 2012 19:28:19 +1000
Subject: [PATCH] Added Worpress Super Cache, W3 Total Cache, fixed dropdown
 menu in FF driver

---
 .../images/icons/LightMon Engine.png           | Bin 0 -> 801 bytes
 .../images/icons/W3 Total Cache.png            | Bin 0 -> 630 bytes
 .../images/icons/WordPress Super Cache.png     | Bin 0 -> 714 bytes
 drivers/bookmarklet/js/apps.js                 |  17 +++++++++++++----
 drivers/bookmarklet/js/wappalyzer.js           |   2 +-
 .../chrome/images/icons/LightMon Engine.png    | Bin 0 -> 801 bytes
 drivers/chrome/images/icons/W3 Total Cache.png | Bin 0 -> 630 bytes
 .../images/icons/WordPress Super Cache.png     | Bin 0 -> 714 bytes
 drivers/chrome/js/apps.js                      |  17 +++++++++++++----
 drivers/chrome/js/wappalyzer.js                |   2 +-
 drivers/firefox/content/js/apps.js             |  17 +++++++++++++----
 drivers/firefox/content/js/content.js          |   7 ++++++-
 drivers/firefox/content/js/driver.js           |   7 ++++---
 drivers/firefox/content/js/wappalyzer.js       |   2 +-
 drivers/firefox/install.rdf                    |   2 +-
 .../skin/images/icons/LightMon Engine.png      | Bin 0 -> 801 bytes
 .../skin/images/icons/W3 Total Cache.png       | Bin 0 -> 630 bytes
 .../images/icons/WordPress Super Cache.png     | Bin 0 -> 714 bytes
 .../firefox/skin/images/icons/chartbeat.png    | Bin 0 -> 133 bytes
 drivers/html/images/icons/LightMon Engine.png  | Bin 0 -> 801 bytes
 drivers/html/images/icons/W3 Total Cache.png   | Bin 0 -> 630 bytes
 .../images/icons/WordPress Super Cache.png     | Bin 0 -> 714 bytes
 drivers/html/js/apps.js                        |  17 +++++++++++++----
 drivers/html/js/wappalyzer.js                  |   2 +-
 share/images/icons/W3 Total Cache.png          | Bin 0 -> 630 bytes
 share/images/icons/WordPress Super Cache.png   | Bin 0 -> 714 bytes
 share/js/apps.js                               |  12 +++++++++++-
 share/js/wappalyzer.js                         |   2 +-
 28 files changed, 79 insertions(+), 27 deletions(-)
 create mode 100644 drivers/bookmarklet/images/icons/LightMon Engine.png
 create mode 100644 drivers/bookmarklet/images/icons/W3 Total Cache.png
 create mode 100644 drivers/bookmarklet/images/icons/WordPress Super Cache.png
 create mode 100644 drivers/chrome/images/icons/LightMon Engine.png
 create mode 100644 drivers/chrome/images/icons/W3 Total Cache.png
 create mode 100644 drivers/chrome/images/icons/WordPress Super Cache.png
 create mode 100644 drivers/firefox/skin/images/icons/LightMon Engine.png
 create mode 100644 drivers/firefox/skin/images/icons/W3 Total Cache.png
 create mode 100644 drivers/firefox/skin/images/icons/WordPress Super Cache.png
 create mode 100644 drivers/firefox/skin/images/icons/chartbeat.png
 create mode 100644 drivers/html/images/icons/LightMon Engine.png
 create mode 100644 drivers/html/images/icons/W3 Total Cache.png
 create mode 100644 drivers/html/images/icons/WordPress Super Cache.png
 create mode 100644 share/images/icons/W3 Total Cache.png
 create mode 100644 share/images/icons/WordPress Super Cache.png

diff --git a/drivers/bookmarklet/images/icons/LightMon Engine.png b/drivers/bookmarklet/images/icons/LightMon Engine.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdce59d32ca205ae3df1adb02cd66c19aa24fdd6
GIT binary patch
literal 801
zcmV++1K#|JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+z1^B6*MCIn^^z=0<K9!
zK~y-)l~b`xBzG8n-*0{^!@4udu)8N&JwiNm3k6M)&TB1%D`JX8uCuW*he2VB5Ya-G
z;~MV|u(LE({(>`v6d623k7G%-7?2T`V|VtL`OWxyY358wbL7FtYd#*2@4Zi~wIvZz
z_y-mMNLmrG_zaYY1YsC{wY$69BKer)6aZgDT$1{;0szX^+Nt4i_`1{Sd<$R_fDfQ7
zB4YslJDTK!V@0xDtJU0Et=8}LdOwC?*aQ#&m?Rkh2nwDg`EOxOQfU!!@9yrZx3{-`
zqtW<KsZ{DDV-cx{hyh?l1O+DmVv-+4<fDir8h~3Wl`8#yKX4pJd!82n$N`x1^K*Y`
zX=&hj9?s6r>Whnuy}7x$8xiS~?28CAfH9?%Ym7k@MgC|Me<>oB%gf73r_*`9u(0sw
z`uh6YlarHHy<YDfA0NN;eZN<vm8&8NZH$3221+?W6h)8s_xD=>{Hv?0uMZ9mo&zXH
zQPga=+go{_PZh^5D*%?HHO3%KQzS{EU%dGK>2Np<NFq&Bq-i=<DwS-OW$1Rh-|X$}
zeFvaS(p3P={r$c9<lyx5^vTW5Uta(~yWRe+(P;FIG1%DH_+xEt?Y%JuVHiHUxVWeS
z(28VStyZIniHSj$Wf+Y{)>@0r&CTCeR#q+@#~EZ<2BlPgdwctr<>lpfS(d3JNpb+W
z5|MajW~O&|c=(g&d4tht6tAwX{@QA_eio5#v)R1LvJ7z?-zcTJM@L7mrl+U7Ns<gi
zBoUI2isl8^*Vj+9)_Qh!_Jh_s2auE0TU%Q{%+Jri+1c57BO=LQFu?fu_^snOv5@ot
zxFpL(Rh5V+k|>@@B}p<y60YmUB9a3z01}c$thFToT0}H}hv)g!_o9UlX%(V*F;*9f
fd9n0=U;*H7Yj<6mfThdP00000NkvXXu0mjfFavKR

literal 0
HcmV?d00001

diff --git a/drivers/bookmarklet/images/icons/W3 Total Cache.png b/drivers/bookmarklet/images/icons/W3 Total Cache.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c253831f51b0bd086338ad8886fd285f4186885
GIT binary patch
literal 630
zcmV-+0*U>JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+zAi}A_*j1>?QyJ0s~1z
zK~y-)jgw1jQ$ZMp-+VLYlBA|dOXi$}wy3nxg6K+6bfIVwwdzt4>7pB<OI@@p#f87Y
ztrSGuR?woGf(t>xMXF6i+C<Xk-qeydmy>gG5t2r1^*oz_`DUK^=4Hm?I1T{7wk(ui
z&cBx9tLI1)38skz=~|L$Vuf@qL7`xpIBzfR!P5~`zI?n~Sa|hb-{jaA&g&$?-<hr@
zr14{m%9+#ie+c4_W){ue>Xjoj0yLWV7apIt6nOeLLY!L!0M*sx$zSnL6Sd45n6BY}
zIJJ7%O8q<w00aOV3ojl5AlqodAPa72Eq}WO08}sLhKe8F-R=|`tzCD5uPc)PK*gmu
z_h4H}S75pm*roDuGhc{t?(<iB3x-*Tr3)}7gIX5s$`)Xn2X%3sD<Ycios=AoQu1><
zZCQaF7GMD{I7whkZjU5^91qMNYm;0Rk*>f$d=yT;xR<ukL~|pv{~Z`dXyV#BsUn&J
zU;{v3C<<$*>M8?L<gLN0H|IF_`D^@8f0?OXLEAfRlMBS%=?BulV2%Jl714A+I}Ee3
z>1wn8#HqLa=Px|(KBT_U@s!kX_kcW#x~)&o+$YA+6+|xHc*cVROFS4_@8oe{>vyJR
z<*>;7^&2}_^_tHp<YPuYJ7yGeqed<pGxFK7Rv{NthDMf$=bl{ZoDKlL0qr8dBvy*Q
QR{#J207*qoM6N<$g7%&iH2?qr

literal 0
HcmV?d00001

diff --git a/drivers/bookmarklet/images/icons/WordPress Super Cache.png b/drivers/bookmarklet/images/icons/WordPress Super Cache.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f74461f2f733e56c4579aa7d854c3bc70536386
GIT binary patch
literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007!Nkl<ZILoDz
zJ7`l;9L9g=<lZDTO`6oUHrljRE0%T=Q3t`nO&4Eu5*(ZyTwFwOP{Bb32T^bm+`9M}
z1P2#82%;e3AX*e3eZ(ZS)|=P8_ndR@ai|8xO~3v7@qc`uu-5WFascMPEP-%|6KRZ_
z#wNg3q_WjVd!+Ju>c#z!)S66PMBu6r;s9Y4rD8wg_X$2MYbRHKwQKGC{ez->{{YKx
zwqSw$P?-&fAFhlZy&Dv^KQ87I;V(}I5Y67alK60Kit_9T5dzl%w+jRihY%>Rz`*3J
z-FD`|Qtr_CfkLJwthIb=1Wxa>qjTujMb?jkSB6>{3}7Y57_tQzC_!HV3_&GxePXb<
z{-XoXn@t;&ENMrz!CMDCn_xsjbrzI{;jNHNL+d-VJ@6gfNJRC)Uq@^M(xmE6WI-F^
z`8lYikfllJOMzE~<wZz$gLNRz_^m((oiBty!jEfd-+&V%oE~Do0gInOq`+u!x<F(g
zSOJr2NSO=)B!D&$Xz>kYz}E;Pu*PC_1Yrb03~>sA2>cL2#~T_QG95s>1%7B6C=Duv
z(2y`L_yIK9(2gOH(DcDqSYLZyUC{xY-Ywj>mDY;Y0hku(0AVFUvuaX+??c#xu*F<e
zS1;{LIh`B`A;htr<i^K$oZ34QpV&3lwT@&CgobV((s_v6v_CdireDeFcNOpA<$G@`
z)>_*Mk`O{1-_4q0K0nsmKX&rKR(WJ|Nfzjf2o@8~J1^AC`%3NV!k2}Yx1LhBKaHyZ
zZvk8fx?C>EKDo4$Y<^_(#P*FF&UPo`^pm#>H)>x$Js*VXxyQ>9v4WO@>~Lp=zgjjm
wg&bZYCz8moistPZG^=6m$Xfennf^sT020AS)(|8#od5s;07*qoM6N<$g4gCky#N3J

literal 0
HcmV?d00001

diff --git a/drivers/bookmarklet/js/apps.js b/drivers/bookmarklet/js/apps.js
index afb89df41..9206648e5 100644
--- a/drivers/bookmarklet/js/apps.js
+++ b/drivers/bookmarklet/js/apps.js
@@ -813,10 +813,9 @@
 			env: /^Liferay$/,
 			headers: { 'Liferay-Portal': /.*/i }
 		},
-		'LightMon': {
+		'LightMon Engine': {
 			cats: [ 1 ],
-			meta: { 'generator': /LightMon/i },
-			headers: { 'X-Powered-By': /LightMon/i },
+			html: /<!-- Lightmon Engine Copyright Lightmon/i,
 			implies: [ 'PHP' ]
 		},
 		'lighttpd': {
@@ -1102,7 +1101,7 @@
 		},
 		'Plesk': {
 			cats: [ 9 ],
-			headers: { 'X-Powered-By-Plesk': /Plesk/i,'X-Powered-By': /PleskLin/i },
+			headers: { 'X-Powered-By-Plesk': /Plesk/i, 'X-Powered-By': /PleskLin/i },
 			script: /common\.js\?plesk/i
 		},
 		'Pligg': {
@@ -1495,6 +1494,11 @@
 			cats: [ 10 ],
 			script: /w3counter\.com\/tracker\.js/
 		},
+		'W3 Total Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+W3 Total Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Web Optimizer': {
 			cats: [ 10 ],
 			html: /<title [^>]*lang=("|')wo("|')>/
@@ -1562,6 +1566,11 @@
 			env: /^wp_username$/,
 			implies: [ 'PHP' ]
 		},
+		'WordPress Super Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+WP\-Super\-Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Xajax': {
 			cats: [ 12 ],
 			script: /xajax_core.*\.js/i
diff --git a/drivers/bookmarklet/js/wappalyzer.js b/drivers/bookmarklet/js/wappalyzer.js
index 6c42357e4..ce3bba716 100644
--- a/drivers/bookmarklet/js/wappalyzer.js
+++ b/drivers/bookmarklet/js/wappalyzer.js
@@ -242,7 +242,7 @@ var wappalyzer = wappalyzer || (function() {
 					}
 				}
 
-				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 200 ) { driver('ping'); }
+				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 100 ) { driver('ping'); }
 
 				apps = null;
 				data = null;
diff --git a/drivers/chrome/images/icons/LightMon Engine.png b/drivers/chrome/images/icons/LightMon Engine.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdce59d32ca205ae3df1adb02cd66c19aa24fdd6
GIT binary patch
literal 801
zcmV++1K#|JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+z1^B6*MCIn^^z=0<K9!
zK~y-)l~b`xBzG8n-*0{^!@4udu)8N&JwiNm3k6M)&TB1%D`JX8uCuW*he2VB5Ya-G
z;~MV|u(LE({(>`v6d623k7G%-7?2T`V|VtL`OWxyY358wbL7FtYd#*2@4Zi~wIvZz
z_y-mMNLmrG_zaYY1YsC{wY$69BKer)6aZgDT$1{;0szX^+Nt4i_`1{Sd<$R_fDfQ7
zB4YslJDTK!V@0xDtJU0Et=8}LdOwC?*aQ#&m?Rkh2nwDg`EOxOQfU!!@9yrZx3{-`
zqtW<KsZ{DDV-cx{hyh?l1O+DmVv-+4<fDir8h~3Wl`8#yKX4pJd!82n$N`x1^K*Y`
zX=&hj9?s6r>Whnuy}7x$8xiS~?28CAfH9?%Ym7k@MgC|Me<>oB%gf73r_*`9u(0sw
z`uh6YlarHHy<YDfA0NN;eZN<vm8&8NZH$3221+?W6h)8s_xD=>{Hv?0uMZ9mo&zXH
zQPga=+go{_PZh^5D*%?HHO3%KQzS{EU%dGK>2Np<NFq&Bq-i=<DwS-OW$1Rh-|X$}
zeFvaS(p3P={r$c9<lyx5^vTW5Uta(~yWRe+(P;FIG1%DH_+xEt?Y%JuVHiHUxVWeS
z(28VStyZIniHSj$Wf+Y{)>@0r&CTCeR#q+@#~EZ<2BlPgdwctr<>lpfS(d3JNpb+W
z5|MajW~O&|c=(g&d4tht6tAwX{@QA_eio5#v)R1LvJ7z?-zcTJM@L7mrl+U7Ns<gi
zBoUI2isl8^*Vj+9)_Qh!_Jh_s2auE0TU%Q{%+Jri+1c57BO=LQFu?fu_^snOv5@ot
zxFpL(Rh5V+k|>@@B}p<y60YmUB9a3z01}c$thFToT0}H}hv)g!_o9UlX%(V*F;*9f
fd9n0=U;*H7Yj<6mfThdP00000NkvXXu0mjfFavKR

literal 0
HcmV?d00001

diff --git a/drivers/chrome/images/icons/W3 Total Cache.png b/drivers/chrome/images/icons/W3 Total Cache.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c253831f51b0bd086338ad8886fd285f4186885
GIT binary patch
literal 630
zcmV-+0*U>JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+zAi}A_*j1>?QyJ0s~1z
zK~y-)jgw1jQ$ZMp-+VLYlBA|dOXi$}wy3nxg6K+6bfIVwwdzt4>7pB<OI@@p#f87Y
ztrSGuR?woGf(t>xMXF6i+C<Xk-qeydmy>gG5t2r1^*oz_`DUK^=4Hm?I1T{7wk(ui
z&cBx9tLI1)38skz=~|L$Vuf@qL7`xpIBzfR!P5~`zI?n~Sa|hb-{jaA&g&$?-<hr@
zr14{m%9+#ie+c4_W){ue>Xjoj0yLWV7apIt6nOeLLY!L!0M*sx$zSnL6Sd45n6BY}
zIJJ7%O8q<w00aOV3ojl5AlqodAPa72Eq}WO08}sLhKe8F-R=|`tzCD5uPc)PK*gmu
z_h4H}S75pm*roDuGhc{t?(<iB3x-*Tr3)}7gIX5s$`)Xn2X%3sD<Ycios=AoQu1><
zZCQaF7GMD{I7whkZjU5^91qMNYm;0Rk*>f$d=yT;xR<ukL~|pv{~Z`dXyV#BsUn&J
zU;{v3C<<$*>M8?L<gLN0H|IF_`D^@8f0?OXLEAfRlMBS%=?BulV2%Jl714A+I}Ee3
z>1wn8#HqLa=Px|(KBT_U@s!kX_kcW#x~)&o+$YA+6+|xHc*cVROFS4_@8oe{>vyJR
z<*>;7^&2}_^_tHp<YPuYJ7yGeqed<pGxFK7Rv{NthDMf$=bl{ZoDKlL0qr8dBvy*Q
QR{#J207*qoM6N<$g7%&iH2?qr

literal 0
HcmV?d00001

diff --git a/drivers/chrome/images/icons/WordPress Super Cache.png b/drivers/chrome/images/icons/WordPress Super Cache.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f74461f2f733e56c4579aa7d854c3bc70536386
GIT binary patch
literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007!Nkl<ZILoDz
zJ7`l;9L9g=<lZDTO`6oUHrljRE0%T=Q3t`nO&4Eu5*(ZyTwFwOP{Bb32T^bm+`9M}
z1P2#82%;e3AX*e3eZ(ZS)|=P8_ndR@ai|8xO~3v7@qc`uu-5WFascMPEP-%|6KRZ_
z#wNg3q_WjVd!+Ju>c#z!)S66PMBu6r;s9Y4rD8wg_X$2MYbRHKwQKGC{ez->{{YKx
zwqSw$P?-&fAFhlZy&Dv^KQ87I;V(}I5Y67alK60Kit_9T5dzl%w+jRihY%>Rz`*3J
z-FD`|Qtr_CfkLJwthIb=1Wxa>qjTujMb?jkSB6>{3}7Y57_tQzC_!HV3_&GxePXb<
z{-XoXn@t;&ENMrz!CMDCn_xsjbrzI{;jNHNL+d-VJ@6gfNJRC)Uq@^M(xmE6WI-F^
z`8lYikfllJOMzE~<wZz$gLNRz_^m((oiBty!jEfd-+&V%oE~Do0gInOq`+u!x<F(g
zSOJr2NSO=)B!D&$Xz>kYz}E;Pu*PC_1Yrb03~>sA2>cL2#~T_QG95s>1%7B6C=Duv
z(2y`L_yIK9(2gOH(DcDqSYLZyUC{xY-Ywj>mDY;Y0hku(0AVFUvuaX+??c#xu*F<e
zS1;{LIh`B`A;htr<i^K$oZ34QpV&3lwT@&CgobV((s_v6v_CdireDeFcNOpA<$G@`
z)>_*Mk`O{1-_4q0K0nsmKX&rKR(WJ|Nfzjf2o@8~J1^AC`%3NV!k2}Yx1LhBKaHyZ
zZvk8fx?C>EKDo4$Y<^_(#P*FF&UPo`^pm#>H)>x$Js*VXxyQ>9v4WO@>~Lp=zgjjm
wg&bZYCz8moistPZG^=6m$Xfennf^sT020AS)(|8#od5s;07*qoM6N<$g4gCky#N3J

literal 0
HcmV?d00001

diff --git a/drivers/chrome/js/apps.js b/drivers/chrome/js/apps.js
index afb89df41..9206648e5 100644
--- a/drivers/chrome/js/apps.js
+++ b/drivers/chrome/js/apps.js
@@ -813,10 +813,9 @@
 			env: /^Liferay$/,
 			headers: { 'Liferay-Portal': /.*/i }
 		},
-		'LightMon': {
+		'LightMon Engine': {
 			cats: [ 1 ],
-			meta: { 'generator': /LightMon/i },
-			headers: { 'X-Powered-By': /LightMon/i },
+			html: /<!-- Lightmon Engine Copyright Lightmon/i,
 			implies: [ 'PHP' ]
 		},
 		'lighttpd': {
@@ -1102,7 +1101,7 @@
 		},
 		'Plesk': {
 			cats: [ 9 ],
-			headers: { 'X-Powered-By-Plesk': /Plesk/i,'X-Powered-By': /PleskLin/i },
+			headers: { 'X-Powered-By-Plesk': /Plesk/i, 'X-Powered-By': /PleskLin/i },
 			script: /common\.js\?plesk/i
 		},
 		'Pligg': {
@@ -1495,6 +1494,11 @@
 			cats: [ 10 ],
 			script: /w3counter\.com\/tracker\.js/
 		},
+		'W3 Total Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+W3 Total Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Web Optimizer': {
 			cats: [ 10 ],
 			html: /<title [^>]*lang=("|')wo("|')>/
@@ -1562,6 +1566,11 @@
 			env: /^wp_username$/,
 			implies: [ 'PHP' ]
 		},
+		'WordPress Super Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+WP\-Super\-Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Xajax': {
 			cats: [ 12 ],
 			script: /xajax_core.*\.js/i
diff --git a/drivers/chrome/js/wappalyzer.js b/drivers/chrome/js/wappalyzer.js
index 6c42357e4..ce3bba716 100644
--- a/drivers/chrome/js/wappalyzer.js
+++ b/drivers/chrome/js/wappalyzer.js
@@ -242,7 +242,7 @@ var wappalyzer = wappalyzer || (function() {
 					}
 				}
 
-				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 200 ) { driver('ping'); }
+				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 100 ) { driver('ping'); }
 
 				apps = null;
 				data = null;
diff --git a/drivers/firefox/content/js/apps.js b/drivers/firefox/content/js/apps.js
index afb89df41..9206648e5 100644
--- a/drivers/firefox/content/js/apps.js
+++ b/drivers/firefox/content/js/apps.js
@@ -813,10 +813,9 @@
 			env: /^Liferay$/,
 			headers: { 'Liferay-Portal': /.*/i }
 		},
-		'LightMon': {
+		'LightMon Engine': {
 			cats: [ 1 ],
-			meta: { 'generator': /LightMon/i },
-			headers: { 'X-Powered-By': /LightMon/i },
+			html: /<!-- Lightmon Engine Copyright Lightmon/i,
 			implies: [ 'PHP' ]
 		},
 		'lighttpd': {
@@ -1102,7 +1101,7 @@
 		},
 		'Plesk': {
 			cats: [ 9 ],
-			headers: { 'X-Powered-By-Plesk': /Plesk/i,'X-Powered-By': /PleskLin/i },
+			headers: { 'X-Powered-By-Plesk': /Plesk/i, 'X-Powered-By': /PleskLin/i },
 			script: /common\.js\?plesk/i
 		},
 		'Pligg': {
@@ -1495,6 +1494,11 @@
 			cats: [ 10 ],
 			script: /w3counter\.com\/tracker\.js/
 		},
+		'W3 Total Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+W3 Total Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Web Optimizer': {
 			cats: [ 10 ],
 			html: /<title [^>]*lang=("|')wo("|')>/
@@ -1562,6 +1566,11 @@
 			env: /^wp_username$/,
 			implies: [ 'PHP' ]
 		},
+		'WordPress Super Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+WP\-Super\-Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Xajax': {
 			cats: [ 12 ],
 			script: /xajax_core.*\.js/i
diff --git a/drivers/firefox/content/js/content.js b/drivers/firefox/content/js/content.js
index 98b2b3f7e..b0028090e 100644
--- a/drivers/firefox/content/js/content.js
+++ b/drivers/firefox/content/js/content.js
@@ -7,7 +7,12 @@
 		if ( content.document.contentType != 'text/html' ) { return };
 
 		// HTML
-		var html = content.document.documentElement.outerHTML
+		var html = content.document.documentElement.outerHTML;
+
+		// Comments outside HTML
+		//if ( content.document.lastChild.nodeType === 8 ) {
+			//content.alert(content.document.lastChild.nodeValue);
+		//}
 
 		if ( html.length > 50000 ) {
 			html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
diff --git a/drivers/firefox/content/js/driver.js b/drivers/firefox/content/js/driver.js
index 5cb6dee74..157759f24 100644
--- a/drivers/firefox/content/js/driver.js
+++ b/drivers/firefox/content/js/driver.js
@@ -101,8 +101,7 @@
 		 * Display apps
 		 */
 		displayApps: function() {
-			var
-				i, j, showCat, cat, image, menuSeparator, menuItem, url = gBrowser.currentURI.spec.split('#')[0];
+			var image, url = gBrowser.currentURI.spec.split('#')[0];
 
 			$('#wappalyzer-container > image, #wappalyzer-menu > menuitem, #wappalyzer-menu > menuseparator').addClass('wappalyzer-remove');
 
@@ -114,6 +113,8 @@
 				}
 
 				w.detected[url].map(function(app, i) {
+					var j, cat, showCat, menuSeparator, menuItem;
+
 					for ( i in w.apps[app].cats ) {
 						showCat = false;
 
@@ -145,7 +146,7 @@
 							$('#wappalyzer-menu').append(menuItem);
 
 							for ( j in w.apps[app].cats ) {
-								cat = w.apps[app].cats[i];
+								var cat = w.apps[app].cats[j];
 
 								menuItem = $('<menuitem/>')
 									.attr('class', 'wappalyzer-category')
diff --git a/drivers/firefox/content/js/wappalyzer.js b/drivers/firefox/content/js/wappalyzer.js
index 6c42357e4..ce3bba716 100644
--- a/drivers/firefox/content/js/wappalyzer.js
+++ b/drivers/firefox/content/js/wappalyzer.js
@@ -242,7 +242,7 @@ var wappalyzer = wappalyzer || (function() {
 					}
 				}
 
-				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 200 ) { driver('ping'); }
+				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 100 ) { driver('ping'); }
 
 				apps = null;
 				data = null;
diff --git a/drivers/firefox/install.rdf b/drivers/firefox/install.rdf
index 49f5ec624..9db4c7a38 100644
--- a/drivers/firefox/install.rdf
+++ b/drivers/firefox/install.rdf
@@ -3,7 +3,7 @@
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>wappalyzer@crunchlabz.com</em:id>
-		<em:version>2.3.1</em:version>
+		<em:version>2.3.2</em:version>
 		<em:type>2</em:type>
 		<em:unpack>true</em:unpack>
 
diff --git a/drivers/firefox/skin/images/icons/LightMon Engine.png b/drivers/firefox/skin/images/icons/LightMon Engine.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdce59d32ca205ae3df1adb02cd66c19aa24fdd6
GIT binary patch
literal 801
zcmV++1K#|JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+z1^B6*MCIn^^z=0<K9!
zK~y-)l~b`xBzG8n-*0{^!@4udu)8N&JwiNm3k6M)&TB1%D`JX8uCuW*he2VB5Ya-G
z;~MV|u(LE({(>`v6d623k7G%-7?2T`V|VtL`OWxyY358wbL7FtYd#*2@4Zi~wIvZz
z_y-mMNLmrG_zaYY1YsC{wY$69BKer)6aZgDT$1{;0szX^+Nt4i_`1{Sd<$R_fDfQ7
zB4YslJDTK!V@0xDtJU0Et=8}LdOwC?*aQ#&m?Rkh2nwDg`EOxOQfU!!@9yrZx3{-`
zqtW<KsZ{DDV-cx{hyh?l1O+DmVv-+4<fDir8h~3Wl`8#yKX4pJd!82n$N`x1^K*Y`
zX=&hj9?s6r>Whnuy}7x$8xiS~?28CAfH9?%Ym7k@MgC|Me<>oB%gf73r_*`9u(0sw
z`uh6YlarHHy<YDfA0NN;eZN<vm8&8NZH$3221+?W6h)8s_xD=>{Hv?0uMZ9mo&zXH
zQPga=+go{_PZh^5D*%?HHO3%KQzS{EU%dGK>2Np<NFq&Bq-i=<DwS-OW$1Rh-|X$}
zeFvaS(p3P={r$c9<lyx5^vTW5Uta(~yWRe+(P;FIG1%DH_+xEt?Y%JuVHiHUxVWeS
z(28VStyZIniHSj$Wf+Y{)>@0r&CTCeR#q+@#~EZ<2BlPgdwctr<>lpfS(d3JNpb+W
z5|MajW~O&|c=(g&d4tht6tAwX{@QA_eio5#v)R1LvJ7z?-zcTJM@L7mrl+U7Ns<gi
zBoUI2isl8^*Vj+9)_Qh!_Jh_s2auE0TU%Q{%+Jri+1c57BO=LQFu?fu_^snOv5@ot
zxFpL(Rh5V+k|>@@B}p<y60YmUB9a3z01}c$thFToT0}H}hv)g!_o9UlX%(V*F;*9f
fd9n0=U;*H7Yj<6mfThdP00000NkvXXu0mjfFavKR

literal 0
HcmV?d00001

diff --git a/drivers/firefox/skin/images/icons/W3 Total Cache.png b/drivers/firefox/skin/images/icons/W3 Total Cache.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c253831f51b0bd086338ad8886fd285f4186885
GIT binary patch
literal 630
zcmV-+0*U>JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+zAi}A_*j1>?QyJ0s~1z
zK~y-)jgw1jQ$ZMp-+VLYlBA|dOXi$}wy3nxg6K+6bfIVwwdzt4>7pB<OI@@p#f87Y
ztrSGuR?woGf(t>xMXF6i+C<Xk-qeydmy>gG5t2r1^*oz_`DUK^=4Hm?I1T{7wk(ui
z&cBx9tLI1)38skz=~|L$Vuf@qL7`xpIBzfR!P5~`zI?n~Sa|hb-{jaA&g&$?-<hr@
zr14{m%9+#ie+c4_W){ue>Xjoj0yLWV7apIt6nOeLLY!L!0M*sx$zSnL6Sd45n6BY}
zIJJ7%O8q<w00aOV3ojl5AlqodAPa72Eq}WO08}sLhKe8F-R=|`tzCD5uPc)PK*gmu
z_h4H}S75pm*roDuGhc{t?(<iB3x-*Tr3)}7gIX5s$`)Xn2X%3sD<Ycios=AoQu1><
zZCQaF7GMD{I7whkZjU5^91qMNYm;0Rk*>f$d=yT;xR<ukL~|pv{~Z`dXyV#BsUn&J
zU;{v3C<<$*>M8?L<gLN0H|IF_`D^@8f0?OXLEAfRlMBS%=?BulV2%Jl714A+I}Ee3
z>1wn8#HqLa=Px|(KBT_U@s!kX_kcW#x~)&o+$YA+6+|xHc*cVROFS4_@8oe{>vyJR
z<*>;7^&2}_^_tHp<YPuYJ7yGeqed<pGxFK7Rv{NthDMf$=bl{ZoDKlL0qr8dBvy*Q
QR{#J207*qoM6N<$g7%&iH2?qr

literal 0
HcmV?d00001

diff --git a/drivers/firefox/skin/images/icons/WordPress Super Cache.png b/drivers/firefox/skin/images/icons/WordPress Super Cache.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f74461f2f733e56c4579aa7d854c3bc70536386
GIT binary patch
literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007!Nkl<ZILoDz
zJ7`l;9L9g=<lZDTO`6oUHrljRE0%T=Q3t`nO&4Eu5*(ZyTwFwOP{Bb32T^bm+`9M}
z1P2#82%;e3AX*e3eZ(ZS)|=P8_ndR@ai|8xO~3v7@qc`uu-5WFascMPEP-%|6KRZ_
z#wNg3q_WjVd!+Ju>c#z!)S66PMBu6r;s9Y4rD8wg_X$2MYbRHKwQKGC{ez->{{YKx
zwqSw$P?-&fAFhlZy&Dv^KQ87I;V(}I5Y67alK60Kit_9T5dzl%w+jRihY%>Rz`*3J
z-FD`|Qtr_CfkLJwthIb=1Wxa>qjTujMb?jkSB6>{3}7Y57_tQzC_!HV3_&GxePXb<
z{-XoXn@t;&ENMrz!CMDCn_xsjbrzI{;jNHNL+d-VJ@6gfNJRC)Uq@^M(xmE6WI-F^
z`8lYikfllJOMzE~<wZz$gLNRz_^m((oiBty!jEfd-+&V%oE~Do0gInOq`+u!x<F(g
zSOJr2NSO=)B!D&$Xz>kYz}E;Pu*PC_1Yrb03~>sA2>cL2#~T_QG95s>1%7B6C=Duv
z(2y`L_yIK9(2gOH(DcDqSYLZyUC{xY-Ywj>mDY;Y0hku(0AVFUvuaX+??c#xu*F<e
zS1;{LIh`B`A;htr<i^K$oZ34QpV&3lwT@&CgobV((s_v6v_CdireDeFcNOpA<$G@`
z)>_*Mk`O{1-_4q0K0nsmKX&rKR(WJ|Nfzjf2o@8~J1^AC`%3NV!k2}Yx1LhBKaHyZ
zZvk8fx?C>EKDo4$Y<^_(#P*FF&UPo`^pm#>H)>x$Js*VXxyQ>9v4WO@>~Lp=zgjjm
wg&bZYCz8moistPZG^=6m$Xfennf^sT020AS)(|8#od5s;07*qoM6N<$g4gCky#N3J

literal 0
HcmV?d00001

diff --git a/drivers/firefox/skin/images/icons/chartbeat.png b/drivers/firefox/skin/images/icons/chartbeat.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cb597cc7ed6478bd165b27d0a3864f9bb5143d8
GIT binary patch
literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|uK$gMLFoT~wWBL10tFdM
zg8YIR9G=}s19G%HT^vI=t|uonFdw^cfr0JXg$n`_6S<T(ZE84j<%(ti(;3$wc9jEF
bjtmU4NBGwK3^Q;5>SFM8^>bP0l+XkKb$uxq

literal 0
HcmV?d00001

diff --git a/drivers/html/images/icons/LightMon Engine.png b/drivers/html/images/icons/LightMon Engine.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdce59d32ca205ae3df1adb02cd66c19aa24fdd6
GIT binary patch
literal 801
zcmV++1K#|JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+z1^B6*MCIn^^z=0<K9!
zK~y-)l~b`xBzG8n-*0{^!@4udu)8N&JwiNm3k6M)&TB1%D`JX8uCuW*he2VB5Ya-G
z;~MV|u(LE({(>`v6d623k7G%-7?2T`V|VtL`OWxyY358wbL7FtYd#*2@4Zi~wIvZz
z_y-mMNLmrG_zaYY1YsC{wY$69BKer)6aZgDT$1{;0szX^+Nt4i_`1{Sd<$R_fDfQ7
zB4YslJDTK!V@0xDtJU0Et=8}LdOwC?*aQ#&m?Rkh2nwDg`EOxOQfU!!@9yrZx3{-`
zqtW<KsZ{DDV-cx{hyh?l1O+DmVv-+4<fDir8h~3Wl`8#yKX4pJd!82n$N`x1^K*Y`
zX=&hj9?s6r>Whnuy}7x$8xiS~?28CAfH9?%Ym7k@MgC|Me<>oB%gf73r_*`9u(0sw
z`uh6YlarHHy<YDfA0NN;eZN<vm8&8NZH$3221+?W6h)8s_xD=>{Hv?0uMZ9mo&zXH
zQPga=+go{_PZh^5D*%?HHO3%KQzS{EU%dGK>2Np<NFq&Bq-i=<DwS-OW$1Rh-|X$}
zeFvaS(p3P={r$c9<lyx5^vTW5Uta(~yWRe+(P;FIG1%DH_+xEt?Y%JuVHiHUxVWeS
z(28VStyZIniHSj$Wf+Y{)>@0r&CTCeR#q+@#~EZ<2BlPgdwctr<>lpfS(d3JNpb+W
z5|MajW~O&|c=(g&d4tht6tAwX{@QA_eio5#v)R1LvJ7z?-zcTJM@L7mrl+U7Ns<gi
zBoUI2isl8^*Vj+9)_Qh!_Jh_s2auE0TU%Q{%+Jri+1c57BO=LQFu?fu_^snOv5@ot
zxFpL(Rh5V+k|>@@B}p<y60YmUB9a3z01}c$thFToT0}H}hv)g!_o9UlX%(V*F;*9f
fd9n0=U;*H7Yj<6mfThdP00000NkvXXu0mjfFavKR

literal 0
HcmV?d00001

diff --git a/drivers/html/images/icons/W3 Total Cache.png b/drivers/html/images/icons/W3 Total Cache.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c253831f51b0bd086338ad8886fd285f4186885
GIT binary patch
literal 630
zcmV-+0*U>JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+zAi}A_*j1>?QyJ0s~1z
zK~y-)jgw1jQ$ZMp-+VLYlBA|dOXi$}wy3nxg6K+6bfIVwwdzt4>7pB<OI@@p#f87Y
ztrSGuR?woGf(t>xMXF6i+C<Xk-qeydmy>gG5t2r1^*oz_`DUK^=4Hm?I1T{7wk(ui
z&cBx9tLI1)38skz=~|L$Vuf@qL7`xpIBzfR!P5~`zI?n~Sa|hb-{jaA&g&$?-<hr@
zr14{m%9+#ie+c4_W){ue>Xjoj0yLWV7apIt6nOeLLY!L!0M*sx$zSnL6Sd45n6BY}
zIJJ7%O8q<w00aOV3ojl5AlqodAPa72Eq}WO08}sLhKe8F-R=|`tzCD5uPc)PK*gmu
z_h4H}S75pm*roDuGhc{t?(<iB3x-*Tr3)}7gIX5s$`)Xn2X%3sD<Ycios=AoQu1><
zZCQaF7GMD{I7whkZjU5^91qMNYm;0Rk*>f$d=yT;xR<ukL~|pv{~Z`dXyV#BsUn&J
zU;{v3C<<$*>M8?L<gLN0H|IF_`D^@8f0?OXLEAfRlMBS%=?BulV2%Jl714A+I}Ee3
z>1wn8#HqLa=Px|(KBT_U@s!kX_kcW#x~)&o+$YA+6+|xHc*cVROFS4_@8oe{>vyJR
z<*>;7^&2}_^_tHp<YPuYJ7yGeqed<pGxFK7Rv{NthDMf$=bl{ZoDKlL0qr8dBvy*Q
QR{#J207*qoM6N<$g7%&iH2?qr

literal 0
HcmV?d00001

diff --git a/drivers/html/images/icons/WordPress Super Cache.png b/drivers/html/images/icons/WordPress Super Cache.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f74461f2f733e56c4579aa7d854c3bc70536386
GIT binary patch
literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007!Nkl<ZILoDz
zJ7`l;9L9g=<lZDTO`6oUHrljRE0%T=Q3t`nO&4Eu5*(ZyTwFwOP{Bb32T^bm+`9M}
z1P2#82%;e3AX*e3eZ(ZS)|=P8_ndR@ai|8xO~3v7@qc`uu-5WFascMPEP-%|6KRZ_
z#wNg3q_WjVd!+Ju>c#z!)S66PMBu6r;s9Y4rD8wg_X$2MYbRHKwQKGC{ez->{{YKx
zwqSw$P?-&fAFhlZy&Dv^KQ87I;V(}I5Y67alK60Kit_9T5dzl%w+jRihY%>Rz`*3J
z-FD`|Qtr_CfkLJwthIb=1Wxa>qjTujMb?jkSB6>{3}7Y57_tQzC_!HV3_&GxePXb<
z{-XoXn@t;&ENMrz!CMDCn_xsjbrzI{;jNHNL+d-VJ@6gfNJRC)Uq@^M(xmE6WI-F^
z`8lYikfllJOMzE~<wZz$gLNRz_^m((oiBty!jEfd-+&V%oE~Do0gInOq`+u!x<F(g
zSOJr2NSO=)B!D&$Xz>kYz}E;Pu*PC_1Yrb03~>sA2>cL2#~T_QG95s>1%7B6C=Duv
z(2y`L_yIK9(2gOH(DcDqSYLZyUC{xY-Ywj>mDY;Y0hku(0AVFUvuaX+??c#xu*F<e
zS1;{LIh`B`A;htr<i^K$oZ34QpV&3lwT@&CgobV((s_v6v_CdireDeFcNOpA<$G@`
z)>_*Mk`O{1-_4q0K0nsmKX&rKR(WJ|Nfzjf2o@8~J1^AC`%3NV!k2}Yx1LhBKaHyZ
zZvk8fx?C>EKDo4$Y<^_(#P*FF&UPo`^pm#>H)>x$Js*VXxyQ>9v4WO@>~Lp=zgjjm
wg&bZYCz8moistPZG^=6m$Xfennf^sT020AS)(|8#od5s;07*qoM6N<$g4gCky#N3J

literal 0
HcmV?d00001

diff --git a/drivers/html/js/apps.js b/drivers/html/js/apps.js
index afb89df41..9206648e5 100644
--- a/drivers/html/js/apps.js
+++ b/drivers/html/js/apps.js
@@ -813,10 +813,9 @@
 			env: /^Liferay$/,
 			headers: { 'Liferay-Portal': /.*/i }
 		},
-		'LightMon': {
+		'LightMon Engine': {
 			cats: [ 1 ],
-			meta: { 'generator': /LightMon/i },
-			headers: { 'X-Powered-By': /LightMon/i },
+			html: /<!-- Lightmon Engine Copyright Lightmon/i,
 			implies: [ 'PHP' ]
 		},
 		'lighttpd': {
@@ -1102,7 +1101,7 @@
 		},
 		'Plesk': {
 			cats: [ 9 ],
-			headers: { 'X-Powered-By-Plesk': /Plesk/i,'X-Powered-By': /PleskLin/i },
+			headers: { 'X-Powered-By-Plesk': /Plesk/i, 'X-Powered-By': /PleskLin/i },
 			script: /common\.js\?plesk/i
 		},
 		'Pligg': {
@@ -1495,6 +1494,11 @@
 			cats: [ 10 ],
 			script: /w3counter\.com\/tracker\.js/
 		},
+		'W3 Total Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+W3 Total Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Web Optimizer': {
 			cats: [ 10 ],
 			html: /<title [^>]*lang=("|')wo("|')>/
@@ -1562,6 +1566,11 @@
 			env: /^wp_username$/,
 			implies: [ 'PHP' ]
 		},
+		'WordPress Super Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+WP\-Super\-Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Xajax': {
 			cats: [ 12 ],
 			script: /xajax_core.*\.js/i
diff --git a/drivers/html/js/wappalyzer.js b/drivers/html/js/wappalyzer.js
index 6c42357e4..ce3bba716 100644
--- a/drivers/html/js/wappalyzer.js
+++ b/drivers/html/js/wappalyzer.js
@@ -242,7 +242,7 @@ var wappalyzer = wappalyzer || (function() {
 					}
 				}
 
-				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 200 ) { driver('ping'); }
+				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 100 ) { driver('ping'); }
 
 				apps = null;
 				data = null;
diff --git a/share/images/icons/W3 Total Cache.png b/share/images/icons/W3 Total Cache.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c253831f51b0bd086338ad8886fd285f4186885
GIT binary patch
literal 630
zcmV-+0*U>JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+zAi}A_*j1>?QyJ0s~1z
zK~y-)jgw1jQ$ZMp-+VLYlBA|dOXi$}wy3nxg6K+6bfIVwwdzt4>7pB<OI@@p#f87Y
ztrSGuR?woGf(t>xMXF6i+C<Xk-qeydmy>gG5t2r1^*oz_`DUK^=4Hm?I1T{7wk(ui
z&cBx9tLI1)38skz=~|L$Vuf@qL7`xpIBzfR!P5~`zI?n~Sa|hb-{jaA&g&$?-<hr@
zr14{m%9+#ie+c4_W){ue>Xjoj0yLWV7apIt6nOeLLY!L!0M*sx$zSnL6Sd45n6BY}
zIJJ7%O8q<w00aOV3ojl5AlqodAPa72Eq}WO08}sLhKe8F-R=|`tzCD5uPc)PK*gmu
z_h4H}S75pm*roDuGhc{t?(<iB3x-*Tr3)}7gIX5s$`)Xn2X%3sD<Ycios=AoQu1><
zZCQaF7GMD{I7whkZjU5^91qMNYm;0Rk*>f$d=yT;xR<ukL~|pv{~Z`dXyV#BsUn&J
zU;{v3C<<$*>M8?L<gLN0H|IF_`D^@8f0?OXLEAfRlMBS%=?BulV2%Jl714A+I}Ee3
z>1wn8#HqLa=Px|(KBT_U@s!kX_kcW#x~)&o+$YA+6+|xHc*cVROFS4_@8oe{>vyJR
z<*>;7^&2}_^_tHp<YPuYJ7yGeqed<pGxFK7Rv{NthDMf$=bl{ZoDKlL0qr8dBvy*Q
QR{#J207*qoM6N<$g7%&iH2?qr

literal 0
HcmV?d00001

diff --git a/share/images/icons/WordPress Super Cache.png b/share/images/icons/WordPress Super Cache.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f74461f2f733e56c4579aa7d854c3bc70536386
GIT binary patch
literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007!Nkl<ZILoDz
zJ7`l;9L9g=<lZDTO`6oUHrljRE0%T=Q3t`nO&4Eu5*(ZyTwFwOP{Bb32T^bm+`9M}
z1P2#82%;e3AX*e3eZ(ZS)|=P8_ndR@ai|8xO~3v7@qc`uu-5WFascMPEP-%|6KRZ_
z#wNg3q_WjVd!+Ju>c#z!)S66PMBu6r;s9Y4rD8wg_X$2MYbRHKwQKGC{ez->{{YKx
zwqSw$P?-&fAFhlZy&Dv^KQ87I;V(}I5Y67alK60Kit_9T5dzl%w+jRihY%>Rz`*3J
z-FD`|Qtr_CfkLJwthIb=1Wxa>qjTujMb?jkSB6>{3}7Y57_tQzC_!HV3_&GxePXb<
z{-XoXn@t;&ENMrz!CMDCn_xsjbrzI{;jNHNL+d-VJ@6gfNJRC)Uq@^M(xmE6WI-F^
z`8lYikfllJOMzE~<wZz$gLNRz_^m((oiBty!jEfd-+&V%oE~Do0gInOq`+u!x<F(g
zSOJr2NSO=)B!D&$Xz>kYz}E;Pu*PC_1Yrb03~>sA2>cL2#~T_QG95s>1%7B6C=Duv
z(2y`L_yIK9(2gOH(DcDqSYLZyUC{xY-Ywj>mDY;Y0hku(0AVFUvuaX+??c#xu*F<e
zS1;{LIh`B`A;htr<i^K$oZ34QpV&3lwT@&CgobV((s_v6v_CdireDeFcNOpA<$G@`
z)>_*Mk`O{1-_4q0K0nsmKX&rKR(WJ|Nfzjf2o@8~J1^AC`%3NV!k2}Yx1LhBKaHyZ
zZvk8fx?C>EKDo4$Y<^_(#P*FF&UPo`^pm#>H)>x$Js*VXxyQ>9v4WO@>~Lp=zgjjm
wg&bZYCz8moistPZG^=6m$Xfennf^sT020AS)(|8#od5s;07*qoM6N<$g4gCky#N3J

literal 0
HcmV?d00001

diff --git a/share/js/apps.js b/share/js/apps.js
index c342a6fab..9206648e5 100644
--- a/share/js/apps.js
+++ b/share/js/apps.js
@@ -1101,7 +1101,7 @@
 		},
 		'Plesk': {
 			cats: [ 9 ],
-			headers: { 'X-Powered-By-Plesk': /Plesk/i,'X-Powered-By': /PleskLin/i },
+			headers: { 'X-Powered-By-Plesk': /Plesk/i, 'X-Powered-By': /PleskLin/i },
 			script: /common\.js\?plesk/i
 		},
 		'Pligg': {
@@ -1494,6 +1494,11 @@
 			cats: [ 10 ],
 			script: /w3counter\.com\/tracker\.js/
 		},
+		'W3 Total Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+W3 Total Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Web Optimizer': {
 			cats: [ 10 ],
 			html: /<title [^>]*lang=("|')wo("|')>/
@@ -1561,6 +1566,11 @@
 			env: /^wp_username$/,
 			implies: [ 'PHP' ]
 		},
+		'WordPress Super Cache': {
+			cats: [ 23 ],
+			html: /<!\-\-[^>]+WP\-Super\-Cache/i,
+			implies: [ 'WordPress' ]
+		},
 		'Xajax': {
 			cats: [ 12 ],
 			script: /xajax_core.*\.js/i
diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js
index 6c42357e4..ce3bba716 100644
--- a/share/js/wappalyzer.js
+++ b/share/js/wappalyzer.js
@@ -242,7 +242,7 @@ var wappalyzer = wappalyzer || (function() {
 					}
 				}
 
-				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 200 ) { driver('ping'); }
+				if ( w.ping.hostnames != null && Object.keys(w.ping.hostnames).length >= 100 ) { driver('ping'); }
 
 				apps = null;
 				data = null;