From 677a53b4193b9824d2b2c303478a9e5eae114779 Mon Sep 17 00:00:00 2001
From: Camille Barneaud <camillebarneaud@gmail.com>
Date: Fri, 16 Nov 2012 11:06:32 +0100
Subject: [PATCH] Add some apps

Correct JSON (#182
#178 : implies joomla for sobi2 & Detect SobiPro
#179 : detect phpalbum
#164 : detect ZK
#163 : detect moinmoin
#162 : detect videojs
---
 drivers/bookmarklet/images/icons/MoinMoin.png | Bin 0 -> 420 bytes
 drivers/bookmarklet/images/icons/SobiPro.png  | Bin 0 -> 190 bytes
 drivers/bookmarklet/images/icons/VideoJS.png  | Bin 0 -> 313 bytes
 drivers/bookmarklet/images/icons/ZK.png       | Bin 0 -> 435 bytes
 drivers/bookmarklet/images/icons/phpAlbum.png | Bin 0 -> 477 bytes
 drivers/bookmarklet/json                      |  46 +++++++++++++++---
 drivers/chrome/apps.json                      |  46 +++++++++++++++---
 drivers/chrome/images/icons/MoinMoin.png      | Bin 0 -> 420 bytes
 drivers/chrome/images/icons/SobiPro.png       | Bin 0 -> 190 bytes
 drivers/chrome/images/icons/VideoJS.png       | Bin 0 -> 313 bytes
 drivers/chrome/images/icons/ZK.png            | Bin 0 -> 435 bytes
 drivers/chrome/images/icons/phpAlbum.png      | Bin 0 -> 477 bytes
 drivers/firefox-jetpack/data/apps.json        |  46 +++++++++++++++---
 .../firefox-jetpack/images/icons/MoinMoin.png | Bin 0 -> 420 bytes
 .../firefox-jetpack/images/icons/SobiPro.png  | Bin 0 -> 190 bytes
 .../firefox-jetpack/images/icons/VideoJS.png  | Bin 0 -> 313 bytes
 drivers/firefox-jetpack/images/icons/ZK.png   | Bin 0 -> 435 bytes
 .../firefox-jetpack/images/icons/phpAlbum.png | Bin 0 -> 477 bytes
 drivers/firefox/content/apps.json             |  44 ++++++++++++++---
 .../firefox/skin/images/icons/MoinMoin.png    | Bin 0 -> 420 bytes
 drivers/firefox/skin/images/icons/SobiPro.png | Bin 0 -> 190 bytes
 drivers/firefox/skin/images/icons/VideoJS.png | Bin 0 -> 313 bytes
 drivers/firefox/skin/images/icons/ZK.png      | Bin 0 -> 435 bytes
 .../firefox/skin/images/icons/phpAlbum.png    | Bin 0 -> 477 bytes
 drivers/html/apps.json                        |  46 +++++++++++++++---
 drivers/html/images/icons/MoinMoin.png        | Bin 0 -> 420 bytes
 drivers/html/images/icons/SobiPro.png         | Bin 0 -> 190 bytes
 drivers/html/images/icons/VideoJS.png         | Bin 0 -> 313 bytes
 drivers/html/images/icons/ZK.png              | Bin 0 -> 435 bytes
 drivers/html/images/icons/phpAlbum.png        | Bin 0 -> 477 bytes
 drivers/php/apps.json                         |  46 +++++++++++++++---
 share/apps.json                               |  46 +++++++++++++++---
 share/images/icons/MoinMoin.png               | Bin 0 -> 420 bytes
 share/images/icons/SobiPro.png                | Bin 0 -> 190 bytes
 share/images/icons/VideoJS.png                | Bin 0 -> 313 bytes
 share/images/icons/ZK.png                     | Bin 0 -> 435 bytes
 share/images/icons/phpAlbum.png               | Bin 0 -> 477 bytes
 37 files changed, 265 insertions(+), 55 deletions(-)
 create mode 100644 drivers/bookmarklet/images/icons/MoinMoin.png
 create mode 100644 drivers/bookmarklet/images/icons/SobiPro.png
 create mode 100644 drivers/bookmarklet/images/icons/VideoJS.png
 create mode 100644 drivers/bookmarklet/images/icons/ZK.png
 create mode 100644 drivers/bookmarklet/images/icons/phpAlbum.png
 create mode 100644 drivers/chrome/images/icons/MoinMoin.png
 create mode 100644 drivers/chrome/images/icons/SobiPro.png
 create mode 100644 drivers/chrome/images/icons/VideoJS.png
 create mode 100644 drivers/chrome/images/icons/ZK.png
 create mode 100644 drivers/chrome/images/icons/phpAlbum.png
 create mode 100644 drivers/firefox-jetpack/images/icons/MoinMoin.png
 create mode 100644 drivers/firefox-jetpack/images/icons/SobiPro.png
 create mode 100644 drivers/firefox-jetpack/images/icons/VideoJS.png
 create mode 100644 drivers/firefox-jetpack/images/icons/ZK.png
 create mode 100644 drivers/firefox-jetpack/images/icons/phpAlbum.png
 create mode 100644 drivers/firefox/skin/images/icons/MoinMoin.png
 create mode 100644 drivers/firefox/skin/images/icons/SobiPro.png
 create mode 100644 drivers/firefox/skin/images/icons/VideoJS.png
 create mode 100644 drivers/firefox/skin/images/icons/ZK.png
 create mode 100644 drivers/firefox/skin/images/icons/phpAlbum.png
 create mode 100644 drivers/html/images/icons/MoinMoin.png
 create mode 100644 drivers/html/images/icons/SobiPro.png
 create mode 100644 drivers/html/images/icons/VideoJS.png
 create mode 100644 drivers/html/images/icons/ZK.png
 create mode 100644 drivers/html/images/icons/phpAlbum.png
 create mode 100644 share/images/icons/MoinMoin.png
 create mode 100644 share/images/icons/SobiPro.png
 create mode 100644 share/images/icons/VideoJS.png
 create mode 100644 share/images/icons/ZK.png
 create mode 100644 share/images/icons/phpAlbum.png

diff --git a/drivers/bookmarklet/images/icons/MoinMoin.png b/drivers/bookmarklet/images/icons/MoinMoin.png
new file mode 100644
index 0000000000000000000000000000000000000000..3839586cd9650bc18f559fe6e4ac9c88ce73b27f
GIT binary patch
literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004NNkl<ZILm#L
zOH0E*5XbW=1qD&4_^7S;K+(3^3ep@@g7~b5B3h^s2_E7D`U!ILkaN!F;z4>J`3>w6
zYmz_AGCT91ot@cP$C*Iz5=yOBSE=k@%VMWz_xPM5#Br>o`suT@Kfa|IBpQsMAC7+1
z2M2C$@a`~HBC@*G)QkwavBUXy2!`#uNY*djG)uK}DOWeQ^7=kfLC1y<flG|78RJIF
z)l-usk#5(O$EQH<2SXKfY-yS*2QD$%6LWP)22m8r^!$?T!PLyG+6>^*7rg}wwVin9
zk_Fj(-&aA;0xmInK&9Q&4VeHX^!t4okH<Cu9UDFXmzb*iAWn7z%!`oO0Nr#Rz_kbD
zmEd`v22iUB#+F+G%g*3a!Z5T1^o53Jn}|N?w@+!FvE`m=vyif9MBv(I%nlMYspJgO
za^u+g{|r*mD6j1u*-=K%j`G~fX7PXEY7h^?FPjm)^fMKGXLCT=cm4$<W|wq6OXgbu
O0000<MNUMnLSTY8aKn=T

literal 0
HcmV?d00001

diff --git a/drivers/bookmarklet/images/icons/SobiPro.png b/drivers/bookmarklet/images/icons/SobiPro.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1463bb40c1dcf4cd7303150807d8f1ff11ea3ea
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`t)4E9Ar_~XPG;n5P~c#w^w2N1
zYf}HB@b3ZppUD%iO=FpHtSo!m4o0B{sl?<7ifXa`Iq%yAm4am+8CX8Q^f55#^fn=r
z6zi?Wm9z_3G+39^zVPtinsjZyasQT(gO7cl@uV~bGOpTgVAx#7ZS7#WaazU>_Pq&-
o!uOj_);o&(9MO$<y8QuzxR^4V{jpQGfDU5tboFyt=akR{01;+Hp#T5?

literal 0
HcmV?d00001

diff --git a/drivers/bookmarklet/images/icons/VideoJS.png b/drivers/bookmarklet/images/icons/VideoJS.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c414feeeb277daed4454a2dfcb4bb95d1bd6399
GIT binary patch
literal 313
zcmV-90mlA`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00031Nkl<ZILl-B
z|NlQDC75Aw8IZR8G&c|{qT{H^n-$gUePNg%s{ufT>_B`Ri2tKwyR_Q>K#eeb9f*0c
z888)_W}n&_$eLkzEs6m^h4I)l1Mx`>r@)<93;^L$umM0thCuuki{_U=EDKa948-@b
z81Ng29T{S#Z$BG5efxh5JYz>P%$ZtlVcuHqVgE64_<aVyx*6U;{1=G-qv4xC%x@f;
z&JM&Uf%rcb91jiypu&1A27vH-prV;LG*5*GB2XbS5O2k1h<!#aHqFODE<=e%pkhHF
zzKd>vZ|(H|R`JEinx6x)EY_3=)Sw8&{^;1PxZ5A735GQXS7rhL`@V1jJkTZv00000
LNkvXXu0mjf_)~#o

literal 0
HcmV?d00001

diff --git a/drivers/bookmarklet/images/icons/ZK.png b/drivers/bookmarklet/images/icons/ZK.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d2b3182d8a93bdcf2fcec288511e7fc24f74901
GIT binary patch
literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004cNkl<ZILoEa
z+b#n^7zglg=MCx&)*J8!`v@MvBe)VSWL-$42}KE^X?xK`9k(oTwi`i+M$@FElpa{?
zSmlODB!4>-Tb0n8o#dC9+5h*=%o0o3@PgR<HM}4;TR>ey+hFnYe{*8-9O^NzpV2sT
z`fpAw=7e1M7}a$R^QsJGIs0eE5sRk5HIJ`@sgpnaOU|Jwn58Euiy63e{F}(X_ryX+
z;3^-Vs2z!{g@)h;%;EzSEiG!;*ghHpOCopsNE+RPpvJ4@0Uas34AsoQDBMGdZbRw_
zL-tQYJ1N1iDscNq3L4;y%NrP_M;KR6LgDqznaeQpcaGa%uao;UxP2t`uYu#EEwSs|
zwprB_<_FtI-Mv5#?Z7v(g-FJNabdyjBgwCW3ncTXynjI5JchcS6qJb-r}zdfa|dwi
ze1ogvGO2e#>`CgGhpSajB9eCgvG^zi4s&9bhgVTsr=8jG_32_w)I9}Hs4E6fs51gj
ds67NPz5uhCkkJjc3lsnV002ovPDHLkV1ks@#(n?*

literal 0
HcmV?d00001

diff --git a/drivers/bookmarklet/images/icons/phpAlbum.png b/drivers/bookmarklet/images/icons/phpAlbum.png
new file mode 100644
index 0000000000000000000000000000000000000000..550aff41c281009f26b064a23bba1f5148bb56f1
GIT binary patch
literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004`Nkl<ZILmdC
zy>Ami5XFBZZwe4L=j2RrmXeZ>2L1pFBt)AiqM;+ArAI<RGz3vofP|0`)KpM{1Sn04
z^a%y+9fj?1;tYwcTPDSxH+vVe)$F`C@4Z>A?EE-X01*HXsv_t$YsYgvljXKX5&_jv
zurb&$GHG7^*R?({zh}~477=)Mdy(eZeDwvnaE-0?)7azJ-=KH3zQWxnAH2icM{8um
zF)TRz-qVks_hxgIbWk7*B__*D4`jmvS-I)&>EJh<ad<i`kmWiiXDuept=}mf6iCMg
zf@6Qr1_iWF%zlo>aDGk#mg;xy+5odbf&#i0qY7Fz^G^?I4>g&VU>$lmDPgK;MgDU%
zMJN9-No4%M#XBzmJSmCW5VZjK`}JW>yx;4fk-;QU%fCSqw_)X$C(VQaZrp!|ORH?Z
z+#re1p-~Id@3sQf6Gx@~Ba^rd{p((|A9v8MaVyMznTu@ZCJ5I7NO~@TJpY_4fF68z
z$l@hGI7^_TeOE7CcF9J27557Aes}DB0z)*g_kz{`*P!p;AardWJtd?Ff}$J)j0w8W
TWpl-(00000NkvXXu0mjf<@?jM

literal 0
HcmV?d00001

diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index e9c0a5867..34fe66485 100644
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -240,7 +240,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -486,7 +486,7 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
 			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
@@ -526,7 +526,7 @@
 			"implies": [ "PHP"]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +535,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -990,6 +990,12 @@
 			"cats": [ 1 ],
 			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
 		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "show_switch2gui",
+			"implies":[ "Python" ]
+		},
 		"Mojolicious": {
 			"cats": [ 18 ],
 			"headers": { "x-powered-by": "mojolicious" },
@@ -1164,6 +1170,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,7 +1214,7 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
@@ -1435,11 +1446,18 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
-			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)"
+			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)",
+			"implies": [ "Joomla" ]
+		},
+		"SobiPro": {
+			"cats":	[ 19 ],
+			"env":	"SobiProUrl",
+			"html":	" <(script|link)[^>].*com_sobipro.*>"
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1623,6 +1641,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "VideoJS",
+			"html": "<div+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1694,7 +1718,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": [ 'PHP' ]
+			"implies": [ "PHP" ]
 		},
 		"Webtrekk": {
 			"cats": [ 10 ],
@@ -1822,6 +1846,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index e9c0a5867..34fe66485 100644
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -240,7 +240,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -486,7 +486,7 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
 			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
@@ -526,7 +526,7 @@
 			"implies": [ "PHP"]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +535,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -990,6 +990,12 @@
 			"cats": [ 1 ],
 			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
 		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "show_switch2gui",
+			"implies":[ "Python" ]
+		},
 		"Mojolicious": {
 			"cats": [ 18 ],
 			"headers": { "x-powered-by": "mojolicious" },
@@ -1164,6 +1170,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,7 +1214,7 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
@@ -1435,11 +1446,18 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
-			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)"
+			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)",
+			"implies": [ "Joomla" ]
+		},
+		"SobiPro": {
+			"cats":	[ 19 ],
+			"env":	"SobiProUrl",
+			"html":	" <(script|link)[^>].*com_sobipro.*>"
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1623,6 +1641,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "VideoJS",
+			"html": "<div+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1694,7 +1718,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": [ 'PHP' ]
+			"implies": [ "PHP" ]
 		},
 		"Webtrekk": {
 			"cats": [ 10 ],
@@ -1822,6 +1846,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }
diff --git a/drivers/chrome/images/icons/MoinMoin.png b/drivers/chrome/images/icons/MoinMoin.png
new file mode 100644
index 0000000000000000000000000000000000000000..3839586cd9650bc18f559fe6e4ac9c88ce73b27f
GIT binary patch
literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004NNkl<ZILm#L
zOH0E*5XbW=1qD&4_^7S;K+(3^3ep@@g7~b5B3h^s2_E7D`U!ILkaN!F;z4>J`3>w6
zYmz_AGCT91ot@cP$C*Iz5=yOBSE=k@%VMWz_xPM5#Br>o`suT@Kfa|IBpQsMAC7+1
z2M2C$@a`~HBC@*G)QkwavBUXy2!`#uNY*djG)uK}DOWeQ^7=kfLC1y<flG|78RJIF
z)l-usk#5(O$EQH<2SXKfY-yS*2QD$%6LWP)22m8r^!$?T!PLyG+6>^*7rg}wwVin9
zk_Fj(-&aA;0xmInK&9Q&4VeHX^!t4okH<Cu9UDFXmzb*iAWn7z%!`oO0Nr#Rz_kbD
zmEd`v22iUB#+F+G%g*3a!Z5T1^o53Jn}|N?w@+!FvE`m=vyif9MBv(I%nlMYspJgO
za^u+g{|r*mD6j1u*-=K%j`G~fX7PXEY7h^?FPjm)^fMKGXLCT=cm4$<W|wq6OXgbu
O0000<MNUMnLSTY8aKn=T

literal 0
HcmV?d00001

diff --git a/drivers/chrome/images/icons/SobiPro.png b/drivers/chrome/images/icons/SobiPro.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1463bb40c1dcf4cd7303150807d8f1ff11ea3ea
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`t)4E9Ar_~XPG;n5P~c#w^w2N1
zYf}HB@b3ZppUD%iO=FpHtSo!m4o0B{sl?<7ifXa`Iq%yAm4am+8CX8Q^f55#^fn=r
z6zi?Wm9z_3G+39^zVPtinsjZyasQT(gO7cl@uV~bGOpTgVAx#7ZS7#WaazU>_Pq&-
o!uOj_);o&(9MO$<y8QuzxR^4V{jpQGfDU5tboFyt=akR{01;+Hp#T5?

literal 0
HcmV?d00001

diff --git a/drivers/chrome/images/icons/VideoJS.png b/drivers/chrome/images/icons/VideoJS.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c414feeeb277daed4454a2dfcb4bb95d1bd6399
GIT binary patch
literal 313
zcmV-90mlA`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00031Nkl<ZILl-B
z|NlQDC75Aw8IZR8G&c|{qT{H^n-$gUePNg%s{ufT>_B`Ri2tKwyR_Q>K#eeb9f*0c
z888)_W}n&_$eLkzEs6m^h4I)l1Mx`>r@)<93;^L$umM0thCuuki{_U=EDKa948-@b
z81Ng29T{S#Z$BG5efxh5JYz>P%$ZtlVcuHqVgE64_<aVyx*6U;{1=G-qv4xC%x@f;
z&JM&Uf%rcb91jiypu&1A27vH-prV;LG*5*GB2XbS5O2k1h<!#aHqFODE<=e%pkhHF
zzKd>vZ|(H|R`JEinx6x)EY_3=)Sw8&{^;1PxZ5A735GQXS7rhL`@V1jJkTZv00000
LNkvXXu0mjf_)~#o

literal 0
HcmV?d00001

diff --git a/drivers/chrome/images/icons/ZK.png b/drivers/chrome/images/icons/ZK.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d2b3182d8a93bdcf2fcec288511e7fc24f74901
GIT binary patch
literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004cNkl<ZILoEa
z+b#n^7zglg=MCx&)*J8!`v@MvBe)VSWL-$42}KE^X?xK`9k(oTwi`i+M$@FElpa{?
zSmlODB!4>-Tb0n8o#dC9+5h*=%o0o3@PgR<HM}4;TR>ey+hFnYe{*8-9O^NzpV2sT
z`fpAw=7e1M7}a$R^QsJGIs0eE5sRk5HIJ`@sgpnaOU|Jwn58Euiy63e{F}(X_ryX+
z;3^-Vs2z!{g@)h;%;EzSEiG!;*ghHpOCopsNE+RPpvJ4@0Uas34AsoQDBMGdZbRw_
zL-tQYJ1N1iDscNq3L4;y%NrP_M;KR6LgDqznaeQpcaGa%uao;UxP2t`uYu#EEwSs|
zwprB_<_FtI-Mv5#?Z7v(g-FJNabdyjBgwCW3ncTXynjI5JchcS6qJb-r}zdfa|dwi
ze1ogvGO2e#>`CgGhpSajB9eCgvG^zi4s&9bhgVTsr=8jG_32_w)I9}Hs4E6fs51gj
ds67NPz5uhCkkJjc3lsnV002ovPDHLkV1ks@#(n?*

literal 0
HcmV?d00001

diff --git a/drivers/chrome/images/icons/phpAlbum.png b/drivers/chrome/images/icons/phpAlbum.png
new file mode 100644
index 0000000000000000000000000000000000000000..550aff41c281009f26b064a23bba1f5148bb56f1
GIT binary patch
literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004`Nkl<ZILmdC
zy>Ami5XFBZZwe4L=j2RrmXeZ>2L1pFBt)AiqM;+ArAI<RGz3vofP|0`)KpM{1Sn04
z^a%y+9fj?1;tYwcTPDSxH+vVe)$F`C@4Z>A?EE-X01*HXsv_t$YsYgvljXKX5&_jv
zurb&$GHG7^*R?({zh}~477=)Mdy(eZeDwvnaE-0?)7azJ-=KH3zQWxnAH2icM{8um
zF)TRz-qVks_hxgIbWk7*B__*D4`jmvS-I)&>EJh<ad<i`kmWiiXDuept=}mf6iCMg
zf@6Qr1_iWF%zlo>aDGk#mg;xy+5odbf&#i0qY7Fz^G^?I4>g&VU>$lmDPgK;MgDU%
zMJN9-No4%M#XBzmJSmCW5VZjK`}JW>yx;4fk-;QU%fCSqw_)X$C(VQaZrp!|ORH?Z
z+#re1p-~Id@3sQf6Gx@~Ba^rd{p((|A9v8MaVyMznTu@ZCJ5I7NO~@TJpY_4fF68z
z$l@hGI7^_TeOE7CcF9J27557Aes}DB0z)*g_kz{`*P!p;AardWJtd?Ff}$J)j0w8W
TWpl-(00000NkvXXu0mjf<@?jM

literal 0
HcmV?d00001

diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index e9c0a5867..34fe66485 100644
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -240,7 +240,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -486,7 +486,7 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
 			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
@@ -526,7 +526,7 @@
 			"implies": [ "PHP"]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +535,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -990,6 +990,12 @@
 			"cats": [ 1 ],
 			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
 		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "show_switch2gui",
+			"implies":[ "Python" ]
+		},
 		"Mojolicious": {
 			"cats": [ 18 ],
 			"headers": { "x-powered-by": "mojolicious" },
@@ -1164,6 +1170,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,7 +1214,7 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
@@ -1435,11 +1446,18 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
-			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)"
+			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)",
+			"implies": [ "Joomla" ]
+		},
+		"SobiPro": {
+			"cats":	[ 19 ],
+			"env":	"SobiProUrl",
+			"html":	" <(script|link)[^>].*com_sobipro.*>"
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1623,6 +1641,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "VideoJS",
+			"html": "<div+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1694,7 +1718,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": [ 'PHP' ]
+			"implies": [ "PHP" ]
 		},
 		"Webtrekk": {
 			"cats": [ 10 ],
@@ -1822,6 +1846,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }
diff --git a/drivers/firefox-jetpack/images/icons/MoinMoin.png b/drivers/firefox-jetpack/images/icons/MoinMoin.png
new file mode 100644
index 0000000000000000000000000000000000000000..3839586cd9650bc18f559fe6e4ac9c88ce73b27f
GIT binary patch
literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004NNkl<ZILm#L
zOH0E*5XbW=1qD&4_^7S;K+(3^3ep@@g7~b5B3h^s2_E7D`U!ILkaN!F;z4>J`3>w6
zYmz_AGCT91ot@cP$C*Iz5=yOBSE=k@%VMWz_xPM5#Br>o`suT@Kfa|IBpQsMAC7+1
z2M2C$@a`~HBC@*G)QkwavBUXy2!`#uNY*djG)uK}DOWeQ^7=kfLC1y<flG|78RJIF
z)l-usk#5(O$EQH<2SXKfY-yS*2QD$%6LWP)22m8r^!$?T!PLyG+6>^*7rg}wwVin9
zk_Fj(-&aA;0xmInK&9Q&4VeHX^!t4okH<Cu9UDFXmzb*iAWn7z%!`oO0Nr#Rz_kbD
zmEd`v22iUB#+F+G%g*3a!Z5T1^o53Jn}|N?w@+!FvE`m=vyif9MBv(I%nlMYspJgO
za^u+g{|r*mD6j1u*-=K%j`G~fX7PXEY7h^?FPjm)^fMKGXLCT=cm4$<W|wq6OXgbu
O0000<MNUMnLSTY8aKn=T

literal 0
HcmV?d00001

diff --git a/drivers/firefox-jetpack/images/icons/SobiPro.png b/drivers/firefox-jetpack/images/icons/SobiPro.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1463bb40c1dcf4cd7303150807d8f1ff11ea3ea
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`t)4E9Ar_~XPG;n5P~c#w^w2N1
zYf}HB@b3ZppUD%iO=FpHtSo!m4o0B{sl?<7ifXa`Iq%yAm4am+8CX8Q^f55#^fn=r
z6zi?Wm9z_3G+39^zVPtinsjZyasQT(gO7cl@uV~bGOpTgVAx#7ZS7#WaazU>_Pq&-
o!uOj_);o&(9MO$<y8QuzxR^4V{jpQGfDU5tboFyt=akR{01;+Hp#T5?

literal 0
HcmV?d00001

diff --git a/drivers/firefox-jetpack/images/icons/VideoJS.png b/drivers/firefox-jetpack/images/icons/VideoJS.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c414feeeb277daed4454a2dfcb4bb95d1bd6399
GIT binary patch
literal 313
zcmV-90mlA`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00031Nkl<ZILl-B
z|NlQDC75Aw8IZR8G&c|{qT{H^n-$gUePNg%s{ufT>_B`Ri2tKwyR_Q>K#eeb9f*0c
z888)_W}n&_$eLkzEs6m^h4I)l1Mx`>r@)<93;^L$umM0thCuuki{_U=EDKa948-@b
z81Ng29T{S#Z$BG5efxh5JYz>P%$ZtlVcuHqVgE64_<aVyx*6U;{1=G-qv4xC%x@f;
z&JM&Uf%rcb91jiypu&1A27vH-prV;LG*5*GB2XbS5O2k1h<!#aHqFODE<=e%pkhHF
zzKd>vZ|(H|R`JEinx6x)EY_3=)Sw8&{^;1PxZ5A735GQXS7rhL`@V1jJkTZv00000
LNkvXXu0mjf_)~#o

literal 0
HcmV?d00001

diff --git a/drivers/firefox-jetpack/images/icons/ZK.png b/drivers/firefox-jetpack/images/icons/ZK.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d2b3182d8a93bdcf2fcec288511e7fc24f74901
GIT binary patch
literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004cNkl<ZILoEa
z+b#n^7zglg=MCx&)*J8!`v@MvBe)VSWL-$42}KE^X?xK`9k(oTwi`i+M$@FElpa{?
zSmlODB!4>-Tb0n8o#dC9+5h*=%o0o3@PgR<HM}4;TR>ey+hFnYe{*8-9O^NzpV2sT
z`fpAw=7e1M7}a$R^QsJGIs0eE5sRk5HIJ`@sgpnaOU|Jwn58Euiy63e{F}(X_ryX+
z;3^-Vs2z!{g@)h;%;EzSEiG!;*ghHpOCopsNE+RPpvJ4@0Uas34AsoQDBMGdZbRw_
zL-tQYJ1N1iDscNq3L4;y%NrP_M;KR6LgDqznaeQpcaGa%uao;UxP2t`uYu#EEwSs|
zwprB_<_FtI-Mv5#?Z7v(g-FJNabdyjBgwCW3ncTXynjI5JchcS6qJb-r}zdfa|dwi
ze1ogvGO2e#>`CgGhpSajB9eCgvG^zi4s&9bhgVTsr=8jG_32_w)I9}Hs4E6fs51gj
ds67NPz5uhCkkJjc3lsnV002ovPDHLkV1ks@#(n?*

literal 0
HcmV?d00001

diff --git a/drivers/firefox-jetpack/images/icons/phpAlbum.png b/drivers/firefox-jetpack/images/icons/phpAlbum.png
new file mode 100644
index 0000000000000000000000000000000000000000..550aff41c281009f26b064a23bba1f5148bb56f1
GIT binary patch
literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004`Nkl<ZILmdC
zy>Ami5XFBZZwe4L=j2RrmXeZ>2L1pFBt)AiqM;+ArAI<RGz3vofP|0`)KpM{1Sn04
z^a%y+9fj?1;tYwcTPDSxH+vVe)$F`C@4Z>A?EE-X01*HXsv_t$YsYgvljXKX5&_jv
zurb&$GHG7^*R?({zh}~477=)Mdy(eZeDwvnaE-0?)7azJ-=KH3zQWxnAH2icM{8um
zF)TRz-qVks_hxgIbWk7*B__*D4`jmvS-I)&>EJh<ad<i`kmWiiXDuept=}mf6iCMg
zf@6Qr1_iWF%zlo>aDGk#mg;xy+5odbf&#i0qY7Fz^G^?I4>g&VU>$lmDPgK;MgDU%
zMJN9-No4%M#XBzmJSmCW5VZjK`}JW>yx;4fk-;QU%fCSqw_)X$C(VQaZrp!|ORH?Z
z+#re1p-~Id@3sQf6Gx@~Ba^rd{p((|A9v8MaVyMznTu@ZCJ5I7NO~@TJpY_4fF68z
z$l@hGI7^_TeOE7CcF9J27557Aes}DB0z)*g_kz{`*P!p;AardWJtd?Ff}$J)j0w8W
TWpl-(00000NkvXXu0mjf<@?jM

literal 0
HcmV?d00001

diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index 0c7053621..34fe66485 100644
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -240,7 +240,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -486,7 +486,7 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
 			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
@@ -526,7 +526,7 @@
 			"implies": [ "PHP"]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +535,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -990,6 +990,12 @@
 			"cats": [ 1 ],
 			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
 		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "show_switch2gui",
+			"implies":[ "Python" ]
+		},
 		"Mojolicious": {
 			"cats": [ 18 ],
 			"headers": { "x-powered-by": "mojolicious" },
@@ -1164,6 +1170,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,7 +1214,7 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
@@ -1435,11 +1446,18 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
-			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)"
+			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)",
+			"implies": [ "Joomla" ]
+		},
+		"SobiPro": {
+			"cats":	[ 19 ],
+			"env":	"SobiProUrl",
+			"html":	" <(script|link)[^>].*com_sobipro.*>"
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1623,6 +1641,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "VideoJS",
+			"html": "<div+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1822,6 +1846,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }
diff --git a/drivers/firefox/skin/images/icons/MoinMoin.png b/drivers/firefox/skin/images/icons/MoinMoin.png
new file mode 100644
index 0000000000000000000000000000000000000000..3839586cd9650bc18f559fe6e4ac9c88ce73b27f
GIT binary patch
literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004NNkl<ZILm#L
zOH0E*5XbW=1qD&4_^7S;K+(3^3ep@@g7~b5B3h^s2_E7D`U!ILkaN!F;z4>J`3>w6
zYmz_AGCT91ot@cP$C*Iz5=yOBSE=k@%VMWz_xPM5#Br>o`suT@Kfa|IBpQsMAC7+1
z2M2C$@a`~HBC@*G)QkwavBUXy2!`#uNY*djG)uK}DOWeQ^7=kfLC1y<flG|78RJIF
z)l-usk#5(O$EQH<2SXKfY-yS*2QD$%6LWP)22m8r^!$?T!PLyG+6>^*7rg}wwVin9
zk_Fj(-&aA;0xmInK&9Q&4VeHX^!t4okH<Cu9UDFXmzb*iAWn7z%!`oO0Nr#Rz_kbD
zmEd`v22iUB#+F+G%g*3a!Z5T1^o53Jn}|N?w@+!FvE`m=vyif9MBv(I%nlMYspJgO
za^u+g{|r*mD6j1u*-=K%j`G~fX7PXEY7h^?FPjm)^fMKGXLCT=cm4$<W|wq6OXgbu
O0000<MNUMnLSTY8aKn=T

literal 0
HcmV?d00001

diff --git a/drivers/firefox/skin/images/icons/SobiPro.png b/drivers/firefox/skin/images/icons/SobiPro.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1463bb40c1dcf4cd7303150807d8f1ff11ea3ea
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`t)4E9Ar_~XPG;n5P~c#w^w2N1
zYf}HB@b3ZppUD%iO=FpHtSo!m4o0B{sl?<7ifXa`Iq%yAm4am+8CX8Q^f55#^fn=r
z6zi?Wm9z_3G+39^zVPtinsjZyasQT(gO7cl@uV~bGOpTgVAx#7ZS7#WaazU>_Pq&-
o!uOj_);o&(9MO$<y8QuzxR^4V{jpQGfDU5tboFyt=akR{01;+Hp#T5?

literal 0
HcmV?d00001

diff --git a/drivers/firefox/skin/images/icons/VideoJS.png b/drivers/firefox/skin/images/icons/VideoJS.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c414feeeb277daed4454a2dfcb4bb95d1bd6399
GIT binary patch
literal 313
zcmV-90mlA`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00031Nkl<ZILl-B
z|NlQDC75Aw8IZR8G&c|{qT{H^n-$gUePNg%s{ufT>_B`Ri2tKwyR_Q>K#eeb9f*0c
z888)_W}n&_$eLkzEs6m^h4I)l1Mx`>r@)<93;^L$umM0thCuuki{_U=EDKa948-@b
z81Ng29T{S#Z$BG5efxh5JYz>P%$ZtlVcuHqVgE64_<aVyx*6U;{1=G-qv4xC%x@f;
z&JM&Uf%rcb91jiypu&1A27vH-prV;LG*5*GB2XbS5O2k1h<!#aHqFODE<=e%pkhHF
zzKd>vZ|(H|R`JEinx6x)EY_3=)Sw8&{^;1PxZ5A735GQXS7rhL`@V1jJkTZv00000
LNkvXXu0mjf_)~#o

literal 0
HcmV?d00001

diff --git a/drivers/firefox/skin/images/icons/ZK.png b/drivers/firefox/skin/images/icons/ZK.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d2b3182d8a93bdcf2fcec288511e7fc24f74901
GIT binary patch
literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004cNkl<ZILoEa
z+b#n^7zglg=MCx&)*J8!`v@MvBe)VSWL-$42}KE^X?xK`9k(oTwi`i+M$@FElpa{?
zSmlODB!4>-Tb0n8o#dC9+5h*=%o0o3@PgR<HM}4;TR>ey+hFnYe{*8-9O^NzpV2sT
z`fpAw=7e1M7}a$R^QsJGIs0eE5sRk5HIJ`@sgpnaOU|Jwn58Euiy63e{F}(X_ryX+
z;3^-Vs2z!{g@)h;%;EzSEiG!;*ghHpOCopsNE+RPpvJ4@0Uas34AsoQDBMGdZbRw_
zL-tQYJ1N1iDscNq3L4;y%NrP_M;KR6LgDqznaeQpcaGa%uao;UxP2t`uYu#EEwSs|
zwprB_<_FtI-Mv5#?Z7v(g-FJNabdyjBgwCW3ncTXynjI5JchcS6qJb-r}zdfa|dwi
ze1ogvGO2e#>`CgGhpSajB9eCgvG^zi4s&9bhgVTsr=8jG_32_w)I9}Hs4E6fs51gj
ds67NPz5uhCkkJjc3lsnV002ovPDHLkV1ks@#(n?*

literal 0
HcmV?d00001

diff --git a/drivers/firefox/skin/images/icons/phpAlbum.png b/drivers/firefox/skin/images/icons/phpAlbum.png
new file mode 100644
index 0000000000000000000000000000000000000000..550aff41c281009f26b064a23bba1f5148bb56f1
GIT binary patch
literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004`Nkl<ZILmdC
zy>Ami5XFBZZwe4L=j2RrmXeZ>2L1pFBt)AiqM;+ArAI<RGz3vofP|0`)KpM{1Sn04
z^a%y+9fj?1;tYwcTPDSxH+vVe)$F`C@4Z>A?EE-X01*HXsv_t$YsYgvljXKX5&_jv
zurb&$GHG7^*R?({zh}~477=)Mdy(eZeDwvnaE-0?)7azJ-=KH3zQWxnAH2icM{8um
zF)TRz-qVks_hxgIbWk7*B__*D4`jmvS-I)&>EJh<ad<i`kmWiiXDuept=}mf6iCMg
zf@6Qr1_iWF%zlo>aDGk#mg;xy+5odbf&#i0qY7Fz^G^?I4>g&VU>$lmDPgK;MgDU%
zMJN9-No4%M#XBzmJSmCW5VZjK`}JW>yx;4fk-;QU%fCSqw_)X$C(VQaZrp!|ORH?Z
z+#re1p-~Id@3sQf6Gx@~Ba^rd{p((|A9v8MaVyMznTu@ZCJ5I7NO~@TJpY_4fF68z
z$l@hGI7^_TeOE7CcF9J27557Aes}DB0z)*g_kz{`*P!p;AardWJtd?Ff}$J)j0w8W
TWpl-(00000NkvXXu0mjf<@?jM

literal 0
HcmV?d00001

diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index e9c0a5867..34fe66485 100644
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -240,7 +240,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -486,7 +486,7 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
 			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
@@ -526,7 +526,7 @@
 			"implies": [ "PHP"]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +535,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -990,6 +990,12 @@
 			"cats": [ 1 ],
 			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
 		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "show_switch2gui",
+			"implies":[ "Python" ]
+		},
 		"Mojolicious": {
 			"cats": [ 18 ],
 			"headers": { "x-powered-by": "mojolicious" },
@@ -1164,6 +1170,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,7 +1214,7 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
@@ -1435,11 +1446,18 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
-			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)"
+			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)",
+			"implies": [ "Joomla" ]
+		},
+		"SobiPro": {
+			"cats":	[ 19 ],
+			"env":	"SobiProUrl",
+			"html":	" <(script|link)[^>].*com_sobipro.*>"
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1623,6 +1641,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "VideoJS",
+			"html": "<div+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1694,7 +1718,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": [ 'PHP' ]
+			"implies": [ "PHP" ]
 		},
 		"Webtrekk": {
 			"cats": [ 10 ],
@@ -1822,6 +1846,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }
diff --git a/drivers/html/images/icons/MoinMoin.png b/drivers/html/images/icons/MoinMoin.png
new file mode 100644
index 0000000000000000000000000000000000000000..3839586cd9650bc18f559fe6e4ac9c88ce73b27f
GIT binary patch
literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004NNkl<ZILm#L
zOH0E*5XbW=1qD&4_^7S;K+(3^3ep@@g7~b5B3h^s2_E7D`U!ILkaN!F;z4>J`3>w6
zYmz_AGCT91ot@cP$C*Iz5=yOBSE=k@%VMWz_xPM5#Br>o`suT@Kfa|IBpQsMAC7+1
z2M2C$@a`~HBC@*G)QkwavBUXy2!`#uNY*djG)uK}DOWeQ^7=kfLC1y<flG|78RJIF
z)l-usk#5(O$EQH<2SXKfY-yS*2QD$%6LWP)22m8r^!$?T!PLyG+6>^*7rg}wwVin9
zk_Fj(-&aA;0xmInK&9Q&4VeHX^!t4okH<Cu9UDFXmzb*iAWn7z%!`oO0Nr#Rz_kbD
zmEd`v22iUB#+F+G%g*3a!Z5T1^o53Jn}|N?w@+!FvE`m=vyif9MBv(I%nlMYspJgO
za^u+g{|r*mD6j1u*-=K%j`G~fX7PXEY7h^?FPjm)^fMKGXLCT=cm4$<W|wq6OXgbu
O0000<MNUMnLSTY8aKn=T

literal 0
HcmV?d00001

diff --git a/drivers/html/images/icons/SobiPro.png b/drivers/html/images/icons/SobiPro.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1463bb40c1dcf4cd7303150807d8f1ff11ea3ea
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`t)4E9Ar_~XPG;n5P~c#w^w2N1
zYf}HB@b3ZppUD%iO=FpHtSo!m4o0B{sl?<7ifXa`Iq%yAm4am+8CX8Q^f55#^fn=r
z6zi?Wm9z_3G+39^zVPtinsjZyasQT(gO7cl@uV~bGOpTgVAx#7ZS7#WaazU>_Pq&-
o!uOj_);o&(9MO$<y8QuzxR^4V{jpQGfDU5tboFyt=akR{01;+Hp#T5?

literal 0
HcmV?d00001

diff --git a/drivers/html/images/icons/VideoJS.png b/drivers/html/images/icons/VideoJS.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c414feeeb277daed4454a2dfcb4bb95d1bd6399
GIT binary patch
literal 313
zcmV-90mlA`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00031Nkl<ZILl-B
z|NlQDC75Aw8IZR8G&c|{qT{H^n-$gUePNg%s{ufT>_B`Ri2tKwyR_Q>K#eeb9f*0c
z888)_W}n&_$eLkzEs6m^h4I)l1Mx`>r@)<93;^L$umM0thCuuki{_U=EDKa948-@b
z81Ng29T{S#Z$BG5efxh5JYz>P%$ZtlVcuHqVgE64_<aVyx*6U;{1=G-qv4xC%x@f;
z&JM&Uf%rcb91jiypu&1A27vH-prV;LG*5*GB2XbS5O2k1h<!#aHqFODE<=e%pkhHF
zzKd>vZ|(H|R`JEinx6x)EY_3=)Sw8&{^;1PxZ5A735GQXS7rhL`@V1jJkTZv00000
LNkvXXu0mjf_)~#o

literal 0
HcmV?d00001

diff --git a/drivers/html/images/icons/ZK.png b/drivers/html/images/icons/ZK.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d2b3182d8a93bdcf2fcec288511e7fc24f74901
GIT binary patch
literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004cNkl<ZILoEa
z+b#n^7zglg=MCx&)*J8!`v@MvBe)VSWL-$42}KE^X?xK`9k(oTwi`i+M$@FElpa{?
zSmlODB!4>-Tb0n8o#dC9+5h*=%o0o3@PgR<HM}4;TR>ey+hFnYe{*8-9O^NzpV2sT
z`fpAw=7e1M7}a$R^QsJGIs0eE5sRk5HIJ`@sgpnaOU|Jwn58Euiy63e{F}(X_ryX+
z;3^-Vs2z!{g@)h;%;EzSEiG!;*ghHpOCopsNE+RPpvJ4@0Uas34AsoQDBMGdZbRw_
zL-tQYJ1N1iDscNq3L4;y%NrP_M;KR6LgDqznaeQpcaGa%uao;UxP2t`uYu#EEwSs|
zwprB_<_FtI-Mv5#?Z7v(g-FJNabdyjBgwCW3ncTXynjI5JchcS6qJb-r}zdfa|dwi
ze1ogvGO2e#>`CgGhpSajB9eCgvG^zi4s&9bhgVTsr=8jG_32_w)I9}Hs4E6fs51gj
ds67NPz5uhCkkJjc3lsnV002ovPDHLkV1ks@#(n?*

literal 0
HcmV?d00001

diff --git a/drivers/html/images/icons/phpAlbum.png b/drivers/html/images/icons/phpAlbum.png
new file mode 100644
index 0000000000000000000000000000000000000000..550aff41c281009f26b064a23bba1f5148bb56f1
GIT binary patch
literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004`Nkl<ZILmdC
zy>Ami5XFBZZwe4L=j2RrmXeZ>2L1pFBt)AiqM;+ArAI<RGz3vofP|0`)KpM{1Sn04
z^a%y+9fj?1;tYwcTPDSxH+vVe)$F`C@4Z>A?EE-X01*HXsv_t$YsYgvljXKX5&_jv
zurb&$GHG7^*R?({zh}~477=)Mdy(eZeDwvnaE-0?)7azJ-=KH3zQWxnAH2icM{8um
zF)TRz-qVks_hxgIbWk7*B__*D4`jmvS-I)&>EJh<ad<i`kmWiiXDuept=}mf6iCMg
zf@6Qr1_iWF%zlo>aDGk#mg;xy+5odbf&#i0qY7Fz^G^?I4>g&VU>$lmDPgK;MgDU%
zMJN9-No4%M#XBzmJSmCW5VZjK`}JW>yx;4fk-;QU%fCSqw_)X$C(VQaZrp!|ORH?Z
z+#re1p-~Id@3sQf6Gx@~Ba^rd{p((|A9v8MaVyMznTu@ZCJ5I7NO~@TJpY_4fF68z
z$l@hGI7^_TeOE7CcF9J27557Aes}DB0z)*g_kz{`*P!p;AardWJtd?Ff}$J)j0w8W
TWpl-(00000NkvXXu0mjf<@?jM

literal 0
HcmV?d00001

diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index e9c0a5867..34fe66485 100644
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -240,7 +240,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -486,7 +486,7 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
 			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
@@ -526,7 +526,7 @@
 			"implies": [ "PHP"]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +535,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -990,6 +990,12 @@
 			"cats": [ 1 ],
 			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
 		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "show_switch2gui",
+			"implies":[ "Python" ]
+		},
 		"Mojolicious": {
 			"cats": [ 18 ],
 			"headers": { "x-powered-by": "mojolicious" },
@@ -1164,6 +1170,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,7 +1214,7 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
@@ -1435,11 +1446,18 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
-			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)"
+			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)",
+			"implies": [ "Joomla" ]
+		},
+		"SobiPro": {
+			"cats":	[ 19 ],
+			"env":	"SobiProUrl",
+			"html":	" <(script|link)[^>].*com_sobipro.*>"
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1623,6 +1641,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "VideoJS",
+			"html": "<div+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1694,7 +1718,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": [ 'PHP' ]
+			"implies": [ "PHP" ]
 		},
 		"Webtrekk": {
 			"cats": [ 10 ],
@@ -1822,6 +1846,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }
diff --git a/share/apps.json b/share/apps.json
index e9c0a5867..34fe66485 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -240,7 +240,7 @@
 			"cats": [ 27 ]
 		},
 		"CacheFly": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^CFS ", "X-CF1": ".+", "X-CF2": ".+" }
 		},
 		"Chameleon": {
@@ -486,7 +486,7 @@
 			"implies": [ "PHP" ]
 		},
 		"DotNetNuke": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
 			"headers": { "X-Compressed-By": "DotNetNuke-Compression", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
@@ -526,7 +526,7 @@
 			"implies": [ "PHP"]
 		},
 		"EdgeCast": {
-			"cats": [ "31" ],
+			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
 		"EPiServer": {
@@ -535,7 +535,7 @@
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
-			"cats": [ "19" ],
+			"cats": [ 19 ],
 			"meta": { "generator": "EPrints" },
 			"implies": [ "Perl" ]
 		},
@@ -990,6 +990,12 @@
 			"cats": [ 1 ],
 			"html": "(<a[^>]+>Powered by MODx</a>|var el= \\$\\('modxhost'\\);|<script type=\\\"text/javascript\\\">var MODX_MEDIA_PATH = \\\"media\\\";)|<(link|script)[^>]+assets/snippets/"
 		},
+		"MoinMoin": {
+			"cats": [ 8 ],
+			"script": "moin.+/common/js/common\\.js",
+			"env": "show_switch2gui",
+			"implies":[ "Python" ]
+		},
 		"Mojolicious": {
 			"cats": [ 18 ],
 			"headers": { "x-powered-by": "mojolicious" },
@@ -1164,6 +1170,11 @@
 			"headers": { "Server": "php", "X-Powered-By": "php", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
+		"phpAlbum":	{
+			"cats":	[ 7 ],
+			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"implies": [ "PHP" ]
+		},
 		"phpBB": {
 			"cats": [ 2 ],
 			"meta": { "copyright": "phpBB Group" },
@@ -1203,7 +1214,7 @@
 			"implies": [ "PHP" ]
 		},
 		"phpSQLiteCMS": {
-			"cats": [ "1" ],
+			"cats": [ 1 ],
 			"meta": { "generator": "^phpSQLiteCMS" },
 			"implies": [ "PHP" ]
 		},
@@ -1435,11 +1446,18 @@
 		"Snoobi": {
 			"cats": [ 10 ],
 			"script": "snoobi\\.com/snoop\\.php",
-			"env": "^snoobi$"
+			"env": "^snoobi$",
+			"implies": [ "Joomla" ]
 		},
 		"SOBI 2": {
 			"cats": [ 19 ],
-			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)"
+			"html": "(<!-- start of Sigsiu Online Business Index|<div[^>]* class=\\\"sobi2)",
+			"implies": [ "Joomla" ]
+		},
+		"SobiPro": {
+			"cats":	[ 19 ],
+			"env":	"SobiProUrl",
+			"html":	" <(script|link)[^>].*com_sobipro.*>"
 		},
 		"SoundManager": {
 			"cats": [ 12 ],
@@ -1623,6 +1641,12 @@
 			"env": "^(vBulletin|vB_[^g])",
 			"implies": [ "PHP" ]
 		},
+		"VideoJS": {
+			"cats": [ 14 ],
+			"env": "VideoJS",
+			"html": "<div+class=\\\"video-js+\\\">",
+			"script": "zencdn\\.net/c/video\\.js"
+		},
 		"viennaCMS": {
 			"cats": [ 1 ],
 			"html": "powered by <a href=\\\"[^>]+viennacms"
@@ -1694,7 +1718,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": [ 'PHP' ]
+			"implies": [ "PHP" ]
 		},
 		"Webtrekk": {
 			"cats": [ 10 ],
@@ -1822,6 +1846,12 @@
 			"cats": [ 11 ],
 			"meta": { "generator": "Zinnia" },
 			"implies": [ "Django" ]
+		},
+		"ZK": {
+			"cats": [ 18 ],
+			"script": "zkau/",
+			"html": "<!-- ZK [\\.\\d\\s]+-->",
+			"implies": [ "Java" ]
 		}
 	}
 }
diff --git a/share/images/icons/MoinMoin.png b/share/images/icons/MoinMoin.png
new file mode 100644
index 0000000000000000000000000000000000000000..3839586cd9650bc18f559fe6e4ac9c88ce73b27f
GIT binary patch
literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004NNkl<ZILm#L
zOH0E*5XbW=1qD&4_^7S;K+(3^3ep@@g7~b5B3h^s2_E7D`U!ILkaN!F;z4>J`3>w6
zYmz_AGCT91ot@cP$C*Iz5=yOBSE=k@%VMWz_xPM5#Br>o`suT@Kfa|IBpQsMAC7+1
z2M2C$@a`~HBC@*G)QkwavBUXy2!`#uNY*djG)uK}DOWeQ^7=kfLC1y<flG|78RJIF
z)l-usk#5(O$EQH<2SXKfY-yS*2QD$%6LWP)22m8r^!$?T!PLyG+6>^*7rg}wwVin9
zk_Fj(-&aA;0xmInK&9Q&4VeHX^!t4okH<Cu9UDFXmzb*iAWn7z%!`oO0Nr#Rz_kbD
zmEd`v22iUB#+F+G%g*3a!Z5T1^o53Jn}|N?w@+!FvE`m=vyif9MBv(I%nlMYspJgO
za^u+g{|r*mD6j1u*-=K%j`G~fX7PXEY7h^?FPjm)^fMKGXLCT=cm4$<W|wq6OXgbu
O0000<MNUMnLSTY8aKn=T

literal 0
HcmV?d00001

diff --git a/share/images/icons/SobiPro.png b/share/images/icons/SobiPro.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1463bb40c1dcf4cd7303150807d8f1ff11ea3ea
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`t)4E9Ar_~XPG;n5P~c#w^w2N1
zYf}HB@b3ZppUD%iO=FpHtSo!m4o0B{sl?<7ifXa`Iq%yAm4am+8CX8Q^f55#^fn=r
z6zi?Wm9z_3G+39^zVPtinsjZyasQT(gO7cl@uV~bGOpTgVAx#7ZS7#WaazU>_Pq&-
o!uOj_);o&(9MO$<y8QuzxR^4V{jpQGfDU5tboFyt=akR{01;+Hp#T5?

literal 0
HcmV?d00001

diff --git a/share/images/icons/VideoJS.png b/share/images/icons/VideoJS.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c414feeeb277daed4454a2dfcb4bb95d1bd6399
GIT binary patch
literal 313
zcmV-90mlA`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00031Nkl<ZILl-B
z|NlQDC75Aw8IZR8G&c|{qT{H^n-$gUePNg%s{ufT>_B`Ri2tKwyR_Q>K#eeb9f*0c
z888)_W}n&_$eLkzEs6m^h4I)l1Mx`>r@)<93;^L$umM0thCuuki{_U=EDKa948-@b
z81Ng29T{S#Z$BG5efxh5JYz>P%$ZtlVcuHqVgE64_<aVyx*6U;{1=G-qv4xC%x@f;
z&JM&Uf%rcb91jiypu&1A27vH-prV;LG*5*GB2XbS5O2k1h<!#aHqFODE<=e%pkhHF
zzKd>vZ|(H|R`JEinx6x)EY_3=)Sw8&{^;1PxZ5A735GQXS7rhL`@V1jJkTZv00000
LNkvXXu0mjf_)~#o

literal 0
HcmV?d00001

diff --git a/share/images/icons/ZK.png b/share/images/icons/ZK.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d2b3182d8a93bdcf2fcec288511e7fc24f74901
GIT binary patch
literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004cNkl<ZILoEa
z+b#n^7zglg=MCx&)*J8!`v@MvBe)VSWL-$42}KE^X?xK`9k(oTwi`i+M$@FElpa{?
zSmlODB!4>-Tb0n8o#dC9+5h*=%o0o3@PgR<HM}4;TR>ey+hFnYe{*8-9O^NzpV2sT
z`fpAw=7e1M7}a$R^QsJGIs0eE5sRk5HIJ`@sgpnaOU|Jwn58Euiy63e{F}(X_ryX+
z;3^-Vs2z!{g@)h;%;EzSEiG!;*ghHpOCopsNE+RPpvJ4@0Uas34AsoQDBMGdZbRw_
zL-tQYJ1N1iDscNq3L4;y%NrP_M;KR6LgDqznaeQpcaGa%uao;UxP2t`uYu#EEwSs|
zwprB_<_FtI-Mv5#?Z7v(g-FJNabdyjBgwCW3ncTXynjI5JchcS6qJb-r}zdfa|dwi
ze1ogvGO2e#>`CgGhpSajB9eCgvG^zi4s&9bhgVTsr=8jG_32_w)I9}Hs4E6fs51gj
ds67NPz5uhCkkJjc3lsnV002ovPDHLkV1ks@#(n?*

literal 0
HcmV?d00001

diff --git a/share/images/icons/phpAlbum.png b/share/images/icons/phpAlbum.png
new file mode 100644
index 0000000000000000000000000000000000000000..550aff41c281009f26b064a23bba1f5148bb56f1
GIT binary patch
literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004`Nkl<ZILmdC
zy>Ami5XFBZZwe4L=j2RrmXeZ>2L1pFBt)AiqM;+ArAI<RGz3vofP|0`)KpM{1Sn04
z^a%y+9fj?1;tYwcTPDSxH+vVe)$F`C@4Z>A?EE-X01*HXsv_t$YsYgvljXKX5&_jv
zurb&$GHG7^*R?({zh}~477=)Mdy(eZeDwvnaE-0?)7azJ-=KH3zQWxnAH2icM{8um
zF)TRz-qVks_hxgIbWk7*B__*D4`jmvS-I)&>EJh<ad<i`kmWiiXDuept=}mf6iCMg
zf@6Qr1_iWF%zlo>aDGk#mg;xy+5odbf&#i0qY7Fz^G^?I4>g&VU>$lmDPgK;MgDU%
zMJN9-No4%M#XBzmJSmCW5VZjK`}JW>yx;4fk-;QU%fCSqw_)X$C(VQaZrp!|ORH?Z
z+#re1p-~Id@3sQf6Gx@~Ba^rd{p((|A9v8MaVyMznTu@ZCJ5I7NO~@TJpY_4fF68z
z$l@hGI7^_TeOE7CcF9J27557Aes}DB0z)*g_kz{`*P!p;AardWJtd?Ff}$J)j0w8W
TWpl-(00000NkvXXu0mjf<@?jM

literal 0
HcmV?d00001