From de035b0596bd27be052d8d799dad48c08e2ee385 Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sat, 2 Feb 2013 11:30:26 +1100
Subject: [PATCH] Fixed merge

---
 drivers/bookmarklet/images/icons/Spree.png    | Bin 0 -> 554 bytes
 drivers/bookmarklet/images/icons/Subrion.png  | Bin 0 -> 950 bytes
 .../bookmarklet/images/icons/eSyndiCat.png    | Bin 0 -> 836 bytes
 drivers/bookmarklet/json                      |  75 ++++++++++--------
 drivers/chrome/apps.json                      |  75 ++++++++++--------
 drivers/chrome/images/icons/Spree.png         | Bin 0 -> 554 bytes
 drivers/chrome/images/icons/Subrion.png       | Bin 0 -> 950 bytes
 drivers/chrome/images/icons/eSyndiCat.png     | Bin 0 -> 836 bytes
 drivers/firefox-jetpack/data/apps.json        |  75 ++++++++++--------
 .../firefox-jetpack/images/icons/Spree.png    | Bin 0 -> 554 bytes
 .../firefox-jetpack/images/icons/Subrion.png  | Bin 0 -> 950 bytes
 .../images/icons/eSyndiCat.png                | Bin 0 -> 836 bytes
 drivers/firefox/content/apps.json             |  75 ++++++++++--------
 drivers/firefox/skin/images/icons/Spree.png   | Bin 0 -> 554 bytes
 drivers/firefox/skin/images/icons/Subrion.png | Bin 0 -> 950 bytes
 .../firefox/skin/images/icons/eSyndiCat.png   | Bin 0 -> 836 bytes
 drivers/html/apps.json                        |  75 ++++++++++--------
 drivers/html/images/icons/Spree.png           | Bin 0 -> 554 bytes
 drivers/html/images/icons/Subrion.png         | Bin 0 -> 950 bytes
 drivers/html/images/icons/eSyndiCat.png       | Bin 0 -> 836 bytes
 drivers/php/apps.json                         |  75 ++++++++++--------
 21 files changed, 252 insertions(+), 198 deletions(-)
 create mode 100644 drivers/bookmarklet/images/icons/Spree.png
 create mode 100755 drivers/bookmarklet/images/icons/Subrion.png
 create mode 100755 drivers/bookmarklet/images/icons/eSyndiCat.png
 create mode 100644 drivers/chrome/images/icons/Spree.png
 create mode 100755 drivers/chrome/images/icons/Subrion.png
 create mode 100755 drivers/chrome/images/icons/eSyndiCat.png
 create mode 100644 drivers/firefox-jetpack/images/icons/Spree.png
 create mode 100755 drivers/firefox-jetpack/images/icons/Subrion.png
 create mode 100755 drivers/firefox-jetpack/images/icons/eSyndiCat.png
 create mode 100644 drivers/firefox/skin/images/icons/Spree.png
 create mode 100755 drivers/firefox/skin/images/icons/Subrion.png
 create mode 100755 drivers/firefox/skin/images/icons/eSyndiCat.png
 create mode 100644 drivers/html/images/icons/Spree.png
 create mode 100755 drivers/html/images/icons/Subrion.png
 create mode 100755 drivers/html/images/icons/eSyndiCat.png

diff --git a/drivers/bookmarklet/images/icons/Spree.png b/drivers/bookmarklet/images/icons/Spree.png
new file mode 100644
index 0000000000000000000000000000000000000000..88b593baf9636fee9c06e2d4bdff018a61c15852
GIT binary patch
literal 554
zcmV+_0@eMAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005;Nkl<ZILl-B
z|NlP&E_~_n?xbZWDv$p8^P3r$8U}m@9KF4wZpyy+SHFJ$U?<6d?>|5BfBN=D^5orh
zrPB{2KLxShetxV*v;jAs9}k+mH|*=OlU0X61}r>Qbbj^ef|Ga+SakexQsL^W)2lYz
z>3sa|gVL_6y$gGH2LA8a8T5bF!N|AwUf;D?bmCFcs<Y3+u^M39cKD`1(a!%MT)OsF
zA4u%LjR~`79f*AU{KFlid#^vKaOLm&?=|J*L97Nme)mmg*R@w33e|hxD%Bo%`S#0C
zp+A5BFn;~<NeCogv*}Jd$na?gALQW;gW@$;r+^er+IPS3)u$gKPv3u&y!`Z&wpQbT
z$I=yhK7;sp4LJSay(!EqAk1I53(n47ad{3=vCz5mPEFi`^Q*&WpWPff>+Dt#J7w|3
zrB{G1A<BSTFF&g-Ir%u@$FDzZApY@t@2pm%g+5*b(wAPJ!;`<~|B*ZIY(RX6zSGCK
z^7sF}|N5IeQ3l+3^;&!7>AOkafBgn0;j<54TJ5@eJ&I@-?7uN>%Hdl}n}7WJ$^+s*
zcyr!m)A{<XFF)QgBFcbOryF*IQsLCSv2SM`OncA^OpQG|ga1Byd&Q0@13)&PxVxre
s(XryQa}H(Q-gKd7#nbmUO|hv307nhjX6;P#fB*mh07*qoM6N<$f*&3qj{pDw

literal 0
HcmV?d00001

diff --git a/drivers/bookmarklet/images/icons/Subrion.png b/drivers/bookmarklet/images/icons/Subrion.png
new file mode 100755
index 0000000000000000000000000000000000000000..fdd2e2d4eddc1a883a213ca2751175cfa6cd46da
GIT binary patch
literal 950
zcmV;n14;aeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uz0Xh}ptR5*=IQ%h`=RTw?ry?6e3&)6x`hqX;BwP*ngI6*{+wJ};^
zjDe7D1dKsr6O0K9RMf--(cm5z6d#E~l#RMz(FDN;Sy*C#N-V8?q?JKPOJ~w~{qz5G
z@BLf=Nl$W;laritR)?4wD`A<XAegbG{PttlrcU0jRM#jWtLszAk-_ec57#7PR}Hh2
zL<Rt8Wr1a*1PQH~oPi4ye@_=Gor!?5mNnH(g<^_p@Aq^K_O~{Eb8m=@dJtx|QjpZv
zdd^(_a$gHwsIQB-0ENg!D^>8gDcO`fIyU=tND05UIep49OJZg)TR|l3<l@<Zi!;Z*
zSSnAn2Zd(CmMk+Y9Im3p=4gkxh1~%qB8B5yR&Pj$LUUxTkwn5=$$oYCx9N{Rmm+ML
zLI{u)NhgeWAYuY!gf)38c?-CuJN2mkMD@32zTDrr>K$Tc+%1o9{`s$gQ5GQ^mJUA_
zjmy>1I@CEatKbSCQ9vv+Y*Z?{ko$eZui5K;*XZbfM>amaP65Dt{@fl?4!WWZc2hK_
z;sFQDWVOF2ba>k@Dt+)ZTVWT)VywAoXK`=i_*#E_WO%By@fiUC8m95dXcEswBNX8p
zJg;nO)dfMSdqkxV?JS%)xj&of$YnF_%Qv6TOqwf|z$@K*UJjwGz|1HvojL4HZe@RJ
zN3HtLOYBYcvv;GHng3l|Jbmho*$8<4k%XS_NZHvSc&;Jt`ZE*jnHhrh(!-(LnFFjD
zR#zm9XW7pK!Parurs?wc$3Jk|8lW2LS%w|d9XjYodY=uIzB@4p0K(io{jM(GXaU1O
zy985Z_6rbB!;H->C&*uJSE(dq#E~)<rr7Im$@-xmA*}ZV04S3i-US1&tq6bt5@7AY
z`h|#01bvxIc&uCpN`XCv;%DzcHa0^<<7EI4>@9Xcdw_Nc+6A;r#1b|?)<bbs3vSvv
zB7}x|DDDT+DUDK2*Djugli4y10E)E>7@t9g0b*EBvMpPfo2zW$(hHF{KRUp-r?&Cp
zojRz10sLTa_rCMN7k3Q-0J)c+nzW_sT@WD)_5?Z21(|;JC)KofNJQ6Ng$PzTx6r0X
z&%e#Ze7k6Q^pe`#_bmcW6#$`j=ZAgnA3e+NpW7$>*-wwyYPR+MKkog+TEX_de!vyp
Y|9`96!-k(!f&c&j07*qoM6N<$g5rR<LjV8(

literal 0
HcmV?d00001

diff --git a/drivers/bookmarklet/images/icons/eSyndiCat.png b/drivers/bookmarklet/images/icons/eSyndiCat.png
new file mode 100755
index 0000000000000000000000000000000000000000..4efd96fdb9a8997aab1513b99d144db944597824
GIT binary patch
literal 836
zcmV-K1H1f*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!=1D|BRCwBA{Qv(y10{e3L<F`RVFFTy
zKy1MJ_s`x{^$rhU3V?EKKuQOQoq$*th^MZvvAG46V_*RimOyqtD+`mfq#(yLK`xeG
zK(S9iF@GR7V`N~k2FmeD2y%Q?mgM<tpd`2y#RYPrTp9oVGw9SrXuS~^;J6DEd$Hl*
zeg4xAKZWyiu}gZHN^+`6^ZsOGVY&m9JJ;5+LvhMl4vXK+EJ8s32^K32VZH~izx@Pi
zwgn122ALXQuP6|}z;Fe~yt?M-<I{Z$&M1YQ+L|Ww;e}W1kFTs>{L`PaD9Ap$`}|8H
zldKr`!AGyY{R2At4U)?~0C5RW?7;E^kEY4-vnFU5$V-ZSdC$uJ?+-&(oauKrBgrR<
z5<EgoK%4gh{m23IiW;)tLYfYlaI!H^3$vAFZz!<4$D*$E86?ig!^ObI#}&8g;KLtc
z{OoU7fB|y{$oTpB#~(+ajW>a6YJdS3$id3Yp()G9?`<m81r%%ic=+5qaRELCMim8y
zmrvfFXZiQn8t8&EplJLqz|H#f*WZ8UT<pwmnHU*!;$0L!8!8EW6Xs*z4V3Sy%U&Ru
zEGN#vn;-fA%k}%eH_qR$`b$|;NK2M)H8>q8i*Q_c@amhMq!6c&osQ^V7X$H9pzr}u
zjDY0L6WoP`RQPVN3vy3j*HN?n@$Ptx7$5gPpzC*l4bYU~-MIDqE6@LojAG18j0=E5
zE0Dv(+f))1s1ZO6N<fP~Fmqnj5#@Ra^zu8f0dg_|`y~X~7_L43A_`0}2ho!&P$4i_
z82Es=4v1|8dDs+8RfQ&QJn<Bgl!4&Af(X}>d(XZIvoJGVK++flq=JC1(gb1=1##~8
z#wtQ=HrgU@rGz+V!}9{z6~Y|*thGf|c{o_!KsB?dNbw|y@pGu!>xwbzD)9dTM(bsu
z)G;953B>oo8bP@cicNvI3y7JZd=?<?1>y-n>;%NzNNVAjk<#o85MTfseG@`vQT7o4
O0000<MNUMnLSTZrq=j<;

literal 0
HcmV?d00001

diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index d25d45029..da60407df 100755
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -52,7 +52,7 @@
 		},
 		"2z Project": {
 			"cats": [ 1 ],
-			"meta": { "generator": "2z project" }
+			"meta": { "generator": "2z project ([\\d\\.]+);version:\\1" }
 		},
 		"3dCart": {
 			"cats": [ 1, 6 ],
@@ -66,7 +66,7 @@
 		},
 		"AddThis": {
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js",
+			"script": "addthis\\.com/js/(\d+)?;version:\\1",
 			"env": "^addthis"
 		},
 		"Adobe CQ5": {
@@ -101,12 +101,12 @@
 		"Amiro.CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Amiro" },
-			"html": "system_js\\.php\\?script=",
+			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^"]+cv=([\d\.]+)\\;version:\\2",
 			"implies": "PHP"
 		},
 		"AMPcms": {
 			"cats": [ 1 ],
-			"headers": { "X-AMP-Version": ".*", "Set-Cookie": "AMP=" },
+			"headers": { "X-AMP-Version": "([\\d\\.]+)\\;version=\\1", "Set-Cookie": "^AMP=" },
 			"env": "^amp_js_init$",
 			"implies": "PHP"
 		},
@@ -116,7 +116,7 @@
 		},
 		"AOLserver": {
 			"cats": [ 22 ],
-			"headers": { "Server": "AOLserver" }
+			"headers": { "Server": "AOLserver/?([\d\.]+)?\\;version:\\1" }
 		},
 		"Apache": {
 			"cats": [ 22 ],
@@ -130,11 +130,11 @@
 		},
 		"Apache Tomcat": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote" }
