From 2131e834581ce00fb3cdadeca30775260813c4a5 Mon Sep 17 00:00:00 2001
From: root <root@home.(none)>
Date: Sat, 16 Feb 2013 12:32:54 +1100
Subject: [PATCH] Updated icons, improved HubSpot

---
 drivers/bookmarklet/images/icons/SPDY.png     | Bin 644 -> 549 bytes
 drivers/bookmarklet/images/icons/UNIX.png     | Bin 264 -> 562 bytes
 drivers/bookmarklet/json                      | 249 ++++++++++--------
 drivers/chrome/apps.json                      | 249 ++++++++++--------
 drivers/chrome/images/icons/SPDY.png          | Bin 644 -> 549 bytes
 drivers/chrome/images/icons/UNIX.png          | Bin 264 -> 562 bytes
 drivers/firefox-jetpack/data/apps.json        | 249 ++++++++++--------
 drivers/firefox-jetpack/images/icons/SPDY.png | Bin 644 -> 549 bytes
 drivers/firefox-jetpack/images/icons/UNIX.png | Bin 264 -> 562 bytes
 drivers/firefox/content/apps.json             | 249 ++++++++++--------
 drivers/firefox/skin/images/icons/SPDY.png    | Bin 644 -> 549 bytes
 drivers/firefox/skin/images/icons/UNIX.png    | Bin 264 -> 562 bytes
 drivers/html/apps.json                        | 249 ++++++++++--------
 drivers/html/images/icons/SPDY.png            | Bin 644 -> 549 bytes
 drivers/html/images/icons/UNIX.png            | Bin 264 -> 562 bytes
 drivers/php/apps.json                         | 249 ++++++++++--------
 share/apps.json                               |   5 +
 share/images/icons/Hubspot.png                | Bin 690 -> 0 bytes
 share/images/icons/SPDY.png                   | Bin 644 -> 549 bytes
 share/images/icons/UNIX.png                   | Bin 264 -> 562 bytes
 20 files changed, 815 insertions(+), 684 deletions(-)
 delete mode 100644 share/images/icons/Hubspot.png

diff --git a/drivers/bookmarklet/images/icons/SPDY.png b/drivers/bookmarklet/images/icons/SPDY.png
index 44b57f9291fea297b430c5f649dbfd3523828891..5ac3599a59d058024a94371fa6bd046e7ce34703 100644
GIT binary patch
delta 525
zcmV+o0`mQY1*HU#BYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xB+4lLy~iu3>g0kTO%K~y-)ol{LLBVibRW~OPYOIA{(5?SHU*p+W2
zA`(*KC>v)Y4!Ds`L}Cvv>|y<#h-4zW;U;ks2M&aTMg2yEnSW8@H)$G;Ri&Aher0@n
zrc+zq+xxxG^S#ge2fV??*Z1*mlUCGfqj%H)h>pb&T*95G(aU}Sb1&okYvh{EFqjq~
zy2-X@JKbtA!f=Vm4a?UEYS$#)?vQhXM;ilQOUjIJh6)<zE<j?p<S#zRPCUWtSKAXM
zic`=ydjSU`#D7h#a)w2K<K_&NdG=0?#;g{zDW$o*uruKYO_S%an<+U)s_f@Dc&UzD
zfycuWP^dp3U}nhiZ&!`A)-J`D@JmK<CP(fgoGe5_U^hW<u_$&Pbv)82ywMN@->!JT
zXDuaEP&%@}c<5jNB09sD>;kyM6rZSueCidIm_<>(*MAr{qfMH4=6B7gZBA*E6%Vhn
z`o3{e)H8)Qjj>!>V?JF+#pQvx$E7K1Z#|OQ#Lv<^EVi^ChbIBlT7%-U@KN#ntV7ac
z1OR*YG^=A*;-4_Dc!ru^UG+Exu8z^)&RZXG-!auQ_U(O_=V}^E8v75Hd#5sM2PjMc
P0000<MFvhpu0mjfR}=3T

delta 620
zcmV-y0+aov1cU{UBYy%*Nkl<ZILoEe&r8z*9L8}E;vxD2LOSGMAc<|O=oX{Y{Lz+%
z9s(^1gcuRhv?yUslWk2yr!%qCwFTBTS4hp$?W@zN^Vgyj6(g##HeLQMbG|!toQBfj
zIX!${r{@y~#QjfpEhZ-?oi>|ot*WYOt*EGIdf$NAZ1!3#7JpPK6*)OM!F>T;U0sQ_
zH8lqw=(LoVDN!gC2i0oz5u?%Q(r7e7Nl8h<u7Js8s&Kn{H~IuOE{~UYZV#Qd7d+JK
zqBVLwTCEnjT;8-JU^bf@r#^mQz~^V~%OZ2%BKT%P*e4>`J+nM+Zs1~G?vhk0JsbnH
zwzi(}jSNM527f15UfTp9@Z%@`K$Py8EpF6Uv5hTKsk#%D%Veix07HG9L+Br5KD@!|
zZ&>*S;VtloK$@P3#lMZ-y@KO)59iX(+GBwBwkJV{YmC4$%q_tD3h0dONW>DFoHIO|
z27?gcsW(8LEGrNLv@}0j>UcZOR0!OkU?dEeFXfXf%YVi`3k@Ss=Ut~|D2yyKEfND%
zS5<mDodONL-?2`?%NZ~YuVUy8(mW1o58NLGd;fb*osbN~0OjRniszO#48j7sH-C?e
zqo5sziaw|t*+k{trn=%5DJe&<#Q=qcg$c@=r4tTo2fF@suD=R%w>yH`wMy9_sJu}u
zW)l)o>Sb6`Qqs;tQYw{+SBtOs8f!IJoqaS4pQ#tVV(S^^-tAJv$5MS_k?7Drr(94_
z5HFL-inB7(UHQ4^Ll?3$f+vrQUCGJG#Uha?e$UUe*ZcvYYTh<yw(95r0000<MNUMn
GLSTYhE+RGn

diff --git a/drivers/bookmarklet/images/icons/UNIX.png b/drivers/bookmarklet/images/icons/UNIX.png
index ebb6deb3424f603cd5f52aa2141310898a70e852..44d58989a7bd1f2e810e4ad70fc9b725e76a28b3 100644
GIT binary patch
delta 549
zcmV+=0^0qE0<r{<7=H)`0000V^Z#K0000JJOGiWi{{a60|De66lK=n!32;bRa{vGf
z6951U69E94oEQKA00(qQO+^RY0uTT-D@GuiSO5S4zez+vR5;6h(?4hvaTEve&&5#E
zK?0GZO9eA@)q)Vain<jnRHD#99g3q<aq42FP@G(Cg?1>|P=BFA-MSX4P|z+;a-f3B
z4+C+~fWtZT?s^H;x4p;ve&4_Ei*%eZWN|x=!)%z*cN5fn^xg~0j)rriGC|yq<8Ui{
zl88W43VI@4^t6UaDrG0s!)J*|1C1=$$cUO!b#JX%C}XMv{j91D_-hs<mW+F6&Xjf2
z_H8?B+-(m}Mt|6J;Fn2tsh-GuiD=V-IaAgwxZp8JL`LknYx;PEFD5mm8t7(~bDJ||
z!>%8eida+Xo9o9NTr_LU%VJ^OEU9g@G+JLhE09|vl4w;-hzn4@wEPOW&8z7R#o&@F
zl>(I8p(s9#&s#S=kUU~<!0(=N#vB|vA=tNFCW&9i_kSgs9`d5UeXYc=;+-Pc(+Zss
ztmwNT^~ZLhkxmFAi&D>Zvkvart%gnrR<ppeBU_%8#!9W|YufSCp{frUmxx?GUiyiY
zSM`hgZ`d{J+Q4o~V`|#bc4ttD^J+F7sCx5X@Hvaxo}Mmc*z-UuYhSUOlV^G~_)O7h
n@9c>g6CSRLj7fcmf4%cxhe4A>#J%Tq00000NkvXXu0mjff?WQr

delta 248
zcmV<U00;lF1c(BV7=Hu<0002(-QrRJ001yhOjJb#69fb{1O!L~1y=<HX$3TMG)R6(
zRE$(>n`?)thnKmRth=nR$FR=T&gtjr{QmrUgW!Sy005IoL_t&t*JJqq|KGBV`~Uwl
z{QqYtY$OX}d=OH0F`N%%{Qv(`^bf~>hOf%{|Kq1P<uiPAk#YS0O~gf>VUvsT|4$|^
zx(o|l9RL4UanWK}<RW+ee~OC~!y?D`JpUh==rBC={b=<6XR|!RC;LWc@i~qD4FC1N
ynYg%!15N(g?Be1Gvf?X~F~rjUzuP;2&Hw<-nMoNsrklF}0000<MNUMnLSTa4dwR<N

diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index edf39bd60..ea5db6e67 100755
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -52,7 +52,7 @@
 		},
 		"2z Project": {
 			"cats": [ 1 ],
-			"meta": { "generator": "2z project ([\\d\\.]+);version:\\1" }
+			"meta": { "generator": "2z project ([\\d.]+);version:\\1" }
 		},
 		"3dCart": {
 			"cats": [ 1, 6 ],
@@ -77,7 +77,7 @@
 		},
 		"Adobe GoLive": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Adobe GoLive(\\s([\\d\\.]+))?\\;version:\\2" }
+			"meta": { "generator": "Adobe GoLive(\\s([\\d.]+))?\\;version:\\2" }
 		},
 		"Advanced Web Stats": {
 			"cats": [ 10 ],
@@ -90,7 +90,7 @@
 		},
 		"Amaya": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Amaya( V?([\\d\\.]+[a-z]))?\\;version:\\2" }
+			"meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" }
 		},
 		"Ametys": {
 			"cats": [ 1 ],
@@ -101,12 +101,12 @@
 		"Amiro.CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Amiro" },
-			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d\\.]+)\\;version:\\2",
+			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d.]+)\\;version:\\2",
 			"implies": "PHP"
 		},
 		"AMPcms": {
 			"cats": [ 1 ],
-			"headers": { "X-AMP-Version": "([\\d\\.]+)\\;version:\\1", "Set-Cookie": "^AMP=" },
+			"headers": { "X-AMP-Version": "([\\d.]+)\\;version:\\1", "Set-Cookie": "^AMP=" },
 			"env": "^amp_js_init$",
 			"implies": "PHP"
 		},
@@ -116,11 +116,11 @@
 		},
 		"AOLserver": {
 			"cats": [ 22 ],
-			"headers": { "Server": "AOLserver/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "AOLserver/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache": {
 			"cats": [ 22 ],
-			"headers": { "Server": "(Apache($|/([\\d\\.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
+			"headers": { "Server": "(Apache($|/([\\d.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
 		},
 		"Apache JSPWiki": {
 			"cats": [ 8 ],
@@ -130,11 +130,11 @@
 		},
 		"Apache Tomcat": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "Apache-Coyote/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "ATS/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "ATS/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Arc Forum": {
 			"cats": [ 2 ],
@@ -142,17 +142,17 @@
 		},
 		"AsciiDoc": {
 			"cats": [ 1, 20, 27 ],
-			"meta": { "generator": "^AsciiDoc ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "^AsciiDoc ([\\d.]+)\\;version:\\1" },
 			"env": "^asciidoc$"
 		},
 		"ATG Web Commerce": {
 			"cats": [ 6 ],
-			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d.]+))?\\;version:\\2" },
 			"html": "<[^>]+_DARGS"
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence([^>]+>Atlassian Confluence</a> ([\\d\\.]+))?\\;version:\\2",
+			"html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence([^>]+>Atlassian Confluence</a> ([\\d.]+))?\\;version:\\2",
 			"headers": { "X-Confluence-Request-Time": ".*" },
 			"meta": { "confluence-request-time": ".*" },
 			"implies": "Java"
@@ -167,7 +167,7 @@
 		},
 		"AWStats": {
 			"cats": [ 10 ],
-			"meta": { "generator": "AWStats ([\\d\\.]+( \\(build [\\d\\.]+\\))?)\\;version:\\1" },
+			"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/\">[a-z]+</a>(v([\\d\\.]+))?\\;version:\\2",
+			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(v([\\d.]+))?\\;version:\\2",
 			"implies": "PHP"
 		},
 		"BIGACE": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BIGACE ([\\d\\.]+)\\;version:\\1" },
+			"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 ver\\. ([\\d\\.b]+)\\;version:\\1",
+			"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 ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "BrowserCMS ([\\d.]+)\\;version:\\1" },
 			"implies": "Ruby"
 		},
 		"Bugzilla": {
@@ -266,9 +266,9 @@
 		},
 		"Chamilo": {
 			"cats": [ 21 ],
-			"html": "\">Chamilo ([\\d\\.]+)</a>\\;version:\\1",
-			"meta": { "generator": "Chamilo ([\\d\\.]+)\\;version:\\1" },
-			"headers": { "X-Powered-By": "Chamilo ([\\d\\.]+)\\;version:\\1" },
+			"html": "\">Chamilo ([\\d.]+)</a>\\;version:\\1",
+			"meta": { "generator": "Chamilo ([\\d.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "Chamilo ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Chartbeat": {
@@ -278,7 +278,7 @@
 		},
 		"Cherokee": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee/([\\d\\.]+)\\;version:\\1" }
+			"headers": { "Server": "Cherokee/([\\d.]+)\\;version:\\1" }
 		},
 		"CKEditor": {
 			"cats": [ 24 ],
@@ -313,7 +313,7 @@
 		},
 		"CMSimple": {
 			"cats": [ 1 ],
-			"meta": { "generator": "CMSimple( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "CMSimple( [\\d.]+)?\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"CO2Stats": {
@@ -338,7 +338,7 @@
 		"Concrete5": {
 			"cats": [ 1 ],
 			"script": "concrete/js/",
-			"meta": { "generator": "concrete5 - ([\\d\\.ab]+)\\;version:\\1" },
+			"meta": { "generator": "concrete5 - ([\\d.ab]+)\\;version:\\1" },
 			"env": "^CCM_IMAGE_PATH$",
 			"implies": "PHP"
 		},
@@ -354,12 +354,12 @@
 		},
 		"Contenido": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contenido ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Contenido ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Contens": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contensis CMS Version ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Contensis CMS Version ([\\d.]+)\\;version:\\1" },
 			"implies": [ "Java", "CFML" ]
 		},
 		"ConversionLab": {
@@ -368,7 +368,7 @@
 		},
 		"Coppermine": {
 			"cats": [ 7 ],
-			"html": "<!--Coppermine Photo Gallery ([\\d\\.]+)\\;version:\\1",
+			"html": "<!--Coppermine Photo Gallery ([\\d.]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Cosmoshop": {
@@ -382,11 +382,11 @@
 		},
 		"CouchDB": {
 			"cats": [ 22 ],
-			"headers": { "Server": "CouchDB/([\\d\\.]+)\\;version:\\1" }
+			"headers": { "Server": "CouchDB/([\\d.]+)\\;version:\\1" }
 		},
 		"cPanel": {
 			"cats": [ 9 ],
-			"headers": { "Server": "cpsrvd/([\\d\\.]+)\\;version:\\1" },
+			"headers": { "Server": "cpsrvd/([\\d.]+)\\;version:\\1" },
 			"html": "<!-- cPanel"
 		},
 		"CPG Dragonfly": {
@@ -428,13 +428,13 @@
 		},
 		"Dancer": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Perl Dancer ([\\d\\.]+)\\;version:\\1", "Server": "Perl Dancer ([\\d\\.]+)\\;version:\\1" },
+			"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 ([\\d\\.]+)\\;version:\\1" },
-			"meta": { "generator": "Danneo CMS ([\\d\\.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "CMS Danneo ([\\d.]+)\\;version:\\1" },
+			"meta": { "generator": "Danneo CMS ([\\d.]+)\\;version:\\1" },
 			"implies": [ "Apache", "PHP" ]
 		},
 		"dashCommerce": {
@@ -449,7 +449,7 @@
 		},
 		"David Webbox": {
 			"cats": [ 22 ],
-			"headers": { "Server": "David-WebBox/([\\d\\.a]+ \\(\\d+\\))\\;version:\\1" }
+			"headers": { "Server": "David-WebBox/([\\d.a]+ \\(\\d+\\))\\;version:\\1" }
 		},
 		"Debian": {
 			"cats": [ 28 ],
@@ -474,7 +474,7 @@
 		"DirectAdmin": {
 			"cats": [ 9 ],
 			"html": "<a[^>]+>DirectAdmin</a> Web Control Panel",
-			"headers": { "Server": "DirectAdmin Daemon v([\\d\\.]+)\\;version:\\1" },
+			"headers": { "Server": "DirectAdmin Daemon v([\\d.]+)\\;version:\\1" },
 			"implies": [ "PHP", "Apache" ]
 		},
 		"Disqus": {
@@ -485,7 +485,7 @@
 		},
 		"Django": {
 			"cats": [ 18 ],
-			"html": "(powered by <a[^>]+>Django ?([\\d\\.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z0-9]{32}\" type=\"hidden\"></div>)\\;version:\\2",
+			"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"
 		},
@@ -497,7 +497,7 @@
 		},
 		"Dojo": {
 			"cats": [ 12 ],
-			"script": "([\\d\\.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
+			"script": "([\\d.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
 			"env": "^dojo$"
 		},
 		"Dokeos": {
@@ -523,7 +523,7 @@
 		},
 		"Doxygen": {
 			"cats": [ 4 ],
-			"html": "(<!-- Generated by Doxygen|<link[^>]+doxygen.css)"
+			"html": "(<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\1"
 		},
 		"DreamWeaver": {
 			"cats": [ 20 ],
@@ -533,7 +533,7 @@
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
 			"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
-			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
+			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": "PHP"
 		},
@@ -544,36 +544,40 @@
 		},
 		"Dynamicweb": {
 			"cats": [ 1, 6, 10 ],
-			"meta": { "generator": "Dynamicweb" },
+			"meta": { "generator": "Dynamicweb ([\\d.]+)\\;version:\\1" },
 			"headers": { "Set-Cookie": "Dynamicweb=" },
 			"implies": "Microsoft ASP.NET"
 		},
 		"e107": {
 			"cats": [ 1 ],
 			"script": "e107\\.js",
+			"headers": { "Set-Cookie": "e107_td[^;]+=" },
 			"implies": "PHP"
 		},
 		"EdgeCast": {
 			"cats": [ 31 ],
-			"headers": { "Server": "^ECS " }
+			"headers": { "Server": "^ECS" }
 		},
 		"Embedthis-http": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Embedthis-http" }
+			"headers": { "Server": "Embedthis-http(/([\\d.]+))?\\;version:\\2" }
 		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
+			"headers": { "Set-Cookie": "EPi(Trace|Server)[^;]*=" },
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
 			"cats": [ 19 ],
-			"meta": { "generator": "EPrints" },
+			"meta": { "generator": "EPrints ([\\d.]+)\\;version:\\1" },
+			"env": "^EPJS_menu_template$",
 			"implies": "Perl"
 		},
 		"eSyndiCat": {
 			"cats": [ 1 ],
 			"headers": { "X-Drectory-Script": "^eSyndiCat" },
+			"env": "^esyndicat$",
 			"implies": [ "PHP" ]
 		},
 		"Exhibit": {
@@ -604,23 +608,25 @@
 		},
 		"Fact Finder": {
 			"cats": [ 29 ],
-			"html": "/images/fact-finder\\.gif|ViewParametricSearch|factfinder|Suggest\\.ff",
-			"url": "ViewParametricSearch|factfinder|ffsuggest"
+			"html": "<!-- Factfinder",
+			"script": "Suggest\\.ff",
+			"url": "/ViewParametricSearch|ffsuggest\\.[a-z]htm"
 		},
 		"FAST ESP": {
 			"cats": [ 29 ],
-			"html": "fastsearch|searchProfile=|searchCategory=",
-			"url": "esppublished|searchProfile=|searchCategory="
+			"html": "<form[^>]+id=\"fastsearch\""
 		},
 		"FAST Search for SharePoint": {
 			"cats": [ 29 ],
 			"url": "Pages/SearchResults\\.aspx\\?k=",
+			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
 		"FlexCMP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
-			"headers": { "X-Powered-By": "FlexCMP" }
+			"html": "<!--[^>]+FlexCMP[^>v]+v\\. ([\\d.]+)\\;version:\\1",
+			"headers": { "X-Powered-By": "FlexCMP.+\\[v\\. ([\\d.]+)\\;version:\\1", "X-Flex-Lang": ".+" }
 		},
 		"FluxBB": {
 			"cats": [ 2 ],
@@ -628,20 +634,22 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform|Powered by <a href=[^>]+flyspray\\.org)"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform)",
+			"headers": { "Set-Cookie": "flyspray_project=" }
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
-			"headers": { "Server": "FreeBSD" }
+			"headers": { "Server": "FreeBSD( ([\\d.]+))?\\;version:\\2" }
 		},
 		"FrontPage": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Microsoft FrontPage(\\s([\\d\\.]+))?\\;version:\\2" },
+			"meta": { "generator": "Microsoft FrontPage(\\s([\\d.]+))?\\;version:\\2" },
 			"html": "<html[^>]+urn:schemas-microsoft-com:office:office"
 		},
 		"FWP": {
 			"cats": [ 6 ],
-			"meta": { "generator": "FWP Shop" }
+			"meta": { "generator": "FWP Shop" },
+			"html": "<!--\\s+FwP Systems"
 		},
 		"Gallery": {
 			"cats": [ 7 ],
@@ -655,6 +663,7 @@
 		},
 		"Gauges": {
 			"cats": [ 10 ],
+			"headers": { "Set-Cookie": "_gauges_[^;]+=" },
 			"html": "t\\.src = '//secure\\.gaug\\.es/track\\.js",
 			"env": "^_gauges$"
 		},
@@ -664,7 +673,7 @@
 		},
 		"Get Satisfaction": {
 			"cats": [ 13 ],
-			"html": "var feedback_widget = new GSFN\\.feedback_widget\\(feedback_widget_options\\)"
+			"env": "^feedback_widget$"
 		},
 		"GetSimple CMS": {
 			"cats": [ 1 ],
@@ -698,11 +707,11 @@
 		},
 		"Google Maps": {
 			"cats": [ 35 ],
-			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
+			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
 		},
 		"Google PageSpeed": {
 			"cats": [ 23, 33 ],
-			"headers": { "X-Mod-Pagespeed": ".*" }
+			"headers": { "X-Mod-Pagespeed": "([\\d.]+)\\;version:\\1" }
 		},
 		"Google Sites": {
 			"cats": [ 1 ],
@@ -723,7 +732,9 @@
 		},
 		"Graffiti CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Graffiti CMS" }
+			"meta": { "generator": "Graffiti CMS ([^\"]+)\\;version:\\1" },
+			"script": "/graffiti.js",
+			"headers": { "Set-Cookie": "graffitibot[^;]=" }
 		},
 		"Gravatar": {
 			"cats": [ 19 ],
@@ -740,7 +751,8 @@
 		},
 		"GX WebManager": {
 			"cats": [ 1 ],
-			"meta": { "generator": "GX WebManager" }
+			"meta": { "generator": "GX WebManager( ([\\d.]+))?\\;version:\\2" },
+			"html": "<!--\\s+Powered by GX"
 		},
 		"Handlebars": {
 			"cats": [ 12 ],
@@ -748,7 +760,7 @@
 		},
 		"Hiawatha": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Hiawatha" }
+			"headers": { "Server": "Hiawatha v([\\d.]+)\\;version:\\1" }
 		},
 		"Highcharts": {
 			"cats": [ 25 ],
@@ -761,10 +773,12 @@
 		},
 		"Hotaru CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Hotaru CMS" }
+			"meta": { "generator": "Hotaru CMS" },
+			"headers": { "Set-Cookie": "hotaru_mobile=" }
 		},
-		"Hubspot": {
+		"HubSpot": {
 			"cats": [ 32 ],
+			"html": "<!-- Start of Async HubSpot",
 			"env": "^(_hsq|hubspot)$"
 		},
 		"Hybris": {
@@ -775,11 +789,11 @@
 		},
 		"IBM HTTP Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "IBM_HTTP_Server" }
+			"headers": { "Server": "IBM_HTTP_Server(/([\\d.]+))?\\;version:\\2" }
 		},
 		"IBM WebSphere Portal": {
 			"cats": [ 1 ],
-			"headers": { "IBM-Web2-Location": ".*" },
+			"headers": { "IBM-Web2-Location": ".*", "Itx-Generated-Timestamp": ".+" },
 			"url": "/wps/",
 			"implies": "Java"
 		},