+			"headers": { "Server": "Apache-Coyote/?([\\d\\.]+)?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "YTS" }
+			"headers": { "Server": "ATS/?([\\d\\.]+)?\\;version:\\1" }
 		},
 		"Arc Forum": {
 			"cats": [ 2 ],
@@ -142,12 +142,12 @@
 		},
 		"AsciiDoc": {
 			"cats": [ 1, 20, 27 ],
-			"meta": { "generator": "^AsciiDoc" },
+			"meta": { "generator": "^AsciiDoc ([\\d\\.]+)\\;version:\\1" },
 			"env": "^asciidoc$"
 		},
 		"ATG Web Commerce": {
 			"cats": [ 6 ],
-			"headers": { "X-ATG-Version": "ATG" },
+			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d\\.]+))?\\;version:\\2" },
 			"html": "<[^>]+_DARGS"
 		},
 		"Atlassian Confluence": {
@@ -167,7 +167,7 @@
 		},
 		"AWStats": {
 			"cats": [ 10 ],
-			"meta": { "generator": "AWStats" },
+			"meta": { "generator": "AWStats ([\\d\\.]+( \\(build [\\d\\.]+\\))?)\\;version:\\1" },
 			"implies": "Perl"
 		},
 		"Backbone.js": {
@@ -178,12 +178,12 @@
 		},
 		"Banshee": {
 			"cats": [ 1, 18 ],
-			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org",
+			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(v([\\d\\.]+))?\\;version:\\2",
 			"implies": "PHP"
 		},
 		"BIGACE": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BIGACE" },
+			"meta": { "generator": "BIGACE ([\\d\\.]+)\\;version:\\1" },
 			"html": "Powered by <a href=\"[^>]+BIGACE|<!--\\s+Site is running BIGACE",
 			"implies": "PHP"
 		},
@@ -196,7 +196,7 @@
 		},
 		"BigDump": {
 			"cats": [ 3 ],
-			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer",
+			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer ver\. ([\\d\\.b]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Bigware": {
@@ -217,7 +217,7 @@
 		},
 		"BrowserCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BrowserCMS" },
+			"meta": { "generator": "BrowserCMS ([\\d\\.]+)\\;version:\\1" },
 			"implies": "Ruby"
 		},
 		"Bugzilla": {
@@ -266,17 +266,19 @@
 		},
 		"Chamilo": {
 			"cats": [ 21 ],
-			"meta": { "generator": "Chamilo" },
-			"headers": { "X-Powered-By": "Chamilo" },
+			"html": "\">Chamilo ([\\d\\.]+)</a>\\;version:\\1",
+			"meta": { "generator": "Chamilo ([\\d\\.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "Chamilo ([\\d\\.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Chartbeat": {
 			"cats": [ 10 ],
-			"html": "function loadChartbeat\\(\\) {"
+			"html": "function loadChartbeat\\(\\) {",
+			"script": "chartbeat.js"
 		},
 		"Cherokee": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee" }
+			"headers": { "Server": "Cherokee/([\\d\\.]+)\\;version:\\1" }
 		},
 		"CKEditor": {
 			"cats": [ 24 ],
@@ -286,7 +288,7 @@
 		"ClickHeat": {
 			"cats": [ 10 ],
 			"script": "clickheat.*\\.js",
-			"env": "^clickHeatBrowser$",
+			"env": "^clickHeat",
 			"implies": "PHP"
 		},
 		"ClickTale": {
@@ -336,7 +338,7 @@
 		"Concrete5": {
 			"cats": [ 1 ],
 			"script": "concrete/js/",
-			"meta": { "generator": "concrete5" },
+			"meta": { "generator": "concrete5 - ([\\d\\.ab]+)\\;version:\\1" },
 			"env": "^CCM_IMAGE_PATH$",
 			"implies": "PHP"
 		},
@@ -352,12 +354,12 @@
 		},
 		"Contenido": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contenido" },
+			"meta": { "generator": "Contenido ([\\d\\.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Contens": {
 			"cats": [ 1 ],
-			"meta": { "generator": "contens" },
+			"meta": { "generator": "Contensis CMS Version ([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "Java", "CFML" ]
 		},
 		"ConversionLab": {
@@ -366,7 +368,7 @@
 		},
 		"Coppermine": {
 			"cats": [ 7 ],
-			"html": "<!--Coppermine Photo Gallery",
+			"html": "<!--Coppermine Photo Gallery ([\\d\\.]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Cosmoshop": {
@@ -380,11 +382,11 @@
 		},
 		"CouchDB": {
 			"cats": [ 22 ],
-			"headers": { "Server": "CouchDB" }
+			"headers": { "Server": "CouchDB/([\\d\\.]+)\\;version:\\1" }
 		},
 		"cPanel": {
 			"cats": [ 9 ],
-			"headers": { "Server": "cpsrvd" },
+			"headers": { "Server": "cpsrvd/([\\d\\.]+)\\;version:\\1" },
 			"html": "<!-- cPanel"
 		},
 		"CPG Dragonfly": {
@@ -426,13 +428,13 @@
 		},
 		"Dancer": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Perl Dancer", "Server": "Perl Dancer" },
+			"headers": { "X-Powered-By": "Perl Dancer ([\\d\\.]+)\\;version:\\1", "Server": "Perl Dancer ([\\d\\.]+)\\;version:\\1" },
 			"implies": "Perl"
 		},
 		"Danneo CMS": {
 			"cats": [ 1 ],
-			"headers": { "X-Powered-By": "CMS Danneo.*" },
-			"meta": { "generator": "Danneo" },
+			"headers": { "X-Powered-By": "CMS Danneo ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Danneo CMS ([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "Apache", "PHP" ]
 		},
 		"dashCommerce": {
@@ -447,7 +449,7 @@
 		},
 		"David Webbox": {
 			"cats": [ 22 ],
-			"headers": { "Server": "David-WebBox" }
+			"headers": { "Server": "David-WebBox/([\\d\\.a]+ \(\d+\))\\;version:\\1" }
 		},
 		"Debian": {
 			"cats": [ 28 ],
@@ -455,7 +457,7 @@
 		},
 		"DedeCMS": {
 			"cats": [ 1 ],
-			"env": "^Dede",
+			"env": "^DedeContainer",
 			"script": "dedeajax",
 			"implies": "PHP"
 		},
@@ -472,6 +474,7 @@
 		"DirectAdmin": {
 			"cats": [ 9 ],
 			"html": "<a[^>]+>DirectAdmin</a> Web Control Panel",
+			"headers": { "Server": "DirectAdmin Daemon v([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "PHP", "Apache" ]
 		},
 		"Disqus": {
@@ -482,18 +485,19 @@
 		},
 		"Django": {
 			"cats": [ 18 ],
-			"html": "powered by <a[^>]+>Django",
+			"html": "(powered by <a[^>]+>Django ?([\\d\\.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z0-9]{32}\" type=\"hidden\"></div>)\\;version:\\2",
+			"env": "__admin_media_prefix__",
 			"implies": "Python"
 		},
 		"Django CMS": {
 			"cats": [ 1 ],
 			"script": "media/cms/js/csrf\\.js",
-			"headers": { "Set-Cookie": "django" },
+			"headers": { "Set-Cookie": "django[^\\;]=" },
 			"implies": "Django"
 		},
 		"Dojo": {
 			"cats": [ 12 ],
-			"script": "dojo(\\.xd)?\\.js",
+			"script": "([\\d\\.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
 			"env": "^dojo$"
 		},
 		"Dokeos": {
@@ -567,6 +571,11 @@
 			"meta": { "generator": "EPrints" },
 			"implies": "Perl"
 		},
+		"eSyndiCat": {
+			"cats": [ 1 ],
+			"headers": { "X-Drectory-Script": "^eSyndiCat" },
+			"implies": [ "PHP" ]
+		},
 		"Exhibit": {
 			"cats": [ 25 ],
 			"script": "exhibit.*\\.js",
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index d25d45029..da60407df 100755
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -52,7 +52,7 @@
 		},
 		"2z Project": {
 			"cats": [ 1 ],
-			"meta": { "generator": "2z project" }
+			"meta": { "generator": "2z project ([\\d\\.]+);version:\\1" }
 		},
 		"3dCart": {
 			"cats": [ 1, 6 ],
@@ -66,7 +66,7 @@
 		},
 		"AddThis": {
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js",
+			"script": "addthis\\.com/js/(\d+)?;version:\\1",
 			"env": "^addthis"
 		},
 		"Adobe CQ5": {
@@ -101,12 +101,12 @@
 		"Amiro.CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Amiro" },
-			"html": "system_js\\.php\\?script=",
+			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^"]+cv=([\d\.]+)\\;version:\\2",
 			"implies": "PHP"
 		},
 		"AMPcms": {
 			"cats": [ 1 ],
-			"headers": { "X-AMP-Version": ".*", "Set-Cookie": "AMP=" },
+			"headers": { "X-AMP-Version": "([\\d\\.]+)\\;version=\\1", "Set-Cookie": "^AMP=" },
 			"env": "^amp_js_init$",
 			"implies": "PHP"
 		},
@@ -116,7 +116,7 @@
 		},
 		"AOLserver": {
 			"cats": [ 22 ],
-			"headers": { "Server": "AOLserver" }
+			"headers": { "Server": "AOLserver/?([\d\.]+)?\\;version:\\1" }
 		},
 		"Apache": {
 			"cats": [ 22 ],
@@ -130,11 +130,11 @@
 		},
 		"Apache Tomcat": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote" }
+			"headers": { "Server": "Apache-Coyote/?([\\d\\.]+)?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "YTS" }
+			"headers": { "Server": "ATS/?([\\d\\.]+)?\\;version:\\1" }
 		},
 		"Arc Forum": {
 			"cats": [ 2 ],
@@ -142,12 +142,12 @@
 		},
 		"AsciiDoc": {
 			"cats": [ 1, 20, 27 ],
-			"meta": { "generator": "^AsciiDoc" },
+			"meta": { "generator": "^AsciiDoc ([\\d\\.]+)\\;version:\\1" },
 			"env": "^asciidoc$"
 		},
 		"ATG Web Commerce": {
 			"cats": [ 6 ],
-			"headers": { "X-ATG-Version": "ATG" },
+			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d\\.]+))?\\;version:\\2" },
 			"html": "<[^>]+_DARGS"
 		},
 		"Atlassian Confluence": {
@@ -167,7 +167,7 @@
 		},
 		"AWStats": {
 			"cats": [ 10 ],
-			"meta": { "generator": "AWStats" },
+			"meta": { "generator": "AWStats ([\\d\\.]+( \\(build [\\d\\.]+\\))?)\\;version:\\1" },
 			"implies": "Perl"
 		},
 		"Backbone.js": {
@@ -178,12 +178,12 @@
 		},
 		"Banshee": {
 			"cats": [ 1, 18 ],
-			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org",
+			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(v([\\d\\.]+))?\\;version:\\2",
 			"implies": "PHP"
 		},
 		"BIGACE": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BIGACE" },
+			"meta": { "generator": "BIGACE ([\\d\\.]+)\\;version:\\1" },
 			"html": "Powered by <a href=\"[^>]+BIGACE|<!--\\s+Site is running BIGACE",
 			"implies": "PHP"
 		},
@@ -196,7 +196,7 @@
 		},
 		"BigDump": {
 			"cats": [ 3 ],
-			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer",
+			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer ver\. ([\\d\\.b]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Bigware": {
@@ -217,7 +217,7 @@
 		},
 		"BrowserCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BrowserCMS" },
+			"meta": { "generator": "BrowserCMS ([\\d\\.]+)\\;version:\\1" },
 			"implies": "Ruby"
 		},
 		"Bugzilla": {
@@ -266,17 +266,19 @@
 		},
 		"Chamilo": {
 			"cats": [ 21 ],
-			"meta": { "generator": "Chamilo" },
-			"headers": { "X-Powered-By": "Chamilo" },
+			"html": "\">Chamilo ([\\d\\.]+)</a>\\;version:\\1",
+			"meta": { "generator": "Chamilo ([\\d\\.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "Chamilo ([\\d\\.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Chartbeat": {
 			"cats": [ 10 ],
-			"html": "function loadChartbeat\\(\\) {"
+			"html": "function loadChartbeat\\(\\) {",
+			"script": "chartbeat.js"
 		},
 		"Cherokee": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee" }
+			"headers": { "Server": "Cherokee/([\\d\\.]+)\\;version:\\1" }
 		},
 		"CKEditor": {
 			"cats": [ 24 ],
@@ -286,7 +288,7 @@
 		"ClickHeat": {
 			"cats": [ 10 ],
 			"script": "clickheat.*\\.js",
-			"env": "^clickHeatBrowser$",
+			"env": "^clickHeat",
 			"implies": "PHP"
 		},
 		"ClickTale": {
@@ -336,7 +338,7 @@
 		"Concrete5": {
 			"cats": [ 1 ],
 			"script": "concrete/js/",
-			"meta": { "generator": "concrete5" },
+			"meta": { "generator": "concrete5 - ([\\d\\.ab]+)\\;version:\\1" },
 			"env": "^CCM_IMAGE_PATH$",
 			"implies": "PHP"
 		},
@@ -352,12 +354,12 @@
 		},
 		"Contenido": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contenido" },
+			"meta": { "generator": "Contenido ([\\d\\.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Contens": {
 			"cats": [ 1 ],
-			"meta": { "generator": "contens" },
+			"meta": { "generator": "Contensis CMS Version ([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "Java", "CFML" ]
 		},
 		"ConversionLab": {
@@ -366,7 +368,7 @@
 		},
 		"Coppermine": {
 			"cats": [ 7 ],
-			"html": "<!--Coppermine Photo Gallery",
+			"html": "<!--Coppermine Photo Gallery ([\\d\\.]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Cosmoshop": {
@@ -380,11 +382,11 @@
 		},
 		"CouchDB": {
 			"cats": [ 22 ],
-			"headers": { "Server": "CouchDB" }
+			"headers": { "Server": "CouchDB/([\\d\\.]+)\\;version:\\1" }
 		},
 		"cPanel": {
 			"cats": [ 9 ],
-			"headers": { "Server": "cpsrvd" },
+			"headers": { "Server": "cpsrvd/([\\d\\.]+)\\;version:\\1" },
 			"html": "<!-- cPanel"
 		},
 		"CPG Dragonfly": {
@@ -426,13 +428,13 @@
 		},
 		"Dancer": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Perl Dancer", "Server": "Perl Dancer" },
+			"headers": { "X-Powered-By": "Perl Dancer ([\\d\\.]+)\\;version:\\1", "Server": "Perl Dancer ([\\d\\.]+)\\;version:\\1" },
 			"implies": "Perl"
 		},
 		"Danneo CMS": {
 			"cats": [ 1 ],
-			"headers": { "X-Powered-By": "CMS Danneo.*" },
-			"meta": { "generator": "Danneo" },
+			"headers": { "X-Powered-By": "CMS Danneo ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Danneo CMS ([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "Apache", "PHP" ]
 		},
 		"dashCommerce": {
@@ -447,7 +449,7 @@
 		},
 		"David Webbox": {
 			"cats": [ 22 ],
-			"headers": { "Server": "David-WebBox" }
+			"headers": { "Server": "David-WebBox/([\\d\\.a]+ \(\d+\))\\;version:\\1" }
 		},
 		"Debian": {
 			"cats": [ 28 ],
@@ -455,7 +457,7 @@
 		},
 		"DedeCMS": {
 			"cats": [ 1 ],
-			"env": "^Dede",
+			"env": "^DedeContainer",
 			"script": "dedeajax",
 			"implies": "PHP"
 		},
@@ -472,6 +474,7 @@
 		"DirectAdmin": {
 			"cats": [ 9 ],
 			"html": "<a[^>]+>DirectAdmin</a> Web Control Panel",
+			"headers": { "Server": "DirectAdmin Daemon v([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "PHP", "Apache" ]
 		},
 		"Disqus": {
@@ -482,18 +485,19 @@
 		},
 		"Django": {
 			"cats": [ 18 ],
-			"html": "powered by <a[^>]+>Django",
+			"html": "(powered by <a[^>]+>Django ?([\\d\\.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z0-9]{32}\" type=\"hidden\"></div>)\\;version:\\2",
+			"env": "__admin_media_prefix__",
 			"implies": "Python"
 		},
 		"Django CMS": {
 			"cats": [ 1 ],
 			"script": "media/cms/js/csrf\\.js",
-			"headers": { "Set-Cookie": "django" },
+			"headers": { "Set-Cookie": "django[^\\;]=" },
 			"implies": "Django"
 		},
 		"Dojo": {
 			"cats": [ 12 ],
-			"script": "dojo(\\.xd)?\\.js",
+			"script": "([\\d\\.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
 			"env": "^dojo$"
 		},
 		"Dokeos": {
@@ -567,6 +571,11 @@
 			"meta": { "generator": "EPrints" },
 			"implies": "Perl"
 		},
+		"eSyndiCat": {
+			"cats": [ 1 ],
+			"headers": { "X-Drectory-Script": "^eSyndiCat" },
+			"implies": [ "PHP" ]
+		},
 		"Exhibit": {
 			"cats": [ 25 ],
 			"script": "exhibit.*\\.js",
diff --git a/drivers/chrome/images/icons/Spree.png b/drivers/chrome/images/icons/Spree.png
new file mode 100644
index 0000000000000000000000000000000000000000..88b593baf9636fee9c06e2d4bdff018a61c15852
GIT binary patch
literal 554
zcmV+_0@eMAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005;Nkl<ZILl-B
z|NlP&E_~_n?xbZWDv$p8^P3r$8U}m@9KF4wZpyy+SHFJ$U?<6d?>|5BfBN=D^5orh
zrPB{2KLxShetxV*v;jAs9}k+mH|*=OlU0X61}r>Qbbj^ef|Ga+SakexQsL^W)2lYz
z>3sa|gVL_6y$gGH2LA8a8T5bF!N|AwUf;D?bmCFcs<Y3+u^M39cKD`1(a!%MT)OsF
zA4u%LjR~`79f*AU{KFlid#^vKaOLm&?=|J*L97Nme)mmg*R@w33e|hxD%Bo%`S#0C
zp+A5BFn;~<NeCogv*}Jd$na?gALQW;gW@$;r+^er+IPS3)u$gKPv3u&y!`Z&wpQbT
z$I=yhK7;sp4LJSay(!EqAk1I53(n47ad{3=vCz5mPEFi`^Q*&WpWPff>+Dt#J7w|3
zrB{G1A<BSTFF&g-Ir%u@$FDzZApY@t@2pm%g+5*b(wAPJ!;`<~|B*ZIY(RX6zSGCK
z^7sF}|N5IeQ3l+3^;&!7>AOkafBgn0;j<54TJ5@eJ&I@-?7uN>%Hdl}n}7WJ$^+s*
zcyr!m)A{<XFF)QgBFcbOryF*IQsLCSv2SM`OncA^OpQG|ga1Byd&Q0@13)&PxVxre
s(XryQa}H(Q-gKd7#nbmUO|hv307nhjX6;P#fB*mh07*qoM6N<$f*&3qj{pDw

literal 0
HcmV?d00001

diff --git a/drivers/chrome/images/icons/Subrion.png b/drivers/chrome/images/icons/Subrion.png
new file mode 100755
index 0000000000000000000000000000000000000000..fdd2e2d4eddc1a883a213ca2751175cfa6cd46da
GIT binary patch
literal 950
zcmV;n14;aeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uz0Xh}ptR5*=IQ%h`=RTw?ry?6e3&)6x`hqX;BwP*ngI6*{+wJ};^
zjDe7D1dKsr6O0K9RMf--(cm5z6d#E~l#RMz(FDN;Sy*C#N-V8?q?JKPOJ~w~{qz5G
z@BLf=Nl$W;laritR)?4wD`A<XAegbG{PttlrcU0jRM#jWtLszAk-_ec57#7PR}Hh2
zL<Rt8Wr1a*1PQH~oPi4ye@_=Gor!?5mNnH(g<^_p@Aq^K_O~{Eb8m=@dJtx|QjpZv
zdd^(_a$gHwsIQB-0ENg!D^>8gDcO`fIyU=tND05UIep49OJZg)TR|l3<l@<Zi!;Z*
zSSnAn2Zd(CmMk+Y9Im3p=4gkxh1~%qB8B5yR&Pj$LUUxTkwn5=$$oYCx9N{Rmm+ML
zLI{u)NhgeWAYuY!gf)38c?-CuJN2mkMD@32zTDrr>K$Tc+%1o9{`s$gQ5GQ^mJUA_
zjmy>1I@CEatKbSCQ9vv+Y*Z?{ko$eZui5K;*XZbfM>amaP65Dt{@fl?4!WWZc2hK_
z;sFQDWVOF2ba>k@Dt+)ZTVWT)VywAoXK`=i_*#E_WO%By@fiUC8m95dXcEswBNX8p
zJg;nO)dfMSdqkxV?JS%)xj&of$YnF_%Qv6TOqwf|z$@K*UJjwGz|1HvojL4HZe@RJ
zN3HtLOYBYcvv;GHng3l|Jbmho*$8<4k%XS_NZHvSc&;Jt`ZE*jnHhrh(!-(LnFFjD
zR#zm9XW7pK!Parurs?wc$3Jk|8lW2LS%w|d9XjYodY=uIzB@4p0K(io{jM(GXaU1O
zy985Z_6rbB!;H->C&*uJSE(dq#E~)<rr7Im$@-xmA*}ZV04S3i-US1&tq6bt5@7AY
z`h|#01bvxIc&uCpN`XCv;%DzcHa0^<<7EI4>@9Xcdw_Nc+6A;r#1b|?)<bbs3vSvv
zB7}x|DDDT+DUDK2*Djugli4y10E)E>7@t9g0b*EBvMpPfo2zW$(hHF{KRUp-r?&Cp
zojRz10sLTa_rCMN7k3Q-0J)c+nzW_sT@WD)_5?Z21(|;JC)KofNJQ6Ng$PzTx6r0X
z&%e#Ze7k6Q^pe`#_bmcW6#$`j=ZAgnA3e+NpW7$>*-wwyYPR+MKkog+TEX_de!vyp
Y|9`96!-k(!f&c&j07*qoM6N<$g5rR<LjV8(

literal 0
HcmV?d00001

diff --git a/drivers/chrome/images/icons/eSyndiCat.png b/drivers/chrome/images/icons/eSyndiCat.png
new file mode 100755
index 0000000000000000000000000000000000000000..4efd96fdb9a8997aab1513b99d144db944597824
GIT binary patch
literal 836
zcmV-K1H1f*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!=1D|BRCwBA{Qv(y10{e3L<F`RVFFTy
zKy1MJ_s`x{^$rhU3V?EKKuQOQoq$*th^MZvvAG46V_*RimOyqtD+`mfq#(yLK`xeG
zK(S9iF@GR7V`N~k2FmeD2y%Q?mgM<tpd`2y#RYPrTp9oVGw9SrXuS~^;J6DEd$Hl*
zeg4xAKZWyiu}gZHN^+`6^ZsOGVY&m9JJ;5+LvhMl4vXK+EJ8s32^K32VZH~izx@Pi
zwgn122ALXQuP6|}z;Fe~yt?M-<I{Z$&M1YQ+L|Ww;e}W1kFTs>{L`PaD9Ap$`}|8H
zldKr`!AGyY{R2At4U)?~0C5RW?7;E^kEY4-vnFU5$V-ZSdC$uJ?+-&(oauKrBgrR<
z5<EgoK%4gh{m23IiW;)tLYfYlaI!H^3$vAFZz!<4$D*$E86?ig!^ObI#}&8g;KLtc
z{OoU7fB|y{$oTpB#~(+ajW>a6YJdS3$id3Yp()G9?`<m81r%%ic=+5qaRELCMim8y
zmrvfFXZiQn8t8&EplJLqz|H#f*WZ8UT<pwmnHU*!;$0L!8!8EW6Xs*z4V3Sy%U&Ru
zEGN#vn;-fA%k}%eH_qR$`b$|;NK2M)H8>q8i*Q_c@amhMq!6c&osQ^V7X$H9pzr}u
zjDY0L6WoP`RQPVN3vy3j*HN?n@$Ptx7$5gPpzC*l4bYU~-MIDqE6@LojAG18j0=E5
zE0Dv(+f))1s1ZO6N<fP~Fmqnj5#@Ra^zu8f0dg_|`y~X~7_L43A_`0}2ho!&P$4i_
z82Es=4v1|8dDs+8RfQ&QJn<Bgl!4&Af(X}>d(XZIvoJGVK++flq=JC1(gb1=1##~8
z#wtQ=HrgU@rGz+V!}9{z6~Y|*thGf|c{o_!KsB?dNbw|y@pGu!>xwbzD)9dTM(bsu
z)G;953B>oo8bP@cicNvI3y7JZd=?<?1>y-n>;%NzNNVAjk<#o85MTfseG@`vQT7o4
O0000<MNUMnLSTZrq=j<;

literal 0
HcmV?d00001

diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index d25d45029..da60407df 100755
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -52,7 +52,7 @@
 		},
 		"2z Project": {
 			"cats": [ 1 ],
-			"meta": { "generator": "2z project" }
+			"meta": { "generator": "2z project ([\\d\\.]+);version:\\1" }
 		},
 		"3dCart": {
 			"cats": [ 1, 6 ],
@@ -66,7 +66,7 @@
 		},
 		"AddThis": {
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js",
+			"script": "addthis\\.com/js/(\d+)?;version:\\1",
 			"env": "^addthis"
 		},
 		"Adobe CQ5": {
@@ -101,12 +101,12 @@
 		"Amiro.CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Amiro" },
-			"html": "system_js\\.php\\?script=",
+			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^"]+cv=([\d\.]+)\\;version:\\2",
 			"implies": "PHP"
 		},
 		"AMPcms": {
 			"cats": [ 1 ],
-			"headers": { "X-AMP-Version": ".*", "Set-Cookie": "AMP=" },
+			"headers": { "X-AMP-Version": "([\\d\\.]+)\\;version=\\1", "Set-Cookie": "^AMP=" },
 			"env": "^amp_js_init$",
 			"implies": "PHP"
 		},
@@ -116,7 +116,7 @@
 		},
 		"AOLserver": {
 			"cats": [ 22 ],
-			"headers": { "Server": "AOLserver" }
+			"headers": { "Server": "AOLserver/?([\d\.]+)?\\;version:\\1" }
 		},
 		"Apache": {
 			"cats": [ 22 ],
@@ -130,11 +130,11 @@
 		},
 		"Apache Tomcat": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote" }
+			"headers": { "Server": "Apache-Coyote/?([\\d\\.]+)?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "YTS" }
+			"headers": { "Server": "ATS/?([\\d\\.]+)?\\;version:\\1" }
 		},
 		"Arc Forum": {
 			"cats": [ 2 ],
@@ -142,12 +142,12 @@
 		},
 		"AsciiDoc": {
 			"cats": [ 1, 20, 27 ],
-			"meta": { "generator": "^AsciiDoc" },
+			"meta": { "generator": "^AsciiDoc ([\\d\\.]+)\\;version:\\1" },
 			"env": "^asciidoc$"
 		},
 		"ATG Web Commerce": {
 			"cats": [ 6 ],
-			"headers": { "X-ATG-Version": "ATG" },
+			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d\\.]+))?\\;version:\\2" },
 			"html": "<[^>]+_DARGS"
 		},
 		"Atlassian Confluence": {
@@ -167,7 +167,7 @@
 		},
 		"AWStats": {
 			"cats": [ 10 ],
-			"meta": { "generator": "AWStats" },
+			"meta": { "generator": "AWStats ([\\d\\.]+( \\(build [\\d\\.]+\\))?)\\;version:\\1" },
 			"implies": "Perl"
 		},
 		"Backbone.js": {
@@ -178,12 +178,12 @@
 		},
 		"Banshee": {
 			"cats": [ 1, 18 ],
-			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org",
+			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(v([\\d\\.]+))?\\;version:\\2",
 			"implies": "PHP"
 		},
 		"BIGACE": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BIGACE" },