@@ -790,19 +804,19 @@
 		},
 		"IIS": {
 			"cats": [ 22 ],
-			"headers": { "Server": "IIS\\/?([\\d\\.]+)?\\;version:\\1" },
+			"headers": { "Server": "IIS(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Windows Server"
 		},
 		"ImpressCMS": {
 			"cats": [ 1 ],
 			"script": "include/linkexternal\\.js",
 			"meta": { "generator": "ImpressCMS" },
-			"headers": { "X-Powered-By": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS", "Set-Cookie": "ICMSession[^;]+=" },
 			"implies": "PHP"
 		},
 		"ImpressPages": {
 			"cats": [ 1 ],
-			"meta": { "generator": "ImpressPages" },
+			"meta": { "generator": "ImpressPages CMS ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Indexhibit": {
@@ -813,26 +827,26 @@
 		},
 		"InstantCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "InstantCMS" }
+			"meta": { "generator": "InstantCMS" },
+			"headers": { "Set-Cookie": "InstantCMS\\[logdate\\]=" }
 		},
 		"Intershop": {
 			"cats": [ 6 ],
-			"url": "is-bin|INTERSHOP",
 			"script": "is-bin|INTERSHOP"
 		},
 		"IPB": {
 			"cats": [ 2 ],
 			"script": "jscripts/ips_",
-			"env": "^IPBoard$",
+			"env": "^(IPBoard$|ipb_var)",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
 		"iWeb": {
 			"cats": [ 20 ],
-			"meta": { "generator": "^iWeb( [\\d\\.]+)?\\;version:\\1" }
+			"meta": { "generator": "^iWeb( [\\d.]+)?\\;version:\\1" }
 		},
 		"JAlbum": {
 			"cats": [ 7 ],
-			"meta": { "generator": "JAlbum( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "JAlbum( [\\d.]+)?\\;version:\\1" },
 			"implies": "Java"
 		},
 		"Jalios": {
@@ -850,17 +864,17 @@
 		},
 		"JavaServer Faces": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "JSF(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "JSF(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"JavaServer Pages": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "JSP(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "JSP(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"Java Servlet": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Servlet(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "Servlet(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"Jirafe": {
@@ -879,10 +893,10 @@
 		},
 		"Joomla": {
 			"cats": [ 1 ],
-			"url": "option=com_\\;confidence:50",
-			"meta": { "generator": "Joomla" },
+			"url": "option=com_",
+			"meta": { "generator": "Joomla!( ([\\d.]+))?\\;version:\\2" },
 			"html": "(<div[^>]+id=\"wrapper_r\"|<[^>]+(feed|components)/com_|<table[^>]+class=\"pill)\\;confidence:50",
-			"headers": { "X-Content-Encoded-By": "Joomla" },
+			"headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" },
 			"env": "^jcomments$",
 			"implies": "PHP"
 		},
@@ -898,21 +912,22 @@
 		},
 		"jQuery": {
 			"cats": [ 12 ],
-			"script": [ "jquery(\\-|\\.)([\\d\\.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d\\.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
+			"script": [ "jquery(\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
 			"env": "^jQuery$"
 		},
 		"jQuery Mobile": {
 			"cats": [ 26 ],
-			"script": "jquery\\.mobile.*\\.js",
+			"script": "jquery\\.mobile(-([\\d.]+rc\\d))?.*\\.js(\\?ver=([\\d.]+))?\\;version:\\2",
 			"implies": "jQuery"
 		},
 		"jQuery Sparklines": {
 			"cats": [ 25 ],
-			"script": "jquery\\.sparkline.*\\.js"
+			"script": "jquery\\.sparkline.*\\.js",
+			"implies": "jQuery"
 		},
 		"jQuery UI": {
 			"cats": [ 12 ],
-			"script": "jquery-ui.*\\.js",
+			"script": "jqueryui/([\\d.]+)\\.js\\;version:\\1",
 			"implies": "jQuery"
 		},
 		"JS Charts": {
@@ -922,11 +937,12 @@
 		},
 		"JTL Shop": {
 			"cats": [ 6 ],
-			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)"
+			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)",
+			"headers": { "Set-Cookie": "JTLSHOP=" }
 		},
 		"K2": {
 			"cats": [ 19 ],
-			"html": "<!-- JoomlaWorks \"K2\"",
+			"html": "<!--( JoomlaWorks \"K2\"| Start K2)",
 			"env": "^K2RatingURL$",
 			"implies": "Joomla"
 		},
@@ -944,11 +960,12 @@
 		},
 		"Kentico CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Kentico CMS" }
+			"meta": { "generator": "Kentico CMS ([\\d.R]+ \\(build [\\d.]+\\))\\;version:\\1" },
+			"headers": { "Set-Cookie": "CMSPreferredCulture=" }
 		},
 		"KineticJS": {
 			"cats": [ 25 ],
-			"script": "kinetic(-v?([\\d\\.]+))?\\.js\\;version:\\2"
+			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2"
 		},
 		"KISSmetrics": {
 			"cats": [ 10 ],
@@ -956,16 +973,18 @@
 		},
 		"Koego": {
 			"cats": [ 10 ],
-			"script": "tracking\\.koego\\.com/end/ego\\.js"
+			"script": "tracking\\.koego\\.com/end/ego\\.js",
+			"env": "^ego_domains$"
 		},
 		"Kohana": {
 			"cats": [ 18 ],
-			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana" },
+			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana Framework ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Kolibri CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Kolibri" }
+			"meta": { "generator": "Kolibri" },
+			"headers": { "X-Powered-By": "Kolibri" }
 		},
 		"Komodo CMS": {
 			"cats": [ 1 ],
@@ -974,17 +993,19 @@
 		},
 		"Koobi": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Koobi" }
+			"meta": { "generator": "Koobi" },
+			"html": "<!--[^K>-]+Koobi ([a-z\\d.]+)\\;version:\\1"
 		},
 		"LEPTON": {
 			"cats": [ 1 ],
 			"meta": { "generator": "LEPTON" },
+			"headers": { "Set-Cookie": "lep\\d+sessionid=" },
 			"implies": "PHP"
 		},
 		"Liferay": {
 			"cats": [ 1 ],
 			"env": "^Liferay$",
-			"headers": { "Liferay-Portal": ".*" }
+			"headers": { "Liferay-Portal": "[a-z\\s]+([\\d.]+)\\;version:\\1" }
 		},
 		"LightMon Engine": {
 			"cats": [ 1 ],
@@ -993,7 +1014,7 @@
 		},
 		"lighttpd": {
 			"cats": [ 22 ],
-			"headers": { "Server": "lighttpd(/([\\d\\.]+))?\\;version:\\2" }
+			"headers": { "Server": "lighttpd(/([\\d.]+))?\\;version:\\2" }
 		},
 		"LimeSurvey": {
 			"cats": [ 19 ],
@@ -1008,11 +1029,11 @@
 			"script": "addtoany\\.com/menu/page\\.js",
 			"env": "^a2apage_init$"
 		},
-    "Locomotive": {
-      "cats": [ 1 ],
-      "html": "<link[^>]*/sites/[a-zA-Z0-9]{24}/theme/stylesheets/.*>",
-      "implies": [ "Ruby on Rails", "MongoDB" ]
-    },
+		"Locomotive": {
+			"cats": [ 1 ],
+			"html": "<link[^>]*/sites/[a-zA-Z0-9]{24}/theme/stylesheets/.*>",
+			"implies": [ "Ruby on Rails", "MongoDB" ]
+		},
 		"Lotus Domino": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Lotus-Domino" }
@@ -1086,44 +1107,44 @@
 		},
 		"Modernizr": {
 			"cats": [ 12 ],
-			"script": "modernizr(-([\\d\\.]*[\\d]))?.*\\.js\\;version:\\2",
+			"script": "modernizr(-([\\d.]*[\\d]))?.*\\.js\\;version:\\2",
 			"env": "^Modernizr$"
 		},
 		"MODx": {
 			"cats": [ 1 ],
 			"html": "<a[^>]+>Powered by MODx</a>|<(link|script)[^>]+assets/snippets/",
 			"env": "^MODX_MEDIA_PATH$",
-			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}" },
 			"implies": "PHP"
 		},
 		"mod_fastcgi": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_fastcgi(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_fastcgi(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Apache"
 		},
 		"mod_python": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_python(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_python(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Python", "Apache" ]
 		},
 		"mod_rack": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rack(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_rack(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_rails": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rails(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_rails(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_ssl": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_ssl(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_ssl(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Apache"
 		},
 		"mod_wsgi": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_wsgi(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_wsgi(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Python\\;confidence:50", "Apache" ]
 		},
 		"MoinMoin": {
@@ -1192,7 +1213,7 @@
 			"meta": { "generator": "Mynetcap" }
 		},
 		"MySQL": {
-			"cats": [ 24 ]
+			"cats": [ 34 ]
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
@@ -1247,7 +1268,7 @@
 		"OpenGrok": {
 			"cats": [ 19 ],
 			"headers": { "Set-Cookie": "OpenGrok" },
-			"meta": { "generator": "OpenGrok( v?([\\d\\.]+))?\\;version:\\2" },
+			"meta": { "generator": "OpenGrok( v?([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"OpenGSE": {
@@ -1266,7 +1287,7 @@
 		},
 		"OpenSSL": {
 			"cats": [ 33 ],
-			"headers": { "Server": "OpenSSL(/([\\d\\.]+[a-z]?))?\\;version:\\2" }
+			"headers": { "Server": "OpenSSL(/([\\d.]+[a-z]?))?\\;version:\\2" }
 		},
 		"OpenText Web Solutions": {
 			"cats": [ 1 ],
@@ -1288,7 +1309,7 @@
 		"osCommerce": {
 			"cats": [ 6 ],
 			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\"[^>]*infoBoxHeading)",
-			"headers": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
+			"headers": { "Set-Cookie": "osCsid=" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1327,7 +1348,7 @@
 		},
 		"PHP": {
 			"cats": [ 27 ],
-			"headers": { "Server": "php/?([\\d\\.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d\\.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
+			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
 		"phpAlbum":	{
@@ -1434,7 +1455,7 @@
 		},
 		"Prototype": {
 			"cats": [ 12 ],
-			"script": "(prototype|protoaculous)(-([\\d\\.]*[\\d]))?.*\\.js\\;version:\\3",
+			"script": "(prototype|protoaculous)(-([\\d.]*[\\d]))?.*\\.js\\;version:\\3",
 			"env": "^Prototype$"
 		},
 		"Protovis": {
@@ -1449,7 +1470,7 @@
 		},
 		"Python": {
 			"cats": [ 27 ],
-			"headers": { "Server": "(^|\\s)Python(/([\\d\\.]+))?\\;version:\\3" }
+			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;version:\\3" }
 		},
 		"Quantcast": {
 			"cats": [ 10 ],
@@ -1543,7 +1564,7 @@
 		},
 		"Sarka-SPIP": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(^|\\s)Sarka-SPIP(\\s([\\d\\.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
+			"meta": { "generator": "(^|\\s)Sarka-SPIP(\\s([\\d.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
 			"headers": { "X-Spip-Cache": ".*" },
 			"implies": "SPIP"
 		},
@@ -1651,7 +1672,7 @@
 		},
 		"SPIP": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(^|\\s)SPIP(\\s([\\d\\.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
+			"meta": { "generator": "(^|\\s)SPIP(\\s([\\d.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
 			"headers": { "X-Spip-Cache": ".*" }
 		},
     "Spree": {
@@ -1697,11 +1718,11 @@
 		},
 		"Supersized": {
 			"cats": [ 7, 25 ],
-			"script": "supersized(\\.([\\d\\.]*[\\d]))?.*\\.js\\;version:\\2"
+			"script": "supersized(\\.([\\d.]*[\\d]))?.*\\.js\\;version:\\2"
 		},
 		"SUSE": {
 			"cats": [ 28 ],
-			"headers": { "Server": "SUSE(/?\\s?-?([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "SUSE(/?\\s?-?([\\d\\.]+))?\\;version:\\2" }
+			"headers": { "Server": "SUSE(/?\\s?-?([\\d.]+))?\\;version:\\2", "X-Powered-By": "SUSE(/?\\s?-?([\\d.]+))?\\;version:\\2" }
 		},
 		"Scientific Linux": {
 			"cats": [ 28 ],
@@ -1963,7 +1984,7 @@
 		},
 		"WordPress": {
 			"cats": [ 1, 11 ],
-			"meta": { "generator": "WordPress( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "WordPress( [\\d.]+)?\\;version:\\1" },
 			"html": "<link rel=\"stylesheet\" [^>]+wp-content",
 			"env": "^wp_username$",
 			"implies": "PHP"
@@ -1985,7 +2006,7 @@
 			"cats": [ 2 ],
 			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
 		},
-		"XiTi": {
+		"AT Internet": {
 			"cats": [ 10 ],
 			"html": "(<[^>]+src=\"[^>]+xiti\\.com/hit\\.xiti)",
 			"env": "^Xt_"
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index edf39bd60..ea5db6e67 100755
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -52,7 +52,7 @@
 		},
 		"2z Project": {
 			"cats": [ 1 ],
-			"meta": { "generator": "2z project ([\\d\\.]+);version:\\1" }
+			"meta": { "generator": "2z project ([\\d.]+);version:\\1" }
 		},
 		"3dCart": {
 			"cats": [ 1, 6 ],
@@ -77,7 +77,7 @@
 		},
 		"Adobe GoLive": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Adobe GoLive(\\s([\\d\\.]+))?\\;version:\\2" }
+			"meta": { "generator": "Adobe GoLive(\\s([\\d.]+))?\\;version:\\2" }
 		},
 		"Advanced Web Stats": {
 			"cats": [ 10 ],
@@ -90,7 +90,7 @@
 		},
 		"Amaya": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Amaya( V?([\\d\\.]+[a-z]))?\\;version:\\2" }
+			"meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" }
 		},
 		"Ametys": {
 			"cats": [ 1 ],
@@ -101,12 +101,12 @@
 		"Amiro.CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Amiro" },
-			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d\\.]+)\\;version:\\2",
+			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d.]+)\\;version:\\2",
 			"implies": "PHP"
 		},
 		"AMPcms": {
 			"cats": [ 1 ],
-			"headers": { "X-AMP-Version": "([\\d\\.]+)\\;version:\\1", "Set-Cookie": "^AMP=" },
+			"headers": { "X-AMP-Version": "([\\d.]+)\\;version:\\1", "Set-Cookie": "^AMP=" },
 			"env": "^amp_js_init$",
 			"implies": "PHP"
 		},
@@ -116,11 +116,11 @@
 		},
 		"AOLserver": {
 			"cats": [ 22 ],
-			"headers": { "Server": "AOLserver/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "AOLserver/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache": {
 			"cats": [ 22 ],
-			"headers": { "Server": "(Apache($|/([\\d\\.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
+			"headers": { "Server": "(Apache($|/([\\d.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
 		},
 		"Apache JSPWiki": {
 			"cats": [ 8 ],
@@ -130,11 +130,11 @@
 		},
 		"Apache Tomcat": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "Apache-Coyote/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "ATS/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "ATS/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Arc Forum": {
 			"cats": [ 2 ],
@@ -142,17 +142,17 @@
 		},
 		"AsciiDoc": {
 			"cats": [ 1, 20, 27 ],
-			"meta": { "generator": "^AsciiDoc ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "^AsciiDoc ([\\d.]+)\\;version:\\1" },
 			"env": "^asciidoc$"
 		},
 		"ATG Web Commerce": {
 			"cats": [ 6 ],
-			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d.]+))?\\;version:\\2" },
 			"html": "<[^>]+_DARGS"
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence([^>]+>Atlassian Confluence</a> ([\\d\\.]+))?\\;version:\\2",
+			"html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence([^>]+>Atlassian Confluence</a> ([\\d.]+))?\\;version:\\2",
 			"headers": { "X-Confluence-Request-Time": ".*" },
 			"meta": { "confluence-request-time": ".*" },
 			"implies": "Java"
@@ -167,7 +167,7 @@
 		},
 		"AWStats": {
 			"cats": [ 10 ],
-			"meta": { "generator": "AWStats ([\\d\\.]+( \\(build [\\d\\.]+\\))?)\\;version:\\1" },
+			"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/\">[a-z]+</a>(v([\\d\\.]+))?\\;version:\\2",
+			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(v([\\d.]+))?\\;version:\\2",
 			"implies": "PHP"
 		},
 		"BIGACE": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BIGACE ([\\d\\.]+)\\;version:\\1" },
+			"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 ver\\. ([\\d\\.b]+)\\;version:\\1",
+			"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 ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "BrowserCMS ([\\d.]+)\\;version:\\1" },
 			"implies": "Ruby"
 		},
 		"Bugzilla": {
@@ -266,9 +266,9 @@
 		},
 		"Chamilo": {
 			"cats": [ 21 ],
-			"html": "\">Chamilo ([\\d\\.]+)</a>\\;version:\\1",
-			"meta": { "generator": "Chamilo ([\\d\\.]+)\\;version:\\1" },
-			"headers": { "X-Powered-By": "Chamilo ([\\d\\.]+)\\;version:\\1" },
+			"html": "\">Chamilo ([\\d.]+)</a>\\;version:\\1",
+			"meta": { "generator": "Chamilo ([\\d.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "Chamilo ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Chartbeat": {
@@ -278,7 +278,7 @@
 		},
 		"Cherokee": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee/([\\d\\.]+)\\;version:\\1" }
+			"headers": { "Server": "Cherokee/([\\d.]+)\\;version:\\1" }
 		},
 		"CKEditor": {
 			"cats": [ 24 ],
@@ -313,7 +313,7 @@
 		},
 		"CMSimple": {
 			"cats": [ 1 ],
-			"meta": { "generator": "CMSimple( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "CMSimple( [\\d.]+)?\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"CO2Stats": {
@@ -338,7 +338,7 @@
 		"Concrete5": {
 			"cats": [ 1 ],
 			"script": "concrete/js/",
-			"meta": { "generator": "concrete5 - ([\\d\\.ab]+)\\;version:\\1" },
+			"meta": { "generator": "concrete5 - ([\\d.ab]+)\\;version:\\1" },
 			"env": "^CCM_IMAGE_PATH$",
 			"implies": "PHP"
 		},
@@ -354,12 +354,12 @@
 		},
 		"Contenido": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contenido ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Contenido ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Contens": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contensis CMS Version ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Contensis CMS Version ([\\d.]+)\\;version:\\1" },
 			"implies": [ "Java", "CFML" ]
 		},
 		"ConversionLab": {
@@ -368,7 +368,7 @@
 		},
 		"Coppermine": {
 			"cats": [ 7 ],
-			"html": "<!--Coppermine Photo Gallery ([\\d\\.]+)\\;version:\\1",
+			"html": "<!--Coppermine Photo Gallery ([\\d.]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Cosmoshop": {
@@ -382,11 +382,11 @@
 		},
 		"CouchDB": {
 			"cats": [ 22 ],
-			"headers": { "Server": "CouchDB/([\\d\\.]+)\\;version:\\1" }
+			"headers": { "Server": "CouchDB/([\\d.]+)\\;version:\\1" }
 		},
 		"cPanel": {
 			"cats": [ 9 ],
-			"headers": { "Server": "cpsrvd/([\\d\\.]+)\\;version:\\1" },
+			"headers": { "Server": "cpsrvd/([\\d.]+)\\;version:\\1" },
 			"html": "<!-- cPanel"
 		},
 		"CPG Dragonfly": {
@@ -428,13 +428,13 @@
 		},
 		"Dancer": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Perl Dancer ([\\d\\.]+)\\;version:\\1", "Server": "Perl Dancer ([\\d\\.]+)\\;version:\\1" },
+			"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 ([\\d\\.]+)\\;version:\\1" },
-			"meta": { "generator": "Danneo CMS ([\\d\\.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "CMS Danneo ([\\d.]+)\\;version:\\1" },
+			"meta": { "generator": "Danneo CMS ([\\d.]+)\\;version:\\1" },
 			"implies": [ "Apache", "PHP" ]
 		},
 		"dashCommerce": {
@@ -449,7 +449,7 @@
 		},
 		"David Webbox": {
 			"cats": [ 22 ],
-			"headers": { "Server": "David-WebBox/([\\d\\.a]+ \\(\\d+\\))\\;version:\\1" }
+			"headers": { "Server": "David-WebBox/([\\d.a]+ \\(\\d+\\))\\;version:\\1" }
 		},
 		"Debian": {
 			"cats": [ 28 ],
@@ -474,7 +474,7 @@
 		"DirectAdmin": {
 			"cats": [ 9 ],
 			"html": "<a[^>]+>DirectAdmin</a> Web Control Panel",
-			"headers": { "Server": "DirectAdmin Daemon v([\\d\\.]+)\\;version:\\1" },
+			"headers": { "Server": "DirectAdmin Daemon v([\\d.]+)\\;version:\\1" },
 			"implies": [ "PHP", "Apache" ]
 		},
 		"Disqus": {
@@ -485,7 +485,7 @@
 		},
 		"Django": {
 			"cats": [ 18 ],
-			"html": "(powered by <a[^>]+>Django ?([\\d\\.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z0-9]{32}\" type=\"hidden\"></div>)\\;version:\\2",
+			"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"
 		},
@@ -497,7 +497,7 @@
 		},
 		"Dojo": {
 			"cats": [ 12 ],
-			"script": "([\\d\\.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
+			"script": "([\\d.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
 			"env": "^dojo$"
 		},
 		"Dokeos": {
@@ -523,7 +523,7 @@
 		},
 		"Doxygen": {
 			"cats": [ 4 ],
-			"html": "(<!-- Generated by Doxygen|<link[^>]+doxygen.css)"
+			"html": "(<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\1"
 		},
 		"DreamWeaver": {
 			"cats": [ 20 ],
@@ -533,7 +533,7 @@
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
 			"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
-			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
+			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": "PHP"
 		},
@@ -544,36 +544,40 @@
 		},
 		"Dynamicweb": {
 			"cats": [ 1, 6, 10 ],
-			"meta": { "generator": "Dynamicweb" },
+			"meta": { "generator": "Dynamicweb ([\\d.]+)\\;version:\\1" },
 			"headers": { "Set-Cookie": "Dynamicweb=" },
 			"implies": "Microsoft ASP.NET"
 		},
 		"e107": {
 			"cats": [ 1 ],
 			"script": "e107\\.js",
+			"headers": { "Set-Cookie": "e107_td[^;]+=" },
 			"implies": "PHP"
 		},
 		"EdgeCast": {
 			"cats": [ 31 ],
-			"headers": { "Server": "^ECS " }
+			"headers": { "Server": "^ECS" }
 		},
 		"Embedthis-http": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Embedthis-http" }
+			"headers": { "Server": "Embedthis-http(/([\\d.]+))?\\;version:\\2" }
 		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
+			"headers": { "Set-Cookie": "EPi(Trace|Server)[^;]*=" },
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
 			"cats": [ 19 ],
-			"meta": { "generator": "EPrints" },
+			"meta": { "generator": "EPrints ([\\d.]+)\\;version:\\1" },
+			"env": "^EPJS_menu_template$",
 			"implies": "Perl"
 		},
 		"eSyndiCat": {
 			"cats": [ 1 ],
 			"headers": { "X-Drectory-Script": "^eSyndiCat" },
+			"env": "^esyndicat$",
 			"implies": [ "PHP" ]
 		},
 		"Exhibit": {
@@ -604,23 +608,25 @@
 		},
 		"Fact Finder": {
 			"cats": [ 29 ],
-			"html": "/images/fact-finder\\.gif|ViewParametricSearch|factfinder|Suggest\\.ff",
-			"url": "ViewParametricSearch|factfinder|ffsuggest"
+			"html": "<!-- Factfinder",
+			"script": "Suggest\\.ff",
+			"url": "/ViewParametricSearch|ffsuggest\\.[a-z]htm"
 		},
 		"FAST ESP": {
 			"cats": [ 29 ],
-			"html": "fastsearch|searchProfile=|searchCategory=",
-			"url": "esppublished|searchProfile=|searchCategory="
+			"html": "<form[^>]+id=\"fastsearch\""
 		},
 		"FAST Search for SharePoint": {
 			"cats": [ 29 ],
 			"url": "Pages/SearchResults\\.aspx\\?k=",
+			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
 		"FlexCMP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
-			"headers": { "X-Powered-By": "FlexCMP" }
+			"html": "<!--[^>]+FlexCMP[^>v]+v\\. ([\\d.]+)\\;version:\\1",
+			"headers": { "X-Powered-By": "FlexCMP.+\\[v\\. ([\\d.]+)\\;version:\\1", "X-Flex-Lang": ".+" }
 		},
 		"FluxBB": {
 			"cats": [ 2 ],
@@ -628,20 +634,22 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform|Powered by <a href=[^>]+flyspray\\.org)"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform)",
+			"headers": { "Set-Cookie": "flyspray_project=" }
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
-			"headers": { "Server": "FreeBSD" }
+			"headers": { "Server": "FreeBSD( ([\\d.]+))?\\;version:\\2" }
 		},
 		"FrontPage": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Microsoft FrontPage(\\s([\\d\\.]+))?\\;version:\\2" },
+			"meta": { "generator": "Microsoft FrontPage(\\s([\\d.]+))?\\;version:\\2" },
 			"html": "<html[^>]+urn:schemas-microsoft-com:office:office"
 		},
 		"FWP": {
 			"cats": [ 6 ],
-			"meta": { "generator": "FWP Shop" }
+			"meta": { "generator": "FWP Shop" },
+			"html": "<!--\\s+FwP Systems"
 		},
 		"Gallery": {
 			"cats": [ 7 ],
@@ -655,6 +663,7 @@
 		},
 		"Gauges": {
 			"cats": [ 10 ],
+			"headers": { "Set-Cookie": "_gauges_[^;]+=" },
 			"html": "t\\.src = '//secure\\.gaug\\.es/track\\.js",
 			"env": "^_gauges$"
 		},
@@ -664,7 +673,7 @@
 		},
 		"Get Satisfaction": {
 			"cats": [ 13 ],
-			"html": "var feedback_widget = new GSFN\\.feedback_widget\\(feedback_widget_options\\)"
+			"env": "^feedback_widget$"
 		},
 		"GetSimple CMS": {
 			"cats": [ 1 ],
@@ -698,11 +707,11 @@
 		},
 		"Google Maps": {
 			"cats": [ 35 ],
-			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
+			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
 		},
 		"Google PageSpeed": {
 			"cats": [ 23, 33 ],
-			"headers": { "X-Mod-Pagespeed": ".*" }
+			"headers": { "X-Mod-Pagespeed": "([\\d.]+)\\;version:\\1" }
 		},
 		"Google Sites": {
 			"cats": [ 1 ],
@@ -723,7 +732,9 @@
 		},
 		"Graffiti CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Graffiti CMS" }
+			"meta": { "generator": "Graffiti CMS ([^\"]+)\\;version:\\1" },
+			"script": "/graffiti.js",
+			"headers": { "Set-Cookie": "graffitibot[^;]=" }
 		},
 		"Gravatar": {
 			"cats": [ 19 ],
@@ -740,7 +751,8 @@
 		},
 		"GX WebManager": {
 			"cats": [ 1 ],
-			"meta": { "generator": "GX WebManager" }
+			"meta": { "generator": "GX WebManager( ([\\d.]+))?\\;version:\\2" },
+			"html": "<!--\\s+Powered by GX"
 		},
 		"Handlebars": {
 			"cats": [ 12 ],
@@ -748,7 +760,7 @@
 		},
 		"Hiawatha": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Hiawatha" }
+			"headers": { "Server": "Hiawatha v([\\d.]+)\\;version:\\1" }
 		},
 		"Highcharts": {
 			"cats": [ 25 ],
@@ -761,10 +773,12 @@
 		},
 		"Hotaru CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Hotaru CMS" }
+			"meta": { "generator": "Hotaru CMS" },
+			"headers": { "Set-Cookie": "hotaru_mobile=" }
 		},
-		"Hubspot": {
+		"HubSpot": {
 			"cats": [ 32 ],
+			"html": "<!-- Start of Async HubSpot",
 			"env": "^(_hsq|hubspot)$"
 		},
 		"Hybris": {
@@ -775,11 +789,11 @@
 		},
 		"IBM HTTP Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "IBM_HTTP_Server" }
+			"headers": { "Server": "IBM_HTTP_Server(/([\\d.]+))?\\;version:\\2" }
 		},
 		"IBM WebSphere Portal": {
 			"cats": [ 1 ],
-			"headers": { "IBM-Web2-Location": ".*" },
+			"headers": { "IBM-Web2-Location": ".*", "Itx-Generated-Timestamp": ".+" },
 			"url": "/wps/",
 			"implies": "Java"
 		},
@@ -790,19 +804,19 @@
 		},
 		"IIS": {
 			"cats": [ 22 ],
-			"headers": { "Server": "IIS\\/?([\\d\\.]+)?\\;version:\\1" },
+			"headers": { "Server": "IIS(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Windows Server"
 		},
 		"ImpressCMS": {
 			"cats": [ 1 ],
 			"script": "include/linkexternal\\.js",
 			"meta": { "generator": "ImpressCMS" },
-			"headers": { "X-Powered-By": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS", "Set-Cookie": "ICMSession[^;]+=" },
 			"implies": "PHP"
 		},
 		"ImpressPages": {
 			"cats": [ 1 ],
-			"meta": { "generator": "ImpressPages" },
+			"meta": { "generator": "ImpressPages CMS ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Indexhibit": {
@@ -813,26 +827,26 @@
 		},
 		"InstantCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "InstantCMS" }
+			"meta": { "generator": "InstantCMS" },
+			"headers": { "Set-Cookie": "InstantCMS\\[logdate\\]=" }
 		},
 		"Intershop": {
 			"cats": [ 6 ],
-			"url": "is-bin|INTERSHOP",
 			"script": "is-bin|INTERSHOP"
 		},
 		"IPB": {
 			"cats": [ 2 ],
 			"script": "jscripts/ips_",
-			"env": "^IPBoard$",
+			"env": "^(IPBoard$|ipb_var)",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
 		"iWeb": {
 			"cats": [ 20 ],
-			"meta": { "generator": "^iWeb( [\\d\\.]+)?\\;version:\\1" }
+			"meta": { "generator": "^iWeb( [\\d.]+)?\\;version:\\1" }
 		},
 		"JAlbum": {
 			"cats": [ 7 ],
-			"meta": { "generator": "JAlbum( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "JAlbum( [\\d.]+)?\\;version:\\1" },
 			"implies": "Java"
 		},
 		"Jalios": {
@@ -850,17 +864,17 @@
 		},
 		"JavaServer Faces": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "JSF(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "JSF(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"JavaServer Pages": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "JSP(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "JSP(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"Java Servlet": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Servlet(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "Servlet(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"Jirafe": {
@@ -879,10 +893,10 @@
 		},
 		"Joomla": {
 			"cats": [ 1 ],
-			"url": "option=com_\\;confidence:50",
-			"meta": { "generator": "Joomla" },
+			"url": "option=com_",
+			"meta": { "generator": "Joomla!( ([\\d.]+))?\\;version:\\2" },
 			"html": "(<div[^>]+id=\"wrapper_r\"|<[^>]+(feed|components)/com_|<table[^>]+class=\"pill)\\;confidence:50",
-			"headers": { "X-Content-Encoded-By": "Joomla" },
+			"headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" },
 			"env": "^jcomments$",
 			"implies": "PHP"
 		},
@@ -898,21 +912,22 @@
 		},
 		"jQuery": {
 			"cats": [ 12 ],
-			"script": [ "jquery(\\-|\\.)([\\d\\.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d\\.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
+			"script": [ "jquery(\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
 			"env": "^jQuery$"
 		},
 		"jQuery Mobile": {
 			"cats": [ 26 ],
-			"script": "jquery\\.mobile.*\\.js",
+			"script": "jquery\\.mobile(-([\\d.]+rc\\d))?.*\\.js(\\?ver=([\\d.]+))?\\;version:\\2",
 			"implies": "jQuery"
 		},
 		"jQuery Sparklines": {
 			"cats": [ 25 ],
-			"script": "jquery\\.sparkline.*\\.js"
+			"script": "jquery\\.sparkline.*\\.js",
+			"implies": "jQuery"
 		},
 		"jQuery UI": {
 			"cats": [ 12 ],
-			"script": "jquery-ui.*\\.js",
+			"script": "jqueryui/([\\d.]+)\\.js\\;version:\\1",
 			"implies": "jQuery"
 		},
 		"JS Charts": {
@@ -922,11 +937,12 @@
 		},
 		"JTL Shop": {
 			"cats": [ 6 ],
-			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)"
+			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)",
+			"headers": { "Set-Cookie": "JTLSHOP=" }
 		},
 		"K2": {
 			"cats": [ 19 ],
-			"html": "<!-- JoomlaWorks \"K2\"",
+			"html": "<!--( JoomlaWorks \"K2\"| Start K2)",
 			"env": "^K2RatingURL$",
 			"implies": "Joomla"
 		},
@@ -944,11 +960,12 @@
 		},
 		"Kentico CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Kentico CMS" }
+			"meta": { "generator": "Kentico CMS ([\\d.R]+ \\(build [\\d.]+\\))\\;version:\\1" },
+			"headers": { "Set-Cookie": "CMSPreferredCulture=" }
 		},
 		"KineticJS": {
 			"cats": [ 25 ],
-			"script": "kinetic(-v?([\\d\\.]+))?\\.js\\;version:\\2"
+			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2"
 		},
 		"KISSmetrics": {
 			"cats": [ 10 ],
@@ -956,16 +973,18 @@
 		},
 		"Koego": {
 			"cats": [ 10 ],
-			"script": "tracking\\.koego\\.com/end/ego\\.js"
+			"script": "tracking\\.koego\\.com/end/ego\\.js",
+			"env": "^ego_domains$"
 		},
 		"Kohana": {
 			"cats": [ 18 ],
-			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana" },
+			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana Framework ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Kolibri CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Kolibri" }
+			"meta": { "generator": "Kolibri" },
+			"headers": { "X-Powered-By": "Kolibri" }
 		},
 		"Komodo CMS": {
 			"cats": [ 1 ],
@@ -974,17 +993,19 @@
 		},
 		"Koobi": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Koobi" }
+			"meta": { "generator": "Koobi" },
+			"html": "<!--[^K>-]+Koobi ([a-z\\d.]+)\\;version:\\1"
 		},
 		"LEPTON": {
 			"cats": [ 1 ],
 			"meta": { "generator": "LEPTON" },
+			"headers": { "Set-Cookie": "lep\\d+sessionid=" },
 			"implies": "PHP"
 		},
 		"Liferay": {
 			"cats": [ 1 ],
 			"env": "^Liferay$",
-			"headers": { "Liferay-Portal": ".*" }
+			"headers": { "Liferay-Portal": "[a-z\\s]+([\\d.]+)\\;version:\\1" }
 		},
 		"LightMon Engine": {
 			"cats": [ 1 ],
@@ -993,7 +1014,7 @@
 		},
 		"lighttpd": {
 			"cats": [ 22 ],
-			"headers": { "Server": "lighttpd(/([\\d\\.]+))?\\;version:\\2" }
+			"headers": { "Server": "lighttpd(/([\\d.]+))?\\;version:\\2" }
 		},
 		"LimeSurvey": {
 			"cats": [ 19 ],
@@ -1008,11 +1029,11 @@
 			"script": "addtoany\\.com/menu/page\\.js",
 			"env": "^a2apage_init$"
 		},
-    "Locomotive": {
-      "cats": [ 1 ],
-      "html": "<link[^>]*/sites/[a-zA-Z0-9]{24}/theme/stylesheets/.*>",
-      "implies": [ "Ruby on Rails", "MongoDB" ]
-    },
+		"Locomotive": {
+			"cats": [ 1 ],
+			"html": "<link[^>]*/sites/[a-zA-Z0-9]{24}/theme/stylesheets/.*>",
+			"implies": [ "Ruby on Rails", "MongoDB" ]
+		},
 		"Lotus Domino": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Lotus-Domino" }
@@ -1086,44 +1107,44 @@
 		},
 		"Modernizr": {
 			"cats": [ 12 ],
-			"script": "modernizr(-([\\d\\.]*[\\d]))?.*\\.js\\;version:\\2",
+			"script": "modernizr(-([\\d.]*[\\d]))?.*\\.js\\;version:\\2",
 			"env": "^Modernizr$"
 		},
 		"MODx": {
 			"cats": [ 1 ],
 			"html": "<a[^>]+>Powered by MODx</a>|<(link|script)[^>]+assets/snippets/",
 			"env": "^MODX_MEDIA_PATH$",
-			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}" },
 			"implies": "PHP"
 		},
 		"mod_fastcgi": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_fastcgi(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_fastcgi(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Apache"
 		},
 		"mod_python": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_python(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_python(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Python", "Apache" ]
 		},
 		"mod_rack": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rack(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_rack(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_rails": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rails(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_rails(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_ssl": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_ssl(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_ssl(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Apache"
 		},
 		"mod_wsgi": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_wsgi(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_wsgi(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Python\\;confidence:50", "Apache" ]
 		},
 		"MoinMoin": {
@@ -1192,7 +1213,7 @@
 			"meta": { "generator": "Mynetcap" }
 		},
 		"MySQL": {
-			"cats": [ 24 ]
+			"cats": [ 34 ]
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
@@ -1247,7 +1268,7 @@
 		"OpenGrok": {
 			"cats": [ 19 ],
 			"headers": { "Set-Cookie": "OpenGrok" },
-			"meta": { "generator": "OpenGrok( v?([\\d\\.]+))?\\;version:\\2" },
+			"meta": { "generator": "OpenGrok( v?([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"OpenGSE": {
@@ -1266,7 +1287,7 @@
 		},
 		"OpenSSL": {
 			"cats": [ 33 ],
-			"headers": { "Server": "OpenSSL(/([\\d\\.]+[a-z]?))?\\;version:\\2" }
+			"headers": { "Server": "OpenSSL(/([\\d.]+[a-z]?))?\\;version:\\2" }
 		},
 		"OpenText Web Solutions": {
 			"cats": [ 1 ],
@@ -1288,7 +1309,7 @@
 		"osCommerce": {
 			"cats": [ 6 ],
 			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\"[^>]*infoBoxHeading)",
-			"headers": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
+			"headers": { "Set-Cookie": "osCsid=" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1327,7 +1348,7 @@
 		},
 		"PHP": {
 			"cats": [ 27 ],
-			"headers": { "Server": "php/?([\\d\\.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d\\.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
+			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
 		"phpAlbum":	{
@@ -1434,7 +1455,7 @@
 		},
 		"Prototype": {
 			"cats": [ 12 ],
-			"script": "(prototype|protoaculous)(-([\\d\\.]*[\\d]))?.*\\.js\\;version:\\3",
+			"script": "(prototype|protoaculous)(-([\\d.]*[\\d]))?.*\\.js\\;version:\\3",
 			"env": "^Prototype$"
 		},
 		"Protovis": {
@@ -1449,7 +1470,7 @@
 		},
 		"Python": {
 			"cats": [ 27 ],
-			"headers": { "Server": "(^|\\s)Python(/([\\d\\.]+))?\\;version:\\3" }
+			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;version:\\3" }
 		},
 		"Quantcast": {
 			"cats": [ 10 ],
@@ -1543,7 +1564,7 @@
 		},
 		"Sarka-SPIP": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(^|\\s)Sarka-SPIP(\\s([\\d\\.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
+			"meta": { "generator": "(^|\\s)Sarka-SPIP(\\s([\\d.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
 			"headers": { "X-Spip-Cache": ".*" },
 			"implies": "SPIP"
 		},
@@ -1651,7 +1672,7 @@
 		},
 		"SPIP": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(^|\\s)SPIP(\\s([\\d\\.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
+			"meta": { "generator": "(^|\\s)SPIP(\\s([\\d.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
 			"headers": { "X-Spip-Cache": ".*" }
 		},
     "Spree": {
@@ -1697,11 +1718,11 @@
 		},
 		"Supersized": {
 			"cats": [ 7, 25 ],
-			"script": "supersized(\\.([\\d\\.]*[\\d]))?.*\\.js\\;version:\\2"
+			"script": "supersized(\\.([\\d.]*[\\d]))?.*\\.js\\;version:\\2"
 		},
 		"SUSE": {
 			"cats": [ 28 ],
-			"headers": { "Server": "SUSE(/?\\s?-?([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "SUSE(/?\\s?-?([\\d\\.]+))?\\;version:\\2" }
+			"headers": { "Server": "SUSE(/?\\s?-?([\\d.]+))?\\;version:\\2", "X-Powered-By": "SUSE(/?\\s?-?([\\d.]+))?\\;version:\\2" }
 		},
 		"Scientific Linux": {
 			"cats": [ 28 ],
@@ -1963,7 +1984,7 @@
 		},
 		"WordPress": {
 			"cats": [ 1, 11 ],
-			"meta": { "generator": "WordPress( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "WordPress( [\\d.]+)?\\;version:\\1" },
 			"html": "<link rel=\"stylesheet\" [^>]+wp-content",
 			"env": "^wp_username$",
 			"implies": "PHP"
@@ -1985,7 +2006,7 @@
 			"cats": [ 2 ],
 			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
 		},
-		"XiTi": {
+		"AT Internet": {
 			"cats": [ 10 ],
 			"html": "(<[^>]+src=\"[^>]+xiti\\.com/hit\\.xiti)",
 			"env": "^Xt_"
diff --git a/drivers/chrome/images/icons/SPDY.png b/drivers/chrome/images/icons/SPDY.png
index 44b57f9291fea297b430c5f649dbfd3523828891..5ac3599a59d058024a94371fa6bd046e7ce34703 100644
GIT binary patch
delta 525
zcmV+o0`mQY1*HU#BYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xB+4lLy~iu3>g0kTO%K~y-)ol{LLBVibRW~OPYOIA{(5?SHU*p+W2
zA`(*KC>v)Y4!Ds`L}Cvv>|y<#h-4zW;U;ks2M&aTMg2yEnSW8@H)$G;Ri&Aher0@n
zrc+zq+xxxG^S#ge2fV??*Z1*mlUCGfqj%H)h>pb&T*95G(aU}Sb1&okYvh{EFqjq~
zy2-X@JKbtA!f=Vm4a?UEYS$#)?vQhXM;ilQOUjIJh6)<zE<j?p<S#zRPCUWtSKAXM
zic`=ydjSU`#D7h#a)w2K<K_&NdG=0?#;g{zDW$o*uruKYO_S%an<+U)s_f@Dc&UzD
zfycuWP^dp3U}nhiZ&!`A)-J`D@JmK<CP(fgoGe5_U^hW<u_$&Pbv)82ywMN@->!JT
zXDuaEP&%@}c<5jNB09sD>;kyM6rZSueCidIm_<>(*MAr{qfMH4=6B7gZBA*E6%Vhn
z`o3{e)H8)Qjj>!>V?JF+#pQvx$E7K1Z#|OQ#Lv<^EVi^ChbIBlT7%-U@KN#ntV7ac
z1OR*YG^=A*;-4_Dc!ru^UG+Exu8z^)&RZXG-!auQ_U(O_=V}^E8v75Hd#5sM2PjMc
P0000<MFvhpu0mjfR}=3T

delta 620
zcmV-y0+aov1cU{UBYy%*Nkl<ZILoEe&r8z*9L8}E;vxD2LOSGMAc<|O=oX{Y{Lz+%
z9s(^1gcuRhv?yUslWk2yr!%qCwFTBTS4hp$?W@zN^Vgyj6(g##HeLQMbG|!toQBfj
zIX!${r{@y~#QjfpEhZ-?oi>|ot*WYOt*EGIdf$NAZ1!3#7JpPK6*)OM!F>T;U0sQ_
zH8lqw=(LoVDN!gC2i0oz5u?%Q(r7e7Nl8h<u7Js8s&Kn{H~IuOE{~UYZV#Qd7d+JK
zqBVLwTCEnjT;8-JU^bf@r#^mQz~^V~%OZ2%BKT%P*e4>`J+nM+Zs1~G?vhk0JsbnH
zwzi(}jSNM527f15UfTp9@Z%@`K$Py8EpF6Uv5hTKsk#%D%Veix07HG9L+Br5KD@!|
zZ&>*S;VtloK$@P3#lMZ-y@KO)59iX(+GBwBwkJV{YmC4$%q_tD3h0dONW>DFoHIO|
z27?gcsW(8LEGrNLv@}0j>UcZOR0!OkU?dEeFXfXf%YVi`3k@Ss=Ut~|D2yyKEfND%
zS5<mDodONL-?2`?%NZ~YuVUy8(mW1o58NLGd;fb*osbN~0OjRniszO#48j7sH-C?e
zqo5sziaw|t*+k{trn=%5DJe&<#Q=qcg$c@=r4tTo2fF@suD=R%w>yH`wMy9_sJu}u
zW)l)o>Sb6`Qqs;tQYw{+SBtOs8f!IJoqaS4pQ#tVV(S^^-tAJv$5MS_k?7Drr(94_
z5HFL-inB7(UHQ4^Ll?3$f+vrQUCGJG#Uha?e$UUe*ZcvYYTh<yw(95r0000<MNUMn
GLSTYhE+RGn

diff --git a/drivers/chrome/images/icons/UNIX.png b/drivers/chrome/images/icons/UNIX.png
index ebb6deb3424f603cd5f52aa2141310898a70e852..44d58989a7bd1f2e810e4ad70fc9b725e76a28b3 100644
GIT binary patch
delta 549
zcmV+=0^0qE0<r{<7=H)`0000V^Z#K0000JJOGiWi{{a60|De66lK=n!32;bRa{vGf
z6951U69E94oEQKA00(qQO+^RY0uTT-D@GuiSO5S4zez+vR5;6h(?4hvaTEve&&5#E
zK?0GZO9eA@)q)Vain<jnRHD#99g3q<aq42FP@G(Cg?1>|P=BFA-MSX4P|z+;a-f3B
z4+C+~fWtZT?s^H;x4p;ve&4_Ei*%eZWN|x=!)%z*cN5fn^xg~0j)rriGC|yq<8Ui{
zl88W43VI@4^t6UaDrG0s!)J*|1C1=$$cUO!b#JX%C}XMv{j91D_-hs<mW+F6&Xjf2
z_H8?B+-(m}Mt|6J;Fn2tsh-GuiD=V-IaAgwxZp8JL`LknYx;PEFD5mm8t7(~bDJ||
z!>%8eida+Xo9o9NTr_LU%VJ^OEU9g@G+JLhE09|vl4w;-hzn4@wEPOW&8z7R#o&@F
zl>(I8p(s9#&s#S=kUU~<!0(=N#vB|vA=tNFCW&9i_kSgs9`d5UeXYc=;+-Pc(+Zss
ztmwNT^~ZLhkxmFAi&D>Zvkvart%gnrR<ppeBU_%8#!9W|YufSCp{frUmxx?GUiyiY
zSM`hgZ`d{J+Q4o~V`|#bc4ttD^J+F7sCx5X@Hvaxo}Mmc*z-UuYhSUOlV^G~_)O7h
n@9c>g6CSRLj7fcmf4%cxhe4A>#J%Tq00000NkvXXu0mjff?WQr

delta 248
zcmV<U00;lF1c(BV7=Hu<0002(-QrRJ001yhOjJb#69fb{1O!L~1y=<HX$3TMG)R6(
zRE$(>n`?)thnKmRth=nR$FR=T&gtjr{QmrUgW!Sy005IoL_t&t*JJqq|KGBV`~Uwl
z{QqYtY$OX}d=OH0F`N%%{Qv(`^bf~>hOf%{|Kq1P<uiPAk#YS0O~gf>VUvsT|4$|^
zx(o|l9RL4UanWK}<RW+ee~OC~!y?D`JpUh==rBC={b=<6XR|!RC;LWc@i~qD4FC1N
ynYg%!15N(g?Be1Gvf?X~F~rjUzuP;2&Hw<-nMoNsrklF}0000<MNUMnLSTa4dwR<N

diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index edf39bd60..ea5db6e67 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 ([\\d\\.]+);version:\\1" }
+			"meta": { "generator": "2z project ([\\d.]+);version:\\1" }
 		},
 		"3dCart": {
 			"cats": [ 1, 6 ],
@@ -77,7 +77,7 @@
 		},
 		"Adobe GoLive": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Adobe GoLive(\\s([\\d\\.]+))?\\;version:\\2" }
+			"meta": { "generator": "Adobe GoLive(\\s([\\d.]+))?\\;version:\\2" }
 		},
 		"Advanced Web Stats": {
 			"cats": [ 10 ],
@@ -90,7 +90,7 @@
 		},
 		"Amaya": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Amaya( V?([\\d\\.]+[a-z]))?\\;version:\\2" }
+			"meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" }
 		},
 		"Ametys": {
 			"cats": [ 1 ],
@@ -101,12 +101,12 @@
 		"Amiro.CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Amiro" },
-			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d\\.]+)\\;version:\\2",
+			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d.]+)\\;version:\\2",
 			"implies": "PHP"
 		},
 		"AMPcms": {
 			"cats": [ 1 ],
-			"headers": { "X-AMP-Version": "([\\d\\.]+)\\;version:\\1", "Set-Cookie": "^AMP=" },
+			"headers": { "X-AMP-Version": "([\\d.]+)\\;version:\\1", "Set-Cookie": "^AMP=" },
 			"env": "^amp_js_init$",
 			"implies": "PHP"
 		},
@@ -116,11 +116,11 @@
 		},
 		"AOLserver": {
 			"cats": [ 22 ],
-			"headers": { "Server": "AOLserver/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "AOLserver/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache": {
 			"cats": [ 22 ],
-			"headers": { "Server": "(Apache($|/([\\d\\.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
+			"headers": { "Server": "(Apache($|/([\\d.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
 		},
 		"Apache JSPWiki": {
 			"cats": [ 8 ],
@@ -130,11 +130,11 @@
 		},
 		"Apache Tomcat": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "Apache-Coyote/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "ATS/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "ATS/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Arc Forum": {
 			"cats": [ 2 ],
@@ -142,17 +142,17 @@
 		},
 		"AsciiDoc": {
 			"cats": [ 1, 20, 27 ],
-			"meta": { "generator": "^AsciiDoc ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "^AsciiDoc ([\\d.]+)\\;version:\\1" },
 			"env": "^asciidoc$"
 		},
 		"ATG Web Commerce": {
 			"cats": [ 6 ],
-			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d.]+))?\\;version:\\2" },
 			"html": "<[^>]+_DARGS"
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence([^>]+>Atlassian Confluence</a> ([\\d\\.]+))?\\;version:\\2",
+			"html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence([^>]+>Atlassian Confluence</a> ([\\d.]+))?\\;version:\\2",
 			"headers": { "X-Confluence-Request-Time": ".*" },
 			"meta": { "confluence-request-time": ".*" },
 			"implies": "Java"
@@ -167,7 +167,7 @@
 		},
 		"AWStats": {
 			"cats": [ 10 ],
-			"meta": { "generator": "AWStats ([\\d\\.]+( \\(build [\\d\\.]+\\))?)\\;version:\\1" },
+			"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/\">[a-z]+</a>(v([\\d\\.]+))?\\;version:\\2",
+			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(v([\\d.]+))?\\;version:\\2",
 			"implies": "PHP"
 		},
 		"BIGACE": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BIGACE ([\\d\\.]+)\\;version:\\1" },
+			"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 ver\\. ([\\d\\.b]+)\\;version:\\1",
+			"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 ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "BrowserCMS ([\\d.]+)\\;version:\\1" },
 			"implies": "Ruby"
 		},
 		"Bugzilla": {
@@ -266,9 +266,9 @@
 		},
 		"Chamilo": {
 			"cats": [ 21 ],
-			"html": "\">Chamilo ([\\d\\.]+)</a>\\;version:\\1",
-			"meta": { "generator": "Chamilo ([\\d\\.]+)\\;version:\\1" },
-			"headers": { "X-Powered-By": "Chamilo ([\\d\\.]+)\\;version:\\1" },
+			"html": "\">Chamilo ([\\d.]+)</a>\\;version:\\1",
+			"meta": { "generator": "Chamilo ([\\d.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "Chamilo ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Chartbeat": {
@@ -278,7 +278,7 @@
 		},
 		"Cherokee": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee/([\\d\\.]+)\\;version:\\1" }
+			"headers": { "Server": "Cherokee/([\\d.]+)\\;version:\\1" }
 		},
 		"CKEditor": {
 			"cats": [ 24 ],
@@ -313,7 +313,7 @@
 		},
 		"CMSimple": {
 			"cats": [ 1 ],
-			"meta": { "generator": "CMSimple( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "CMSimple( [\\d.]+)?\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"CO2Stats": {
@@ -338,7 +338,7 @@
 		"Concrete5": {
 			"cats": [ 1 ],
 			"script": "concrete/js/",
-			"meta": { "generator": "concrete5 - ([\\d\\.ab]+)\\;version:\\1" },
+			"meta": { "generator": "concrete5 - ([\\d.ab]+)\\;version:\\1" },
 			"env": "^CCM_IMAGE_PATH$",
 			"implies": "PHP"
 		},
@@ -354,12 +354,12 @@
 		},
 		"Contenido": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contenido ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Contenido ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Contens": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contensis CMS Version ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Contensis CMS Version ([\\d.]+)\\;version:\\1" },
 			"implies": [ "Java", "CFML" ]
 		},
 		"ConversionLab": {
@@ -368,7 +368,7 @@
 		},
 		"Coppermine": {
 			"cats": [ 7 ],
-			"html": "<!--Coppermine Photo Gallery ([\\d\\.]+)\\;version:\\1",
+			"html": "<!--Coppermine Photo Gallery ([\\d.]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Cosmoshop": {
@@ -382,11 +382,11 @@
 		},
 		"CouchDB": {
 			"cats": [ 22 ],
-			"headers": { "Server": "CouchDB/([\\d\\.]+)\\;version:\\1" }
+			"headers": { "Server": "CouchDB/([\\d.]+)\\;version:\\1" }
 		},
 		"cPanel": {
 			"cats": [ 9 ],
-			"headers": { "Server": "cpsrvd/([\\d\\.]+)\\;version:\\1" },
+			"headers": { "Server": "cpsrvd/([\\d.]+)\\;version:\\1" },
 			"html": "<!-- cPanel"
 		},
 		"CPG Dragonfly": {
@@ -428,13 +428,13 @@
 		},
 		"Dancer": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Perl Dancer ([\\d\\.]+)\\;version:\\1", "Server": "Perl Dancer ([\\d\\.]+)\\;version:\\1" },
+			"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 ([\\d\\.]+)\\;version:\\1" },
-			"meta": { "generator": "Danneo CMS ([\\d\\.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "CMS Danneo ([\\d.]+)\\;version:\\1" },
+			"meta": { "generator": "Danneo CMS ([\\d.]+)\\;version:\\1" },
 			"implies": [ "Apache", "PHP" ]
 		},
 		"dashCommerce": {
@@ -449,7 +449,7 @@
 		},
 		"David Webbox": {
 			"cats": [ 22 ],
-			"headers": { "Server": "David-WebBox/([\\d\\.a]+ \\(\\d+\\))\\;version:\\1" }
+			"headers": { "Server": "David-WebBox/([\\d.a]+ \\(\\d+\\))\\;version:\\1" }
 		},
 		"Debian": {
 			"cats": [ 28 ],
@@ -474,7 +474,7 @@
 		"DirectAdmin": {
 			"cats": [ 9 ],
 			"html": "<a[^>]+>DirectAdmin</a> Web Control Panel",
-			"headers": { "Server": "DirectAdmin Daemon v([\\d\\.]+)\\;version:\\1" },
+			"headers": { "Server": "DirectAdmin Daemon v([\\d.]+)\\;version:\\1" },
 			"implies": [ "PHP", "Apache" ]
 		},
 		"Disqus": {
@@ -485,7 +485,7 @@
 		},
 		"Django": {
 			"cats": [ 18 ],
-			"html": "(powered by <a[^>]+>Django ?([\\d\\.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z0-9]{32}\" type=\"hidden\"></div>)\\;version:\\2",
+			"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"
 		},
@@ -497,7 +497,7 @@
 		},
 		"Dojo": {
 			"cats": [ 12 ],
-			"script": "([\\d\\.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
+			"script": "([\\d.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
 			"env": "^dojo$"
 		},
 		"Dokeos": {
@@ -523,7 +523,7 @@
 		},
 		"Doxygen": {
 			"cats": [ 4 ],
-			"html": "(<!-- Generated by Doxygen|<link[^>]+doxygen.css)"
+			"html": "(<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\1"
 		},
 		"DreamWeaver": {
 			"cats": [ 20 ],
@@ -533,7 +533,7 @@
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
 			"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
-			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
+			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": "PHP"
 		},
@@ -544,36 +544,40 @@
 		},
 		"Dynamicweb": {
 			"cats": [ 1, 6, 10 ],
-			"meta": { "generator": "Dynamicweb" },
+			"meta": { "generator": "Dynamicweb ([\\d.]+)\\;version:\\1" },
 			"headers": { "Set-Cookie": "Dynamicweb=" },
 			"implies": "Microsoft ASP.NET"
 		},
 		"e107": {
 			"cats": [ 1 ],
 			"script": "e107\\.js",
+			"headers": { "Set-Cookie": "e107_td[^;]+=" },
 			"implies": "PHP"
 		},
 		"EdgeCast": {
 			"cats": [ 31 ],
-			"headers": { "Server": "^ECS " }
+			"headers": { "Server": "^ECS" }
 		},
 		"Embedthis-http": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Embedthis-http" }
+			"headers": { "Server": "Embedthis-http(/([\\d.]+))?\\;version:\\2" }
 		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
+			"headers": { "Set-Cookie": "EPi(Trace|Server)[^;]*=" },
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
 			"cats": [ 19 ],
-			"meta": { "generator": "EPrints" },
+			"meta": { "generator": "EPrints ([\\d.]+)\\;version:\\1" },
+			"env": "^EPJS_menu_template$",
 			"implies": "Perl"
 		},
 		"eSyndiCat": {
 			"cats": [ 1 ],
 			"headers": { "X-Drectory-Script": "^eSyndiCat" },
+			"env": "^esyndicat$",
 			"implies": [ "PHP" ]
 		},
 		"Exhibit": {
@@ -604,23 +608,25 @@
 		},
 		"Fact Finder": {
 			"cats": [ 29 ],
-			"html": "/images/fact-finder\\.gif|ViewParametricSearch|factfinder|Suggest\\.ff",
-			"url": "ViewParametricSearch|factfinder|ffsuggest"
+			"html": "<!-- Factfinder",
+			"script": "Suggest\\.ff",
+			"url": "/ViewParametricSearch|ffsuggest\\.[a-z]htm"
 		},
 		"FAST ESP": {
 			"cats": [ 29 ],
-			"html": "fastsearch|searchProfile=|searchCategory=",
-			"url": "esppublished|searchProfile=|searchCategory="
+			"html": "<form[^>]+id=\"fastsearch\""
 		},
 		"FAST Search for SharePoint": {
 			"cats": [ 29 ],
 			"url": "Pages/SearchResults\\.aspx\\?k=",
+			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
 		"FlexCMP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
-			"headers": { "X-Powered-By": "FlexCMP" }
+			"html": "<!--[^>]+FlexCMP[^>v]+v\\. ([\\d.]+)\\;version:\\1",
+			"headers": { "X-Powered-By": "FlexCMP.+\\[v\\. ([\\d.]+)\\;version:\\1", "X-Flex-Lang": ".+" }
 		},
 		"FluxBB": {
 			"cats": [ 2 ],
@@ -628,20 +634,22 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform|Powered by <a href=[^>]+flyspray\\.org)"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform)",
+			"headers": { "Set-Cookie": "flyspray_project=" }
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
-			"headers": { "Server": "FreeBSD" }
+			"headers": { "Server": "FreeBSD( ([\\d.]+))?\\;version:\\2" }
 		},
 		"FrontPage": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Microsoft FrontPage(\\s([\\d\\.]+))?\\;version:\\2" },
+			"meta": { "generator": "Microsoft FrontPage(\\s([\\d.]+))?\\;version:\\2" },
 			"html": "<html[^>]+urn:schemas-microsoft-com:office:office"
 		},
 		"FWP": {
 			"cats": [ 6 ],
-			"meta": { "generator": "FWP Shop" }
+			"meta": { "generator": "FWP Shop" },
+			"html": "<!--\\s+FwP Systems"
 		},
 		"Gallery": {
 			"cats": [ 7 ],
@@ -655,6 +663,7 @@
 		},
 		"Gauges": {
 			"cats": [ 10 ],
+			"headers": { "Set-Cookie": "_gauges_[^;]+=" },
 			"html": "t\\.src = '//secure\\.gaug\\.es/track\\.js",
 			"env": "^_gauges$"
 		},
@@ -664,7 +673,7 @@
 		},
 		"Get Satisfaction": {
 			"cats": [ 13 ],
-			"html": "var feedback_widget = new GSFN\\.feedback_widget\\(feedback_widget_options\\)"
+			"env": "^feedback_widget$"
 		},
 		"GetSimple CMS": {
 			"cats": [ 1 ],
@@ -698,11 +707,11 @@
 		},
 		"Google Maps": {
 			"cats": [ 35 ],
-			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
+			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
 		},
 		"Google PageSpeed": {
 			"cats": [ 23, 33 ],
-			"headers": { "X-Mod-Pagespeed": ".*" }
+			"headers": { "X-Mod-Pagespeed": "([\\d.]+)\\;version:\\1" }
 		},
 		"Google Sites": {
 			"cats": [ 1 ],
@@ -723,7 +732,9 @@
 		},
 		"Graffiti CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Graffiti CMS" }
+			"meta": { "generator": "Graffiti CMS ([^\"]+)\\;version:\\1" },
+			"script": "/graffiti.js",
+			"headers": { "Set-Cookie": "graffitibot[^;]=" }
 		},
 		"Gravatar": {
 			"cats": [ 19 ],
@@ -740,7 +751,8 @@
 		},
 		"GX WebManager": {
 			"cats": [ 1 ],
-			"meta": { "generator": "GX WebManager" }
+			"meta": { "generator": "GX WebManager( ([\\d.]+))?\\;version:\\2" },
+			"html": "<!--\\s+Powered by GX"
 		},
 		"Handlebars": {
 			"cats": [ 12 ],
@@ -748,7 +760,7 @@
 		},
 		"Hiawatha": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Hiawatha" }
+			"headers": { "Server": "Hiawatha v([\\d.]+)\\;version:\\1" }
 		},
 		"Highcharts": {
 			"cats": [ 25 ],
@@ -761,10 +773,12 @@
 		},
 		"Hotaru CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Hotaru CMS" }
+			"meta": { "generator": "Hotaru CMS" },
+			"headers": { "Set-Cookie": "hotaru_mobile=" }
 		},
-		"Hubspot": {
+		"HubSpot": {
 			"cats": [ 32 ],
+			"html": "<!-- Start of Async HubSpot",
 			"env": "^(_hsq|hubspot)$"
 		},
 		"Hybris": {
@@ -775,11 +789,11 @@
 		},
 		"IBM HTTP Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "IBM_HTTP_Server" }
+			"headers": { "Server": "IBM_HTTP_Server(/([\\d.]+))?\\;version:\\2" }
 		},
 		"IBM WebSphere Portal": {
 			"cats": [ 1 ],
-			"headers": { "IBM-Web2-Location": ".*" },
+			"headers": { "IBM-Web2-Location": ".*", "Itx-Generated-Timestamp": ".+" },
 			"url": "/wps/",
 			"implies": "Java"
 		},
@@ -790,19 +804,19 @@
 		},
 		"IIS": {
 			"cats": [ 22 ],
-			"headers": { "Server": "IIS\\/?([\\d\\.]+)?\\;version:\\1" },
+			"headers": { "Server": "IIS(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Windows Server"
 		},
 		"ImpressCMS": {
 			"cats": [ 1 ],
 			"script": "include/linkexternal\\.js",
 			"meta": { "generator": "ImpressCMS" },
-			"headers": { "X-Powered-By": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS", "Set-Cookie": "ICMSession[^;]+=" },
 			"implies": "PHP"
 		},
 		"ImpressPages": {
 			"cats": [ 1 ],
-			"meta": { "generator": "ImpressPages" },
+			"meta": { "generator": "ImpressPages CMS ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Indexhibit": {
@@ -813,26 +827,26 @@
 		},
 		"InstantCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "InstantCMS" }
+			"meta": { "generator": "InstantCMS" },
+			"headers": { "Set-Cookie": "InstantCMS\\[logdate\\]=" }
 		},
 		"Intershop": {
 			"cats": [ 6 ],
-			"url": "is-bin|INTERSHOP",
 			"script": "is-bin|INTERSHOP"
 		},
 		"IPB": {
 			"cats": [ 2 ],
 			"script": "jscripts/ips_",
-			"env": "^IPBoard$",
+			"env": "^(IPBoard$|ipb_var)",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
 		"iWeb": {
 			"cats": [ 20 ],
-			"meta": { "generator": "^iWeb( [\\d\\.]+)?\\;version:\\1" }
+			"meta": { "generator": "^iWeb( [\\d.]+)?\\;version:\\1" }
 		},
 		"JAlbum": {
 			"cats": [ 7 ],
-			"meta": { "generator": "JAlbum( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "JAlbum( [\\d.]+)?\\;version:\\1" },
 			"implies": "Java"
 		},
 		"Jalios": {
@@ -850,17 +864,17 @@
 		},
 		"JavaServer Faces": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "JSF(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "JSF(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"JavaServer Pages": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "JSP(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "JSP(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"Java Servlet": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Servlet(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "Servlet(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"Jirafe": {
@@ -879,10 +893,10 @@
 		},
 		"Joomla": {
 			"cats": [ 1 ],
-			"url": "option=com_\\;confidence:50",
-			"meta": { "generator": "Joomla" },
+			"url": "option=com_",
+			"meta": { "generator": "Joomla!( ([\\d.]+))?\\;version:\\2" },
 			"html": "(<div[^>]+id=\"wrapper_r\"|<[^>]+(feed|components)/com_|<table[^>]+class=\"pill)\\;confidence:50",
-			"headers": { "X-Content-Encoded-By": "Joomla" },
+			"headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" },
 			"env": "^jcomments$",
 			"implies": "PHP"
 		},
@@ -898,21 +912,22 @@
 		},
 		"jQuery": {
 			"cats": [ 12 ],
-			"script": [ "jquery(\\-|\\.)([\\d\\.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d\\.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
+			"script": [ "jquery(\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
 			"env": "^jQuery$"
 		},
 		"jQuery Mobile": {
 			"cats": [ 26 ],
-			"script": "jquery\\.mobile.*\\.js",
+			"script": "jquery\\.mobile(-([\\d.]+rc\\d))?.*\\.js(\\?ver=([\\d.]+))?\\;version:\\2",
 			"implies": "jQuery"
 		},
 		"jQuery Sparklines": {
 			"cats": [ 25 ],
-			"script": "jquery\\.sparkline.*\\.js"
+			"script": "jquery\\.sparkline.*\\.js",
+			"implies": "jQuery"
 		},
 		"jQuery UI": {
 			"cats": [ 12 ],
-			"script": "jquery-ui.*\\.js",
+			"script": "jqueryui/([\\d.]+)\\.js\\;version:\\1",
 			"implies": "jQuery"
 		},
 		"JS Charts": {
@@ -922,11 +937,12 @@
 		},
 		"JTL Shop": {
 			"cats": [ 6 ],
-			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)"
+			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)",
+			"headers": { "Set-Cookie": "JTLSHOP=" }
 		},
 		"K2": {
 			"cats": [ 19 ],
-			"html": "<!-- JoomlaWorks \"K2\"",
+			"html": "<!--( JoomlaWorks \"K2\"| Start K2)",
 			"env": "^K2RatingURL$",
 			"implies": "Joomla"
 		},
@@ -944,11 +960,12 @@
 		},
 		"Kentico CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Kentico CMS" }
+			"meta": { "generator": "Kentico CMS ([\\d.R]+ \\(build [\\d.]+\\))\\;version:\\1" },
+			"headers": { "Set-Cookie": "CMSPreferredCulture=" }
 		},
 		"KineticJS": {
 			"cats": [ 25 ],
-			"script": "kinetic(-v?([\\d\\.]+))?\\.js\\;version:\\2"
+			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2"
 		},
 		"KISSmetrics": {
 			"cats": [ 10 ],
@@ -956,16 +973,18 @@
 		},
 		"Koego": {
 			"cats": [ 10 ],
-			"script": "tracking\\.koego\\.com/end/ego\\.js"
+			"script": "tracking\\.koego\\.com/end/ego\\.js",
+			"env": "^ego_domains$"
 		},
 		"Kohana": {
 			"cats": [ 18 ],
-			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana" },
+			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana Framework ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Kolibri CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Kolibri" }
+			"meta": { "generator": "Kolibri" },
+			"headers": { "X-Powered-By": "Kolibri" }
 		},
 		"Komodo CMS": {
 			"cats": [ 1 ],
@@ -974,17 +993,19 @@
 		},
 		"Koobi": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Koobi" }
+			"meta": { "generator": "Koobi" },
+			"html": "<!--[^K>-]+Koobi ([a-z\\d.]+)\\;version:\\1"
 		},
 		"LEPTON": {
 			"cats": [ 1 ],
 			"meta": { "generator": "LEPTON" },
+			"headers": { "Set-Cookie": "lep\\d+sessionid=" },
 			"implies": "PHP"
 		},
 		"Liferay": {
 			"cats": [ 1 ],
 			"env": "^Liferay$",
-			"headers": { "Liferay-Portal": ".*" }
+			"headers": { "Liferay-Portal": "[a-z\\s]+([\\d.]+)\\;version:\\1" }
 		},
 		"LightMon Engine": {
 			"cats": [ 1 ],
@@ -993,7 +1014,7 @@
 		},
 		"lighttpd": {
 			"cats": [ 22 ],
-			"headers": { "Server": "lighttpd(/([\\d\\.]+))?\\;version:\\2" }
+			"headers": { "Server": "lighttpd(/([\\d.]+))?\\;version:\\2" }
 		},
 		"LimeSurvey": {
 			"cats": [ 19 ],
@@ -1008,11 +1029,11 @@
 			"script": "addtoany\\.com/menu/page\\.js",
 			"env": "^a2apage_init$"
 		},
-    "Locomotive": {
-      "cats": [ 1 ],
-      "html": "<link[^>]*/sites/[a-zA-Z0-9]{24}/theme/stylesheets/.*>",
-      "implies": [ "Ruby on Rails", "MongoDB" ]
-    },
+		"Locomotive": {
+			"cats": [ 1 ],
+			"html": "<link[^>]*/sites/[a-zA-Z0-9]{24}/theme/stylesheets/.*>",
+			"implies": [ "Ruby on Rails", "MongoDB" ]
+		},
 		"Lotus Domino": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Lotus-Domino" }
@@ -1086,44 +1107,44 @@
 		},
 		"Modernizr": {
 			"cats": [ 12 ],
-			"script": "modernizr(-([\\d\\.]*[\\d]))?.*\\.js\\;version:\\2",
+			"script": "modernizr(-([\\d.]*[\\d]))?.*\\.js\\;version:\\2",
 			"env": "^Modernizr$"
 		},
 		"MODx": {
 			"cats": [ 1 ],
 			"html": "<a[^>]+>Powered by MODx</a>|<(link|script)[^>]+assets/snippets/",
 			"env": "^MODX_MEDIA_PATH$",
-			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}" },
 			"implies": "PHP"
 		},
 		"mod_fastcgi": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_fastcgi(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_fastcgi(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Apache"
 		},
 		"mod_python": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_python(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_python(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Python", "Apache" ]
 		},
 		"mod_rack": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rack(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_rack(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_rails": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rails(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_rails(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_ssl": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_ssl(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_ssl(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Apache"
 		},
 		"mod_wsgi": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_wsgi(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_wsgi(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Python\\;confidence:50", "Apache" ]
 		},
 		"MoinMoin": {
@@ -1192,7 +1213,7 @@
 			"meta": { "generator": "Mynetcap" }
 		},
 		"MySQL": {
-			"cats": [ 24 ]
+			"cats": [ 34 ]
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
@@ -1247,7 +1268,7 @@
 		"OpenGrok": {
 			"cats": [ 19 ],
 			"headers": { "Set-Cookie": "OpenGrok" },
-			"meta": { "generator": "OpenGrok( v?([\\d\\.]+))?\\;version:\\2" },
+			"meta": { "generator": "OpenGrok( v?([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"OpenGSE": {
@@ -1266,7 +1287,7 @@
 		},
 		"OpenSSL": {
 			"cats": [ 33 ],
-			"headers": { "Server": "OpenSSL(/([\\d\\.]+[a-z]?))?\\;version:\\2" }
+			"headers": { "Server": "OpenSSL(/([\\d.]+[a-z]?))?\\;version:\\2" }
 		},
 		"OpenText Web Solutions": {
 			"cats": [ 1 ],
@@ -1288,7 +1309,7 @@
 		"osCommerce": {
 			"cats": [ 6 ],
 			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\"[^>]*infoBoxHeading)",
-			"headers": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
+			"headers": { "Set-Cookie": "osCsid=" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1327,7 +1348,7 @@
 		},
 		"PHP": {
 			"cats": [ 27 ],
-			"headers": { "Server": "php/?([\\d\\.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d\\.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
+			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
 		"phpAlbum":	{
@@ -1434,7 +1455,7 @@
 		},
 		"Prototype": {
 			"cats": [ 12 ],
-			"script": "(prototype|protoaculous)(-([\\d\\.]*[\\d]))?.*\\.js\\;version:\\3",
+			"script": "(prototype|protoaculous)(-([\\d.]*[\\d]))?.*\\.js\\;version:\\3",
 			"env": "^Prototype$"
 		},
 		"Protovis": {
@@ -1449,7 +1470,7 @@
 		},
 		"Python": {
 			"cats": [ 27 ],
-			"headers": { "Server": "(^|\\s)Python(/([\\d\\.]+))?\\;version:\\3" }
+			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;version:\\3" }
 		},
 		"Quantcast": {
 			"cats": [ 10 ],
@@ -1543,7 +1564,7 @@
 		},
 		"Sarka-SPIP": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(^|\\s)Sarka-SPIP(\\s([\\d\\.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
+			"meta": { "generator": "(^|\\s)Sarka-SPIP(\\s([\\d.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
 			"headers": { "X-Spip-Cache": ".*" },
 			"implies": "SPIP"
 		},
@@ -1651,7 +1672,7 @@
 		},
 		"SPIP": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(^|\\s)SPIP(\\s([\\d\\.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
+			"meta": { "generator": "(^|\\s)SPIP(\\s([\\d.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
 			"headers": { "X-Spip-Cache": ".*" }
 		},
     "Spree": {
@@ -1697,11 +1718,11 @@
 		},
 		"Supersized": {
 			"cats": [ 7, 25 ],
-			"script": "supersized(\\.([\\d\\.]*[\\d]))?.*\\.js\\;version:\\2"
+			"script": "supersized(\\.([\\d.]*[\\d]))?.*\\.js\\;version:\\2"
 		},
 		"SUSE": {
 			"cats": [ 28 ],
-			"headers": { "Server": "SUSE(/?\\s?-?([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "SUSE(/?\\s?-?([\\d\\.]+))?\\;version:\\2" }
+			"headers": { "Server": "SUSE(/?\\s?-?([\\d.]+))?\\;version:\\2", "X-Powered-By": "SUSE(/?\\s?-?([\\d.]+))?\\;version:\\2" }
 		},
 		"Scientific Linux": {
 			"cats": [ 28 ],
@@ -1963,7 +1984,7 @@
 		},
 		"WordPress": {
 			"cats": [ 1, 11 ],
-			"meta": { "generator": "WordPress( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "WordPress( [\\d.]+)?\\;version:\\1" },
 			"html": "<link rel=\"stylesheet\" [^>]+wp-content",
 			"env": "^wp_username$",
 			"implies": "PHP"
@@ -1985,7 +2006,7 @@
 			"cats": [ 2 ],
 			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
 		},
-		"XiTi": {
+		"AT Internet": {
 			"cats": [ 10 ],
 			"html": "(<[^>]+src=\"[^>]+xiti\\.com/hit\\.xiti)",
 			"env": "^Xt_"
diff --git a/drivers/firefox-jetpack/images/icons/SPDY.png b/drivers/firefox-jetpack/images/icons/SPDY.png
index 44b57f9291fea297b430c5f649dbfd3523828891..5ac3599a59d058024a94371fa6bd046e7ce34703 100644
GIT binary patch
delta 525
zcmV+o0`mQY1*HU#BYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xB+4lLy~iu3>g0kTO%K~y-)ol{LLBVibRW~OPYOIA{(5?SHU*p+W2
zA`(*KC>v)Y4!Ds`L}Cvv>|y<#h-4zW;U;ks2M&aTMg2yEnSW8@H)$G;Ri&Aher0@n
zrc+zq+xxxG^S#ge2fV??*Z1*mlUCGfqj%H)h>pb&T*95G(aU}Sb1&okYvh{EFqjq~
zy2-X@JKbtA!f=Vm4a?UEYS$#)?vQhXM;ilQOUjIJh6)<zE<j?p<S#zRPCUWtSKAXM
zic`=ydjSU`#D7h#a)w2K<K_&NdG=0?#;g{zDW$o*uruKYO_S%an<+U)s_f@Dc&UzD
zfycuWP^dp3U}nhiZ&!`A)-J`D@JmK<CP(fgoGe5_U^hW<u_$&Pbv)82ywMN@->!JT
zXDuaEP&%@}c<5jNB09sD>;kyM6rZSueCidIm_<>(*MAr{qfMH4=6B7gZBA*E6%Vhn
z`o3{e)H8)Qjj>!>V?JF+#pQvx$E7K1Z#|OQ#Lv<^EVi^ChbIBlT7%-U@KN#ntV7ac
z1OR*YG^=A*;-4_Dc!ru^UG+Exu8z^)&RZXG-!auQ_U(O_=V}^E8v75Hd#5sM2PjMc
P0000<MFvhpu0mjfR}=3T

delta 620
zcmV-y0+aov1cU{UBYy%*Nkl<ZILoEe&r8z*9L8}E;vxD2LOSGMAc<|O=oX{Y{Lz+%
z9s(^1gcuRhv?yUslWk2yr!%qCwFTBTS4hp$?W@zN^Vgyj6(g##HeLQMbG|!toQBfj
zIX!${r{@y~#QjfpEhZ-?oi>|ot*WYOt*EGIdf$NAZ1!3#7JpPK6*)OM!F>T;U0sQ_
zH8lqw=(LoVDN!gC2i0oz5u?%Q(r7e7Nl8h<u7Js8s&Kn{H~IuOE{~UYZV#Qd7d+JK
zqBVLwTCEnjT;8-JU^bf@r#^mQz~^V~%OZ2%BKT%P*e4>`J+nM+Zs1~G?vhk0JsbnH
zwzi(}jSNM527f15UfTp9@Z%@`K$Py8EpF6Uv5hTKsk#%D%Veix07HG9L+Br5KD@!|
zZ&>*S;VtloK$@P3#lMZ-y@KO)59iX(+GBwBwkJV{YmC4$%q_tD3h0dONW>DFoHIO|
z27?gcsW(8LEGrNLv@}0j>UcZOR0!OkU?dEeFXfXf%YVi`3k@Ss=Ut~|D2yyKEfND%
zS5<mDodONL-?2`?%NZ~YuVUy8(mW1o58NLGd;fb*osbN~0OjRniszO#48j7sH-C?e
zqo5sziaw|t*+k{trn=%5DJe&<#Q=qcg$c@=r4tTo2fF@suD=R%w>yH`wMy9_sJu}u
zW)l)o>Sb6`Qqs;tQYw{+SBtOs8f!IJoqaS4pQ#tVV(S^^-tAJv$5MS_k?7Drr(94_
z5HFL-inB7(UHQ4^Ll?3$f+vrQUCGJG#Uha?e$UUe*ZcvYYTh<yw(95r0000<MNUMn
GLSTYhE+RGn

diff --git a/drivers/firefox-jetpack/images/icons/UNIX.png b/drivers/firefox-jetpack/images/icons/UNIX.png
index ebb6deb3424f603cd5f52aa2141310898a70e852..44d58989a7bd1f2e810e4ad70fc9b725e76a28b3 100644
GIT binary patch
delta 549
zcmV+=0^0qE0<r{<7=H)`0000V^Z#K0000JJOGiWi{{a60|De66lK=n!32;bRa{vGf
z6951U69E94oEQKA00(qQO+^RY0uTT-D@GuiSO5S4zez+vR5;6h(?4hvaTEve&&5#E
zK?0GZO9eA@)q)Vain<jnRHD#99g3q<aq42FP@G(Cg?1>|P=BFA-MSX4P|z+;a-f3B
z4+C+~fWtZT?s^H;x4p;ve&4_Ei*%eZWN|x=!)%z*cN5fn^xg~0j)rriGC|yq<8Ui{
zl88W43VI@4^t6UaDrG0s!)J*|1C1=$$cUO!b#JX%C}XMv{j91D_-hs<mW+F6&Xjf2
z_H8?B+-(m}Mt|6J;Fn2tsh-GuiD=V-IaAgwxZp8JL`LknYx;PEFD5mm8t7(~bDJ||
z!>%8eida+Xo9o9NTr_LU%VJ^OEU9g@G+JLhE09|vl4w;-hzn4@wEPOW&8z7R#o&@F
zl>(I8p(s9#&s#S=kUU~<!0(=N#vB|vA=tNFCW&9i_kSgs9`d5UeXYc=;+-Pc(+Zss
ztmwNT^~ZLhkxmFAi&D>Zvkvart%gnrR<ppeBU_%8#!9W|YufSCp{frUmxx?GUiyiY
zSM`hgZ`d{J+Q4o~V`|#bc4ttD^J+F7sCx5X@Hvaxo}Mmc*z-UuYhSUOlV^G~_)O7h
n@9c>g6CSRLj7fcmf4%cxhe4A>#J%Tq00000NkvXXu0mjff?WQr

delta 248
zcmV<U00;lF1c(BV7=Hu<0002(-QrRJ001yhOjJb#69fb{1O!L~1y=<HX$3TMG)R6(
zRE$(>n`?)thnKmRth=nR$FR=T&gtjr{QmrUgW!Sy005IoL_t&t*JJqq|KGBV`~Uwl
z{QqYtY$OX}d=OH0F`N%%{Qv(`^bf~>hOf%{|Kq1P<uiPAk#YS0O~gf>VUvsT|4$|^
zx(o|l9RL4UanWK}<RW+ee~OC~!y?D`JpUh==rBC={b=<6XR|!RC;LWc@i~qD4FC1N
ynYg%!15N(g?Be1Gvf?X~F~rjUzuP;2&Hw<-nMoNsrklF}0000<MNUMnLSTa4dwR<N

diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index edf39bd60..ea5db6e67 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 ([\\d\\.]+);version:\\1" }
+			"meta": { "generator": "2z project ([\\d.]+);version:\\1" }
 		},
 		"3dCart": {
 			"cats": [ 1, 6 ],
@@ -77,7 +77,7 @@
 		},
 		"Adobe GoLive": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Adobe GoLive(\\s([\\d\\.]+))?\\;version:\\2" }
+			"meta": { "generator": "Adobe GoLive(\\s([\\d.]+))?\\;version:\\2" }
 		},
 		"Advanced Web Stats": {
 			"cats": [ 10 ],
@@ -90,7 +90,7 @@
 		},
 		"Amaya": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Amaya( V?([\\d\\.]+[a-z]))?\\;version:\\2" }
+			"meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" }
 		},
 		"Ametys": {
 			"cats": [ 1 ],
@@ -101,12 +101,12 @@
 		"Amiro.CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Amiro" },
-			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d\\.]+)\\;version:\\2",
+			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d.]+)\\;version:\\2",
 			"implies": "PHP"
 		},
 		"AMPcms": {
 			"cats": [ 1 ],
-			"headers": { "X-AMP-Version": "([\\d\\.]+)\\;version:\\1", "Set-Cookie": "^AMP=" },
+			"headers": { "X-AMP-Version": "([\\d.]+)\\;version:\\1", "Set-Cookie": "^AMP=" },
 			"env": "^amp_js_init$",
 			"implies": "PHP"
 		},
@@ -116,11 +116,11 @@
 		},
 		"AOLserver": {
 			"cats": [ 22 ],
-			"headers": { "Server": "AOLserver/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "AOLserver/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache": {
 			"cats": [ 22 ],
-			"headers": { "Server": "(Apache($|/([\\d\\.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
+			"headers": { "Server": "(Apache($|/([\\d.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
 		},
 		"Apache JSPWiki": {
 			"cats": [ 8 ],
@@ -130,11 +130,11 @@
 		},
 		"Apache Tomcat": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "Apache-Coyote/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "ATS/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "ATS/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Arc Forum": {
 			"cats": [ 2 ],
@@ -142,17 +142,17 @@
 		},
 		"AsciiDoc": {
 			"cats": [ 1, 20, 27 ],
-			"meta": { "generator": "^AsciiDoc ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "^AsciiDoc ([\\d.]+)\\;version:\\1" },
 			"env": "^asciidoc$"
 		},
 		"ATG Web Commerce": {
 			"cats": [ 6 ],
-			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d.]+))?\\;version:\\2" },
 			"html": "<[^>]+_DARGS"
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence([^>]+>Atlassian Confluence</a> ([\\d\\.]+))?\\;version:\\2",
+			"html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence([^>]+>Atlassian Confluence</a> ([\\d.]+))?\\;version:\\2",
 			"headers": { "X-Confluence-Request-Time": ".*" },
 			"meta": { "confluence-request-time": ".*" },
 			"implies": "Java"
@@ -167,7 +167,7 @@
 		},
 		"AWStats": {
 			"cats": [ 10 ],
-			"meta": { "generator": "AWStats ([\\d\\.]+( \\(build [\\d\\.]+\\))?)\\;version:\\1" },
+			"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/\">[a-z]+</a>(v([\\d\\.]+))?\\;version:\\2",
+			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(v([\\d.]+))?\\;version:\\2",
 			"implies": "PHP"
 		},
 		"BIGACE": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BIGACE ([\\d\\.]+)\\;version:\\1" },
+			"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 ver\\. ([\\d\\.b]+)\\;version:\\1",
+			"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 ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "BrowserCMS ([\\d.]+)\\;version:\\1" },
 			"implies": "Ruby"
 		},
 		"Bugzilla": {
@@ -266,9 +266,9 @@
 		},
 		"Chamilo": {
 			"cats": [ 21 ],
-			"html": "\">Chamilo ([\\d\\.]+)</a>\\;version:\\1",
-			"meta": { "generator": "Chamilo ([\\d\\.]+)\\;version:\\1" },
-			"headers": { "X-Powered-By": "Chamilo ([\\d\\.]+)\\;version:\\1" },
+			"html": "\">Chamilo ([\\d.]+)</a>\\;version:\\1",
+			"meta": { "generator": "Chamilo ([\\d.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "Chamilo ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Chartbeat": {
@@ -278,7 +278,7 @@
 		},
 		"Cherokee": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee/([\\d\\.]+)\\;version:\\1" }
+			"headers": { "Server": "Cherokee/([\\d.]+)\\;version:\\1" }
 		},
 		"CKEditor": {
 			"cats": [ 24 ],
@@ -313,7 +313,7 @@
 		},
 		"CMSimple": {
 			"cats": [ 1 ],
-			"meta": { "generator": "CMSimple( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "CMSimple( [\\d.]+)?\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"CO2Stats": {
@@ -338,7 +338,7 @@
 		"Concrete5": {
 			"cats": [ 1 ],
 			"script": "concrete/js/",
-			"meta": { "generator": "concrete5 - ([\\d\\.ab]+)\\;version:\\1" },
+			"meta": { "generator": "concrete5 - ([\\d.ab]+)\\;version:\\1" },
 			"env": "^CCM_IMAGE_PATH$",
 			"implies": "PHP"
 		},
@@ -354,12 +354,12 @@
 		},
 		"Contenido": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contenido ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Contenido ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Contens": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contensis CMS Version ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Contensis CMS Version ([\\d.]+)\\;version:\\1" },
 			"implies": [ "Java", "CFML" ]
 		},
 		"ConversionLab": {
@@ -368,7 +368,7 @@
 		},
 		"Coppermine": {
 			"cats": [ 7 ],
-			"html": "<!--Coppermine Photo Gallery ([\\d\\.]+)\\;version:\\1",
+			"html": "<!--Coppermine Photo Gallery ([\\d.]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Cosmoshop": {
@@ -382,11 +382,11 @@
 		},
 		"CouchDB": {
 			"cats": [ 22 ],
-			"headers": { "Server": "CouchDB/([\\d\\.]+)\\;version:\\1" }
+			"headers": { "Server": "CouchDB/([\\d.]+)\\;version:\\1" }
 		},
 		"cPanel": {
 			"cats": [ 9 ],
-			"headers": { "Server": "cpsrvd/([\\d\\.]+)\\;version:\\1" },
+			"headers": { "Server": "cpsrvd/([\\d.]+)\\;version:\\1" },
 			"html": "<!-- cPanel"
 		},
 		"CPG Dragonfly": {
@@ -428,13 +428,13 @@
 		},
 		"Dancer": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Perl Dancer ([\\d\\.]+)\\;version:\\1", "Server": "Perl Dancer ([\\d\\.]+)\\;version:\\1" },
+			"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 ([\\d\\.]+)\\;version:\\1" },
-			"meta": { "generator": "Danneo CMS ([\\d\\.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "CMS Danneo ([\\d.]+)\\;version:\\1" },
+			"meta": { "generator": "Danneo CMS ([\\d.]+)\\;version:\\1" },
 			"implies": [ "Apache", "PHP" ]
 		},
 		"dashCommerce": {
@@ -449,7 +449,7 @@
 		},
 		"David Webbox": {
 			"cats": [ 22 ],
-			"headers": { "Server": "David-WebBox/([\\d\\.a]+ \\(\\d+\\))\\;version:\\1" }
+			"headers": { "Server": "David-WebBox/([\\d.a]+ \\(\\d+\\))\\;version:\\1" }
 		},
 		"Debian": {
 			"cats": [ 28 ],
@@ -474,7 +474,7 @@
 		"DirectAdmin": {
 			"cats": [ 9 ],
 			"html": "<a[^>]+>DirectAdmin</a> Web Control Panel",
-			"headers": { "Server": "DirectAdmin Daemon v([\\d\\.]+)\\;version:\\1" },
+			"headers": { "Server": "DirectAdmin Daemon v([\\d.]+)\\;version:\\1" },
 			"implies": [ "PHP", "Apache" ]
 		},
 		"Disqus": {
@@ -485,7 +485,7 @@
 		},
 		"Django": {
 			"cats": [ 18 ],
-			"html": "(powered by <a[^>]+>Django ?([\\d\\.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z0-9]{32}\" type=\"hidden\"></div>)\\;version:\\2",
+			"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"
 		},
@@ -497,7 +497,7 @@
 		},
 		"Dojo": {
 			"cats": [ 12 ],
-			"script": "([\\d\\.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
+			"script": "([\\d.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
 			"env": "^dojo$"
 		},
 		"Dokeos": {
@@ -523,7 +523,7 @@
 		},
 		"Doxygen": {
 			"cats": [ 4 ],
-			"html": "(<!-- Generated by Doxygen|<link[^>]+doxygen.css)"
+			"html": "(<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\1"
 		},
 		"DreamWeaver": {
 			"cats": [ 20 ],
@@ -533,7 +533,7 @@
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
 			"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
-			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
+			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": "PHP"
 		},
@@ -544,36 +544,40 @@
 		},
 		"Dynamicweb": {
 			"cats": [ 1, 6, 10 ],
-			"meta": { "generator": "Dynamicweb" },
+			"meta": { "generator": "Dynamicweb ([\\d.]+)\\;version:\\1" },
 			"headers": { "Set-Cookie": "Dynamicweb=" },
 			"implies": "Microsoft ASP.NET"
 		},
 		"e107": {
 			"cats": [ 1 ],
 			"script": "e107\\.js",
+			"headers": { "Set-Cookie": "e107_td[^;]+=" },
 			"implies": "PHP"
 		},
 		"EdgeCast": {
 			"cats": [ 31 ],
-			"headers": { "Server": "^ECS " }
+			"headers": { "Server": "^ECS" }
 		},
 		"Embedthis-http": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Embedthis-http" }
+			"headers": { "Server": "Embedthis-http(/([\\d.]+))?\\;version:\\2" }
 		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
+			"headers": { "Set-Cookie": "EPi(Trace|Server)[^;]*=" },
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
 			"cats": [ 19 ],
-			"meta": { "generator": "EPrints" },
+			"meta": { "generator": "EPrints ([\\d.]+)\\;version:\\1" },
+			"env": "^EPJS_menu_template$",
 			"implies": "Perl"
 		},
 		"eSyndiCat": {
 			"cats": [ 1 ],
 			"headers": { "X-Drectory-Script": "^eSyndiCat" },
+			"env": "^esyndicat$",
 			"implies": [ "PHP" ]
 		},
 		"Exhibit": {
@@ -604,23 +608,25 @@
 		},
 		"Fact Finder": {
 			"cats": [ 29 ],
-			"html": "/images/fact-finder\\.gif|ViewParametricSearch|factfinder|Suggest\\.ff",
-			"url": "ViewParametricSearch|factfinder|ffsuggest"
+			"html": "<!-- Factfinder",
+			"script": "Suggest\\.ff",
+			"url": "/ViewParametricSearch|ffsuggest\\.[a-z]htm"
 		},
 		"FAST ESP": {
 			"cats": [ 29 ],
-			"html": "fastsearch|searchProfile=|searchCategory=",
-			"url": "esppublished|searchProfile=|searchCategory="
+			"html": "<form[^>]+id=\"fastsearch\""
 		},
 		"FAST Search for SharePoint": {
 			"cats": [ 29 ],
 			"url": "Pages/SearchResults\\.aspx\\?k=",
+			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
 		"FlexCMP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
-			"headers": { "X-Powered-By": "FlexCMP" }
+			"html": "<!--[^>]+FlexCMP[^>v]+v\\. ([\\d.]+)\\;version:\\1",
+			"headers": { "X-Powered-By": "FlexCMP.+\\[v\\. ([\\d.]+)\\;version:\\1", "X-Flex-Lang": ".+" }
 		},
 		"FluxBB": {
 			"cats": [ 2 ],
@@ -628,20 +634,22 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform|Powered by <a href=[^>]+flyspray\\.org)"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform)",
+			"headers": { "Set-Cookie": "flyspray_project=" }
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
-			"headers": { "Server": "FreeBSD" }
+			"headers": { "Server": "FreeBSD( ([\\d.]+))?\\;version:\\2" }
 		},
 		"FrontPage": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Microsoft FrontPage(\\s([\\d\\.]+))?\\;version:\\2" },
+			"meta": { "generator": "Microsoft FrontPage(\\s([\\d.]+))?\\;version:\\2" },
 			"html": "<html[^>]+urn:schemas-microsoft-com:office:office"
 		},
 		"FWP": {
 			"cats": [ 6 ],
-			"meta": { "generator": "FWP Shop" }
+			"meta": { "generator": "FWP Shop" },
+			"html": "<!--\\s+FwP Systems"
 		},
 		"Gallery": {
 			"cats": [ 7 ],
@@ -655,6 +663,7 @@
 		},
 		"Gauges": {
 			"cats": [ 10 ],
+			"headers": { "Set-Cookie": "_gauges_[^;]+=" },
 			"html": "t\\.src = '//secure\\.gaug\\.es/track\\.js",
 			"env": "^_gauges$"
 		},
@@ -664,7 +673,7 @@
 		},
 		"Get Satisfaction": {
 			"cats": [ 13 ],
-			"html": "var feedback_widget = new GSFN\\.feedback_widget\\(feedback_widget_options\\)"
+			"env": "^feedback_widget$"
 		},
 		"GetSimple CMS": {
 			"cats": [ 1 ],
@@ -698,11 +707,11 @@
 		},
 		"Google Maps": {
 			"cats": [ 35 ],
-			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
+			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
 		},
 		"Google PageSpeed": {
 			"cats": [ 23, 33 ],
-			"headers": { "X-Mod-Pagespeed": ".*" }
+			"headers": { "X-Mod-Pagespeed": "([\\d.]+)\\;version:\\1" }
 		},
 		"Google Sites": {
 			"cats": [ 1 ],
@@ -723,7 +732,9 @@
 		},
 		"Graffiti CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Graffiti CMS" }
+			"meta": { "generator": "Graffiti CMS ([^\"]+)\\;version:\\1" },
+			"script": "/graffiti.js",
+			"headers": { "Set-Cookie": "graffitibot[^;]=" }
 		},
 		"Gravatar": {
 			"cats": [ 19 ],
@@ -740,7 +751,8 @@
 		},
 		"GX WebManager": {
 			"cats": [ 1 ],
-			"meta": { "generator": "GX WebManager" }
+			"meta": { "generator": "GX WebManager( ([\\d.]+))?\\;version:\\2" },
+			"html": "<!--\\s+Powered by GX"
 		},
 		"Handlebars": {
 			"cats": [ 12 ],
@@ -748,7 +760,7 @@
 		},
 		"Hiawatha": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Hiawatha" }
+			"headers": { "Server": "Hiawatha v([\\d.]+)\\;version:\\1" }
 		},
 		"Highcharts": {
 			"cats": [ 25 ],
@@ -761,10 +773,12 @@
 		},
 		"Hotaru CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Hotaru CMS" }
+			"meta": { "generator": "Hotaru CMS" },
+			"headers": { "Set-Cookie": "hotaru_mobile=" }
 		},
-		"Hubspot": {
+		"HubSpot": {
 			"cats": [ 32 ],
+			"html": "<!-- Start of Async HubSpot",
 			"env": "^(_hsq|hubspot)$"
 		},
 		"Hybris": {
@@ -775,11 +789,11 @@
 		},
 		"IBM HTTP Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "IBM_HTTP_Server" }
+			"headers": { "Server": "IBM_HTTP_Server(/([\\d.]+))?\\;version:\\2" }
 		},
 		"IBM WebSphere Portal": {
 			"cats": [ 1 ],
-			"headers": { "IBM-Web2-Location": ".*" },
+			"headers": { "IBM-Web2-Location": ".*", "Itx-Generated-Timestamp": ".+" },
 			"url": "/wps/",
 			"implies": "Java"
 		},
@@ -790,19 +804,19 @@
 		},
 		"IIS": {
 			"cats": [ 22 ],
-			"headers": { "Server": "IIS\\/?([\\d\\.]+)?\\;version:\\1" },
+			"headers": { "Server": "IIS(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Windows Server"
 		},
 		"ImpressCMS": {
 			"cats": [ 1 ],
 			"script": "include/linkexternal\\.js",
 			"meta": { "generator": "ImpressCMS" },
-			"headers": { "X-Powered-By": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS", "Set-Cookie": "ICMSession[^;]+=" },
 			"implies": "PHP"
 		},
 		"ImpressPages": {
 			"cats": [ 1 ],
-			"meta": { "generator": "ImpressPages" },
+			"meta": { "generator": "ImpressPages CMS ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Indexhibit": {
@@ -813,26 +827,26 @@
 		},
 		"InstantCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "InstantCMS" }
+			"meta": { "generator": "InstantCMS" },
+			"headers": { "Set-Cookie": "InstantCMS\\[logdate\\]=" }
 		},
 		"Intershop": {
 			"cats": [ 6 ],
-			"url": "is-bin|INTERSHOP",
 			"script": "is-bin|INTERSHOP"
 		},
 		"IPB": {
 			"cats": [ 2 ],
 			"script": "jscripts/ips_",
-			"env": "^IPBoard$",
+			"env": "^(IPBoard$|ipb_var)",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
 		"iWeb": {
 			"cats": [ 20 ],
-			"meta": { "generator": "^iWeb( [\\d\\.]+)?\\;version:\\1" }
+			"meta": { "generator": "^iWeb( [\\d.]+)?\\;version:\\1" }
 		},
 		"JAlbum": {
 			"cats": [ 7 ],
-			"meta": { "generator": "JAlbum( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "JAlbum( [\\d.]+)?\\;version:\\1" },
 			"implies": "Java"
 		},
 		"Jalios": {
@@ -850,17 +864,17 @@
 		},
 		"JavaServer Faces": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "JSF(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "JSF(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"JavaServer Pages": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "JSP(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "JSP(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"Java Servlet": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Servlet(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "Servlet(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"Jirafe": {
@@ -879,10 +893,10 @@
 		},
 		"Joomla": {
 			"cats": [ 1 ],
-			"url": "option=com_\\;confidence:50",
-			"meta": { "generator": "Joomla" },
+			"url": "option=com_",
+			"meta": { "generator": "Joomla!( ([\\d.]+))?\\;version:\\2" },
 			"html": "(<div[^>]+id=\"wrapper_r\"|<[^>]+(feed|components)/com_|<table[^>]+class=\"pill)\\;confidence:50",
-			"headers": { "X-Content-Encoded-By": "Joomla" },
+			"headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" },
 			"env": "^jcomments$",
 			"implies": "PHP"
 		},
@@ -898,21 +912,22 @@
 		},
 		"jQuery": {
 			"cats": [ 12 ],
-			"script": [ "jquery(\\-|\\.)([\\d\\.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d\\.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
+			"script": [ "jquery(\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
 			"env": "^jQuery$"
 		},
 		"jQuery Mobile": {
 			"cats": [ 26 ],
-			"script": "jquery\\.mobile.*\\.js",
+			"script": "jquery\\.mobile(-([\\d.]+rc\\d))?.*\\.js(\\?ver=([\\d.]+))?\\;version:\\2",
 			"implies": "jQuery"
 		},
 		"jQuery Sparklines": {
 			"cats": [ 25 ],
-			"script": "jquery\\.sparkline.*\\.js"
+			"script": "jquery\\.sparkline.*\\.js",
+			"implies": "jQuery"
 		},
 		"jQuery UI": {
 			"cats": [ 12 ],
-			"script": "jquery-ui.*\\.js",
+			"script": "jqueryui/([\\d.]+)\\.js\\;version:\\1",
 			"implies": "jQuery"
 		},
 		"JS Charts": {
@@ -922,11 +937,12 @@
 		},
 		"JTL Shop": {
 			"cats": [ 6 ],
-			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)"
+			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)",
+			"headers": { "Set-Cookie": "JTLSHOP=" }
 		},
 		"K2": {
 			"cats": [ 19 ],
-			"html": "<!-- JoomlaWorks \"K2\"",
+			"html": "<!--( JoomlaWorks \"K2\"| Start K2)",
 			"env": "^K2RatingURL$",
 			"implies": "Joomla"
 		},
@@ -944,11 +960,12 @@
 		},
 		"Kentico CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Kentico CMS" }
+			"meta": { "generator": "Kentico CMS ([\\d.R]+ \\(build [\\d.]+\\))\\;version:\\1" },
+			"headers": { "Set-Cookie": "CMSPreferredCulture=" }
 		},
 		"KineticJS": {
 			"cats": [ 25 ],
-			"script": "kinetic(-v?([\\d\\.]+))?\\.js\\;version:\\2"
+			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2"
 		},
 		"KISSmetrics": {
 			"cats": [ 10 ],
@@ -956,16 +973,18 @@
 		},
 		"Koego": {
 			"cats": [ 10 ],
-			"script": "tracking\\.koego\\.com/end/ego\\.js"
+			"script": "tracking\\.koego\\.com/end/ego\\.js",
+			"env": "^ego_domains$"
 		},
 		"Kohana": {
 			"cats": [ 18 ],
-			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana" },
+			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana Framework ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Kolibri CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Kolibri" }
+			"meta": { "generator": "Kolibri" },
+			"headers": { "X-Powered-By": "Kolibri" }
 		},
 		"Komodo CMS": {
 			"cats": [ 1 ],
@@ -974,17 +993,19 @@
 		},
 		"Koobi": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Koobi" }
+			"meta": { "generator": "Koobi" },
+			"html": "<!--[^K>-]+Koobi ([a-z\\d.]+)\\;version:\\1"
 		},
 		"LEPTON": {
 			"cats": [ 1 ],
 			"meta": { "generator": "LEPTON" },
+			"headers": { "Set-Cookie": "lep\\d+sessionid=" },
 			"implies": "PHP"
 		},
 		"Liferay": {
 			"cats": [ 1 ],
 			"env": "^Liferay$",
-			"headers": { "Liferay-Portal": ".*" }
+			"headers": { "Liferay-Portal": "[a-z\\s]+([\\d.]+)\\;version:\\1" }
 		},
 		"LightMon Engine": {
 			"cats": [ 1 ],
@@ -993,7 +1014,7 @@
 		},
 		"lighttpd": {
 			"cats": [ 22 ],
-			"headers": { "Server": "lighttpd(/([\\d\\.]+))?\\;version:\\2" }
+			"headers": { "Server": "lighttpd(/([\\d.]+))?\\;version:\\2" }
 		},
 		"LimeSurvey": {
 			"cats": [ 19 ],
@@ -1008,11 +1029,11 @@
 			"script": "addtoany\\.com/menu/page\\.js",
 			"env": "^a2apage_init$"
 		},
-    "Locomotive": {
-      "cats": [ 1 ],
-      "html": "<link[^>]*/sites/[a-zA-Z0-9]{24}/theme/stylesheets/.*>",
-      "implies": [ "Ruby on Rails", "MongoDB" ]
-    },
+		"Locomotive": {
+			"cats": [ 1 ],
+			"html": "<link[^>]*/sites/[a-zA-Z0-9]{24}/theme/stylesheets/.*>",
+			"implies": [ "Ruby on Rails", "MongoDB" ]
+		},
 		"Lotus Domino": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Lotus-Domino" }
@@ -1086,44 +1107,44 @@
 		},
 		"Modernizr": {
 			"cats": [ 12 ],
-			"script": "modernizr(-([\\d\\.]*[\\d]))?.*\\.js\\;version:\\2",
+			"script": "modernizr(-([\\d.]*[\\d]))?.*\\.js\\;version:\\2",
 			"env": "^Modernizr$"
 		},
 		"MODx": {
 			"cats": [ 1 ],
 			"html": "<a[^>]+>Powered by MODx</a>|<(link|script)[^>]+assets/snippets/",
 			"env": "^MODX_MEDIA_PATH$",
-			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}" },
 			"implies": "PHP"
 		},
 		"mod_fastcgi": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_fastcgi(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_fastcgi(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Apache"
 		},
 		"mod_python": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_python(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_python(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Python", "Apache" ]
 		},
 		"mod_rack": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rack(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_rack(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_rails": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rails(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_rails(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_ssl": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_ssl(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_ssl(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Apache"
 		},
 		"mod_wsgi": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_wsgi(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_wsgi(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Python\\;confidence:50", "Apache" ]
 		},
 		"MoinMoin": {
@@ -1192,7 +1213,7 @@
 			"meta": { "generator": "Mynetcap" }
 		},
 		"MySQL": {
-			"cats": [ 24 ]
+			"cats": [ 34 ]
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
@@ -1247,7 +1268,7 @@
 		"OpenGrok": {
 			"cats": [ 19 ],
 			"headers": { "Set-Cookie": "OpenGrok" },
-			"meta": { "generator": "OpenGrok( v?([\\d\\.]+))?\\;version:\\2" },
+			"meta": { "generator": "OpenGrok( v?([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"OpenGSE": {
@@ -1266,7 +1287,7 @@
 		},
 		"OpenSSL": {
 			"cats": [ 33 ],
-			"headers": { "Server": "OpenSSL(/([\\d\\.]+[a-z]?))?\\;version:\\2" }
+			"headers": { "Server": "OpenSSL(/([\\d.]+[a-z]?))?\\;version:\\2" }
 		},
 		"OpenText Web Solutions": {
 			"cats": [ 1 ],
@@ -1288,7 +1309,7 @@
 		"osCommerce": {
 			"cats": [ 6 ],
 			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\"[^>]*infoBoxHeading)",
-			"headers": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
+			"headers": { "Set-Cookie": "osCsid=" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1327,7 +1348,7 @@
 		},
 		"PHP": {
 			"cats": [ 27 ],
-			"headers": { "Server": "php/?([\\d\\.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d\\.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
+			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
 		"phpAlbum":	{
@@ -1434,7 +1455,7 @@
 		},
 		"Prototype": {
 			"cats": [ 12 ],
-			"script": "(prototype|protoaculous)(-([\\d\\.]*[\\d]))?.*\\.js\\;version:\\3",
+			"script": "(prototype|protoaculous)(-([\\d.]*[\\d]))?.*\\.js\\;version:\\3",
 			"env": "^Prototype$"
 		},
 		"Protovis": {
@@ -1449,7 +1470,7 @@
 		},
 		"Python": {
 			"cats": [ 27 ],
-			"headers": { "Server": "(^|\\s)Python(/([\\d\\.]+))?\\;version:\\3" }
+			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;version:\\3" }
 		},
 		"Quantcast": {
 			"cats": [ 10 ],
@@ -1543,7 +1564,7 @@
 		},
 		"Sarka-SPIP": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(^|\\s)Sarka-SPIP(\\s([\\d\\.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
+			"meta": { "generator": "(^|\\s)Sarka-SPIP(\\s([\\d.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
 			"headers": { "X-Spip-Cache": ".*" },
 			"implies": "SPIP"
 		},
@@ -1651,7 +1672,7 @@
 		},
 		"SPIP": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(^|\\s)SPIP(\\s([\\d\\.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
+			"meta": { "generator": "(^|\\s)SPIP(\\s([\\d.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
 			"headers": { "X-Spip-Cache": ".*" }
 		},
     "Spree": {
@@ -1697,11 +1718,11 @@
 		},
 		"Supersized": {
 			"cats": [ 7, 25 ],
-			"script": "supersized(\\.([\\d\\.]*[\\d]))?.*\\.js\\;version:\\2"
+			"script": "supersized(\\.([\\d.]*[\\d]))?.*\\.js\\;version:\\2"
 		},
 		"SUSE": {
 			"cats": [ 28 ],
-			"headers": { "Server": "SUSE(/?\\s?-?([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "SUSE(/?\\s?-?([\\d\\.]+))?\\;version:\\2" }
+			"headers": { "Server": "SUSE(/?\\s?-?([\\d.]+))?\\;version:\\2", "X-Powered-By": "SUSE(/?\\s?-?([\\d.]+))?\\;version:\\2" }
 		},
 		"Scientific Linux": {
 			"cats": [ 28 ],
@@ -1963,7 +1984,7 @@
 		},
 		"WordPress": {
 			"cats": [ 1, 11 ],
-			"meta": { "generator": "WordPress( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "WordPress( [\\d.]+)?\\;version:\\1" },
 			"html": "<link rel=\"stylesheet\" [^>]+wp-content",
 			"env": "^wp_username$",
 			"implies": "PHP"
@@ -1985,7 +2006,7 @@
 			"cats": [ 2 ],
 			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
 		},
-		"XiTi": {
+		"AT Internet": {
 			"cats": [ 10 ],
 			"html": "(<[^>]+src=\"[^>]+xiti\\.com/hit\\.xiti)",
 			"env": "^Xt_"
diff --git a/drivers/firefox/skin/images/icons/SPDY.png b/drivers/firefox/skin/images/icons/SPDY.png
index 44b57f9291fea297b430c5f649dbfd3523828891..5ac3599a59d058024a94371fa6bd046e7ce34703 100644
GIT binary patch
delta 525
zcmV+o0`mQY1*HU#BYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xB+4lLy~iu3>g0kTO%K~y-)ol{LLBVibRW~OPYOIA{(5?SHU*p+W2
zA`(*KC>v)Y4!Ds`L}Cvv>|y<#h-4zW;U;ks2M&aTMg2yEnSW8@H)$G;Ri&Aher0@n
zrc+zq+xxxG^S#ge2fV??*Z1*mlUCGfqj%H)h>pb&T*95G(aU}Sb1&okYvh{EFqjq~
zy2-X@JKbtA!f=Vm4a?UEYS$#)?vQhXM;ilQOUjIJh6)<zE<j?p<S#zRPCUWtSKAXM
zic`=ydjSU`#D7h#a)w2K<K_&NdG=0?#;g{zDW$o*uruKYO_S%an<+U)s_f@Dc&UzD
zfycuWP^dp3U}nhiZ&!`A)-J`D@JmK<CP(fgoGe5_U^hW<u_$&Pbv)82ywMN@->!JT
zXDuaEP&%@}c<5jNB09sD>;kyM6rZSueCidIm_<>(*MAr{qfMH4=6B7gZBA*E6%Vhn
z`o3{e)H8)Qjj>!>V?JF+#pQvx$E7K1Z#|OQ#Lv<^EVi^ChbIBlT7%-U@KN#ntV7ac
z1OR*YG^=A*;-4_Dc!ru^UG+Exu8z^)&RZXG-!auQ_U(O_=V}^E8v75Hd#5sM2PjMc
P0000<MFvhpu0mjfR}=3T

delta 620
zcmV-y0+aov1cU{UBYy%*Nkl<ZILoEe&r8z*9L8}E;vxD2LOSGMAc<|O=oX{Y{Lz+%
z9s(^1gcuRhv?yUslWk2yr!%qCwFTBTS4hp$?W@zN^Vgyj6(g##HeLQMbG|!toQBfj
zIX!${r{@y~#QjfpEhZ-?oi>|ot*WYOt*EGIdf$NAZ1!3#7JpPK6*)OM!F>T;U0sQ_
zH8lqw=(LoVDN!gC2i0oz5u?%Q(r7e7Nl8h<u7Js8s&Kn{H~IuOE{~UYZV#Qd7d+JK
zqBVLwTCEnjT;8-JU^bf@r#^mQz~^V~%OZ2%BKT%P*e4>`J+nM+Zs1~G?vhk0JsbnH
zwzi(}jSNM527f15UfTp9@Z%@`K$Py8EpF6Uv5hTKsk#%D%Veix07HG9L+Br5KD@!|
zZ&>*S;VtloK$@P3#lMZ-y@KO)59iX(+GBwBwkJV{YmC4$%q_tD3h0dONW>DFoHIO|
z27?gcsW(8LEGrNLv@}0j>UcZOR0!OkU?dEeFXfXf%YVi`3k@Ss=Ut~|D2yyKEfND%
zS5<mDodONL-?2`?%NZ~YuVUy8(mW1o58NLGd;fb*osbN~0OjRniszO#48j7sH-C?e
zqo5sziaw|t*+k{trn=%5DJe&<#Q=qcg$c@=r4tTo2fF@suD=R%w>yH`wMy9_sJu}u
zW)l)o>Sb6`Qqs;tQYw{+SBtOs8f!IJoqaS4pQ#tVV(S^^-tAJv$5MS_k?7Drr(94_
z5HFL-inB7(UHQ4^Ll?3$f+vrQUCGJG#Uha?e$UUe*ZcvYYTh<yw(95r0000<MNUMn
GLSTYhE+RGn

diff --git a/drivers/firefox/skin/images/icons/UNIX.png b/drivers/firefox/skin/images/icons/UNIX.png
index ebb6deb3424f603cd5f52aa2141310898a70e852..44d58989a7bd1f2e810e4ad70fc9b725e76a28b3 100644
GIT binary patch
delta 549
zcmV+=0^0qE0<r{<7=H)`0000V^Z#K0000JJOGiWi{{a60|De66lK=n!32;bRa{vGf
z6951U69E94oEQKA00(qQO+^RY0uTT-D@GuiSO5S4zez+vR5;6h(?4hvaTEve&&5#E
zK?0GZO9eA@)q)Vain<jnRHD#99g3q<aq42FP@G(Cg?1>|P=BFA-MSX4P|z+;a-f3B
z4+C+~fWtZT?s^H;x4p;ve&4_Ei*%eZWN|x=!)%z*cN5fn^xg~0j)rriGC|yq<8Ui{
zl88W43VI@4^t6UaDrG0s!)J*|1C1=$$cUO!b#JX%C}XMv{j91D_-hs<mW+F6&Xjf2
z_H8?B+-(m}Mt|6J;Fn2tsh-GuiD=V-IaAgwxZp8JL`LknYx;PEFD5mm8t7(~bDJ||
z!>%8eida+Xo9o9NTr_LU%VJ^OEU9g@G+JLhE09|vl4w;-hzn4@wEPOW&8z7R#o&@F
zl>(I8p(s9#&s#S=kUU~<!0(=N#vB|vA=tNFCW&9i_kSgs9`d5UeXYc=;+-Pc(+Zss
ztmwNT^~ZLhkxmFAi&D>Zvkvart%gnrR<ppeBU_%8#!9W|YufSCp{frUmxx?GUiyiY
zSM`hgZ`d{J+Q4o~V`|#bc4ttD^J+F7sCx5X@Hvaxo}Mmc*z-UuYhSUOlV^G~_)O7h
n@9c>g6CSRLj7fcmf4%cxhe4A>#J%Tq00000NkvXXu0mjff?WQr

delta 248
zcmV<U00;lF1c(BV7=Hu<0002(-QrRJ001yhOjJb#69fb{1O!L~1y=<HX$3TMG)R6(
zRE$(>n`?)thnKmRth=nR$FR=T&gtjr{QmrUgW!Sy005IoL_t&t*JJqq|KGBV`~Uwl
z{QqYtY$OX}d=OH0F`N%%{Qv(`^bf~>hOf%{|Kq1P<uiPAk#YS0O~gf>VUvsT|4$|^
zx(o|l9RL4UanWK}<RW+ee~OC~!y?D`JpUh==rBC={b=<6XR|!RC;LWc@i~qD4FC1N
ynYg%!15N(g?Be1Gvf?X~F~rjUzuP;2&Hw<-nMoNsrklF}0000<MNUMnLSTa4dwR<N

diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index edf39bd60..ea5db6e67 100755
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -52,7 +52,7 @@
 		},
 		"2z Project": {
 			"cats": [ 1 ],
-			"meta": { "generator": "2z project ([\\d\\.]+);version:\\1" }
+			"meta": { "generator": "2z project ([\\d.]+);version:\\1" }
 		},
 		"3dCart": {
 			"cats": [ 1, 6 ],
@@ -77,7 +77,7 @@
 		},
 		"Adobe GoLive": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Adobe GoLive(\\s([\\d\\.]+))?\\;version:\\2" }
+			"meta": { "generator": "Adobe GoLive(\\s([\\d.]+))?\\;version:\\2" }
 		},
 		"Advanced Web Stats": {
 			"cats": [ 10 ],
@@ -90,7 +90,7 @@
 		},
 		"Amaya": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Amaya( V?([\\d\\.]+[a-z]))?\\;version:\\2" }
+			"meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" }
 		},
 		"Ametys": {
 			"cats": [ 1 ],
@@ -101,12 +101,12 @@
 		"Amiro.CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Amiro" },
-			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d\\.]+)\\;version:\\2",
+			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d.]+)\\;version:\\2",
 			"implies": "PHP"
 		},
 		"AMPcms": {
 			"cats": [ 1 ],
-			"headers": { "X-AMP-Version": "([\\d\\.]+)\\;version:\\1", "Set-Cookie": "^AMP=" },
+			"headers": { "X-AMP-Version": "([\\d.]+)\\;version:\\1", "Set-Cookie": "^AMP=" },
 			"env": "^amp_js_init$",
 			"implies": "PHP"
 		},
@@ -116,11 +116,11 @@
 		},
 		"AOLserver": {
 			"cats": [ 22 ],
-			"headers": { "Server": "AOLserver/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "AOLserver/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache": {
 			"cats": [ 22 ],
-			"headers": { "Server": "(Apache($|/([\\d\\.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
+			"headers": { "Server": "(Apache($|/([\\d.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
 		},
 		"Apache JSPWiki": {
 			"cats": [ 8 ],
@@ -130,11 +130,11 @@
 		},
 		"Apache Tomcat": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "Apache-Coyote/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "ATS/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "ATS/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Arc Forum": {
 			"cats": [ 2 ],
@@ -142,17 +142,17 @@
 		},
 		"AsciiDoc": {
 			"cats": [ 1, 20, 27 ],
-			"meta": { "generator": "^AsciiDoc ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "^AsciiDoc ([\\d.]+)\\;version:\\1" },
 			"env": "^asciidoc$"
 		},
 		"ATG Web Commerce": {
 			"cats": [ 6 ],
-			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d.]+))?\\;version:\\2" },
 			"html": "<[^>]+_DARGS"
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence([^>]+>Atlassian Confluence</a> ([\\d\\.]+))?\\;version:\\2",
+			"html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence([^>]+>Atlassian Confluence</a> ([\\d.]+))?\\;version:\\2",
 			"headers": { "X-Confluence-Request-Time": ".*" },
 			"meta": { "confluence-request-time": ".*" },
 			"implies": "Java"
@@ -167,7 +167,7 @@
 		},
 		"AWStats": {
 			"cats": [ 10 ],
-			"meta": { "generator": "AWStats ([\\d\\.]+( \\(build [\\d\\.]+\\))?)\\;version:\\1" },
+			"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/\">[a-z]+</a>(v([\\d\\.]+))?\\;version:\\2",
+			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(v([\\d.]+))?\\;version:\\2",
 			"implies": "PHP"
 		},
 		"BIGACE": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BIGACE ([\\d\\.]+)\\;version:\\1" },
+			"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 ver\\. ([\\d\\.b]+)\\;version:\\1",
+			"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 ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "BrowserCMS ([\\d.]+)\\;version:\\1" },
 			"implies": "Ruby"
 		},
 		"Bugzilla": {
@@ -266,9 +266,9 @@
 		},
 		"Chamilo": {
 			"cats": [ 21 ],
-			"html": "\">Chamilo ([\\d\\.]+)</a>\\;version:\\1",
-			"meta": { "generator": "Chamilo ([\\d\\.]+)\\;version:\\1" },
-			"headers": { "X-Powered-By": "Chamilo ([\\d\\.]+)\\;version:\\1" },
+			"html": "\">Chamilo ([\\d.]+)</a>\\;version:\\1",
+			"meta": { "generator": "Chamilo ([\\d.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "Chamilo ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Chartbeat": {
@@ -278,7 +278,7 @@
 		},
 		"Cherokee": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee/([\\d\\.]+)\\;version:\\1" }
+			"headers": { "Server": "Cherokee/([\\d.]+)\\;version:\\1" }
 		},
 		"CKEditor": {
 			"cats": [ 24 ],
@@ -313,7 +313,7 @@
 		},
 		"CMSimple": {
 			"cats": [ 1 ],
-			"meta": { "generator": "CMSimple( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "CMSimple( [\\d.]+)?\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"CO2Stats": {
@@ -338,7 +338,7 @@
 		"Concrete5": {
 			"cats": [ 1 ],
 			"script": "concrete/js/",
-			"meta": { "generator": "concrete5 - ([\\d\\.ab]+)\\;version:\\1" },
+			"meta": { "generator": "concrete5 - ([\\d.ab]+)\\;version:\\1" },
 			"env": "^CCM_IMAGE_PATH$",
 			"implies": "PHP"
 		},
@@ -354,12 +354,12 @@
 		},
 		"Contenido": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contenido ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Contenido ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Contens": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contensis CMS Version ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Contensis CMS Version ([\\d.]+)\\;version:\\1" },
 			"implies": [ "Java", "CFML" ]
 		},
 		"ConversionLab": {
@@ -368,7 +368,7 @@
 		},
 		"Coppermine": {
 			"cats": [ 7 ],
-			"html": "<!--Coppermine Photo Gallery ([\\d\\.]+)\\;version:\\1",
+			"html": "<!--Coppermine Photo Gallery ([\\d.]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Cosmoshop": {
@@ -382,11 +382,11 @@
 		},
 		"CouchDB": {
 			"cats": [ 22 ],
-			"headers": { "Server": "CouchDB/([\\d\\.]+)\\;version:\\1" }
+			"headers": { "Server": "CouchDB/([\\d.]+)\\;version:\\1" }
 		},
 		"cPanel": {
 			"cats": [ 9 ],
-			"headers": { "Server": "cpsrvd/([\\d\\.]+)\\;version:\\1" },
+			"headers": { "Server": "cpsrvd/([\\d.]+)\\;version:\\1" },
 			"html": "<!-- cPanel"
 		},
 		"CPG Dragonfly": {
@@ -428,13 +428,13 @@
 		},
 		"Dancer": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Perl Dancer ([\\d\\.]+)\\;version:\\1", "Server": "Perl Dancer ([\\d\\.]+)\\;version:\\1" },
+			"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 ([\\d\\.]+)\\;version:\\1" },
-			"meta": { "generator": "Danneo CMS ([\\d\\.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "CMS Danneo ([\\d.]+)\\;version:\\1" },
+			"meta": { "generator": "Danneo CMS ([\\d.]+)\\;version:\\1" },
 			"implies": [ "Apache", "PHP" ]
 		},
 		"dashCommerce": {
@@ -449,7 +449,7 @@
 		},
 		"David Webbox": {
 			"cats": [ 22 ],
-			"headers": { "Server": "David-WebBox/([\\d\\.a]+ \\(\\d+\\))\\;version:\\1" }
+			"headers": { "Server": "David-WebBox/([\\d.a]+ \\(\\d+\\))\\;version:\\1" }
 		},
 		"Debian": {
 			"cats": [ 28 ],
@@ -474,7 +474,7 @@
 		"DirectAdmin": {
 			"cats": [ 9 ],
 			"html": "<a[^>]+>DirectAdmin</a> Web Control Panel",
-			"headers": { "Server": "DirectAdmin Daemon v([\\d\\.]+)\\;version:\\1" },
+			"headers": { "Server": "DirectAdmin Daemon v([\\d.]+)\\;version:\\1" },
 			"implies": [ "PHP", "Apache" ]
 		},
 		"Disqus": {
@@ -485,7 +485,7 @@
 		},
 		"Django": {
 			"cats": [ 18 ],
-			"html": "(powered by <a[^>]+>Django ?([\\d\\.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z0-9]{32}\" type=\"hidden\"></div>)\\;version:\\2",
+			"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"
 		},
@@ -497,7 +497,7 @@
 		},
 		"Dojo": {
 			"cats": [ 12 ],
-			"script": "([\\d\\.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
+			"script": "([\\d.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
 			"env": "^dojo$"
 		},
 		"Dokeos": {
@@ -523,7 +523,7 @@
 		},
 		"Doxygen": {
 			"cats": [ 4 ],
-			"html": "(<!-- Generated by Doxygen|<link[^>]+doxygen.css)"
+			"html": "(<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\1"
 		},
 		"DreamWeaver": {
 			"cats": [ 20 ],
@@ -533,7 +533,7 @@
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
 			"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
-			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
+			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": "PHP"
 		},
@@ -544,36 +544,40 @@
 		},
 		"Dynamicweb": {
 			"cats": [ 1, 6, 10 ],
-			"meta": { "generator": "Dynamicweb" },
+			"meta": { "generator": "Dynamicweb ([\\d.]+)\\;version:\\1" },
 			"headers": { "Set-Cookie": "Dynamicweb=" },
 			"implies": "Microsoft ASP.NET"
 		},
 		"e107": {
 			"cats": [ 1 ],
 			"script": "e107\\.js",
+			"headers": { "Set-Cookie": "e107_td[^;]+=" },
 			"implies": "PHP"
 		},
 		"EdgeCast": {
 			"cats": [ 31 ],
-			"headers": { "Server": "^ECS " }
+			"headers": { "Server": "^ECS" }
 		},
 		"Embedthis-http": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Embedthis-http" }
+			"headers": { "Server": "Embedthis-http(/([\\d.]+))?\\;version:\\2" }
 		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
+			"headers": { "Set-Cookie": "EPi(Trace|Server)[^;]*=" },
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
 			"cats": [ 19 ],
-			"meta": { "generator": "EPrints" },
+			"meta": { "generator": "EPrints ([\\d.]+)\\;version:\\1" },
+			"env": "^EPJS_menu_template$",
 			"implies": "Perl"
 		},
 		"eSyndiCat": {
 			"cats": [ 1 ],
 			"headers": { "X-Drectory-Script": "^eSyndiCat" },
+			"env": "^esyndicat$",
 			"implies": [ "PHP" ]
 		},
 		"Exhibit": {
@@ -604,23 +608,25 @@
 		},
 		"Fact Finder": {
 			"cats": [ 29 ],
-			"html": "/images/fact-finder\\.gif|ViewParametricSearch|factfinder|Suggest\\.ff",
-			"url": "ViewParametricSearch|factfinder|ffsuggest"
+			"html": "<!-- Factfinder",
+			"script": "Suggest\\.ff",
+			"url": "/ViewParametricSearch|ffsuggest\\.[a-z]htm"
 		},
 		"FAST ESP": {
 			"cats": [ 29 ],
-			"html": "fastsearch|searchProfile=|searchCategory=",
-			"url": "esppublished|searchProfile=|searchCategory="
+			"html": "<form[^>]+id=\"fastsearch\""
 		},
 		"FAST Search for SharePoint": {
 			"cats": [ 29 ],
 			"url": "Pages/SearchResults\\.aspx\\?k=",
+			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
 		"FlexCMP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
-			"headers": { "X-Powered-By": "FlexCMP" }
+			"html": "<!--[^>]+FlexCMP[^>v]+v\\. ([\\d.]+)\\;version:\\1",
+			"headers": { "X-Powered-By": "FlexCMP.+\\[v\\. ([\\d.]+)\\;version:\\1", "X-Flex-Lang": ".+" }
 		},
 		"FluxBB": {
 			"cats": [ 2 ],
@@ -628,20 +634,22 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform|Powered by <a href=[^>]+flyspray\\.org)"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform)",
+			"headers": { "Set-Cookie": "flyspray_project=" }
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
-			"headers": { "Server": "FreeBSD" }
+			"headers": { "Server": "FreeBSD( ([\\d.]+))?\\;version:\\2" }
 		},
 		"FrontPage": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Microsoft FrontPage(\\s([\\d\\.]+))?\\;version:\\2" },
+			"meta": { "generator": "Microsoft FrontPage(\\s([\\d.]+))?\\;version:\\2" },
 			"html": "<html[^>]+urn:schemas-microsoft-com:office:office"
 		},
 		"FWP": {
 			"cats": [ 6 ],
-			"meta": { "generator": "FWP Shop" }
+			"meta": { "generator": "FWP Shop" },
+			"html": "<!--\\s+FwP Systems"
 		},
 		"Gallery": {
 			"cats": [ 7 ],
@@ -655,6 +663,7 @@
 		},
 		"Gauges": {
 			"cats": [ 10 ],
+			"headers": { "Set-Cookie": "_gauges_[^;]+=" },
 			"html": "t\\.src = '//secure\\.gaug\\.es/track\\.js",
 			"env": "^_gauges$"
 		},
@@ -664,7 +673,7 @@
 		},
 		"Get Satisfaction": {
 			"cats": [ 13 ],
-			"html": "var feedback_widget = new GSFN\\.feedback_widget\\(feedback_widget_options\\)"
+			"env": "^feedback_widget$"
 		},
 		"GetSimple CMS": {
 			"cats": [ 1 ],
@@ -698,11 +707,11 @@
 		},
 		"Google Maps": {
 			"cats": [ 35 ],
-			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
+			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
 		},
 		"Google PageSpeed": {
 			"cats": [ 23, 33 ],
-			"headers": { "X-Mod-Pagespeed": ".*" }
+			"headers": { "X-Mod-Pagespeed": "([\\d.]+)\\;version:\\1" }
 		},
 		"Google Sites": {
 			"cats": [ 1 ],
@@ -723,7 +732,9 @@
 		},
 		"Graffiti CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Graffiti CMS" }
+			"meta": { "generator": "Graffiti CMS ([^\"]+)\\;version:\\1" },
+			"script": "/graffiti.js",
+			"headers": { "Set-Cookie": "graffitibot[^;]=" }
 		},
 		"Gravatar": {
 			"cats": [ 19 ],
@@ -740,7 +751,8 @@
 		},
 		"GX WebManager": {
 			"cats": [ 1 ],
-			"meta": { "generator": "GX WebManager" }
+			"meta": { "generator": "GX WebManager( ([\\d.]+))?\\;version:\\2" },
+			"html": "<!--\\s+Powered by GX"
 		},
 		"Handlebars": {
 			"cats": [ 12 ],
@@ -748,7 +760,7 @@
 		},
 		"Hiawatha": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Hiawatha" }
+			"headers": { "Server": "Hiawatha v([\\d.]+)\\;version:\\1" }
 		},
 		"Highcharts": {
 			"cats": [ 25 ],
@@ -761,10 +773,12 @@
 		},
 		"Hotaru CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Hotaru CMS" }
+			"meta": { "generator": "Hotaru CMS" },
+			"headers": { "Set-Cookie": "hotaru_mobile=" }
 		},
-		"Hubspot": {
+		"HubSpot": {
 			"cats": [ 32 ],
+			"html": "<!-- Start of Async HubSpot",
 			"env": "^(_hsq|hubspot)$"
 		},
 		"Hybris": {
@@ -775,11 +789,11 @@
 		},
 		"IBM HTTP Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "IBM_HTTP_Server" }
+			"headers": { "Server": "IBM_HTTP_Server(/([\\d.]+))?\\;version:\\2" }
 		},
 		"IBM WebSphere Portal": {
 			"cats": [ 1 ],
-			"headers": { "IBM-Web2-Location": ".*" },
+			"headers": { "IBM-Web2-Location": ".*", "Itx-Generated-Timestamp": ".+" },
 			"url": "/wps/",
 			"implies": "Java"
 		},
@@ -790,19 +804,19 @@
 		},
 		"IIS": {
 			"cats": [ 22 ],
-			"headers": { "Server": "IIS\\/?([\\d\\.]+)?\\;version:\\1" },
+			"headers": { "Server": "IIS(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Windows Server"
 		},
 		"ImpressCMS": {
 			"cats": [ 1 ],
 			"script": "include/linkexternal\\.js",
 			"meta": { "generator": "ImpressCMS" },
-			"headers": { "X-Powered-By": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS", "Set-Cookie": "ICMSession[^;]+=" },
 			"implies": "PHP"
 		},
 		"ImpressPages": {
 			"cats": [ 1 ],
-			"meta": { "generator": "ImpressPages" },
+			"meta": { "generator": "ImpressPages CMS ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Indexhibit": {
@@ -813,26 +827,26 @@
 		},
 		"InstantCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "InstantCMS" }
+			"meta": { "generator": "InstantCMS" },
+			"headers": { "Set-Cookie": "InstantCMS\\[logdate\\]=" }
 		},
 		"Intershop": {
 			"cats": [ 6 ],
-			"url": "is-bin|INTERSHOP",
 			"script": "is-bin|INTERSHOP"
 		},
 		"IPB": {
 			"cats": [ 2 ],
 			"script": "jscripts/ips_",
-			"env": "^IPBoard$",
+			"env": "^(IPBoard$|ipb_var)",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
 		"iWeb": {
 			"cats": [ 20 ],
-			"meta": { "generator": "^iWeb( [\\d\\.]+)?\\;version:\\1" }
+			"meta": { "generator": "^iWeb( [\\d.]+)?\\;version:\\1" }
 		},
 		"JAlbum": {
 			"cats": [ 7 ],
-			"meta": { "generator": "JAlbum( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "JAlbum( [\\d.]+)?\\;version:\\1" },
 			"implies": "Java"
 		},
 		"Jalios": {
@@ -850,17 +864,17 @@
 		},
 		"JavaServer Faces": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "JSF(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "JSF(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"JavaServer Pages": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "JSP(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "JSP(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"Java Servlet": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Servlet(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "Servlet(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"Jirafe": {
@@ -879,10 +893,10 @@
 		},
 		"Joomla": {
 			"cats": [ 1 ],
-			"url": "option=com_\\;confidence:50",
-			"meta": { "generator": "Joomla" },
+			"url": "option=com_",
+			"meta": { "generator": "Joomla!( ([\\d.]+))?\\;version:\\2" },
 			"html": "(<div[^>]+id=\"wrapper_r\"|<[^>]+(feed|components)/com_|<table[^>]+class=\"pill)\\;confidence:50",
-			"headers": { "X-Content-Encoded-By": "Joomla" },
+			"headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" },
 			"env": "^jcomments$",
 			"implies": "PHP"
 		},
@@ -898,21 +912,22 @@
 		},
 		"jQuery": {
 			"cats": [ 12 ],
-			"script": [ "jquery(\\-|\\.)([\\d\\.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d\\.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
+			"script": [ "jquery(\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
 			"env": "^jQuery$"
 		},
 		"jQuery Mobile": {
 			"cats": [ 26 ],
-			"script": "jquery\\.mobile.*\\.js",
+			"script": "jquery\\.mobile(-([\\d.]+rc\\d))?.*\\.js(\\?ver=([\\d.]+))?\\;version:\\2",
 			"implies": "jQuery"
 		},
 		"jQuery Sparklines": {
 			"cats": [ 25 ],
-			"script": "jquery\\.sparkline.*\\.js"
+			"script": "jquery\\.sparkline.*\\.js",
+			"implies": "jQuery"
 		},
 		"jQuery UI": {
 			"cats": [ 12 ],
-			"script": "jquery-ui.*\\.js",
+			"script": "jqueryui/([\\d.]+)\\.js\\;version:\\1",
 			"implies": "jQuery"
 		},
 		"JS Charts": {
@@ -922,11 +937,12 @@
 		},
 		"JTL Shop": {
 			"cats": [ 6 ],
-			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)"
+			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)",
+			"headers": { "Set-Cookie": "JTLSHOP=" }
 		},
 		"K2": {
 			"cats": [ 19 ],
-			"html": "<!-- JoomlaWorks \"K2\"",
+			"html": "<!--( JoomlaWorks \"K2\"| Start K2)",
 			"env": "^K2RatingURL$",
 			"implies": "Joomla"
 		},
@@ -944,11 +960,12 @@
 		},
 		"Kentico CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Kentico CMS" }
+			"meta": { "generator": "Kentico CMS ([\\d.R]+ \\(build [\\d.]+\\))\\;version:\\1" },
+			"headers": { "Set-Cookie": "CMSPreferredCulture=" }
 		},
 		"KineticJS": {
 			"cats": [ 25 ],
-			"script": "kinetic(-v?([\\d\\.]+))?\\.js\\;version:\\2"
+			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2"
 		},
 		"KISSmetrics": {
 			"cats": [ 10 ],
@@ -956,16 +973,18 @@
 		},
 		"Koego": {
 			"cats": [ 10 ],
-			"script": "tracking\\.koego\\.com/end/ego\\.js"
+			"script": "tracking\\.koego\\.com/end/ego\\.js",
+			"env": "^ego_domains$"
 		},
 		"Kohana": {
 			"cats": [ 18 ],
-			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana" },
+			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana Framework ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Kolibri CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Kolibri" }
+			"meta": { "generator": "Kolibri" },
+			"headers": { "X-Powered-By": "Kolibri" }
 		},
 		"Komodo CMS": {
 			"cats": [ 1 ],
@@ -974,17 +993,19 @@
 		},
 		"Koobi": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Koobi" }
+			"meta": { "generator": "Koobi" },
+			"html": "<!--[^K>-]+Koobi ([a-z\\d.]+)\\;version:\\1"
 		},
 		"LEPTON": {
 			"cats": [ 1 ],
 			"meta": { "generator": "LEPTON" },
+			"headers": { "Set-Cookie": "lep\\d+sessionid=" },
 			"implies": "PHP"
 		},
 		"Liferay": {
 			"cats": [ 1 ],
 			"env": "^Liferay$",
-			"headers": { "Liferay-Portal": ".*" }
+			"headers": { "Liferay-Portal": "[a-z\\s]+([\\d.]+)\\;version:\\1" }
 		},
 		"LightMon Engine": {
 			"cats": [ 1 ],
@@ -993,7 +1014,7 @@
 		},
 		"lighttpd": {
 			"cats": [ 22 ],
-			"headers": { "Server": "lighttpd(/([\\d\\.]+))?\\;version:\\2" }
+			"headers": { "Server": "lighttpd(/([\\d.]+))?\\;version:\\2" }
 		},
 		"LimeSurvey": {
 			"cats": [ 19 ],
@@ -1008,11 +1029,11 @@
 			"script": "addtoany\\.com/menu/page\\.js",
 			"env": "^a2apage_init$"
 		},
-    "Locomotive": {
-      "cats": [ 1 ],
-      "html": "<link[^>]*/sites/[a-zA-Z0-9]{24}/theme/stylesheets/.*>",
-      "implies": [ "Ruby on Rails", "MongoDB" ]
-    },
+		"Locomotive": {
+			"cats": [ 1 ],
+			"html": "<link[^>]*/sites/[a-zA-Z0-9]{24}/theme/stylesheets/.*>",
+			"implies": [ "Ruby on Rails", "MongoDB" ]
+		},
 		"Lotus Domino": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Lotus-Domino" }
@@ -1086,44 +1107,44 @@
 		},
 		"Modernizr": {
 			"cats": [ 12 ],
-			"script": "modernizr(-([\\d\\.]*[\\d]))?.*\\.js\\;version:\\2",
+			"script": "modernizr(-([\\d.]*[\\d]))?.*\\.js\\;version:\\2",
 			"env": "^Modernizr$"
 		},
 		"MODx": {
 			"cats": [ 1 ],
 			"html": "<a[^>]+>Powered by MODx</a>|<(link|script)[^>]+assets/snippets/",
 			"env": "^MODX_MEDIA_PATH$",
-			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}" },
 			"implies": "PHP"
 		},
 		"mod_fastcgi": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_fastcgi(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_fastcgi(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Apache"
 		},
 		"mod_python": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_python(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_python(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Python", "Apache" ]
 		},
 		"mod_rack": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rack(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_rack(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_rails": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rails(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_rails(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_ssl": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_ssl(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_ssl(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Apache"
 		},
 		"mod_wsgi": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_wsgi(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_wsgi(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Python\\;confidence:50", "Apache" ]
 		},
 		"MoinMoin": {
@@ -1192,7 +1213,7 @@
 			"meta": { "generator": "Mynetcap" }
 		},
 		"MySQL": {
-			"cats": [ 24 ]
+			"cats": [ 34 ]
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
@@ -1247,7 +1268,7 @@
 		"OpenGrok": {
 			"cats": [ 19 ],
 			"headers": { "Set-Cookie": "OpenGrok" },
-			"meta": { "generator": "OpenGrok( v?([\\d\\.]+))?\\;version:\\2" },
+			"meta": { "generator": "OpenGrok( v?([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"OpenGSE": {
@@ -1266,7 +1287,7 @@
 		},
 		"OpenSSL": {
 			"cats": [ 33 ],
-			"headers": { "Server": "OpenSSL(/([\\d\\.]+[a-z]?))?\\;version:\\2" }
+			"headers": { "Server": "OpenSSL(/([\\d.]+[a-z]?))?\\;version:\\2" }
 		},
 		"OpenText Web Solutions": {
 			"cats": [ 1 ],
@@ -1288,7 +1309,7 @@
 		"osCommerce": {
 			"cats": [ 6 ],
 			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\"[^>]*infoBoxHeading)",
-			"headers": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
+			"headers": { "Set-Cookie": "osCsid=" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1327,7 +1348,7 @@
 		},
 		"PHP": {
 			"cats": [ 27 ],
-			"headers": { "Server": "php/?([\\d\\.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d\\.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
+			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
 		"phpAlbum":	{
@@ -1434,7 +1455,7 @@
 		},
 		"Prototype": {
 			"cats": [ 12 ],
-			"script": "(prototype|protoaculous)(-([\\d\\.]*[\\d]))?.*\\.js\\;version:\\3",
+			"script": "(prototype|protoaculous)(-([\\d.]*[\\d]))?.*\\.js\\;version:\\3",
 			"env": "^Prototype$"
 		},
 		"Protovis": {
@@ -1449,7 +1470,7 @@
 		},
 		"Python": {
 			"cats": [ 27 ],
-			"headers": { "Server": "(^|\\s)Python(/([\\d\\.]+))?\\;version:\\3" }
+			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;version:\\3" }
 		},
 		"Quantcast": {
 			"cats": [ 10 ],
@@ -1543,7 +1564,7 @@
 		},
 		"Sarka-SPIP": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(^|\\s)Sarka-SPIP(\\s([\\d\\.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
+			"meta": { "generator": "(^|\\s)Sarka-SPIP(\\s([\\d.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
 			"headers": { "X-Spip-Cache": ".*" },
 			"implies": "SPIP"
 		},
@@ -1651,7 +1672,7 @@
 		},
 		"SPIP": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(^|\\s)SPIP(\\s([\\d\\.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
+			"meta": { "generator": "(^|\\s)SPIP(\\s([\\d.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
 			"headers": { "X-Spip-Cache": ".*" }
 		},
     "Spree": {
@@ -1697,11 +1718,11 @@
 		},
 		"Supersized": {
 			"cats": [ 7, 25 ],
-			"script": "supersized(\\.([\\d\\.]*[\\d]))?.*\\.js\\;version:\\2"
+			"script": "supersized(\\.([\\d.]*[\\d]))?.*\\.js\\;version:\\2"
 		},
 		"SUSE": {
 			"cats": [ 28 ],
-			"headers": { "Server": "SUSE(/?\\s?-?([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "SUSE(/?\\s?-?([\\d\\.]+))?\\;version:\\2" }
+			"headers": { "Server": "SUSE(/?\\s?-?([\\d.]+))?\\;version:\\2", "X-Powered-By": "SUSE(/?\\s?-?([\\d.]+))?\\;version:\\2" }
 		},
 		"Scientific Linux": {
 			"cats": [ 28 ],
@@ -1963,7 +1984,7 @@
 		},
 		"WordPress": {
 			"cats": [ 1, 11 ],
-			"meta": { "generator": "WordPress( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "WordPress( [\\d.]+)?\\;version:\\1" },
 			"html": "<link rel=\"stylesheet\" [^>]+wp-content",
 			"env": "^wp_username$",
 			"implies": "PHP"
@@ -1985,7 +2006,7 @@
 			"cats": [ 2 ],
 			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
 		},
-		"XiTi": {
+		"AT Internet": {
 			"cats": [ 10 ],
 			"html": "(<[^>]+src=\"[^>]+xiti\\.com/hit\\.xiti)",
 			"env": "^Xt_"
diff --git a/drivers/html/images/icons/SPDY.png b/drivers/html/images/icons/SPDY.png
index 44b57f9291fea297b430c5f649dbfd3523828891..5ac3599a59d058024a94371fa6bd046e7ce34703 100644
GIT binary patch
delta 525
zcmV+o0`mQY1*HU#BYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xB+4lLy~iu3>g0kTO%K~y-)ol{LLBVibRW~OPYOIA{(5?SHU*p+W2
zA`(*KC>v)Y4!Ds`L}Cvv>|y<#h-4zW;U;ks2M&aTMg2yEnSW8@H)$G;Ri&Aher0@n
zrc+zq+xxxG^S#ge2fV??*Z1*mlUCGfqj%H)h>pb&T*95G(aU}Sb1&okYvh{EFqjq~
zy2-X@JKbtA!f=Vm4a?UEYS$#)?vQhXM;ilQOUjIJh6)<zE<j?p<S#zRPCUWtSKAXM
zic`=ydjSU`#D7h#a)w2K<K_&NdG=0?#;g{zDW$o*uruKYO_S%an<+U)s_f@Dc&UzD
zfycuWP^dp3U}nhiZ&!`A)-J`D@JmK<CP(fgoGe5_U^hW<u_$&Pbv)82ywMN@->!JT
zXDuaEP&%@}c<5jNB09sD>;kyM6rZSueCidIm_<>(*MAr{qfMH4=6B7gZBA*E6%Vhn
z`o3{e)H8)Qjj>!>V?JF+#pQvx$E7K1Z#|OQ#Lv<^EVi^ChbIBlT7%-U@KN#ntV7ac
z1OR*YG^=A*;-4_Dc!ru^UG+Exu8z^)&RZXG-!auQ_U(O_=V}^E8v75Hd#5sM2PjMc
P0000<MFvhpu0mjfR}=3T

delta 620
zcmV-y0+aov1cU{UBYy%*Nkl<ZILoEe&r8z*9L8}E;vxD2LOSGMAc<|O=oX{Y{Lz+%
z9s(^1gcuRhv?yUslWk2yr!%qCwFTBTS4hp$?W@zN^Vgyj6(g##HeLQMbG|!toQBfj
zIX!${r{@y~#QjfpEhZ-?oi>|ot*WYOt*EGIdf$NAZ1!3#7JpPK6*)OM!F>T;U0sQ_
zH8lqw=(LoVDN!gC2i0oz5u?%Q(r7e7Nl8h<u7Js8s&Kn{H~IuOE{~UYZV#Qd7d+JK
zqBVLwTCEnjT;8-JU^bf@r#^mQz~^V~%OZ2%BKT%P*e4>`J+nM+Zs1~G?vhk0JsbnH
zwzi(}jSNM527f15UfTp9@Z%@`K$Py8EpF6Uv5hTKsk#%D%Veix07HG9L+Br5KD@!|
zZ&>*S;VtloK$@P3#lMZ-y@KO)59iX(+GBwBwkJV{YmC4$%q_tD3h0dONW>DFoHIO|
z27?gcsW(8LEGrNLv@}0j>UcZOR0!OkU?dEeFXfXf%YVi`3k@Ss=Ut~|D2yyKEfND%
zS5<mDodONL-?2`?%NZ~YuVUy8(mW1o58NLGd;fb*osbN~0OjRniszO#48j7sH-C?e
zqo5sziaw|t*+k{trn=%5DJe&<#Q=qcg$c@=r4tTo2fF@suD=R%w>yH`wMy9_sJu}u
zW)l)o>Sb6`Qqs;tQYw{+SBtOs8f!IJoqaS4pQ#tVV(S^^-tAJv$5MS_k?7Drr(94_
z5HFL-inB7(UHQ4^Ll?3$f+vrQUCGJG#Uha?e$UUe*ZcvYYTh<yw(95r0000<MNUMn
GLSTYhE+RGn

diff --git a/drivers/html/images/icons/UNIX.png b/drivers/html/images/icons/UNIX.png
index ebb6deb3424f603cd5f52aa2141310898a70e852..44d58989a7bd1f2e810e4ad70fc9b725e76a28b3 100644
GIT binary patch
delta 549
zcmV+=0^0qE0<r{<7=H)`0000V^Z#K0000JJOGiWi{{a60|De66lK=n!32;bRa{vGf
z6951U69E94oEQKA00(qQO+^RY0uTT-D@GuiSO5S4zez+vR5;6h(?4hvaTEve&&5#E
zK?0GZO9eA@)q)Vain<jnRHD#99g3q<aq42FP@G(Cg?1>|P=BFA-MSX4P|z+;a-f3B
z4+C+~fWtZT?s^H;x4p;ve&4_Ei*%eZWN|x=!)%z*cN5fn^xg~0j)rriGC|yq<8Ui{
zl88W43VI@4^t6UaDrG0s!)J*|1C1=$$cUO!b#JX%C}XMv{j91D_-hs<mW+F6&Xjf2
z_H8?B+-(m}Mt|6J;Fn2tsh-GuiD=V-IaAgwxZp8JL`LknYx;PEFD5mm8t7(~bDJ||
z!>%8eida+Xo9o9NTr_LU%VJ^OEU9g@G+JLhE09|vl4w;-hzn4@wEPOW&8z7R#o&@F
zl>(I8p(s9#&s#S=kUU~<!0(=N#vB|vA=tNFCW&9i_kSgs9`d5UeXYc=;+-Pc(+Zss
ztmwNT^~ZLhkxmFAi&D>Zvkvart%gnrR<ppeBU_%8#!9W|YufSCp{frUmxx?GUiyiY
zSM`hgZ`d{J+Q4o~V`|#bc4ttD^J+F7sCx5X@Hvaxo}Mmc*z-UuYhSUOlV^G~_)O7h
n@9c>g6CSRLj7fcmf4%cxhe4A>#J%Tq00000NkvXXu0mjff?WQr

delta 248
zcmV<U00;lF1c(BV7=Hu<0002(-QrRJ001yhOjJb#69fb{1O!L~1y=<HX$3TMG)R6(
zRE$(>n`?)thnKmRth=nR$FR=T&gtjr{QmrUgW!Sy005IoL_t&t*JJqq|KGBV`~Uwl
z{QqYtY$OX}d=OH0F`N%%{Qv(`^bf~>hOf%{|Kq1P<uiPAk#YS0O~gf>VUvsT|4$|^
zx(o|l9RL4UanWK}<RW+ee~OC~!y?D`JpUh==rBC={b=<6XR|!RC;LWc@i~qD4FC1N
ynYg%!15N(g?Be1Gvf?X~F~rjUzuP;2&Hw<-nMoNsrklF}0000<MNUMnLSTa4dwR<N

diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index edf39bd60..ea5db6e67 100755
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -52,7 +52,7 @@
 		},
 		"2z Project": {
 			"cats": [ 1 ],
-			"meta": { "generator": "2z project ([\\d\\.]+);version:\\1" }
+			"meta": { "generator": "2z project ([\\d.]+);version:\\1" }
 		},
 		"3dCart": {
 			"cats": [ 1, 6 ],
@@ -77,7 +77,7 @@
 		},
 		"Adobe GoLive": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Adobe GoLive(\\s([\\d\\.]+))?\\;version:\\2" }
+			"meta": { "generator": "Adobe GoLive(\\s([\\d.]+))?\\;version:\\2" }
 		},
 		"Advanced Web Stats": {
 			"cats": [ 10 ],
@@ -90,7 +90,7 @@
 		},
 		"Amaya": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Amaya( V?([\\d\\.]+[a-z]))?\\;version:\\2" }
+			"meta": { "generator": "Amaya( V?([\\d.]+[a-z]))?\\;version:\\2" }
 		},
 		"Ametys": {
 			"cats": [ 1 ],
@@ -101,12 +101,12 @@
 		"Amiro.CMS": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Amiro" },
-			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d\\.]+)\\;version:\\2",
+			"html": "system_(js\\.php\\?script=|css\\.php\\?styles)[^\"]+cv=([\\d.]+)\\;version:\\2",
 			"implies": "PHP"
 		},
 		"AMPcms": {
 			"cats": [ 1 ],
-			"headers": { "X-AMP-Version": "([\\d\\.]+)\\;version:\\1", "Set-Cookie": "^AMP=" },
+			"headers": { "X-AMP-Version": "([\\d.]+)\\;version:\\1", "Set-Cookie": "^AMP=" },
 			"env": "^amp_js_init$",
 			"implies": "PHP"
 		},
@@ -116,11 +116,11 @@
 		},
 		"AOLserver": {
 			"cats": [ 22 ],
-			"headers": { "Server": "AOLserver/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "AOLserver/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache": {
 			"cats": [ 22 ],
-			"headers": { "Server": "(Apache($|/([\\d\\.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
+			"headers": { "Server": "(Apache($|/([\\d.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
 		},
 		"Apache JSPWiki": {
 			"cats": [ 8 ],
@@ -130,11 +130,11 @@
 		},
 		"Apache Tomcat": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Apache-Coyote/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "Apache-Coyote/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Apache Traffic Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "ATS/?([\\d\\.]+)?\\;version:\\1" }
+			"headers": { "Server": "ATS/?([\\d.]+)?\\;version:\\1" }
 		},
 		"Arc Forum": {
 			"cats": [ 2 ],
@@ -142,17 +142,17 @@
 		},
 		"AsciiDoc": {
 			"cats": [ 1, 20, 27 ],
-			"meta": { "generator": "^AsciiDoc ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "^AsciiDoc ([\\d.]+)\\;version:\\1" },
 			"env": "^asciidoc$"
 		},
 		"ATG Web Commerce": {
 			"cats": [ 6 ],
-			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-ATG-Version": "(ATGPlatform/([\\d.]+))?\\;version:\\2" },
 			"html": "<[^>]+_DARGS"
 		},
 		"Atlassian Confluence": {
 			"cats": [ 8 ],
-			"html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence([^>]+>Atlassian Confluence</a> ([\\d\\.]+))?\\;version:\\2",
+			"html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence([^>]+>Atlassian Confluence</a> ([\\d.]+))?\\;version:\\2",
 			"headers": { "X-Confluence-Request-Time": ".*" },
 			"meta": { "confluence-request-time": ".*" },
 			"implies": "Java"
@@ -167,7 +167,7 @@
 		},
 		"AWStats": {
 			"cats": [ 10 ],
-			"meta": { "generator": "AWStats ([\\d\\.]+( \\(build [\\d\\.]+\\))?)\\;version:\\1" },
+			"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/\">[a-z]+</a>(v([\\d\\.]+))?\\;version:\\2",
+			"html": "Built upon the <a href=\"[^>]+banshee-php\\.org/\">[a-z]+</a>(v([\\d.]+))?\\;version:\\2",
 			"implies": "PHP"
 		},
 		"BIGACE": {
 			"cats": [ 1 ],
-			"meta": { "generator": "BIGACE ([\\d\\.]+)\\;version:\\1" },
+			"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 ver\\. ([\\d\\.b]+)\\;version:\\1",
+			"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 ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "BrowserCMS ([\\d.]+)\\;version:\\1" },
 			"implies": "Ruby"
 		},
 		"Bugzilla": {
@@ -266,9 +266,9 @@
 		},
 		"Chamilo": {
 			"cats": [ 21 ],
-			"html": "\">Chamilo ([\\d\\.]+)</a>\\;version:\\1",
-			"meta": { "generator": "Chamilo ([\\d\\.]+)\\;version:\\1" },
-			"headers": { "X-Powered-By": "Chamilo ([\\d\\.]+)\\;version:\\1" },
+			"html": "\">Chamilo ([\\d.]+)</a>\\;version:\\1",
+			"meta": { "generator": "Chamilo ([\\d.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "Chamilo ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Chartbeat": {
@@ -278,7 +278,7 @@
 		},
 		"Cherokee": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Cherokee/([\\d\\.]+)\\;version:\\1" }
+			"headers": { "Server": "Cherokee/([\\d.]+)\\;version:\\1" }
 		},
 		"CKEditor": {
 			"cats": [ 24 ],
@@ -313,7 +313,7 @@
 		},
 		"CMSimple": {
 			"cats": [ 1 ],
-			"meta": { "generator": "CMSimple( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "CMSimple( [\\d.]+)?\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"CO2Stats": {
@@ -338,7 +338,7 @@
 		"Concrete5": {
 			"cats": [ 1 ],
 			"script": "concrete/js/",
-			"meta": { "generator": "concrete5 - ([\\d\\.ab]+)\\;version:\\1" },
+			"meta": { "generator": "concrete5 - ([\\d.ab]+)\\;version:\\1" },
 			"env": "^CCM_IMAGE_PATH$",
 			"implies": "PHP"
 		},
@@ -354,12 +354,12 @@
 		},
 		"Contenido": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contenido ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Contenido ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Contens": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Contensis CMS Version ([\\d\\.]+)\\;version:\\1" },
+			"meta": { "generator": "Contensis CMS Version ([\\d.]+)\\;version:\\1" },
 			"implies": [ "Java", "CFML" ]
 		},
 		"ConversionLab": {
@@ -368,7 +368,7 @@
 		},
 		"Coppermine": {
 			"cats": [ 7 ],
-			"html": "<!--Coppermine Photo Gallery ([\\d\\.]+)\\;version:\\1",
+			"html": "<!--Coppermine Photo Gallery ([\\d.]+)\\;version:\\1",
 			"implies": "PHP"
 		},
 		"Cosmoshop": {
@@ -382,11 +382,11 @@
 		},
 		"CouchDB": {
 			"cats": [ 22 ],
-			"headers": { "Server": "CouchDB/([\\d\\.]+)\\;version:\\1" }
+			"headers": { "Server": "CouchDB/([\\d.]+)\\;version:\\1" }
 		},
 		"cPanel": {
 			"cats": [ 9 ],
-			"headers": { "Server": "cpsrvd/([\\d\\.]+)\\;version:\\1" },
+			"headers": { "Server": "cpsrvd/([\\d.]+)\\;version:\\1" },
 			"html": "<!-- cPanel"
 		},
 		"CPG Dragonfly": {
@@ -428,13 +428,13 @@
 		},
 		"Dancer": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Perl Dancer ([\\d\\.]+)\\;version:\\1", "Server": "Perl Dancer ([\\d\\.]+)\\;version:\\1" },
+			"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 ([\\d\\.]+)\\;version:\\1" },
-			"meta": { "generator": "Danneo CMS ([\\d\\.]+)\\;version:\\1" },
+			"headers": { "X-Powered-By": "CMS Danneo ([\\d.]+)\\;version:\\1" },
+			"meta": { "generator": "Danneo CMS ([\\d.]+)\\;version:\\1" },
 			"implies": [ "Apache", "PHP" ]
 		},
 		"dashCommerce": {
@@ -449,7 +449,7 @@
 		},
 		"David Webbox": {
 			"cats": [ 22 ],
-			"headers": { "Server": "David-WebBox/([\\d\\.a]+ \\(\\d+\\))\\;version:\\1" }
+			"headers": { "Server": "David-WebBox/([\\d.a]+ \\(\\d+\\))\\;version:\\1" }
 		},
 		"Debian": {
 			"cats": [ 28 ],
@@ -474,7 +474,7 @@
 		"DirectAdmin": {
 			"cats": [ 9 ],
 			"html": "<a[^>]+>DirectAdmin</a> Web Control Panel",
-			"headers": { "Server": "DirectAdmin Daemon v([\\d\\.]+)\\;version:\\1" },
+			"headers": { "Server": "DirectAdmin Daemon v([\\d.]+)\\;version:\\1" },
 			"implies": [ "PHP", "Apache" ]
 		},
 		"Disqus": {
@@ -485,7 +485,7 @@
 		},
 		"Django": {
 			"cats": [ 18 ],
-			"html": "(powered by <a[^>]+>Django ?([\\d\\.]+)?|<div style=\"display:none\"><input name=\"csrfmiddlewaretoken\" value=\"[a-z0-9]{32}\" type=\"hidden\"></div>)\\;version:\\2",
+			"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"
 		},
@@ -497,7 +497,7 @@
 		},
 		"Dojo": {
 			"cats": [ 12 ],
-			"script": "([\\d\\.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
+			"script": "([\\d.]+)/dojo/dojo(\\.xd)?\\.js\\;version:\\1",
 			"env": "^dojo$"
 		},
 		"Dokeos": {
@@ -523,7 +523,7 @@
 		},
 		"Doxygen": {
 			"cats": [ 4 ],
-			"html": "(<!-- Generated by Doxygen|<link[^>]+doxygen.css)"
+			"html": "(<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\1"
 		},
 		"DreamWeaver": {
 			"cats": [ 20 ],
@@ -533,7 +533,7 @@
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
 			"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
-			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
+			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": "PHP"
 		},
@@ -544,36 +544,40 @@
 		},
 		"Dynamicweb": {
 			"cats": [ 1, 6, 10 ],
-			"meta": { "generator": "Dynamicweb" },
+			"meta": { "generator": "Dynamicweb ([\\d.]+)\\;version:\\1" },
 			"headers": { "Set-Cookie": "Dynamicweb=" },
 			"implies": "Microsoft ASP.NET"
 		},
 		"e107": {
 			"cats": [ 1 ],
 			"script": "e107\\.js",
+			"headers": { "Set-Cookie": "e107_td[^;]+=" },
 			"implies": "PHP"
 		},
 		"EdgeCast": {
 			"cats": [ 31 ],
-			"headers": { "Server": "^ECS " }
+			"headers": { "Server": "^ECS" }
 		},
 		"Embedthis-http": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Embedthis-http" }
+			"headers": { "Server": "Embedthis-http(/([\\d.]+))?\\;version:\\2" }
 		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
+			"headers": { "Set-Cookie": "EPi(Trace|Server)[^;]*=" },
 			"implies": [ "Microsoft ASP.NET", "IIS", "Windows Server" ]
 		},
 		"EPrints": {
 			"cats": [ 19 ],
-			"meta": { "generator": "EPrints" },
+			"meta": { "generator": "EPrints ([\\d.]+)\\;version:\\1" },
+			"env": "^EPJS_menu_template$",
 			"implies": "Perl"
 		},
 		"eSyndiCat": {
 			"cats": [ 1 ],
 			"headers": { "X-Drectory-Script": "^eSyndiCat" },
+			"env": "^esyndicat$",
 			"implies": [ "PHP" ]
 		},
 		"Exhibit": {
@@ -604,23 +608,25 @@
 		},
 		"Fact Finder": {
 			"cats": [ 29 ],
-			"html": "/images/fact-finder\\.gif|ViewParametricSearch|factfinder|Suggest\\.ff",
-			"url": "ViewParametricSearch|factfinder|ffsuggest"
+			"html": "<!-- Factfinder",
+			"script": "Suggest\\.ff",
+			"url": "/ViewParametricSearch|ffsuggest\\.[a-z]htm"
 		},
 		"FAST ESP": {
 			"cats": [ 29 ],
-			"html": "fastsearch|searchProfile=|searchCategory=",
-			"url": "esppublished|searchProfile=|searchCategory="
+			"html": "<form[^>]+id=\"fastsearch\""
 		},
 		"FAST Search for SharePoint": {
 			"cats": [ 29 ],
 			"url": "Pages/SearchResults\\.aspx\\?k=",
+			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
 		"FlexCMP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
-			"headers": { "X-Powered-By": "FlexCMP" }
+			"html": "<!--[^>]+FlexCMP[^>v]+v\\. ([\\d.]+)\\;version:\\1",
+			"headers": { "X-Powered-By": "FlexCMP.+\\[v\\. ([\\d.]+)\\;version:\\1", "X-Flex-Lang": ".+" }
 		},
 		"FluxBB": {
 			"cats": [ 2 ],
@@ -628,20 +634,22 @@
 		},
 		"Flyspray": {
 			"cats": [ 13 ],
-			"html": "(<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform|Powered by <a href=[^>]+flyspray\\.org)"
+			"html": "(<a[^>]+>Powered by Flyspray|<map id=\"projectsearchform)",
+			"headers": { "Set-Cookie": "flyspray_project=" }
 		},
 		"FreeBSD": {
 			"cats": [ 28 ],
-			"headers": { "Server": "FreeBSD" }
+			"headers": { "Server": "FreeBSD( ([\\d.]+))?\\;version:\\2" }
 		},
 		"FrontPage": {
 			"cats": [ 20 ],
-			"meta": { "generator": "Microsoft FrontPage(\\s([\\d\\.]+))?\\;version:\\2" },
+			"meta": { "generator": "Microsoft FrontPage(\\s([\\d.]+))?\\;version:\\2" },
 			"html": "<html[^>]+urn:schemas-microsoft-com:office:office"
 		},
 		"FWP": {
 			"cats": [ 6 ],
-			"meta": { "generator": "FWP Shop" }
+			"meta": { "generator": "FWP Shop" },
+			"html": "<!--\\s+FwP Systems"
 		},
 		"Gallery": {
 			"cats": [ 7 ],
@@ -655,6 +663,7 @@
 		},
 		"Gauges": {
 			"cats": [ 10 ],
+			"headers": { "Set-Cookie": "_gauges_[^;]+=" },
 			"html": "t\\.src = '//secure\\.gaug\\.es/track\\.js",
 			"env": "^_gauges$"
 		},
@@ -664,7 +673,7 @@
 		},
 		"Get Satisfaction": {
 			"cats": [ 13 ],
-			"html": "var feedback_widget = new GSFN\\.feedback_widget\\(feedback_widget_options\\)"
+			"env": "^feedback_widget$"
 		},
 		"GetSimple CMS": {
 			"cats": [ 1 ],
@@ -698,11 +707,11 @@
 		},
 		"Google Maps": {
 			"cats": [ 35 ],
-			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
+			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
 		},
 		"Google PageSpeed": {
 			"cats": [ 23, 33 ],
-			"headers": { "X-Mod-Pagespeed": ".*" }
+			"headers": { "X-Mod-Pagespeed": "([\\d.]+)\\;version:\\1" }
 		},
 		"Google Sites": {
 			"cats": [ 1 ],
@@ -723,7 +732,9 @@
 		},
 		"Graffiti CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Graffiti CMS" }
+			"meta": { "generator": "Graffiti CMS ([^\"]+)\\;version:\\1" },
+			"script": "/graffiti.js",
+			"headers": { "Set-Cookie": "graffitibot[^;]=" }
 		},
 		"Gravatar": {
 			"cats": [ 19 ],
@@ -740,7 +751,8 @@
 		},
 		"GX WebManager": {
 			"cats": [ 1 ],
-			"meta": { "generator": "GX WebManager" }
+			"meta": { "generator": "GX WebManager( ([\\d.]+))?\\;version:\\2" },
+			"html": "<!--\\s+Powered by GX"
 		},
 		"Handlebars": {
 			"cats": [ 12 ],
@@ -748,7 +760,7 @@
 		},
 		"Hiawatha": {
 			"cats": [ 22 ],
-			"headers": { "Server": "Hiawatha" }
+			"headers": { "Server": "Hiawatha v([\\d.]+)\\;version:\\1" }
 		},
 		"Highcharts": {
 			"cats": [ 25 ],
@@ -761,10 +773,12 @@
 		},
 		"Hotaru CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Hotaru CMS" }
+			"meta": { "generator": "Hotaru CMS" },
+			"headers": { "Set-Cookie": "hotaru_mobile=" }
 		},
-		"Hubspot": {
+		"HubSpot": {
 			"cats": [ 32 ],
+			"html": "<!-- Start of Async HubSpot",
 			"env": "^(_hsq|hubspot)$"
 		},
 		"Hybris": {
@@ -775,11 +789,11 @@
 		},
 		"IBM HTTP Server": {
 			"cats": [ 22 ],
-			"headers": { "Server": "IBM_HTTP_Server" }
+			"headers": { "Server": "IBM_HTTP_Server(/([\\d.]+))?\\;version:\\2" }
 		},
 		"IBM WebSphere Portal": {
 			"cats": [ 1 ],
-			"headers": { "IBM-Web2-Location": ".*" },
+			"headers": { "IBM-Web2-Location": ".*", "Itx-Generated-Timestamp": ".+" },
 			"url": "/wps/",
 			"implies": "Java"
 		},
@@ -790,19 +804,19 @@
 		},
 		"IIS": {
 			"cats": [ 22 ],
-			"headers": { "Server": "IIS\\/?([\\d\\.]+)?\\;version:\\1" },
+			"headers": { "Server": "IIS(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Windows Server"
 		},
 		"ImpressCMS": {
 			"cats": [ 1 ],
 			"script": "include/linkexternal\\.js",
 			"meta": { "generator": "ImpressCMS" },
-			"headers": { "X-Powered-By": "ImpressCMS" },
+			"headers": { "X-Powered-By": "ImpressCMS", "Set-Cookie": "ICMSession[^;]+=" },
 			"implies": "PHP"
 		},
 		"ImpressPages": {
 			"cats": [ 1 ],
-			"meta": { "generator": "ImpressPages" },
+			"meta": { "generator": "ImpressPages CMS ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Indexhibit": {
@@ -813,26 +827,26 @@
 		},
 		"InstantCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "InstantCMS" }
+			"meta": { "generator": "InstantCMS" },
+			"headers": { "Set-Cookie": "InstantCMS\\[logdate\\]=" }
 		},
 		"Intershop": {
 			"cats": [ 6 ],
-			"url": "is-bin|INTERSHOP",
 			"script": "is-bin|INTERSHOP"
 		},
 		"IPB": {
 			"cats": [ 2 ],
 			"script": "jscripts/ips_",
-			"env": "^IPBoard$",
+			"env": "^(IPBoard$|ipb_var)",
 			"html": "<link[^>]+ipb_[^>]+\\.css"
 		},
 		"iWeb": {
 			"cats": [ 20 ],
-			"meta": { "generator": "^iWeb( [\\d\\.]+)?\\;version:\\1" }
+			"meta": { "generator": "^iWeb( [\\d.]+)?\\;version:\\1" }
 		},
 		"JAlbum": {
 			"cats": [ 7 ],
-			"meta": { "generator": "JAlbum( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "JAlbum( [\\d.]+)?\\;version:\\1" },
 			"implies": "Java"
 		},
 		"Jalios": {
@@ -850,17 +864,17 @@
 		},
 		"JavaServer Faces": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "JSF(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "JSF(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"JavaServer Pages": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "JSP(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "JSP(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"Java Servlet": {
 			"cats": [ 18 ],
-			"headers": { "X-Powered-By": "Servlet(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "X-Powered-By": "Servlet(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"Jirafe": {
@@ -879,10 +893,10 @@
 		},
 		"Joomla": {
 			"cats": [ 1 ],
-			"url": "option=com_\\;confidence:50",
-			"meta": { "generator": "Joomla" },
+			"url": "option=com_",
+			"meta": { "generator": "Joomla!( ([\\d.]+))?\\;version:\\2" },
 			"html": "(<div[^>]+id=\"wrapper_r\"|<[^>]+(feed|components)/com_|<table[^>]+class=\"pill)\\;confidence:50",
-			"headers": { "X-Content-Encoded-By": "Joomla" },
+			"headers": { "X-Content-Encoded-By": "Joomla! ([\\d.]+)\\;version:\\1" },
 			"env": "^jcomments$",
 			"implies": "PHP"
 		},
@@ -898,21 +912,22 @@
 		},
 		"jQuery": {
 			"cats": [ 12 ],
-			"script": [ "jquery(\\-|\\.)([\\d\\.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d\\.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
+			"script": [ "jquery(\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
 			"env": "^jQuery$"
 		},
 		"jQuery Mobile": {
 			"cats": [ 26 ],
-			"script": "jquery\\.mobile.*\\.js",
+			"script": "jquery\\.mobile(-([\\d.]+rc\\d))?.*\\.js(\\?ver=([\\d.]+))?\\;version:\\2",
 			"implies": "jQuery"
 		},
 		"jQuery Sparklines": {
 			"cats": [ 25 ],
-			"script": "jquery\\.sparkline.*\\.js"
+			"script": "jquery\\.sparkline.*\\.js",
+			"implies": "jQuery"
 		},
 		"jQuery UI": {
 			"cats": [ 12 ],
-			"script": "jquery-ui.*\\.js",
+			"script": "jqueryui/([\\d.]+)\\.js\\;version:\\1",
 			"implies": "jQuery"
 		},
 		"JS Charts": {
@@ -922,11 +937,12 @@
 		},
 		"JTL Shop": {
 			"cats": [ 6 ],
-			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)"
+			"html": "(<input[^>]+name=\"JTLSHOP|<a href=\"jtl\\.php)",
+			"headers": { "Set-Cookie": "JTLSHOP=" }
 		},
 		"K2": {
 			"cats": [ 19 ],
-			"html": "<!-- JoomlaWorks \"K2\"",
+			"html": "<!--( JoomlaWorks \"K2\"| Start K2)",
 			"env": "^K2RatingURL$",
 			"implies": "Joomla"
 		},
@@ -944,11 +960,12 @@
 		},
 		"Kentico CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Kentico CMS" }
+			"meta": { "generator": "Kentico CMS ([\\d.R]+ \\(build [\\d.]+\\))\\;version:\\1" },
+			"headers": { "Set-Cookie": "CMSPreferredCulture=" }
 		},
 		"KineticJS": {
 			"cats": [ 25 ],
-			"script": "kinetic(-v?([\\d\\.]+))?\\.js\\;version:\\2"
+			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2"
 		},
 		"KISSmetrics": {
 			"cats": [ 10 ],
@@ -956,16 +973,18 @@
 		},
 		"Koego": {
 			"cats": [ 10 ],
-			"script": "tracking\\.koego\\.com/end/ego\\.js"
+			"script": "tracking\\.koego\\.com/end/ego\\.js",
+			"env": "^ego_domains$"
 		},
 		"Kohana": {
 			"cats": [ 18 ],
-			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana" },
+			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana Framework ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Kolibri CMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Kolibri" }
+			"meta": { "generator": "Kolibri" },
+			"headers": { "X-Powered-By": "Kolibri" }
 		},
 		"Komodo CMS": {
 			"cats": [ 1 ],
@@ -974,17 +993,19 @@
 		},
 		"Koobi": {
 			"cats": [ 1 ],
-			"meta": { "generator": "Koobi" }
+			"meta": { "generator": "Koobi" },
+			"html": "<!--[^K>-]+Koobi ([a-z\\d.]+)\\;version:\\1"
 		},
 		"LEPTON": {
 			"cats": [ 1 ],
 			"meta": { "generator": "LEPTON" },
+			"headers": { "Set-Cookie": "lep\\d+sessionid=" },
 			"implies": "PHP"
 		},
 		"Liferay": {
 			"cats": [ 1 ],
 			"env": "^Liferay$",
-			"headers": { "Liferay-Portal": ".*" }
+			"headers": { "Liferay-Portal": "[a-z\\s]+([\\d.]+)\\;version:\\1" }
 		},
 		"LightMon Engine": {
 			"cats": [ 1 ],
@@ -993,7 +1014,7 @@
 		},
 		"lighttpd": {
 			"cats": [ 22 ],
-			"headers": { "Server": "lighttpd(/([\\d\\.]+))?\\;version:\\2" }
+			"headers": { "Server": "lighttpd(/([\\d.]+))?\\;version:\\2" }
 		},
 		"LimeSurvey": {
 			"cats": [ 19 ],
@@ -1008,11 +1029,11 @@
 			"script": "addtoany\\.com/menu/page\\.js",
 			"env": "^a2apage_init$"
 		},
-    "Locomotive": {
-      "cats": [ 1 ],
-      "html": "<link[^>]*/sites/[a-zA-Z0-9]{24}/theme/stylesheets/.*>",
-      "implies": [ "Ruby on Rails", "MongoDB" ]
-    },
+		"Locomotive": {
+			"cats": [ 1 ],
+			"html": "<link[^>]*/sites/[a-zA-Z0-9]{24}/theme/stylesheets/.*>",
+			"implies": [ "Ruby on Rails", "MongoDB" ]
+		},
 		"Lotus Domino": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Lotus-Domino" }
@@ -1086,44 +1107,44 @@
 		},
 		"Modernizr": {
 			"cats": [ 12 ],
-			"script": "modernizr(-([\\d\\.]*[\\d]))?.*\\.js\\;version:\\2",
+			"script": "modernizr(-([\\d.]*[\\d]))?.*\\.js\\;version:\\2",
 			"env": "^Modernizr$"
 		},
 		"MODx": {
 			"cats": [ 1 ],
 			"html": "<a[^>]+>Powered by MODx</a>|<(link|script)[^>]+assets/snippets/",
 			"env": "^MODX_MEDIA_PATH$",
-			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}|utmcct=/applications/modx" },
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}" },
 			"implies": "PHP"
 		},
 		"mod_fastcgi": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_fastcgi(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_fastcgi(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Apache"
 		},
 		"mod_python": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_python(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_python(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Python", "Apache" ]
 		},
 		"mod_rack": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rack(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_rack(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_rails": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rails(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_rails(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_ssl": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_ssl(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_ssl(/([\\d.]+))?\\;version:\\2" },
 			"implies": "Apache"
 		},
 		"mod_wsgi": {
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_wsgi(/([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(/([\\d\\.]+))?\\;version:\\2" },
+			"headers": { "Server": "mod_wsgi(/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Python\\;confidence:50", "Apache" ]
 		},
 		"MoinMoin": {
@@ -1192,7 +1213,7 @@
 			"meta": { "generator": "Mynetcap" }
 		},
 		"MySQL": {
-			"cats": [ 24 ]
+			"cats": [ 34 ]
 		},
 		"Nedstat": {
 			"cats": [ 10 ],
@@ -1247,7 +1268,7 @@
 		"OpenGrok": {
 			"cats": [ 19 ],
 			"headers": { "Set-Cookie": "OpenGrok" },
-			"meta": { "generator": "OpenGrok( v?([\\d\\.]+))?\\;version:\\2" },
+			"meta": { "generator": "OpenGrok( v?([\\d.]+))?\\;version:\\2" },
 			"implies": "Java"
 		},
 		"OpenGSE": {
@@ -1266,7 +1287,7 @@
 		},
 		"OpenSSL": {
 			"cats": [ 33 ],
-			"headers": { "Server": "OpenSSL(/([\\d\\.]+[a-z]?))?\\;version:\\2" }
+			"headers": { "Server": "OpenSSL(/([\\d.]+[a-z]?))?\\;version:\\2" }
 		},
 		"OpenText Web Solutions": {
 			"cats": [ 1 ],
@@ -1288,7 +1309,7 @@
 		"osCommerce": {
 			"cats": [ 6 ],
 			"html": "(<a[^>]*(\\?|&)osCsid|Powered by (<[^]+>)?osCommerce</a>|<[^]+class=\"[^>]*infoBoxHeading)",
-			"headers": { "Set-Cookie": "osCsid=|utmcct=/applications/oscommerce" }
+			"headers": { "Set-Cookie": "osCsid=" }
 		},
 		"osCSS": {
 			"cats": [ 6 ],
@@ -1327,7 +1348,7 @@
 		},
 		"PHP": {
 			"cats": [ 27 ],
-			"headers": { "Server": "php/?([\\d\\.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d\\.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
+			"headers": { "Server": "php/?([\\d.]+)?\\;confidence:50\\;version:\\1", "X-Powered-By": "php/?([\\d.]+)?\\;version:\\1", "Set-Cookie": "PHPSESSID" },
 			"url": "\\.php$"
 		},
 		"phpAlbum":	{
@@ -1434,7 +1455,7 @@
 		},
 		"Prototype": {
 			"cats": [ 12 ],
-			"script": "(prototype|protoaculous)(-([\\d\\.]*[\\d]))?.*\\.js\\;version:\\3",
+			"script": "(prototype|protoaculous)(-([\\d.]*[\\d]))?.*\\.js\\;version:\\3",
 			"env": "^Prototype$"
 		},
 		"Protovis": {
@@ -1449,7 +1470,7 @@
 		},
 		"Python": {
 			"cats": [ 27 ],
-			"headers": { "Server": "(^|\\s)Python(/([\\d\\.]+))?\\;version:\\3" }
+			"headers": { "Server": "(^|\\s)Python(/([\\d.]+))?\\;version:\\3" }
 		},
 		"Quantcast": {
 			"cats": [ 10 ],
@@ -1543,7 +1564,7 @@
 		},
 		"Sarka-SPIP": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(^|\\s)Sarka-SPIP(\\s([\\d\\.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
+			"meta": { "generator": "(^|\\s)Sarka-SPIP(\\s([\\d.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
 			"headers": { "X-Spip-Cache": ".*" },
 			"implies": "SPIP"
 		},
@@ -1651,7 +1672,7 @@
 		},
 		"SPIP": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(^|\\s)SPIP(\\s([\\d\\.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
+			"meta": { "generator": "(^|\\s)SPIP(\\s([\\d.]+(\\s\\[\\d+\\])?))?\\;version:\\3" },
 			"headers": { "X-Spip-Cache": ".*" }
 		},
     "Spree": {
@@ -1697,11 +1718,11 @@
 		},
 		"Supersized": {
 			"cats": [ 7, 25 ],
-			"script": "supersized(\\.([\\d\\.]*[\\d]))?.*\\.js\\;version:\\2"
+			"script": "supersized(\\.([\\d.]*[\\d]))?.*\\.js\\;version:\\2"
 		},
 		"SUSE": {
 			"cats": [ 28 ],
-			"headers": { "Server": "SUSE(/?\\s?-?([\\d\\.]+))?\\;version:\\2", "X-Powered-By": "SUSE(/?\\s?-?([\\d\\.]+))?\\;version:\\2" }
+			"headers": { "Server": "SUSE(/?\\s?-?([\\d.]+))?\\;version:\\2", "X-Powered-By": "SUSE(/?\\s?-?([\\d.]+))?\\;version:\\2" }
 		},
 		"Scientific Linux": {
 			"cats": [ 28 ],
@@ -1963,7 +1984,7 @@
 		},
 		"WordPress": {
 			"cats": [ 1, 11 ],
-			"meta": { "generator": "WordPress( [\\d\\.]+)?\\;version:\\1" },
+			"meta": { "generator": "WordPress( [\\d.]+)?\\;version:\\1" },
 			"html": "<link rel=\"stylesheet\" [^>]+wp-content",
 			"env": "^wp_username$",
 			"implies": "PHP"
@@ -1985,7 +2006,7 @@
 			"cats": [ 2 ],
 			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
 		},
-		"XiTi": {
+		"AT Internet": {
 			"cats": [ 10 ],
 			"html": "(<[^>]+src=\"[^>]+xiti\\.com/hit\\.xiti)",
 			"env": "^Xt_"
diff --git a/share/apps.json b/share/apps.json
index 3c6749fe9..ea5db6e67 100755
--- a/share/apps.json
+++ b/share/apps.json
@@ -776,6 +776,11 @@
 			"meta": { "generator": "Hotaru CMS" },
 			"headers": { "Set-Cookie": "hotaru_mobile=" }
 		},
+		"HubSpot": {
+			"cats": [ 32 ],
+			"html": "<!-- Start of Async HubSpot",
+			"env": "^(_hsq|hubspot)$"
+		},
 		"Hybris": {
 			"cats": [ 6 ],
 			"html": "(/sys_master/|/hybr/|/_ui/desktop/)",
diff --git a/share/images/icons/Hubspot.png b/share/images/icons/Hubspot.png
deleted file mode 100644
index 58f03bdd2b11cd4caf13826e4519ac3c0bc6eafb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 690
zcmV;j0!{siP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2w>(2`%?(oNNF90zXMa
zK~y-)g_2)LQ*ji>&+hKFyR{OQOb~r&3^JR4*h7R#MGqq)WcUz0L>LHJM1&|w&_hxq
z1_edbia~#f9!$h~5KOR07P63yX$5Y9o87D19n<b^-QVv0-TUilGM87sa9+;&p2ImG
z4iG{>&M!4`L2r}`c;a#)Q%?wi>cEm<!$`DL=P3XH;lu5l+Mm2rSzTx=e!M>bRgzb}
zHRT?3MzZ$~&B^@FeU&u|0KnqvoKe>@jQ{}B!uzgLX0E-`gcheyC|sf)XTKjTr9K_o
zG`+kET8et5<mV3l`Pnz=ent|$gfEn9ijZ@#!|p{c;E7|gP*Zurf48a_Lvi-S`OJV_
z;9s44iIHd{gh2M`>396=o^Z7vwgN^70Xdg)aY1jCz0*7|M4t8jy5&l8cUxm(Y}BtR
zvZ3rV5JEsts`T5w5@`OR30wmJXk~6pi+`-PXXFe;n^X$6kr)YG(gd!7@pO&XT~D;s
z4aQq7`+bvWe!N?pd30qH#I1r0dcUUo83{{*tpe!Y^fekS-*B#O{DH2pYytqyU^FY`
zlz}#vz(4_L*tqcrda|~4j{!!u!bsl}T;v^C$kwjCy&M8nw%CteeFy+MKtx3w|JXMr
zr)N8Wq7@(-0MSfl_wi}x#fejt*;=Bv+rY@|{%b$d7b>uEul2ym2>>8WlW%I*;odMs
zo75d4A~w;yJmko&PX>ncJi5(dY}C&VyOWv0J?pBBjCwv@h(tkFoKLxoHT5iIvZ#8#
Yf6HLXr(~ae4gdfE07*qoM6N<$f=V$obpQYW

diff --git a/share/images/icons/SPDY.png b/share/images/icons/SPDY.png
index 44b57f9291fea297b430c5f649dbfd3523828891..5ac3599a59d058024a94371fa6bd046e7ce34703 100644
GIT binary patch
delta 525
zcmV+o0`mQY1*HU#BYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xB+4lLy~iu3>g0kTO%K~y-)ol{LLBVibRW~OPYOIA{(5?SHU*p+W2
zA`(*KC>v)Y4!Ds`L}Cvv>|y<#h-4zW;U;ks2M&aTMg2yEnSW8@H)$G;Ri&Aher0@n
zrc+zq+xxxG^S#ge2fV??*Z1*mlUCGfqj%H)h>pb&T*95G(aU}Sb1&okYvh{EFqjq~
zy2-X@JKbtA!f=Vm4a?UEYS$#)?vQhXM;ilQOUjIJh6)<zE<j?p<S#zRPCUWtSKAXM
zic`=ydjSU`#D7h#a)w2K<K_&NdG=0?#;g{zDW$o*uruKYO_S%an<+U)s_f@Dc&UzD
zfycuWP^dp3U}nhiZ&!`A)-J`D@JmK<CP(fgoGe5_U^hW<u_$&Pbv)82ywMN@->!JT
zXDuaEP&%@}c<5jNB09sD>;kyM6rZSueCidIm_<>(*MAr{qfMH4=6B7gZBA*E6%Vhn
z`o3{e)H8)Qjj>!>V?JF+#pQvx$E7K1Z#|OQ#Lv<^EVi^ChbIBlT7%-U@KN#ntV7ac
z1OR*YG^=A*;-4_Dc!ru^UG+Exu8z^)&RZXG-!auQ_U(O_=V}^E8v75Hd#5sM2PjMc
P0000<MFvhpu0mjfR}=3T

delta 620
zcmV-y0+aov1cU{UBYy%*Nkl<ZILoEe&r8z*9L8}E;vxD2LOSGMAc<|O=oX{Y{Lz+%
z9s(^1gcuRhv?yUslWk2yr!%qCwFTBTS4hp$?W@zN^Vgyj6(g##HeLQMbG|!toQBfj
zIX!${r{@y~#QjfpEhZ-?oi>|ot*WYOt*EGIdf$NAZ1!3#7JpPK6*)OM!F>T;U0sQ_
zH8lqw=(LoVDN!gC2i0oz5u?%Q(r7e7Nl8h<u7Js8s&Kn{H~IuOE{~UYZV#Qd7d+JK
zqBVLwTCEnjT;8-JU^bf@r#^mQz~^V~%OZ2%BKT%P*e4>`J+nM+Zs1~G?vhk0JsbnH
zwzi(}jSNM527f15UfTp9@Z%@`K$Py8EpF6Uv5hTKsk#%D%Veix07HG9L+Br5KD@!|
zZ&>*S;VtloK$@P3#lMZ-y@KO)59iX(+GBwBwkJV{YmC4$%q_tD3h0dONW>DFoHIO|
z27?gcsW(8LEGrNLv@}0j>UcZOR0!OkU?dEeFXfXf%YVi`3k@Ss=Ut~|D2yyKEfND%
zS5<mDodONL-?2`?%NZ~YuVUy8(mW1o58NLGd;fb*osbN~0OjRniszO#48j7sH-C?e
zqo5sziaw|t*+k{trn=%5DJe&<#Q=qcg$c@=r4tTo2fF@suD=R%w>yH`wMy9_sJu}u
zW)l)o>Sb6`Qqs;tQYw{+SBtOs8f!IJoqaS4pQ#tVV(S^^-tAJv$5MS_k?7Drr(94_
z5HFL-inB7(UHQ4^Ll?3$f+vrQUCGJG#Uha?e$UUe*ZcvYYTh<yw(95r0000<MNUMn
GLSTYhE+RGn

diff --git a/share/images/icons/UNIX.png b/share/images/icons/UNIX.png
index ebb6deb3424f603cd5f52aa2141310898a70e852..44d58989a7bd1f2e810e4ad70fc9b725e76a28b3 100644
GIT binary patch
delta 549
zcmV+=0^0qE0<r{<7=H)`0000V^Z#K0000JJOGiWi{{a60|De66lK=n!32;bRa{vGf
z6951U69E94oEQKA00(qQO+^RY0uTT-D@GuiSO5S4zez+vR5;6h(?4hvaTEve&&5#E
zK?0GZO9eA@)q)Vain<jnRHD#99g3q<aq42FP@G(Cg?1>|P=BFA-MSX4P|z+;a-f3B
z4+C+~fWtZT?s^H;x4p;ve&4_Ei*%eZWN|x=!)%z*cN5fn^xg~0j)rriGC|yq<8Ui{
zl88W43VI@4^t6UaDrG0s!)J*|1C1=$$cUO!b#JX%C}XMv{j91D_-hs<mW+F6&Xjf2
z_H8?B+-(m}Mt|6J;Fn2tsh-GuiD=V-IaAgwxZp8JL`LknYx;PEFD5mm8t7(~bDJ||
z!>%8eida+Xo9o9NTr_LU%VJ^OEU9g@G+JLhE09|vl4w;-hzn4@wEPOW&8z7R#o&@F
zl>(I8p(s9#&s#S=kUU~<!0(=N#vB|vA=tNFCW&9i_kSgs9`d5UeXYc=;+-Pc(+Zss
ztmwNT^~ZLhkxmFAi&D>Zvkvart%gnrR<ppeBU_%8#!9W|YufSCp{frUmxx?GUiyiY
zSM`hgZ`d{J+Q4o~V`|#bc4ttD^J+F7sCx5X@Hvaxo}Mmc*z-UuYhSUOlV^G~_)O7h
n@9c>g6CSRLj7fcmf4%cxhe4A>#J%Tq00000NkvXXu0mjff?WQr

delta 248
zcmV<U00;lF1c(BV7=Hu<0002(-QrRJ001yhOjJb#69fb{1O!L~1y=<HX$3TMG)R6(
zRE$(>n`?)thnKmRth=nR$FR=T&gtjr{QmrUgW!Sy005IoL_t&t*JJqq|KGBV`~Uwl
z{QqYtY$OX}d=OH0F`N%%{Qv(`^bf~>hOf%{|Kq1P<uiPAk#YS0O~gf>VUvsT|4$|^
zx(o|l9RL4UanWK}<RW+ee~OC~!y?D`JpUh==rBC={b=<6XR|!RC;LWc@i~qD4FC1N
ynYg%!15N(g?Be1Gvf?X~F~rjUzuP;2&Hw<-nMoNsrklF}0000<MNUMnLSTa4dwR<N