+			"meta": { "generator": "BIGACE ([\\d\\.]+)\\;version:\\1" },
 			"html": "Powered by <a href=\"[^>]+BIGACE|<!--\\s+Site is running BIGACE",
 			"implies": "PHP"
 		},
@@ -196,7 +196,7 @@
 		},
 		"BigDump": {
 			"cats": [ 3 ],
-			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer",
+			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer ver\. ([\\d\\.b]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Bigware": {
@@ -217,7 +217,7 @@
 		},
 		"BrowserCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BrowserCMS" },
+			"meta": { "generator": "BrowserCMS ([\\d\\.]+)\\;version:\\1" },
 			"implies": "Ruby"
 		},
 		"Bugzilla": {
@@ -266,17 +266,19 @@
 		},
 		"Chamilo": {
 			"cats": [ 21 ],
-			"meta": { "generator": "Chamilo" },
-			"headers": { "X-Powered-By": "Chamilo" },
+			"html": "\">Chamilo ([\\d\\.]+)</a>\\;version:\\1",
+			"meta": { "generator": "Chamilo ([\\d\\.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "Chamilo ([\\d\\.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Chartbeat": {
 			"cats": [ 10 ],
-			"html": "function loadChartbeat\\(\\) {"
+			"html": "function loadChartbeat\\(\\) {",
+			"script": "chartbeat.js"
 		},
 		"Cherokee": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee" }
+			"headers": { "Server": "Cherokee/([\\d\\.]+)\\;version:\\1" }
 		},
 		"CKEditor": {
 			"cats": [ 24 ],
@@ -286,7 +288,7 @@
 		"ClickHeat": {
 			"cats": [ 10 ],
 			"script": "clickheat.*\\.js",
-			"env": "^clickHeatBrowser$",
+			"env": "^clickHeat",
 			"implies": "PHP"
 		},
 		"ClickTale": {
@@ -336,7 +338,7 @@
 		"Concrete5": {
 			"cats": [ 1 ],
 			"script": "concrete/js/",
-			"meta": { "generator": "concrete5" },
+			"meta": { "generator": "concrete5 - ([\\d\\.ab]+)\\;version:\\1" },
 			"env": "^CCM_IMAGE_PATH$",
 			"implies": "PHP"
 		},
@@ -352,12 +354,12 @@
 		},
 		"Contenido": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contenido" },
+			"meta": { "generator": "Contenido ([\\d\\.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Contens": {
 			"cats": [ 1 ],
-			"meta": { "generator": "contens" },
+			"meta": { "generator": "Contensis CMS Version ([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "Java", "CFML" ]
 		},
 		"ConversionLab": {
@@ -366,7 +368,7 @@
 		},
 		"Coppermine": {
 			"cats": [ 7 ],
-			"html": "<!--Coppermine Photo Gallery",
+			"html": "<!--Coppermine Photo Gallery ([\\d\\.]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Cosmoshop": {
@@ -380,11 +382,11 @@
 		},
 		"CouchDB": {
 			"cats": [ 22 ],
-			"headers": { "Server": "CouchDB" }
+			"headers": { "Server": "CouchDB/([\\d\\.]+)\\;version:\\1" }
 		},
 		"cPanel": {
 			"cats": [ 9 ],
-			"headers": { "Server": "cpsrvd" },
+			"headers": { "Server": "cpsrvd/([\\d\\.]+)\\;version:\\1" },
 			"html": "<!-- cPanel"
 		},
 		"CPG Dragonfly": {
@@ -426,13 +428,13 @@
 		},
 		"Dancer": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Perl Dancer", "Server": "Perl Dancer" },
+			"headers": { "X-Powered-By": "Perl Dancer ([\\d\\.]+)\\;version:\\1", "Server": "Perl Dancer ([\\d\\.]+)\\;version:\\1" },
 			"implies": "Perl"
 		},
 		"Danneo CMS": {
 			"cats": [ 1 ],
-			"headers": { "X-Powered-By": "CMS Danneo.*" },
-			"meta": { "generator": "Danneo" },
+			"headers": { "X-Powered-By": "CMS Danneo ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Danneo CMS ([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "Apache", "PHP" ]
 		},
 		"dashCommerce": {
@@ -447,7 +449,7 @@
 		},
 		"David Webbox": {
 			"cats": [ 22 ],
-			"headers": { "Server": "David-WebBox" }
+			"headers": { "Server": "David-WebBox/([\\d\\.a]+ \(\d+\))\\;version:\\1" }
 		},
 		"Debian": {
 			"cats": [ 28 ],
@@ -455,7 +457,7 @@
 		},
 		"DedeCMS": {
 			"cats": [ 1 ],
-			"env": "^Dede",
+			"env": "^DedeContainer",
 			"script": "dedeajax",
 			"implies": "PHP"
 		},
@@ -472,6 +474,7 @@
 		"DirectAdmin": {
 			"cats": [ 9 ],
 			"html": "<a[^>]+>DirectAdmin</a> Web Control Panel",
+			"headers": { "Server": "DirectAdmin Daemon v([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "PHP", "Apache" ]
 		},
 		"Disqus": {
@@ -482,18 +485,19 @@
 		},
 		"Django": {
 			"cats": [ 18 ],
-			"html": "powered by <a[^>]+>Django",
+			"html": "(powered by <a[^>]+>Django ?([\\d\\.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z0-9]{32}\" type=\"hidden\"></div>)\\;version:\\2",
+			"env": "__admin_media_prefix__",
 			"implies": "Python"
 		},
 		"Django CMS": {
 			"cats": [ 1 ],
 			"script": "media/cms/js/csrf\\.js",
-			"headers": { "Set-Cookie": "django" },
+			"headers": { "Set-Cookie": "django[^\\;]=" },
 			"implies": "Django"
 		},
 		"Dojo": {
 			"cats": [ 12 ],
-			"script": "dojo(\\.xd)?\\.js",
+			"script": "([\\d\\.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
 			"env": "^dojo$"
 		},
 		"Dokeos": {
@@ -567,6 +571,11 @@
 			"meta": { "generator": "EPrints" },
 			"implies": "Perl"
 		},
+		"eSyndiCat": {
+			"cats": [ 1 ],
+			"headers": { "X-Drectory-Script": "^eSyndiCat" },
+			"implies": [ "PHP" ]
+		},
 		"Exhibit": {
 			"cats": [ 25 ],
 			"script": "exhibit.*\\.js",
diff --git a/drivers/firefox-jetpack/images/icons/Spree.png b/drivers/firefox-jetpack/images/icons/Spree.png
new file mode 100644
index 0000000000000000000000000000000000000000..88b593baf9636fee9c06e2d4bdff018a61c15852
GIT binary patch
literal 554
zcmV+_0@eMAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005;Nkl<ZILl-B
z|NlP&E_~_n?xbZWDv$p8^P3r$8U}m@9KF4wZpyy+SHFJ$U?<6d?>|5BfBN=D^5orh
zrPB{2KLxShetxV*v;jAs9}k+mH|*=OlU0X61}r>Qbbj^ef|Ga+SakexQsL^W)2lYz
z>3sa|gVL_6y$gGH2LA8a8T5bF!N|AwUf;D?bmCFcs<Y3+u^M39cKD`1(a!%MT)OsF
zA4u%LjR~`79f*AU{KFlid#^vKaOLm&?=|J*L97Nme)mmg*R@w33e|hxD%Bo%`S#0C
zp+A5BFn;~<NeCogv*}Jd$na?gALQW;gW@$;r+^er+IPS3)u$gKPv3u&y!`Z&wpQbT
z$I=yhK7;sp4LJSay(!EqAk1I53(n47ad{3=vCz5mPEFi`^Q*&WpWPff>+Dt#J7w|3
zrB{G1A<BSTFF&g-Ir%u@$FDzZApY@t@2pm%g+5*b(wAPJ!;`<~|B*ZIY(RX6zSGCK
z^7sF}|N5IeQ3l+3^;&!7>AOkafBgn0;j<54TJ5@eJ&I@-?7uN>%Hdl}n}7WJ$^+s*
zcyr!m)A{<XFF)QgBFcbOryF*IQsLCSv2SM`OncA^OpQG|ga1Byd&Q0@13)&PxVxre
s(XryQa}H(Q-gKd7#nbmUO|hv307nhjX6;P#fB*mh07*qoM6N<$f*&3qj{pDw

literal 0
HcmV?d00001

diff --git a/drivers/firefox-jetpack/images/icons/Subrion.png b/drivers/firefox-jetpack/images/icons/Subrion.png
new file mode 100755
index 0000000000000000000000000000000000000000..fdd2e2d4eddc1a883a213ca2751175cfa6cd46da
GIT binary patch
literal 950
zcmV;n14;aeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uz0Xh}ptR5*=IQ%h`=RTw?ry?6e3&)6x`hqX;BwP*ngI6*{+wJ};^
zjDe7D1dKsr6O0K9RMf--(cm5z6d#E~l#RMz(FDN;Sy*C#N-V8?q?JKPOJ~w~{qz5G
z@BLf=Nl$W;laritR)?4wD`A<XAegbG{PttlrcU0jRM#jWtLszAk-_ec57#7PR}Hh2
zL<Rt8Wr1a*1PQH~oPi4ye@_=Gor!?5mNnH(g<^_p@Aq^K_O~{Eb8m=@dJtx|QjpZv
zdd^(_a$gHwsIQB-0ENg!D^>8gDcO`fIyU=tND05UIep49OJZg)TR|l3<l@<Zi!;Z*
zSSnAn2Zd(CmMk+Y9Im3p=4gkxh1~%qB8B5yR&Pj$LUUxTkwn5=$$oYCx9N{Rmm+ML
zLI{u)NhgeWAYuY!gf)38c?-CuJN2mkMD@32zTDrr>K$Tc+%1o9{`s$gQ5GQ^mJUA_
zjmy>1I@CEatKbSCQ9vv+Y*Z?{ko$eZui5K;*XZbfM>amaP65Dt{@fl?4!WWZc2hK_
z;sFQDWVOF2ba>k@Dt+)ZTVWT)VywAoXK`=i_*#E_WO%By@fiUC8m95dXcEswBNX8p
zJg;nO)dfMSdqkxV?JS%)xj&of$YnF_%Qv6TOqwf|z$@K*UJjwGz|1HvojL4HZe@RJ
zN3HtLOYBYcvv;GHng3l|Jbmho*$8<4k%XS_NZHvSc&;Jt`ZE*jnHhrh(!-(LnFFjD
zR#zm9XW7pK!Parurs?wc$3Jk|8lW2LS%w|d9XjYodY=uIzB@4p0K(io{jM(GXaU1O
zy985Z_6rbB!;H->C&*uJSE(dq#E~)<rr7Im$@-xmA*}ZV04S3i-US1&tq6bt5@7AY
z`h|#01bvxIc&uCpN`XCv;%DzcHa0^<<7EI4>@9Xcdw_Nc+6A;r#1b|?)<bbs3vSvv
zB7}x|DDDT+DUDK2*Djugli4y10E)E>7@t9g0b*EBvMpPfo2zW$(hHF{KRUp-r?&Cp
zojRz10sLTa_rCMN7k3Q-0J)c+nzW_sT@WD)_5?Z21(|;JC)KofNJQ6Ng$PzTx6r0X
z&%e#Ze7k6Q^pe`#_bmcW6#$`j=ZAgnA3e+NpW7$>*-wwyYPR+MKkog+TEX_de!vyp
Y|9`96!-k(!f&c&j07*qoM6N<$g5rR<LjV8(

literal 0
HcmV?d00001

diff --git a/drivers/firefox-jetpack/images/icons/eSyndiCat.png b/drivers/firefox-jetpack/images/icons/eSyndiCat.png
new file mode 100755
index 0000000000000000000000000000000000000000..4efd96fdb9a8997aab1513b99d144db944597824
GIT binary patch
literal 836
zcmV-K1H1f*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!=1D|BRCwBA{Qv(y10{e3L<F`RVFFTy
zKy1MJ_s`x{^$rhU3V?EKKuQOQoq$*th^MZvvAG46V_*RimOyqtD+`mfq#(yLK`xeG
zK(S9iF@GR7V`N~k2FmeD2y%Q?mgM<tpd`2y#RYPrTp9oVGw9SrXuS~^;J6DEd$Hl*
zeg4xAKZWyiu}gZHN^+`6^ZsOGVY&m9JJ;5+LvhMl4vXK+EJ8s32^K32VZH~izx@Pi
zwgn122ALXQuP6|}z;Fe~yt?M-<I{Z$&M1YQ+L|Ww;e}W1kFTs>{L`PaD9Ap$`}|8H
zldKr`!AGyY{R2At4U)?~0C5RW?7;E^kEY4-vnFU5$V-ZSdC$uJ?+-&(oauKrBgrR<
z5<EgoK%4gh{m23IiW;)tLYfYlaI!H^3$vAFZz!<4$D*$E86?ig!^ObI#}&8g;KLtc
z{OoU7fB|y{$oTpB#~(+ajW>a6YJdS3$id3Yp()G9?`<m81r%%ic=+5qaRELCMim8y
zmrvfFXZiQn8t8&EplJLqz|H#f*WZ8UT<pwmnHU*!;$0L!8!8EW6Xs*z4V3Sy%U&Ru
zEGN#vn;-fA%k}%eH_qR$`b$|;NK2M)H8>q8i*Q_c@amhMq!6c&osQ^V7X$H9pzr}u
zjDY0L6WoP`RQPVN3vy3j*HN?n@$Ptx7$5gPpzC*l4bYU~-MIDqE6@LojAG18j0=E5
zE0Dv(+f))1s1ZO6N<fP~Fmqnj5#@Ra^zu8f0dg_|`y~X~7_L43A_`0}2ho!&P$4i_
z82Es=4v1|8dDs+8RfQ&QJn<Bgl!4&Af(X}>d(XZIvoJGVK++flq=JC1(gb1=1##~8
z#wtQ=HrgU@rGz+V!}9{z6~Y|*thGf|c{o_!KsB?dNbw|y@pGu!>xwbzD)9dTM(bsu
z)G;953B>oo8bP@cicNvI3y7JZd=?<?1>y-n>;%NzNNVAjk<#o85MTfseG@`vQT7o4
O0000<MNUMnLSTZrq=j<;

literal 0
HcmV?d00001

diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index d25d45029..da60407df 100755
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -52,7 +52,7 @@
 		},
 		"2z Project": {
 			"cats": [ 1 ],
-			"meta": { "generator": "2z project" }
+			"meta": { "generator": "2z project ([\\d\\.]+);version:\\1" }
 		},
 		"3dCart": {
 			"cats": [ 1, 6 ],
@@ -66,7 +66,7 @@
 		},
 		"AddThis": {
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js",
+			"script": "addthis\\.com/js/(\d+)?;version:\\1",
 			"env": "^addthis"
 		},
 		"Adobe CQ5": {
@@ -101,12 +101,12 @@
 		"Amiro.CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Amiro" },
-			"html": "system_js\\.php\\?script=",
+			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^"]+cv=([\d\.]+)\\;version:\\2",
 			"implies": "PHP"
 		},
 		"AMPcms": {
 			"cats": [ 1 ],
-			"headers": { "X-AMP-Version": ".*", "Set-Cookie": "AMP=" },
+			"headers": { "X-AMP-Version": "([\\d\\.]+)\\;version=\\1", "Set-Cookie": "^AMP=" },
 			"env": "^amp_js_init$",
 			"implies": "PHP"
 		},
@@ -116,7 +116,7 @@
 		},
 		"AOLserver": {
 			"cats": [ 22 ],
-			"headers": { "Server": "AOLserver" }
+			"headers": { "Server": "AOLserver/?([\d\.]+)?\\;version:\\1" }
 		},
 		"Apache": {
 			"cats": [ 22 ],
@@ -130,11 +130,11 @@
 		},
 		"Apache Tomcat": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote" }
+			"headers": { "Server": "Apache-Coyote/?([\\d\\.]+)?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "YTS" }
+			"headers": { "Server": "ATS/?([\\d\\.]+)?\\;version:\\1" }
 		},
 		"Arc Forum": {
 			"cats": [ 2 ],
@@ -142,12 +142,12 @@
 		},
 		"AsciiDoc": {
 			"cats": [ 1, 20, 27 ],
-			"meta": { "generator": "^AsciiDoc" },
+			"meta": { "generator": "^AsciiDoc ([\\d\\.]+)\\;version:\\1" },
 			"env": "^asciidoc$"
 		},
 		"ATG Web Commerce": {
 			"cats": [ 6 ],
-			"headers": { "X-ATG-Version": "ATG" },
+			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d\\.]+))?\\;version:\\2" },
 			"html": "<[^>]+_DARGS"
 		},
 		"Atlassian Confluence": {
@@ -167,7 +167,7 @@
 		},
 		"AWStats": {
 			"cats": [ 10 ],
-			"meta": { "generator": "AWStats" },
+			"meta": { "generator": "AWStats ([\\d\\.]+( \\(build [\\d\\.]+\\))?)\\;version:\\1" },
 			"implies": "Perl"
 		},
 		"Backbone.js": {
@@ -178,12 +178,12 @@
 		},
 		"Banshee": {
 			"cats": [ 1, 18 ],
-			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org",
+			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(v([\\d\\.]+))?\\;version:\\2",
 			"implies": "PHP"
 		},
 		"BIGACE": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BIGACE" },
+			"meta": { "generator": "BIGACE ([\\d\\.]+)\\;version:\\1" },
 			"html": "Powered by <a href=\"[^>]+BIGACE|<!--\\s+Site is running BIGACE",
 			"implies": "PHP"
 		},
@@ -196,7 +196,7 @@
 		},
 		"BigDump": {
 			"cats": [ 3 ],
-			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer",
+			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer ver\. ([\\d\\.b]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Bigware": {
@@ -217,7 +217,7 @@
 		},
 		"BrowserCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BrowserCMS" },
+			"meta": { "generator": "BrowserCMS ([\\d\\.]+)\\;version:\\1" },
 			"implies": "Ruby"
 		},
 		"Bugzilla": {
@@ -266,17 +266,19 @@
 		},
 		"Chamilo": {
 			"cats": [ 21 ],
-			"meta": { "generator": "Chamilo" },
-			"headers": { "X-Powered-By": "Chamilo" },
+			"html": "\">Chamilo ([\\d\\.]+)</a>\\;version:\\1",
+			"meta": { "generator": "Chamilo ([\\d\\.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "Chamilo ([\\d\\.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Chartbeat": {
 			"cats": [ 10 ],
-			"html": "function loadChartbeat\\(\\) {"
+			"html": "function loadChartbeat\\(\\) {",
+			"script": "chartbeat.js"
 		},
 		"Cherokee": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee" }
+			"headers": { "Server": "Cherokee/([\\d\\.]+)\\;version:\\1" }
 		},
 		"CKEditor": {
 			"cats": [ 24 ],
@@ -286,7 +288,7 @@
 		"ClickHeat": {
 			"cats": [ 10 ],
 			"script": "clickheat.*\\.js",
-			"env": "^clickHeatBrowser$",
+			"env": "^clickHeat",
 			"implies": "PHP"
 		},
 		"ClickTale": {
@@ -336,7 +338,7 @@
 		"Concrete5": {
 			"cats": [ 1 ],
 			"script": "concrete/js/",
-			"meta": { "generator": "concrete5" },
+			"meta": { "generator": "concrete5 - ([\\d\\.ab]+)\\;version:\\1" },
 			"env": "^CCM_IMAGE_PATH$",
 			"implies": "PHP"
 		},
@@ -352,12 +354,12 @@
 		},
 		"Contenido": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contenido" },
+			"meta": { "generator": "Contenido ([\\d\\.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Contens": {
 			"cats": [ 1 ],
-			"meta": { "generator": "contens" },
+			"meta": { "generator": "Contensis CMS Version ([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "Java", "CFML" ]
 		},
 		"ConversionLab": {
@@ -366,7 +368,7 @@
 		},
 		"Coppermine": {
 			"cats": [ 7 ],
-			"html": "<!--Coppermine Photo Gallery",
+			"html": "<!--Coppermine Photo Gallery ([\\d\\.]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Cosmoshop": {
@@ -380,11 +382,11 @@
 		},
 		"CouchDB": {
 			"cats": [ 22 ],
-			"headers": { "Server": "CouchDB" }
+			"headers": { "Server": "CouchDB/([\\d\\.]+)\\;version:\\1" }
 		},
 		"cPanel": {
 			"cats": [ 9 ],
-			"headers": { "Server": "cpsrvd" },
+			"headers": { "Server": "cpsrvd/([\\d\\.]+)\\;version:\\1" },
 			"html": "<!-- cPanel"
 		},
 		"CPG Dragonfly": {
@@ -426,13 +428,13 @@
 		},
 		"Dancer": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Perl Dancer", "Server": "Perl Dancer" },
+			"headers": { "X-Powered-By": "Perl Dancer ([\\d\\.]+)\\;version:\\1", "Server": "Perl Dancer ([\\d\\.]+)\\;version:\\1" },
 			"implies": "Perl"
 		},
 		"Danneo CMS": {
 			"cats": [ 1 ],
-			"headers": { "X-Powered-By": "CMS Danneo.*" },
-			"meta": { "generator": "Danneo" },
+			"headers": { "X-Powered-By": "CMS Danneo ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Danneo CMS ([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "Apache", "PHP" ]
 		},
 		"dashCommerce": {
@@ -447,7 +449,7 @@
 		},
 		"David Webbox": {
 			"cats": [ 22 ],
-			"headers": { "Server": "David-WebBox" }
+			"headers": { "Server": "David-WebBox/([\\d\\.a]+ \(\d+\))\\;version:\\1" }
 		},
 		"Debian": {
 			"cats": [ 28 ],
@@ -455,7 +457,7 @@
 		},
 		"DedeCMS": {
 			"cats": [ 1 ],
-			"env": "^Dede",
+			"env": "^DedeContainer",
 			"script": "dedeajax",
 			"implies": "PHP"
 		},
@@ -472,6 +474,7 @@
 		"DirectAdmin": {
 			"cats": [ 9 ],
 			"html": "<a[^>]+>DirectAdmin</a> Web Control Panel",
+			"headers": { "Server": "DirectAdmin Daemon v([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "PHP", "Apache" ]
 		},
 		"Disqus": {
@@ -482,18 +485,19 @@
 		},
 		"Django": {
 			"cats": [ 18 ],
-			"html": "powered by <a[^>]+>Django",
+			"html": "(powered by <a[^>]+>Django ?([\\d\\.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z0-9]{32}\" type=\"hidden\"></div>)\\;version:\\2",
+			"env": "__admin_media_prefix__",
 			"implies": "Python"
 		},
 		"Django CMS": {
 			"cats": [ 1 ],
 			"script": "media/cms/js/csrf\\.js",
-			"headers": { "Set-Cookie": "django" },
+			"headers": { "Set-Cookie": "django[^\\;]=" },
 			"implies": "Django"
 		},
 		"Dojo": {
 			"cats": [ 12 ],
-			"script": "dojo(\\.xd)?\\.js",
+			"script": "([\\d\\.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
 			"env": "^dojo$"
 		},
 		"Dokeos": {
@@ -567,6 +571,11 @@
 			"meta": { "generator": "EPrints" },
 			"implies": "Perl"
 		},
+		"eSyndiCat": {
+			"cats": [ 1 ],
+			"headers": { "X-Drectory-Script": "^eSyndiCat" },
+			"implies": [ "PHP" ]
+		},
 		"Exhibit": {
 			"cats": [ 25 ],
 			"script": "exhibit.*\\.js",
diff --git a/drivers/firefox/skin/images/icons/Spree.png b/drivers/firefox/skin/images/icons/Spree.png
new file mode 100644
index 0000000000000000000000000000000000000000..88b593baf9636fee9c06e2d4bdff018a61c15852
GIT binary patch
literal 554
zcmV+_0@eMAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005;Nkl<ZILl-B
z|NlP&E_~_n?xbZWDv$p8^P3r$8U}m@9KF4wZpyy+SHFJ$U?<6d?>|5BfBN=D^5orh
zrPB{2KLxShetxV*v;jAs9}k+mH|*=OlU0X61}r>Qbbj^ef|Ga+SakexQsL^W)2lYz
z>3sa|gVL_6y$gGH2LA8a8T5bF!N|AwUf;D?bmCFcs<Y3+u^M39cKD`1(a!%MT)OsF
zA4u%LjR~`79f*AU{KFlid#^vKaOLm&?=|J*L97Nme)mmg*R@w33e|hxD%Bo%`S#0C
zp+A5BFn;~<NeCogv*}Jd$na?gALQW;gW@$;r+^er+IPS3)u$gKPv3u&y!`Z&wpQbT
z$I=yhK7;sp4LJSay(!EqAk1I53(n47ad{3=vCz5mPEFi`^Q*&WpWPff>+Dt#J7w|3
zrB{G1A<BSTFF&g-Ir%u@$FDzZApY@t@2pm%g+5*b(wAPJ!;`<~|B*ZIY(RX6zSGCK
z^7sF}|N5IeQ3l+3^;&!7>AOkafBgn0;j<54TJ5@eJ&I@-?7uN>%Hdl}n}7WJ$^+s*
zcyr!m)A{<XFF)QgBFcbOryF*IQsLCSv2SM`OncA^OpQG|ga1Byd&Q0@13)&PxVxre
s(XryQa}H(Q-gKd7#nbmUO|hv307nhjX6;P#fB*mh07*qoM6N<$f*&3qj{pDw

literal 0
HcmV?d00001

diff --git a/drivers/firefox/skin/images/icons/Subrion.png b/drivers/firefox/skin/images/icons/Subrion.png
new file mode 100755
index 0000000000000000000000000000000000000000..fdd2e2d4eddc1a883a213ca2751175cfa6cd46da
GIT binary patch
literal 950
zcmV;n14;aeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uz0Xh}ptR5*=IQ%h`=RTw?ry?6e3&)6x`hqX;BwP*ngI6*{+wJ};^
zjDe7D1dKsr6O0K9RMf--(cm5z6d#E~l#RMz(FDN;Sy*C#N-V8?q?JKPOJ~w~{qz5G
z@BLf=Nl$W;laritR)?4wD`A<XAegbG{PttlrcU0jRM#jWtLszAk-_ec57#7PR}Hh2
zL<Rt8Wr1a*1PQH~oPi4ye@_=Gor!?5mNnH(g<^_p@Aq^K_O~{Eb8m=@dJtx|QjpZv
zdd^(_a$gHwsIQB-0ENg!D^>8gDcO`fIyU=tND05UIep49OJZg)TR|l3<l@<Zi!;Z*
zSSnAn2Zd(CmMk+Y9Im3p=4gkxh1~%qB8B5yR&Pj$LUUxTkwn5=$$oYCx9N{Rmm+ML
zLI{u)NhgeWAYuY!gf)38c?-CuJN2mkMD@32zTDrr>K$Tc+%1o9{`s$gQ5GQ^mJUA_
zjmy>1I@CEatKbSCQ9vv+Y*Z?{ko$eZui5K;*XZbfM>amaP65Dt{@fl?4!WWZc2hK_
z;sFQDWVOF2ba>k@Dt+)ZTVWT)VywAoXK`=i_*#E_WO%By@fiUC8m95dXcEswBNX8p
zJg;nO)dfMSdqkxV?JS%)xj&of$YnF_%Qv6TOqwf|z$@K*UJjwGz|1HvojL4HZe@RJ
zN3HtLOYBYcvv;GHng3l|Jbmho*$8<4k%XS_NZHvSc&;Jt`ZE*jnHhrh(!-(LnFFjD
zR#zm9XW7pK!Parurs?wc$3Jk|8lW2LS%w|d9XjYodY=uIzB@4p0K(io{jM(GXaU1O
zy985Z_6rbB!;H->C&*uJSE(dq#E~)<rr7Im$@-xmA*}ZV04S3i-US1&tq6bt5@7AY
z`h|#01bvxIc&uCpN`XCv;%DzcHa0^<<7EI4>@9Xcdw_Nc+6A;r#1b|?)<bbs3vSvv
zB7}x|DDDT+DUDK2*Djugli4y10E)E>7@t9g0b*EBvMpPfo2zW$(hHF{KRUp-r?&Cp
zojRz10sLTa_rCMN7k3Q-0J)c+nzW_sT@WD)_5?Z21(|;JC)KofNJQ6Ng$PzTx6r0X
z&%e#Ze7k6Q^pe`#_bmcW6#$`j=ZAgnA3e+NpW7$>*-wwyYPR+MKkog+TEX_de!vyp
Y|9`96!-k(!f&c&j07*qoM6N<$g5rR<LjV8(

literal 0
HcmV?d00001

diff --git a/drivers/firefox/skin/images/icons/eSyndiCat.png b/drivers/firefox/skin/images/icons/eSyndiCat.png
new file mode 100755
index 0000000000000000000000000000000000000000..4efd96fdb9a8997aab1513b99d144db944597824
GIT binary patch
literal 836
zcmV-K1H1f*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!=1D|BRCwBA{Qv(y10{e3L<F`RVFFTy
zKy1MJ_s`x{^$rhU3V?EKKuQOQoq$*th^MZvvAG46V_*RimOyqtD+`mfq#(yLK`xeG
zK(S9iF@GR7V`N~k2FmeD2y%Q?mgM<tpd`2y#RYPrTp9oVGw9SrXuS~^;J6DEd$Hl*
zeg4xAKZWyiu}gZHN^+`6^ZsOGVY&m9JJ;5+LvhMl4vXK+EJ8s32^K32VZH~izx@Pi
zwgn122ALXQuP6|}z;Fe~yt?M-<I{Z$&M1YQ+L|Ww;e}W1kFTs>{L`PaD9Ap$`}|8H
zldKr`!AGyY{R2At4U)?~0C5RW?7;E^kEY4-vnFU5$V-ZSdC$uJ?+-&(oauKrBgrR<
z5<EgoK%4gh{m23IiW;)tLYfYlaI!H^3$vAFZz!<4$D*$E86?ig!^ObI#}&8g;KLtc
z{OoU7fB|y{$oTpB#~(+ajW>a6YJdS3$id3Yp()G9?`<m81r%%ic=+5qaRELCMim8y
zmrvfFXZiQn8t8&EplJLqz|H#f*WZ8UT<pwmnHU*!;$0L!8!8EW6Xs*z4V3Sy%U&Ru
zEGN#vn;-fA%k}%eH_qR$`b$|;NK2M)H8>q8i*Q_c@amhMq!6c&osQ^V7X$H9pzr}u
zjDY0L6WoP`RQPVN3vy3j*HN?n@$Ptx7$5gPpzC*l4bYU~-MIDqE6@LojAG18j0=E5
zE0Dv(+f))1s1ZO6N<fP~Fmqnj5#@Ra^zu8f0dg_|`y~X~7_L43A_`0}2ho!&P$4i_
z82Es=4v1|8dDs+8RfQ&QJn<Bgl!4&Af(X}>d(XZIvoJGVK++flq=JC1(gb1=1##~8
z#wtQ=HrgU@rGz+V!}9{z6~Y|*thGf|c{o_!KsB?dNbw|y@pGu!>xwbzD)9dTM(bsu
z)G;953B>oo8bP@cicNvI3y7JZd=?<?1>y-n>;%NzNNVAjk<#o85MTfseG@`vQT7o4
O0000<MNUMnLSTZrq=j<;

literal 0
HcmV?d00001

diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index d25d45029..da60407df 100755
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -52,7 +52,7 @@
 		},
 		"2z Project": {
 			"cats": [ 1 ],
-			"meta": { "generator": "2z project" }
+			"meta": { "generator": "2z project ([\\d\\.]+);version:\\1" }
 		},
 		"3dCart": {
 			"cats": [ 1, 6 ],
@@ -66,7 +66,7 @@
 		},
 		"AddThis": {
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js",
+			"script": "addthis\\.com/js/(\d+)?;version:\\1",
 			"env": "^addthis"
 		},
 		"Adobe CQ5": {
@@ -101,12 +101,12 @@
 		"Amiro.CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Amiro" },
-			"html": "system_js\\.php\\?script=",
+			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^"]+cv=([\d\.]+)\\;version:\\2",
 			"implies": "PHP"
 		},
 		"AMPcms": {
 			"cats": [ 1 ],
-			"headers": { "X-AMP-Version": ".*", "Set-Cookie": "AMP=" },
+			"headers": { "X-AMP-Version": "([\\d\\.]+)\\;version=\\1", "Set-Cookie": "^AMP=" },
 			"env": "^amp_js_init$",
 			"implies": "PHP"
 		},
@@ -116,7 +116,7 @@
 		},
 		"AOLserver": {
 			"cats": [ 22 ],
-			"headers": { "Server": "AOLserver" }
+			"headers": { "Server": "AOLserver/?([\d\.]+)?\\;version:\\1" }
 		},
 		"Apache": {
 			"cats": [ 22 ],
@@ -130,11 +130,11 @@
 		},
 		"Apache Tomcat": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote" }
+			"headers": { "Server": "Apache-Coyote/?([\\d\\.]+)?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "YTS" }
+			"headers": { "Server": "ATS/?([\\d\\.]+)?\\;version:\\1" }
 		},
 		"Arc Forum": {
 			"cats": [ 2 ],
@@ -142,12 +142,12 @@
 		},
 		"AsciiDoc": {
 			"cats": [ 1, 20, 27 ],
-			"meta": { "generator": "^AsciiDoc" },
+			"meta": { "generator": "^AsciiDoc ([\\d\\.]+)\\;version:\\1" },
 			"env": "^asciidoc$"
 		},
 		"ATG Web Commerce": {
 			"cats": [ 6 ],
-			"headers": { "X-ATG-Version": "ATG" },
+			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d\\.]+))?\\;version:\\2" },
 			"html": "<[^>]+_DARGS"
 		},
 		"Atlassian Confluence": {
@@ -167,7 +167,7 @@
 		},
 		"AWStats": {
 			"cats": [ 10 ],
-			"meta": { "generator": "AWStats" },
+			"meta": { "generator": "AWStats ([\\d\\.]+( \\(build [\\d\\.]+\\))?)\\;version:\\1" },
 			"implies": "Perl"
 		},
 		"Backbone.js": {
@@ -178,12 +178,12 @@
 		},
 		"Banshee": {
 			"cats": [ 1, 18 ],
-			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org",
+			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(v([\\d\\.]+))?\\;version:\\2",
 			"implies": "PHP"
 		},
 		"BIGACE": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BIGACE" },
+			"meta": { "generator": "BIGACE ([\\d\\.]+)\\;version:\\1" },
 			"html": "Powered by <a href=\"[^>]+BIGACE|<!--\\s+Site is running BIGACE",
 			"implies": "PHP"
 		},
@@ -196,7 +196,7 @@
 		},
 		"BigDump": {
 			"cats": [ 3 ],
-			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer",
+			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer ver\. ([\\d\\.b]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Bigware": {
@@ -217,7 +217,7 @@
 		},
 		"BrowserCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BrowserCMS" },
+			"meta": { "generator": "BrowserCMS ([\\d\\.]+)\\;version:\\1" },
 			"implies": "Ruby"
 		},
 		"Bugzilla": {
@@ -266,17 +266,19 @@
 		},
 		"Chamilo": {
 			"cats": [ 21 ],
-			"meta": { "generator": "Chamilo" },
-			"headers": { "X-Powered-By": "Chamilo" },
+			"html": "\">Chamilo ([\\d\\.]+)</a>\\;version:\\1",
+			"meta": { "generator": "Chamilo ([\\d\\.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "Chamilo ([\\d\\.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Chartbeat": {
 			"cats": [ 10 ],
-			"html": "function loadChartbeat\\(\\) {"
+			"html": "function loadChartbeat\\(\\) {",
+			"script": "chartbeat.js"
 		},
 		"Cherokee": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee" }
+			"headers": { "Server": "Cherokee/([\\d\\.]+)\\;version:\\1" }
 		},
 		"CKEditor": {
 			"cats": [ 24 ],
@@ -286,7 +288,7 @@
 		"ClickHeat": {
 			"cats": [ 10 ],
 			"script": "clickheat.*\\.js",
-			"env": "^clickHeatBrowser$",
+			"env": "^clickHeat",
 			"implies": "PHP"
 		},
 		"ClickTale": {
@@ -336,7 +338,7 @@
 		"Concrete5": {
 			"cats": [ 1 ],
 			"script": "concrete/js/",
-			"meta": { "generator": "concrete5" },
+			"meta": { "generator": "concrete5 - ([\\d\\.ab]+)\\;version:\\1" },
 			"env": "^CCM_IMAGE_PATH$",
 			"implies": "PHP"
 		},
@@ -352,12 +354,12 @@
 		},
 		"Contenido": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contenido" },
+			"meta": { "generator": "Contenido ([\\d\\.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Contens": {
 			"cats": [ 1 ],
-			"meta": { "generator": "contens" },
+			"meta": { "generator": "Contensis CMS Version ([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "Java", "CFML" ]
 		},
 		"ConversionLab": {
@@ -366,7 +368,7 @@
 		},
 		"Coppermine": {
 			"cats": [ 7 ],
-			"html": "<!--Coppermine Photo Gallery",
+			"html": "<!--Coppermine Photo Gallery ([\\d\\.]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Cosmoshop": {
@@ -380,11 +382,11 @@
 		},
 		"CouchDB": {
 			"cats": [ 22 ],
-			"headers": { "Server": "CouchDB" }
+			"headers": { "Server": "CouchDB/([\\d\\.]+)\\;version:\\1" }
 		},
 		"cPanel": {
 			"cats": [ 9 ],
-			"headers": { "Server": "cpsrvd" },
+			"headers": { "Server": "cpsrvd/([\\d\\.]+)\\;version:\\1" },
 			"html": "<!-- cPanel"
 		},
 		"CPG Dragonfly": {
@@ -426,13 +428,13 @@
 		},
 		"Dancer": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Perl Dancer", "Server": "Perl Dancer" },
+			"headers": { "X-Powered-By": "Perl Dancer ([\\d\\.]+)\\;version:\\1", "Server": "Perl Dancer ([\\d\\.]+)\\;version:\\1" },
 			"implies": "Perl"
 		},
 		"Danneo CMS": {
 			"cats": [ 1 ],
-			"headers": { "X-Powered-By": "CMS Danneo.*" },
-			"meta": { "generator": "Danneo" },
+			"headers": { "X-Powered-By": "CMS Danneo ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Danneo CMS ([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "Apache", "PHP" ]
 		},
 		"dashCommerce": {
@@ -447,7 +449,7 @@
 		},
 		"David Webbox": {
 			"cats": [ 22 ],
-			"headers": { "Server": "David-WebBox" }
+			"headers": { "Server": "David-WebBox/([\\d\\.a]+ \(\d+\))\\;version:\\1" }
 		},
 		"Debian": {
 			"cats": [ 28 ],
@@ -455,7 +457,7 @@
 		},
 		"DedeCMS": {
 			"cats": [ 1 ],
-			"env": "^Dede",
+			"env": "^DedeContainer",
 			"script": "dedeajax",
 			"implies": "PHP"
 		},
@@ -472,6 +474,7 @@
 		"DirectAdmin": {
 			"cats": [ 9 ],
 			"html": "<a[^>]+>DirectAdmin</a> Web Control Panel",
+			"headers": { "Server": "DirectAdmin Daemon v([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "PHP", "Apache" ]
 		},
 		"Disqus": {
@@ -482,18 +485,19 @@
 		},
 		"Django": {
 			"cats": [ 18 ],
-			"html": "powered by <a[^>]+>Django",
+			"html": "(powered by <a[^>]+>Django ?([\\d\\.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z0-9]{32}\" type=\"hidden\"></div>)\\;version:\\2",
+			"env": "__admin_media_prefix__",
 			"implies": "Python"
 		},
 		"Django CMS": {
 			"cats": [ 1 ],
 			"script": "media/cms/js/csrf\\.js",
-			"headers": { "Set-Cookie": "django" },
+			"headers": { "Set-Cookie": "django[^\\;]=" },
 			"implies": "Django"
 		},
 		"Dojo": {
 			"cats": [ 12 ],
-			"script": "dojo(\\.xd)?\\.js",
+			"script": "([\\d\\.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
 			"env": "^dojo$"
 		},
 		"Dokeos": {
@@ -567,6 +571,11 @@
 			"meta": { "generator": "EPrints" },
 			"implies": "Perl"
 		},
+		"eSyndiCat": {
+			"cats": [ 1 ],
+			"headers": { "X-Drectory-Script": "^eSyndiCat" },
+			"implies": [ "PHP" ]
+		},
 		"Exhibit": {
 			"cats": [ 25 ],
 			"script": "exhibit.*\\.js",
diff --git a/drivers/html/images/icons/Spree.png b/drivers/html/images/icons/Spree.png
new file mode 100644
index 0000000000000000000000000000000000000000..88b593baf9636fee9c06e2d4bdff018a61c15852
GIT binary patch
literal 554
zcmV+_0@eMAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005;Nkl<ZILl-B
z|NlP&E_~_n?xbZWDv$p8^P3r$8U}m@9KF4wZpyy+SHFJ$U?<6d?>|5BfBN=D^5orh
zrPB{2KLxShetxV*v;jAs9}k+mH|*=OlU0X61}r>Qbbj^ef|Ga+SakexQsL^W)2lYz
z>3sa|gVL_6y$gGH2LA8a8T5bF!N|AwUf;D?bmCFcs<Y3+u^M39cKD`1(a!%MT)OsF
zA4u%LjR~`79f*AU{KFlid#^vKaOLm&?=|J*L97Nme)mmg*R@w33e|hxD%Bo%`S#0C
zp+A5BFn;~<NeCogv*}Jd$na?gALQW;gW@$;r+^er+IPS3)u$gKPv3u&y!`Z&wpQbT
z$I=yhK7;sp4LJSay(!EqAk1I53(n47ad{3=vCz5mPEFi`^Q*&WpWPff>+Dt#J7w|3
zrB{G1A<BSTFF&g-Ir%u@$FDzZApY@t@2pm%g+5*b(wAPJ!;`<~|B*ZIY(RX6zSGCK
z^7sF}|N5IeQ3l+3^;&!7>AOkafBgn0;j<54TJ5@eJ&I@-?7uN>%Hdl}n}7WJ$^+s*
zcyr!m)A{<XFF)QgBFcbOryF*IQsLCSv2SM`OncA^OpQG|ga1Byd&Q0@13)&PxVxre
s(XryQa}H(Q-gKd7#nbmUO|hv307nhjX6;P#fB*mh07*qoM6N<$f*&3qj{pDw

literal 0
HcmV?d00001

diff --git a/drivers/html/images/icons/Subrion.png b/drivers/html/images/icons/Subrion.png
new file mode 100755
index 0000000000000000000000000000000000000000..fdd2e2d4eddc1a883a213ca2751175cfa6cd46da
GIT binary patch
literal 950
zcmV;n14;aeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uz0Xh}ptR5*=IQ%h`=RTw?ry?6e3&)6x`hqX;BwP*ngI6*{+wJ};^
zjDe7D1dKsr6O0K9RMf--(cm5z6d#E~l#RMz(FDN;Sy*C#N-V8?q?JKPOJ~w~{qz5G
z@BLf=Nl$W;laritR)?4wD`A<XAegbG{PttlrcU0jRM#jWtLszAk-_ec57#7PR}Hh2
zL<Rt8Wr1a*1PQH~oPi4ye@_=Gor!?5mNnH(g<^_p@Aq^K_O~{Eb8m=@dJtx|QjpZv
zdd^(_a$gHwsIQB-0ENg!D^>8gDcO`fIyU=tND05UIep49OJZg)TR|l3<l@<Zi!;Z*
zSSnAn2Zd(CmMk+Y9Im3p=4gkxh1~%qB8B5yR&Pj$LUUxTkwn5=$$oYCx9N{Rmm+ML
zLI{u)NhgeWAYuY!gf)38c?-CuJN2mkMD@32zTDrr>K$Tc+%1o9{`s$gQ5GQ^mJUA_
zjmy>1I@CEatKbSCQ9vv+Y*Z?{ko$eZui5K;*XZbfM>amaP65Dt{@fl?4!WWZc2hK_
z;sFQDWVOF2ba>k@Dt+)ZTVWT)VywAoXK`=i_*#E_WO%By@fiUC8m95dXcEswBNX8p
zJg;nO)dfMSdqkxV?JS%)xj&of$YnF_%Qv6TOqwf|z$@K*UJjwGz|1HvojL4HZe@RJ
zN3HtLOYBYcvv;GHng3l|Jbmho*$8<4k%XS_NZHvSc&;Jt`ZE*jnHhrh(!-(LnFFjD
zR#zm9XW7pK!Parurs?wc$3Jk|8lW2LS%w|d9XjYodY=uIzB@4p0K(io{jM(GXaU1O
zy985Z_6rbB!;H->C&*uJSE(dq#E~)<rr7Im$@-xmA*}ZV04S3i-US1&tq6bt5@7AY
z`h|#01bvxIc&uCpN`XCv;%DzcHa0^<<7EI4>@9Xcdw_Nc+6A;r#1b|?)<bbs3vSvv
zB7}x|DDDT+DUDK2*Djugli4y10E)E>7@t9g0b*EBvMpPfo2zW$(hHF{KRUp-r?&Cp
zojRz10sLTa_rCMN7k3Q-0J)c+nzW_sT@WD)_5?Z21(|;JC)KofNJQ6Ng$PzTx6r0X
z&%e#Ze7k6Q^pe`#_bmcW6#$`j=ZAgnA3e+NpW7$>*-wwyYPR+MKkog+TEX_de!vyp
Y|9`96!-k(!f&c&j07*qoM6N<$g5rR<LjV8(

literal 0
HcmV?d00001

diff --git a/drivers/html/images/icons/eSyndiCat.png b/drivers/html/images/icons/eSyndiCat.png
new file mode 100755
index 0000000000000000000000000000000000000000..4efd96fdb9a8997aab1513b99d144db944597824
GIT binary patch
literal 836
zcmV-K1H1f*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!=1D|BRCwBA{Qv(y10{e3L<F`RVFFTy
zKy1MJ_s`x{^$rhU3V?EKKuQOQoq$*th^MZvvAG46V_*RimOyqtD+`mfq#(yLK`xeG
zK(S9iF@GR7V`N~k2FmeD2y%Q?mgM<tpd`2y#RYPrTp9oVGw9SrXuS~^;J6DEd$Hl*
zeg4xAKZWyiu}gZHN^+`6^ZsOGVY&m9JJ;5+LvhMl4vXK+EJ8s32^K32VZH~izx@Pi
zwgn122ALXQuP6|}z;Fe~yt?M-<I{Z$&M1YQ+L|Ww;e}W1kFTs>{L`PaD9Ap$`}|8H
zldKr`!AGyY{R2At4U)?~0C5RW?7;E^kEY4-vnFU5$V-ZSdC$uJ?+-&(oauKrBgrR<
z5<EgoK%4gh{m23IiW;)tLYfYlaI!H^3$vAFZz!<4$D*$E86?ig!^ObI#}&8g;KLtc
z{OoU7fB|y{$oTpB#~(+ajW>a6YJdS3$id3Yp()G9?`<m81r%%ic=+5qaRELCMim8y
zmrvfFXZiQn8t8&EplJLqz|H#f*WZ8UT<pwmnHU*!;$0L!8!8EW6Xs*z4V3Sy%U&Ru
zEGN#vn;-fA%k}%eH_qR$`b$|;NK2M)H8>q8i*Q_c@amhMq!6c&osQ^V7X$H9pzr}u
zjDY0L6WoP`RQPVN3vy3j*HN?n@$Ptx7$5gPpzC*l4bYU~-MIDqE6@LojAG18j0=E5
zE0Dv(+f))1s1ZO6N<fP~Fmqnj5#@Ra^zu8f0dg_|`y~X~7_L43A_`0}2ho!&P$4i_
z82Es=4v1|8dDs+8RfQ&QJn<Bgl!4&Af(X}>d(XZIvoJGVK++flq=JC1(gb1=1##~8
z#wtQ=HrgU@rGz+V!}9{z6~Y|*thGf|c{o_!KsB?dNbw|y@pGu!>xwbzD)9dTM(bsu
z)G;953B>oo8bP@cicNvI3y7JZd=?<?1>y-n>;%NzNNVAjk<#o85MTfseG@`vQT7o4
O0000<MNUMnLSTZrq=j<;

literal 0
HcmV?d00001

diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index d25d45029..da60407df 100755
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -52,7 +52,7 @@
 		},
 		"2z Project": {
 			"cats": [ 1 ],
-			"meta": { "generator": "2z project" }
+			"meta": { "generator": "2z project ([\\d\\.]+);version:\\1" }
 		},
 		"3dCart": {
 			"cats": [ 1, 6 ],
@@ -66,7 +66,7 @@
 		},
 		"AddThis": {
 			"cats": [ 5 ],
-			"script": "addthis\\.com/js",
+			"script": "addthis\\.com/js/(\d+)?;version:\\1",
 			"env": "^addthis"
 		},
 		"Adobe CQ5": {
@@ -101,12 +101,12 @@
 		"Amiro.CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Amiro" },
-			"html": "system_js\\.php\\?script=",
+			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^"]+cv=([\d\.]+)\\;version:\\2",
 			"implies": "PHP"
 		},
 		"AMPcms": {
 			"cats": [ 1 ],
-			"headers": { "X-AMP-Version": ".*", "Set-Cookie": "AMP=" },
+			"headers": { "X-AMP-Version": "([\\d\\.]+)\\;version=\\1", "Set-Cookie": "^AMP=" },
 			"env": "^amp_js_init$",
 			"implies": "PHP"
 		},
@@ -116,7 +116,7 @@
 		},
 		"AOLserver": {
 			"cats": [ 22 ],
-			"headers": { "Server": "AOLserver" }
+			"headers": { "Server": "AOLserver/?([\d\.]+)?\\;version:\\1" }
 		},
 		"Apache": {
 			"cats": [ 22 ],
@@ -130,11 +130,11 @@
 		},
 		"Apache Tomcat": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote" }
+			"headers": { "Server": "Apache-Coyote/?([\\d\\.]+)?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "YTS" }
+			"headers": { "Server": "ATS/?([\\d\\.]+)?\\;version:\\1" }
 		},
 		"Arc Forum": {
 			"cats": [ 2 ],
@@ -142,12 +142,12 @@
 		},
 		"AsciiDoc": {
 			"cats": [ 1, 20, 27 ],
-			"meta": { "generator": "^AsciiDoc" },
+			"meta": { "generator": "^AsciiDoc ([\\d\\.]+)\\;version:\\1" },
 			"env": "^asciidoc$"
 		},
 		"ATG Web Commerce": {
 			"cats": [ 6 ],
-			"headers": { "X-ATG-Version": "ATG" },
+			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d\\.]+))?\\;version:\\2" },
 			"html": "<[^>]+_DARGS"
 		},
 		"Atlassian Confluence": {
@@ -167,7 +167,7 @@
 		},
 		"AWStats": {
 			"cats": [ 10 ],
-			"meta": { "generator": "AWStats" },
+			"meta": { "generator": "AWStats ([\\d\\.]+( \\(build [\\d\\.]+\\))?)\\;version:\\1" },
 			"implies": "Perl"
 		},
 		"Backbone.js": {
@@ -178,12 +178,12 @@
 		},
 		"Banshee": {
 			"cats": [ 1, 18 ],
-			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org",
+			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(v([\\d\\.]+))?\\;version:\\2",
 			"implies": "PHP"
 		},
 		"BIGACE": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BIGACE" },
+			"meta": { "generator": "BIGACE ([\\d\\.]+)\\;version:\\1" },
 			"html": "Powered by <a href=\"[^>]+BIGACE|<!--\\s+Site is running BIGACE",
 			"implies": "PHP"
 		},
@@ -196,7 +196,7 @@
 		},
 		"BigDump": {
 			"cats": [ 3 ],
-			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer",
+			"html": "<!-- <h1>BigDump: Staggered MySQL Dump Importer ver\. ([\\d\\.b]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Bigware": {
@@ -217,7 +217,7 @@
 		},
 		"BrowserCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BrowserCMS" },
+			"meta": { "generator": "BrowserCMS ([\\d\\.]+)\\;version:\\1" },
 			"implies": "Ruby"
 		},
 		"Bugzilla": {
@@ -266,17 +266,19 @@
 		},
 		"Chamilo": {
 			"cats": [ 21 ],
-			"meta": { "generator": "Chamilo" },
-			"headers": { "X-Powered-By": "Chamilo" },
+			"html": "\">Chamilo ([\\d\\.]+)</a>\\;version:\\1",
+			"meta": { "generator": "Chamilo ([\\d\\.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "Chamilo ([\\d\\.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Chartbeat": {
 			"cats": [ 10 ],
-			"html": "function loadChartbeat\\(\\) {"
+			"html": "function loadChartbeat\\(\\) {",
+			"script": "chartbeat.js"
 		},
 		"Cherokee": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee" }
+			"headers": { "Server": "Cherokee/([\\d\\.]+)\\;version:\\1" }
 		},
 		"CKEditor": {
 			"cats": [ 24 ],
@@ -286,7 +288,7 @@
 		"ClickHeat": {
 			"cats": [ 10 ],
 			"script": "clickheat.*\\.js",
-			"env": "^clickHeatBrowser$",
+			"env": "^clickHeat",
 			"implies": "PHP"
 		},
 		"ClickTale": {
@@ -336,7 +338,7 @@
 		"Concrete5": {
 			"cats": [ 1 ],
 			"script": "concrete/js/",
-			"meta": { "generator": "concrete5" },
+			"meta": { "generator": "concrete5 - ([\\d\\.ab]+)\\;version:\\1" },
 			"env": "^CCM_IMAGE_PATH$",
 			"implies": "PHP"
 		},
@@ -352,12 +354,12 @@
 		},
 		"Contenido": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contenido" },
+			"meta": { "generator": "Contenido ([\\d\\.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Contens": {
 			"cats": [ 1 ],
-			"meta": { "generator": "contens" },
+			"meta": { "generator": "Contensis CMS Version ([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "Java", "CFML" ]
 		},
 		"ConversionLab": {
@@ -366,7 +368,7 @@
 		},
 		"Coppermine": {
 			"cats": [ 7 ],
-			"html": "<!--Coppermine Photo Gallery",
+			"html": "<!--Coppermine Photo Gallery ([\\d\\.]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Cosmoshop": {
@@ -380,11 +382,11 @@
 		},
 		"CouchDB": {
 			"cats": [ 22 ],
-			"headers": { "Server": "CouchDB" }
+			"headers": { "Server": "CouchDB/([\\d\\.]+)\\;version:\\1" }
 		},
 		"cPanel": {
 			"cats": [ 9 ],
-			"headers": { "Server": "cpsrvd" },
+			"headers": { "Server": "cpsrvd/([\\d\\.]+)\\;version:\\1" },
 			"html": "<!-- cPanel"
 		},
 		"CPG Dragonfly": {
@@ -426,13 +428,13 @@
 		},
 		"Dancer": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Perl Dancer", "Server": "Perl Dancer" },
+			"headers": { "X-Powered-By": "Perl Dancer ([\\d\\.]+)\\;version:\\1", "Server": "Perl Dancer ([\\d\\.]+)\\;version:\\1" },
 			"implies": "Perl"
 		},
 		"Danneo CMS": {
 			"cats": [ 1 ],
-			"headers": { "X-Powered-By": "CMS Danneo.*" },
-			"meta": { "generator": "Danneo" },
+			"headers": { "X-Powered-By": "CMS Danneo ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Danneo CMS ([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "Apache", "PHP" ]
 		},
 		"dashCommerce": {
@@ -447,7 +449,7 @@
 		},
 		"David Webbox": {
 			"cats": [ 22 ],
-			"headers": { "Server": "David-WebBox" }
+			"headers": { "Server": "David-WebBox/([\\d\\.a]+ \(\d+\))\\;version:\\1" }
 		},
 		"Debian": {
 			"cats": [ 28 ],
@@ -455,7 +457,7 @@
 		},
 		"DedeCMS": {
 			"cats": [ 1 ],
-			"env": "^Dede",
+			"env": "^DedeContainer",
 			"script": "dedeajax",
 			"implies": "PHP"
 		},
@@ -472,6 +474,7 @@
 		"DirectAdmin": {
 			"cats": [ 9 ],
 			"html": "<a[^>]+>DirectAdmin</a> Web Control Panel",
+			"headers": { "Server": "DirectAdmin Daemon v([\\d\\.]+)\\;version:\\1" },
 			"implies": [ "PHP", "Apache" ]
 		},
 		"Disqus": {
@@ -482,18 +485,19 @@
 		},
 		"Django": {
 			"cats": [ 18 ],
-			"html": "powered by <a[^>]+>Django",
+			"html": "(powered by <a[^>]+>Django ?([\\d\\.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z0-9]{32}\" type=\"hidden\"></div>)\\;version:\\2",
+			"env": "__admin_media_prefix__",
 			"implies": "Python"
 		},
 		"Django CMS": {
 			"cats": [ 1 ],
 			"script": "media/cms/js/csrf\\.js",
-			"headers": { "Set-Cookie": "django" },
+			"headers": { "Set-Cookie": "django[^\\;]=" },
 			"implies": "Django"
 		},
 		"Dojo": {
 			"cats": [ 12 ],
-			"script": "dojo(\\.xd)?\\.js",
+			"script": "([\\d\\.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
 			"env": "^dojo$"
 		},
 		"Dokeos": {
@@ -567,6 +571,11 @@
 			"meta": { "generator": "EPrints" },
 			"implies": "Perl"
 		},
+		"eSyndiCat": {
+			"cats": [ 1 ],
+			"headers": { "X-Drectory-Script": "^eSyndiCat" },
+			"implies": [ "PHP" ]
+		},
 		"Exhibit": {
 			"cats": [ 25 ],
 			"script": "exhibit.*\\.js",