From 2f524f89fa777130ab32cbab4ae70f7ece6cef62 Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sat, 23 Feb 2013 10:46:48 +1100
Subject: [PATCH] Added AT Internet Analyzer, Adobe ColdFusion, BittAds,
 Fedora,  LiteSpeed, SQLite, Shopatron, Wix, iCongo, improved patterns

---
 drivers/bookmarklet/images/icons/Amaya.png    | Bin 810 -> 572 bytes
 drivers/bookmarklet/images/icons/CFML.png     | Bin 643 -> 1184 bytes
 drivers/bookmarklet/json                      |  63 ++++++++++++++++--
 drivers/chrome/_locales/en/messages.json      |   2 +-
 drivers/chrome/apps.json                      |  63 ++++++++++++++++--
 drivers/chrome/images/icons/Amaya.png         | Bin 810 -> 572 bytes
 drivers/chrome/images/icons/CFML.png          | Bin 643 -> 1184 bytes
 drivers/firefox-jetpack/data/apps.json        |  63 ++++++++++++++++--
 .../firefox-jetpack/images/icons/Amaya.png    | Bin 810 -> 572 bytes
 drivers/firefox-jetpack/images/icons/CFML.png | Bin 643 -> 1184 bytes
 drivers/firefox/content/apps.json             |  63 ++++++++++++++++--
 drivers/firefox/locale/en-US/wappalyzer.dtd   |   2 +-
 .../locale/en-US/wappalyzer.properties        |   2 +-
 drivers/firefox/skin/images/icons/Amaya.png   | Bin 810 -> 572 bytes
 drivers/firefox/skin/images/icons/CFML.png    | Bin 643 -> 1184 bytes
 drivers/html/apps.json                        |  63 ++++++++++++++++--
 drivers/html/images/icons/Amaya.png           | Bin 810 -> 572 bytes
 drivers/html/images/icons/CFML.png            | Bin 643 -> 1184 bytes
 drivers/php/apps.json                         |  63 ++++++++++++++++--
 share/apps.json                               |  63 ++++++++++++++++--
 share/images/icons/AT Internet.png            | Bin 508 -> 0 bytes
 share/images/icons/Amaya.png                  | Bin 810 -> 572 bytes
 share/images/icons/CFML.png                   | Bin 643 -> 1184 bytes
 23 files changed, 395 insertions(+), 52 deletions(-)
 delete mode 100644 share/images/icons/AT Internet.png

diff --git a/drivers/bookmarklet/images/icons/Amaya.png b/drivers/bookmarklet/images/icons/Amaya.png
index 900a305f5fa02c7c5a7f3f0617c71d9b3cdc2244..3b3042b2c24664a779d139ac644e777515e302d6 100644
GIT binary patch
delta 548
zcmV+<0^9wn2D}82BYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xUB853xgcP{_{0m(^3K~y-)&67_^(_t9LKihAAT-(T44*i)B)}p!?
zlVKr&LDE6JM5JCKiJ&^>u}dUgqQFDz;2(mR5JXU2qEJv55r6zh$FHVAQL}+D>!)sS
zI{Z2Jb_j<qjXc!@54^nJ_xZehpN9wj+t78YLK;^Xqy10stXm1$8BS>?Uq~}Zl(X9c
zjNGHyoF~a{USeg1B|82ZF#a01G(A@jH?Nc$s=RetZOiYpmYy(#d~OICHiT?3gmi4_
zX*le@{a(A1H-ChbYuTF|l+&4vTzB`u5b`8|Wqt9-x8cj5UtGU?;DSyfmm>Z{r^2aH
z?`c3mDgG-5oGAdlXM}(1QDeegS?9V|mf%_P$uGeIHU1#o)jb?5IbIBzv8|n^9v^H?
ze@eLmO%eJ^D(LrwsdQFR<EdqzJwQG-4o7}-tXcrHA%A?cQ6_zdTKs{gr<=?)%j$y&
zO2@^`r!W`e=IS#3^4d%34XU|}^I-(rgobO6iv87CaedS}dY^i8j`Maeac_BJ1CT1v
z-|3ip_hZ-JpnOZ=j8A}+g`NZFY&k)vvV*UVUG(_8j+h~25a<Hh^TCh{AR9UgrU^@n
m02yEaxE<m1S{DBO()|Q<|FmT{i{)<s0000<MNUMnLSTZXQ~oFb

delta 788
zcmV+v1MB>}1gZv*BYy(%Nkl<ZI1vTG&1+m$7{KA*Irq#*(#a(4Olmb>SVN?yM$%HL
zB2-Y9rBF&0M3=g>QV?AEAE;}0#f2y?L_sMEY8Me}Yi$HuVv})9HObthi8GU#x%Zs&
zzCMq+{PB_&ti>1uD5@X|QG_5$6eWlfq7b5x#YhN>k3tZ^C4bgn4PYRMq6#94k4jV}
zilV9j02nnG1F8^3a0cl6fG8x^($6D#j5uo%RYDN<Gfxo32O*C_9t2|zMitk~A``U=
zS%@@RZH|l`V5sQ$b7L2Pf=f8@*h3g&h@$u?1W|4`Qtt2UWA}O)k53%p?5SCHy927j
zC0={}2?{PDZGR7VYG#}_UV4)Ar)RnN>>RJ3ImYF)i<FCwv^&6NF>-UQMXge%K03^A
z%@ly?@hZE$jK!me`RYc4S3kVU%kO`~`c9Xxe{FJgd7Y?WV>GO6?BSy@Rj)EOT;g!G
z#B_ax;bMWA@e!`w`InW=|2RGOFjKV(?|pWiJSg2kz<&mfq@6yiTYDUP<RJ5tHMToB
zleG~}%^o51k)Q8vVXfuGg(>PIB`!QO%fJhnkJ#J`AqY!%H&~ddb7p>$D?j{!vxZlm
zo8$VuEt+YELXz<2M?Z4u$`bFMTjb=Ub+Y{on+L%f%kAbi#e!pGsK6J$H2CMiJ_}P-
zzWe<?oqs{#!R|h-y&j)@f0ym{faBALzz1yR1yN|UI;?H&vAWr2b*s&dwHB>*;M$!H
z%0<W9=T9<Lb{r@<Mk^&ceGkUq20=&+wEG#$fA7%C0=+zNb1mhkl}(!4T|jwZeu4{6
zAElQCnrVk`m)Bvah&lew=W2j~j~uL&$$X@lc7G@p9Fw&QxBg0zsEn2zZ=E~A*l>{#
zzP!bH+QAkbX7<vjs(`4{&m%qvQ6ckzJoDfZRDmc+F9#GeRK&OhRmJsv1Pr2zh!Pci
zh=?k-kPrk=#Uut-En|SFpsE14JO~C5QGzHTDnW!OiYTB8fGR{)00000{s#dxw*+i%
S5)GRG0000<MNUMnLSTYN^llme

diff --git a/drivers/bookmarklet/images/icons/CFML.png b/drivers/bookmarklet/images/icons/CFML.png
index 4b01af319cf32c6f22937a6dd9d32da0d10c1057..a9a4d8e12b84a5c5efa7f4ff2ebc8322d5e34988 100644
GIT binary patch
literal 1184
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2v2cW~I!Kh>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH
z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt
zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGf*%y)H5_T
zF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`JX@uVl9B=|ef{$C
za=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7N;32F6hI~>Cgqow
z*eU^C3h_d20o>TUVrVb{15Cdnu|VHY&j92lm_lD){7Q3k;i`*Ef>IIg#cFVINM%8)
zeo$(0erZuMFyhjbK~@!5ITxiSmgE<O<mczWLNOpCza+mnBfmhwIoMReH!(Rg55xzn
z_w}{%%quQQ%u7!7bg@+enxL1NnPTPU>T2R@ZeiwT=45JU=xS(TVQJxLVPb6QYGGz#
z<mv{~>yn>bnwy$e0@IrU)az{QX5eJ(W(3r0hE*>pDdZLaZFWg5$}CGwaVyHtRRDY0
zDigO`OmMpeqBjMLTcG|h#i>^x=oo!a#3DsBObD2IKumbD1#;jCKQ#}S+KYh6n*AN8
zG%!mf1o(uw7WdAvjLf|8`q!Ipzh3_Q@0nh4=i?tumk<q)NOkX+uEm?|<8s4_nw%2y
z=WRQ3;L`1<pMO34`v2j_U(?s`yY%RlmS4O<Q1bI{|6hFh_2}c@x>+kV+(I?nBh=j^
zwHyK*lZte^o6UiCt?+bl45_%~bM~TGlL1FV;<h^sl36#WoxJqD{&ZTY)j#oqbLET$
zmfLm2BPPAD_Y~G?atZ0YtulqpYi4}w%=kH;>NBRC;QfB_qSd<}jM|T754^n_wd&r3
zWzr>yhizhh|7pIrUAQtYAwFXLTj6CIQ>9#vUg4GU>aw2b){(?w_^ZHSDznz?Wd~G6
z);&7NZ8$kJE&DgacEwqea=Ggc-kCqk)<*vB%HyAP4=@}!$kWu=^G*p=W_Y^#xvX<a
GXaWG(xSqcN

delta 629
zcmV-*0*d{h34;ZY8Gix*005AYXf^-<0!m3lK~yMHO-(y!RY4S-v%4=ZFE@E6BoU)Y
z1Whp530f!!Vh}9U)=IGwTYuQtSP3ek*k~_U2nu2;mPrt?GZrEe)R;ib=e_&ey?f5F
zxDlLYW|(tk=;_>&v*fIG)>vzdAtIwt5sfU7C5lum%o3xBsDCr0&KPIl3@j8P1O^!b
z6i|YwT2%oEs;W+z1yEJtXr1frONdPHWfeTLMv;0)1T4Z)Too!fkqSxDpQh>OkMm`o
z?%p>uG&&YlMZp3VgiuA1$m$ATg%FaY|MRDX*N<**t^5EmGP(cqgBRWIW~d@7SkUb2
zj|vfWSzb08jeqXe^2>WSdwUue?mSBdhu2qsZESA6x_^D+_mUwJ=F>MG4^2*2W#Q5+
z?;9BWGWR}P`*q^l!yVIyi|*#o^sX#RLw93r-^`&imx`=oTLXETs<6vS&$j&Y^ILDy
z#=z+6$_mFoWK>lYXtrtRbfZkg7+;nET<}4y7gb?Svws{dAAMo06JghEtu8LSxpl6$
zJ$&rSUDwkTX6Hjx8~R4ZITXu_AE!>9hk!wqPh;?dd-m@=a*9PN)>u}6IA4}NRLR7_
zq4BBj@1A$oR+{bM&|Tkq^eo3ftsSkI<1z1e@1d$tSL7K~O`~UG_G0tH+s@bdZminl
z2Ym3&R&GK>oz<Tb3K$Cjsx*7`2>}4eHJr8ZDG{M3sj6TlC=8Q@ssi<cD~lW;5TLm#
z$T~nZUne5K01;3q@Q++x6aWYSQQc9SZH-$0x8S|6(>mBb-9~M<`)m9Kb}fH%z!$-3
P00000NkvXXu0mjfx2Plc

diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index bbf1545cb..7596158a9 100755
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -35,7 +35,7 @@
 		"33": "web-server-extensions",
 		"34": "databases",
 		"35": "maps",
-		"36": "advertizing-networks"
+		"36": "advertising-networks"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -211,6 +211,11 @@
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": "PHP"
 		},
+		"BittAds": {
+			"cats": [ 36 ],
+			"script": "^https://server\\.bittads\\.com/js/bitt\\.js$",
+			"env": "^bitt$"
+		},
 		"Blip.tv": {
 			"cats": [ 14 ],
 			"html": "<(param|embed|iframe)[^>]+blip\\.tv/play"
@@ -416,6 +421,14 @@
 			"html": "&nbsp;Powered by (<a href=[^>]+cs-cart\\.com|CS-Cart)",
 			"implies": "PHP"
 		},
+		"Adobe ColdFusion": {
+			"cats": [ 18 ],
+			"url": "\\.cfm$",
+			"html": "<!-- START headerTags\\.cfm",
+			"script": "/cfajax/",
+			"env": "^_cfEmails$",
+			"implies": "CFML"
+		},
 		"CubeCart": {
 			"cats": [ 6 ],
 			"html": "(Powered by <a href=[^>]+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
@@ -642,6 +655,10 @@
 			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
+		"Fedora": {
+			"cats": [ 28 ],
+			"headers": { "Server": "Fedora" }
+		},
 		"FlexCMP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
@@ -822,6 +839,11 @@
 			"url": "/wcs/",
 			"implies": "Java"
 		},
+		"iCongo": {
+			"cats": [ 6 ],
+			"html": "<meta[^>]+\"iCongo",
+			"implies": "Adobe ColdFusion"
+		},
 		"IIS": {
 			"cats": [ 22 ],
 			"headers": { "Server": "IIS(/([\\d.]+))?\\;version:\\2" },
@@ -989,7 +1011,8 @@
 		},
 		"KineticJS": {
 			"cats": [ 25 ],
-			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2"
+			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2",
+			"env": "^Kinetic$"
 		},
 		"KISSmetrics": {
 			"cats": [ 10 ],
@@ -1044,6 +1067,10 @@
 			"cats": [ 19 ],
 			"headers": { "generator": "LimeSurvey" }
 		},
+		"LiteSpeed": {
+			"cats": [ 22 ],
+			"headers": { "Server": "^LiteSpeed$" }
+		},
 		"Livefyre": {
 			"cats": [ 15 ],
 			"script": "livefyre_init\\.js",
@@ -1106,6 +1133,7 @@
 		},
 		"Microsoft ASP.NET": {
 			"cats": [ 18 ],
+			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
 			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
 			"implies": [ "IIS", "Windows Server" ]
@@ -1113,7 +1141,8 @@
 		"Microsoft SharePoint": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Microsoft SharePoint" },
-			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" }
+			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" },
+			"env": "^_spBodyOnLoadCalled$"
 		},
 		"MiniBB": {
 			"cats": [ 2 ],
@@ -1387,7 +1416,7 @@
 		},
 		"phpAlbum":	{
 			"cats":	[ 7 ],
-			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"html":	"<!--phpalbum [.\\d\\s]+-->",
 			"implies": "PHP"
 		},
 		"phpBB": {
@@ -1629,6 +1658,13 @@
 			"cats": [ 5, 10 ],
 			"env": "^Shopalize$"
 		},
+		"Shopatron": {
+			"cats": [ 6 ],
+			"html": [ "<body class=\"shopatron", "<img[^>]+mediacdn\\.shopatron\\.com\\;confidence:50" ],
+			"script": "mediacdn\\.shopatron\\.com",
+			"meta": { "keywords": "Shopatron" },
+			"env": "^shptUrl$"
+		},
 		"Shopify": {
 			"cats": [ 6 ],
 			"html": "<link[^>]+=cdn\\.shopify\\.com",
@@ -1720,6 +1756,9 @@
 			"cats": [ 3 ],
 			"html": "(<title>SQL Buddy</title>|<[^>]+onclick=\"sideMainClick\\(\"home\\.php)"
 		},
+		"SQLite": {
+			"cats": [ 34 ]
+		},
 		"Squarespace": {
 			"cats": [ 1 ],
 			"html": "Squarespace\\.Constants\\.CURRENT_MODULE_ID",
@@ -1977,7 +2016,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": "PHP"
+			"implies": [ "PHP", "MySQL" ]
 		},
 		"WebsPlanet": {
 			"cats": [ 1 ],
@@ -2010,6 +2049,12 @@
 			"script": "(_base/js/base|wink).*\\.js",
 			"env": "^wink$"
 		},
+		"Wix": {
+			"cats": [ 1 ],
+			"script": "static\\.wix\\.com",
+			"headers": { "X-Wix-Dispatcher-Cache-Hit": ".+", "Set-Cookie": "Domain=\\.wix\\.com" },
+			"env": "^wix(Events|Data|Errors)"
+		},
 		"Wolf CMS": {
 			"cats": [ 1 ],
 			"html": "(<a href=\"[^>]+wolfcms\\.org.+Wolf CMS.+inside|Thank you for using <a[^>]+>Wolf CMS)"
@@ -2042,9 +2087,13 @@
 			"cats": [ 2 ],
 			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
 		},
-		"XiTi": {
+		"AT Internet Analyzer": {
+			"cats": [ 10 ],
+			"env": "^xtsite$"
+		},
+		"AT Internet XiTi": {
 			"cats": [ 10 ],
-			"html": "(<[^>]+src=\"[^>]+xiti\\.com/hit\\.xiti)",
+			"script": "xiti\\.com/hit\\.xiti",
 			"env": "^Xt_"
 		},
 		"XMB": {
diff --git a/drivers/chrome/_locales/en/messages.json b/drivers/chrome/_locales/en/messages.json
index 1a1ee7696..daefcd5f2 100644
--- a/drivers/chrome/_locales/en/messages.json
+++ b/drivers/chrome/_locales/en/messages.json
@@ -47,5 +47,5 @@
 	"categoryName33":           { "message": "Web Server Extension" },
 	"categoryName34":           { "message": "Database" },
 	"categoryName35":           { "message": "Map" },
-	"categoryName36":           { "message": "Advertizing Netork" }
+	"categoryName36":           { "message": "Advertising Network" }
 }
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index bbf1545cb..7596158a9 100755
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -35,7 +35,7 @@
 		"33": "web-server-extensions",
 		"34": "databases",
 		"35": "maps",
-		"36": "advertizing-networks"
+		"36": "advertising-networks"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -211,6 +211,11 @@
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": "PHP"
 		},
+		"BittAds": {
+			"cats": [ 36 ],
+			"script": "^https://server\\.bittads\\.com/js/bitt\\.js$",
+			"env": "^bitt$"
+		},
 		"Blip.tv": {
 			"cats": [ 14 ],
 			"html": "<(param|embed|iframe)[^>]+blip\\.tv/play"
@@ -416,6 +421,14 @@
 			"html": "&nbsp;Powered by (<a href=[^>]+cs-cart\\.com|CS-Cart)",
 			"implies": "PHP"
 		},
+		"Adobe ColdFusion": {
+			"cats": [ 18 ],
+			"url": "\\.cfm$",
+			"html": "<!-- START headerTags\\.cfm",
+			"script": "/cfajax/",
+			"env": "^_cfEmails$",
+			"implies": "CFML"
+		},
 		"CubeCart": {
 			"cats": [ 6 ],
 			"html": "(Powered by <a href=[^>]+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
@@ -642,6 +655,10 @@
 			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
+		"Fedora": {
+			"cats": [ 28 ],
+			"headers": { "Server": "Fedora" }
+		},
 		"FlexCMP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
@@ -822,6 +839,11 @@
 			"url": "/wcs/",
 			"implies": "Java"
 		},
+		"iCongo": {
+			"cats": [ 6 ],
+			"html": "<meta[^>]+\"iCongo",
+			"implies": "Adobe ColdFusion"
+		},
 		"IIS": {
 			"cats": [ 22 ],
 			"headers": { "Server": "IIS(/([\\d.]+))?\\;version:\\2" },
@@ -989,7 +1011,8 @@
 		},
 		"KineticJS": {
 			"cats": [ 25 ],
-			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2"
+			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2",
+			"env": "^Kinetic$"
 		},
 		"KISSmetrics": {
 			"cats": [ 10 ],
@@ -1044,6 +1067,10 @@
 			"cats": [ 19 ],
 			"headers": { "generator": "LimeSurvey" }
 		},
+		"LiteSpeed": {
+			"cats": [ 22 ],
+			"headers": { "Server": "^LiteSpeed$" }
+		},
 		"Livefyre": {
 			"cats": [ 15 ],
 			"script": "livefyre_init\\.js",
@@ -1106,6 +1133,7 @@
 		},
 		"Microsoft ASP.NET": {
 			"cats": [ 18 ],
+			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
 			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
 			"implies": [ "IIS", "Windows Server" ]
@@ -1113,7 +1141,8 @@
 		"Microsoft SharePoint": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Microsoft SharePoint" },
-			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" }
+			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" },
+			"env": "^_spBodyOnLoadCalled$"
 		},
 		"MiniBB": {
 			"cats": [ 2 ],
@@ -1387,7 +1416,7 @@
 		},
 		"phpAlbum":	{
 			"cats":	[ 7 ],
-			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"html":	"<!--phpalbum [.\\d\\s]+-->",
 			"implies": "PHP"
 		},
 		"phpBB": {
@@ -1629,6 +1658,13 @@
 			"cats": [ 5, 10 ],
 			"env": "^Shopalize$"
 		},
+		"Shopatron": {
+			"cats": [ 6 ],
+			"html": [ "<body class=\"shopatron", "<img[^>]+mediacdn\\.shopatron\\.com\\;confidence:50" ],
+			"script": "mediacdn\\.shopatron\\.com",
+			"meta": { "keywords": "Shopatron" },
+			"env": "^shptUrl$"
+		},
 		"Shopify": {
 			"cats": [ 6 ],
 			"html": "<link[^>]+=cdn\\.shopify\\.com",
@@ -1720,6 +1756,9 @@
 			"cats": [ 3 ],
 			"html": "(<title>SQL Buddy</title>|<[^>]+onclick=\"sideMainClick\\(\"home\\.php)"
 		},
+		"SQLite": {
+			"cats": [ 34 ]
+		},
 		"Squarespace": {
 			"cats": [ 1 ],
 			"html": "Squarespace\\.Constants\\.CURRENT_MODULE_ID",
@@ -1977,7 +2016,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": "PHP"
+			"implies": [ "PHP", "MySQL" ]
 		},
 		"WebsPlanet": {
 			"cats": [ 1 ],
@@ -2010,6 +2049,12 @@
 			"script": "(_base/js/base|wink).*\\.js",
 			"env": "^wink$"
 		},
+		"Wix": {
+			"cats": [ 1 ],
+			"script": "static\\.wix\\.com",
+			"headers": { "X-Wix-Dispatcher-Cache-Hit": ".+", "Set-Cookie": "Domain=\\.wix\\.com" },
+			"env": "^wix(Events|Data|Errors)"
+		},
 		"Wolf CMS": {
 			"cats": [ 1 ],
 			"html": "(<a href=\"[^>]+wolfcms\\.org.+Wolf CMS.+inside|Thank you for using <a[^>]+>Wolf CMS)"
@@ -2042,9 +2087,13 @@
 			"cats": [ 2 ],
 			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
 		},
-		"XiTi": {
+		"AT Internet Analyzer": {
+			"cats": [ 10 ],
+			"env": "^xtsite$"
+		},
+		"AT Internet XiTi": {
 			"cats": [ 10 ],
-			"html": "(<[^>]+src=\"[^>]+xiti\\.com/hit\\.xiti)",
+			"script": "xiti\\.com/hit\\.xiti",
 			"env": "^Xt_"
 		},
 		"XMB": {
diff --git a/drivers/chrome/images/icons/Amaya.png b/drivers/chrome/images/icons/Amaya.png
index 900a305f5fa02c7c5a7f3f0617c71d9b3cdc2244..3b3042b2c24664a779d139ac644e777515e302d6 100644
GIT binary patch
delta 548
zcmV+<0^9wn2D}82BYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xUB853xgcP{_{0m(^3K~y-)&67_^(_t9LKihAAT-(T44*i)B)}p!?
zlVKr&LDE6JM5JCKiJ&^>u}dUgqQFDz;2(mR5JXU2qEJv55r6zh$FHVAQL}+D>!)sS
zI{Z2Jb_j<qjXc!@54^nJ_xZehpN9wj+t78YLK;^Xqy10stXm1$8BS>?Uq~}Zl(X9c
zjNGHyoF~a{USeg1B|82ZF#a01G(A@jH?Nc$s=RetZOiYpmYy(#d~OICHiT?3gmi4_
zX*le@{a(A1H-ChbYuTF|l+&4vTzB`u5b`8|Wqt9-x8cj5UtGU?;DSyfmm>Z{r^2aH
z?`c3mDgG-5oGAdlXM}(1QDeegS?9V|mf%_P$uGeIHU1#o)jb?5IbIBzv8|n^9v^H?
ze@eLmO%eJ^D(LrwsdQFR<EdqzJwQG-4o7}-tXcrHA%A?cQ6_zdTKs{gr<=?)%j$y&
zO2@^`r!W`e=IS#3^4d%34XU|}^I-(rgobO6iv87CaedS}dY^i8j`Maeac_BJ1CT1v
z-|3ip_hZ-JpnOZ=j8A}+g`NZFY&k)vvV*UVUG(_8j+h~25a<Hh^TCh{AR9UgrU^@n
m02yEaxE<m1S{DBO()|Q<|FmT{i{)<s0000<MNUMnLSTZXQ~oFb

delta 788
zcmV+v1MB>}1gZv*BYy(%Nkl<ZI1vTG&1+m$7{KA*Irq#*(#a(4Olmb>SVN?yM$%HL
zB2-Y9rBF&0M3=g>QV?AEAE;}0#f2y?L_sMEY8Me}Yi$HuVv})9HObthi8GU#x%Zs&
zzCMq+{PB_&ti>1uD5@X|QG_5$6eWlfq7b5x#YhN>k3tZ^C4bgn4PYRMq6#94k4jV}
zilV9j02nnG1F8^3a0cl6fG8x^($6D#j5uo%RYDN<Gfxo32O*C_9t2|zMitk~A``U=
zS%@@RZH|l`V5sQ$b7L2Pf=f8@*h3g&h@$u?1W|4`Qtt2UWA}O)k53%p?5SCHy927j
zC0={}2?{PDZGR7VYG#}_UV4)Ar)RnN>>RJ3ImYF)i<FCwv^&6NF>-UQMXge%K03^A
z%@ly?@hZE$jK!me`RYc4S3kVU%kO`~`c9Xxe{FJgd7Y?WV>GO6?BSy@Rj)EOT;g!G
z#B_ax;bMWA@e!`w`InW=|2RGOFjKV(?|pWiJSg2kz<&mfq@6yiTYDUP<RJ5tHMToB
zleG~}%^o51k)Q8vVXfuGg(>PIB`!QO%fJhnkJ#J`AqY!%H&~ddb7p>$D?j{!vxZlm
zo8$VuEt+YELXz<2M?Z4u$`bFMTjb=Ub+Y{on+L%f%kAbi#e!pGsK6J$H2CMiJ_}P-
zzWe<?oqs{#!R|h-y&j)@f0ym{faBALzz1yR1yN|UI;?H&vAWr2b*s&dwHB>*;M$!H
z%0<W9=T9<Lb{r@<Mk^&ceGkUq20=&+wEG#$fA7%C0=+zNb1mhkl}(!4T|jwZeu4{6
zAElQCnrVk`m)Bvah&lew=W2j~j~uL&$$X@lc7G@p9Fw&QxBg0zsEn2zZ=E~A*l>{#
zzP!bH+QAkbX7<vjs(`4{&m%qvQ6ckzJoDfZRDmc+F9#GeRK&OhRmJsv1Pr2zh!Pci
zh=?k-kPrk=#Uut-En|SFpsE14JO~C5QGzHTDnW!OiYTB8fGR{)00000{s#dxw*+i%
S5)GRG0000<MNUMnLSTYN^llme

diff --git a/drivers/chrome/images/icons/CFML.png b/drivers/chrome/images/icons/CFML.png
index 4b01af319cf32c6f22937a6dd9d32da0d10c1057..a9a4d8e12b84a5c5efa7f4ff2ebc8322d5e34988 100644
GIT binary patch
literal 1184
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2v2cW~I!Kh>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH
z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt
zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGf*%y)H5_T
zF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`JX@uVl9B=|ef{$C
za=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7N;32F6hI~>Cgqow
z*eU^C3h_d20o>TUVrVb{15Cdnu|VHY&j92lm_lD){7Q3k;i`*Ef>IIg#cFVINM%8)
zeo$(0erZuMFyhjbK~@!5ITxiSmgE<O<mczWLNOpCza+mnBfmhwIoMReH!(Rg55xzn
z_w}{%%quQQ%u7!7bg@+enxL1NnPTPU>T2R@ZeiwT=45JU=xS(TVQJxLVPb6QYGGz#
z<mv{~>yn>bnwy$e0@IrU)az{QX5eJ(W(3r0hE*>pDdZLaZFWg5$}CGwaVyHtRRDY0
zDigO`OmMpeqBjMLTcG|h#i>^x=oo!a#3DsBObD2IKumbD1#;jCKQ#}S+KYh6n*AN8
zG%!mf1o(uw7WdAvjLf|8`q!Ipzh3_Q@0nh4=i?tumk<q)NOkX+uEm?|<8s4_nw%2y
z=WRQ3;L`1<pMO34`v2j_U(?s`yY%RlmS4O<Q1bI{|6hFh_2}c@x>+kV+(I?nBh=j^
zwHyK*lZte^o6UiCt?+bl45_%~bM~TGlL1FV;<h^sl36#WoxJqD{&ZTY)j#oqbLET$
zmfLm2BPPAD_Y~G?atZ0YtulqpYi4}w%=kH;>NBRC;QfB_qSd<}jM|T754^n_wd&r3
zWzr>yhizhh|7pIrUAQtYAwFXLTj6CIQ>9#vUg4GU>aw2b){(?w_^ZHSDznz?Wd~G6
z);&7NZ8$kJE&DgacEwqea=Ggc-kCqk)<*vB%HyAP4=@}!$kWu=^G*p=W_Y^#xvX<a
GXaWG(xSqcN

delta 629
zcmV-*0*d{h34;ZY8Gix*005AYXf^-<0!m3lK~yMHO-(y!RY4S-v%4=ZFE@E6BoU)Y
z1Whp530f!!Vh}9U)=IGwTYuQtSP3ek*k~_U2nu2;mPrt?GZrEe)R;ib=e_&ey?f5F
zxDlLYW|(tk=;_>&v*fIG)>vzdAtIwt5sfU7C5lum%o3xBsDCr0&KPIl3@j8P1O^!b
z6i|YwT2%oEs;W+z1yEJtXr1frONdPHWfeTLMv;0)1T4Z)Too!fkqSxDpQh>OkMm`o
z?%p>uG&&YlMZp3VgiuA1$m$ATg%FaY|MRDX*N<**t^5EmGP(cqgBRWIW~d@7SkUb2
zj|vfWSzb08jeqXe^2>WSdwUue?mSBdhu2qsZESA6x_^D+_mUwJ=F>MG4^2*2W#Q5+
z?;9BWGWR}P`*q^l!yVIyi|*#o^sX#RLw93r-^`&imx`=oTLXETs<6vS&$j&Y^ILDy
z#=z+6$_mFoWK>lYXtrtRbfZkg7+;nET<}4y7gb?Svws{dAAMo06JghEtu8LSxpl6$
zJ$&rSUDwkTX6Hjx8~R4ZITXu_AE!>9hk!wqPh;?dd-m@=a*9PN)>u}6IA4}NRLR7_
zq4BBj@1A$oR+{bM&|Tkq^eo3ftsSkI<1z1e@1d$tSL7K~O`~UG_G0tH+s@bdZminl
z2Ym3&R&GK>oz<Tb3K$Cjsx*7`2>}4eHJr8ZDG{M3sj6TlC=8Q@ssi<cD~lW;5TLm#
z$T~nZUne5K01;3q@Q++x6aWYSQQc9SZH-$0x8S|6(>mBb-9~M<`)m9Kb}fH%z!$-3
P00000NkvXXu0mjfx2Plc

diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index bbf1545cb..7596158a9 100755
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -35,7 +35,7 @@
 		"33": "web-server-extensions",
 		"34": "databases",
 		"35": "maps",
-		"36": "advertizing-networks"
+		"36": "advertising-networks"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -211,6 +211,11 @@
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": "PHP"
 		},
+		"BittAds": {
+			"cats": [ 36 ],
+			"script": "^https://server\\.bittads\\.com/js/bitt\\.js$",
+			"env": "^bitt$"
+		},
 		"Blip.tv": {
 			"cats": [ 14 ],
 			"html": "<(param|embed|iframe)[^>]+blip\\.tv/play"
@@ -416,6 +421,14 @@
 			"html": "&nbsp;Powered by (<a href=[^>]+cs-cart\\.com|CS-Cart)",
 			"implies": "PHP"
 		},
+		"Adobe ColdFusion": {
+			"cats": [ 18 ],
+			"url": "\\.cfm$",
+			"html": "<!-- START headerTags\\.cfm",
+			"script": "/cfajax/",
+			"env": "^_cfEmails$",
+			"implies": "CFML"
+		},
 		"CubeCart": {
 			"cats": [ 6 ],
 			"html": "(Powered by <a href=[^>]+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
@@ -642,6 +655,10 @@
 			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
+		"Fedora": {
+			"cats": [ 28 ],
+			"headers": { "Server": "Fedora" }
+		},
 		"FlexCMP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
@@ -822,6 +839,11 @@
 			"url": "/wcs/",
 			"implies": "Java"
 		},
+		"iCongo": {
+			"cats": [ 6 ],
+			"html": "<meta[^>]+\"iCongo",
+			"implies": "Adobe ColdFusion"
+		},
 		"IIS": {
 			"cats": [ 22 ],
 			"headers": { "Server": "IIS(/([\\d.]+))?\\;version:\\2" },
@@ -989,7 +1011,8 @@
 		},
 		"KineticJS": {
 			"cats": [ 25 ],
-			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2"
+			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2",
+			"env": "^Kinetic$"
 		},
 		"KISSmetrics": {
 			"cats": [ 10 ],
@@ -1044,6 +1067,10 @@
 			"cats": [ 19 ],
 			"headers": { "generator": "LimeSurvey" }
 		},
+		"LiteSpeed": {
+			"cats": [ 22 ],
+			"headers": { "Server": "^LiteSpeed$" }
+		},
 		"Livefyre": {
 			"cats": [ 15 ],
 			"script": "livefyre_init\\.js",
@@ -1106,6 +1133,7 @@
 		},
 		"Microsoft ASP.NET": {
 			"cats": [ 18 ],
+			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
 			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
 			"implies": [ "IIS", "Windows Server" ]
@@ -1113,7 +1141,8 @@
 		"Microsoft SharePoint": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Microsoft SharePoint" },
-			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" }
+			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" },
+			"env": "^_spBodyOnLoadCalled$"
 		},
 		"MiniBB": {
 			"cats": [ 2 ],
@@ -1387,7 +1416,7 @@
 		},
 		"phpAlbum":	{
 			"cats":	[ 7 ],
-			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"html":	"<!--phpalbum [.\\d\\s]+-->",
 			"implies": "PHP"
 		},
 		"phpBB": {
@@ -1629,6 +1658,13 @@
 			"cats": [ 5, 10 ],
 			"env": "^Shopalize$"
 		},
+		"Shopatron": {
+			"cats": [ 6 ],
+			"html": [ "<body class=\"shopatron", "<img[^>]+mediacdn\\.shopatron\\.com\\;confidence:50" ],
+			"script": "mediacdn\\.shopatron\\.com",
+			"meta": { "keywords": "Shopatron" },
+			"env": "^shptUrl$"
+		},
 		"Shopify": {
 			"cats": [ 6 ],
 			"html": "<link[^>]+=cdn\\.shopify\\.com",
@@ -1720,6 +1756,9 @@
 			"cats": [ 3 ],
 			"html": "(<title>SQL Buddy</title>|<[^>]+onclick=\"sideMainClick\\(\"home\\.php)"
 		},
+		"SQLite": {
+			"cats": [ 34 ]
+		},
 		"Squarespace": {
 			"cats": [ 1 ],
 			"html": "Squarespace\\.Constants\\.CURRENT_MODULE_ID",
@@ -1977,7 +2016,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": "PHP"
+			"implies": [ "PHP", "MySQL" ]
 		},
 		"WebsPlanet": {
 			"cats": [ 1 ],
@@ -2010,6 +2049,12 @@
 			"script": "(_base/js/base|wink).*\\.js",
 			"env": "^wink$"
 		},
+		"Wix": {
+			"cats": [ 1 ],
+			"script": "static\\.wix\\.com",
+			"headers": { "X-Wix-Dispatcher-Cache-Hit": ".+", "Set-Cookie": "Domain=\\.wix\\.com" },
+			"env": "^wix(Events|Data|Errors)"
+		},
 		"Wolf CMS": {
 			"cats": [ 1 ],
 			"html": "(<a href=\"[^>]+wolfcms\\.org.+Wolf CMS.+inside|Thank you for using <a[^>]+>Wolf CMS)"
@@ -2042,9 +2087,13 @@
 			"cats": [ 2 ],
 			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
 		},
-		"XiTi": {
+		"AT Internet Analyzer": {
+			"cats": [ 10 ],
+			"env": "^xtsite$"
+		},
+		"AT Internet XiTi": {
 			"cats": [ 10 ],
-			"html": "(<[^>]+src=\"[^>]+xiti\\.com/hit\\.xiti)",
+			"script": "xiti\\.com/hit\\.xiti",
 			"env": "^Xt_"
 		},
 		"XMB": {
diff --git a/drivers/firefox-jetpack/images/icons/Amaya.png b/drivers/firefox-jetpack/images/icons/Amaya.png
index 900a305f5fa02c7c5a7f3f0617c71d9b3cdc2244..3b3042b2c24664a779d139ac644e777515e302d6 100644
GIT binary patch
delta 548
zcmV+<0^9wn2D}82BYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xUB853xgcP{_{0m(^3K~y-)&67_^(_t9LKihAAT-(T44*i)B)}p!?
zlVKr&LDE6JM5JCKiJ&^>u}dUgqQFDz;2(mR5JXU2qEJv55r6zh$FHVAQL}+D>!)sS
zI{Z2Jb_j<qjXc!@54^nJ_xZehpN9wj+t78YLK;^Xqy10stXm1$8BS>?Uq~}Zl(X9c
zjNGHyoF~a{USeg1B|82ZF#a01G(A@jH?Nc$s=RetZOiYpmYy(#d~OICHiT?3gmi4_
zX*le@{a(A1H-ChbYuTF|l+&4vTzB`u5b`8|Wqt9-x8cj5UtGU?;DSyfmm>Z{r^2aH
z?`c3mDgG-5oGAdlXM}(1QDeegS?9V|mf%_P$uGeIHU1#o)jb?5IbIBzv8|n^9v^H?
ze@eLmO%eJ^D(LrwsdQFR<EdqzJwQG-4o7}-tXcrHA%A?cQ6_zdTKs{gr<=?)%j$y&
zO2@^`r!W`e=IS#3^4d%34XU|}^I-(rgobO6iv87CaedS}dY^i8j`Maeac_BJ1CT1v
z-|3ip_hZ-JpnOZ=j8A}+g`NZFY&k)vvV*UVUG(_8j+h~25a<Hh^TCh{AR9UgrU^@n
m02yEaxE<m1S{DBO()|Q<|FmT{i{)<s0000<MNUMnLSTZXQ~oFb

delta 788
zcmV+v1MB>}1gZv*BYy(%Nkl<ZI1vTG&1+m$7{KA*Irq#*(#a(4Olmb>SVN?yM$%HL
zB2-Y9rBF&0M3=g>QV?AEAE;}0#f2y?L_sMEY8Me}Yi$HuVv})9HObthi8GU#x%Zs&
zzCMq+{PB_&ti>1uD5@X|QG_5$6eWlfq7b5x#YhN>k3tZ^C4bgn4PYRMq6#94k4jV}
zilV9j02nnG1F8^3a0cl6fG8x^($6D#j5uo%RYDN<Gfxo32O*C_9t2|zMitk~A``U=
zS%@@RZH|l`V5sQ$b7L2Pf=f8@*h3g&h@$u?1W|4`Qtt2UWA}O)k53%p?5SCHy927j
zC0={}2?{PDZGR7VYG#}_UV4)Ar)RnN>>RJ3ImYF)i<FCwv^&6NF>-UQMXge%K03^A
z%@ly?@hZE$jK!me`RYc4S3kVU%kO`~`c9Xxe{FJgd7Y?WV>GO6?BSy@Rj)EOT;g!G
z#B_ax;bMWA@e!`w`InW=|2RGOFjKV(?|pWiJSg2kz<&mfq@6yiTYDUP<RJ5tHMToB
zleG~}%^o51k)Q8vVXfuGg(>PIB`!QO%fJhnkJ#J`AqY!%H&~ddb7p>$D?j{!vxZlm
zo8$VuEt+YELXz<2M?Z4u$`bFMTjb=Ub+Y{on+L%f%kAbi#e!pGsK6J$H2CMiJ_}P-
zzWe<?oqs{#!R|h-y&j)@f0ym{faBALzz1yR1yN|UI;?H&vAWr2b*s&dwHB>*;M$!H
z%0<W9=T9<Lb{r@<Mk^&ceGkUq20=&+wEG#$fA7%C0=+zNb1mhkl}(!4T|jwZeu4{6
zAElQCnrVk`m)Bvah&lew=W2j~j~uL&$$X@lc7G@p9Fw&QxBg0zsEn2zZ=E~A*l>{#
zzP!bH+QAkbX7<vjs(`4{&m%qvQ6ckzJoDfZRDmc+F9#GeRK&OhRmJsv1Pr2zh!Pci
zh=?k-kPrk=#Uut-En|SFpsE14JO~C5QGzHTDnW!OiYTB8fGR{)00000{s#dxw*+i%
S5)GRG0000<MNUMnLSTYN^llme

diff --git a/drivers/firefox-jetpack/images/icons/CFML.png b/drivers/firefox-jetpack/images/icons/CFML.png
index 4b01af319cf32c6f22937a6dd9d32da0d10c1057..a9a4d8e12b84a5c5efa7f4ff2ebc8322d5e34988 100644
GIT binary patch
literal 1184
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2v2cW~I!Kh>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH
z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt
zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGf*%y)H5_T
zF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`JX@uVl9B=|ef{$C
za=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7N;32F6hI~>Cgqow
z*eU^C3h_d20o>TUVrVb{15Cdnu|VHY&j92lm_lD){7Q3k;i`*Ef>IIg#cFVINM%8)
zeo$(0erZuMFyhjbK~@!5ITxiSmgE<O<mczWLNOpCza+mnBfmhwIoMReH!(Rg55xzn
z_w}{%%quQQ%u7!7bg@+enxL1NnPTPU>T2R@ZeiwT=45JU=xS(TVQJxLVPb6QYGGz#
z<mv{~>yn>bnwy$e0@IrU)az{QX5eJ(W(3r0hE*>pDdZLaZFWg5$}CGwaVyHtRRDY0
zDigO`OmMpeqBjMLTcG|h#i>^x=oo!a#3DsBObD2IKumbD1#;jCKQ#}S+KYh6n*AN8
zG%!mf1o(uw7WdAvjLf|8`q!Ipzh3_Q@0nh4=i?tumk<q)NOkX+uEm?|<8s4_nw%2y
z=WRQ3;L`1<pMO34`v2j_U(?s`yY%RlmS4O<Q1bI{|6hFh_2}c@x>+kV+(I?nBh=j^
zwHyK*lZte^o6UiCt?+bl45_%~bM~TGlL1FV;<h^sl36#WoxJqD{&ZTY)j#oqbLET$
zmfLm2BPPAD_Y~G?atZ0YtulqpYi4}w%=kH;>NBRC;QfB_qSd<}jM|T754^n_wd&r3
zWzr>yhizhh|7pIrUAQtYAwFXLTj6CIQ>9#vUg4GU>aw2b){(?w_^ZHSDznz?Wd~G6
z);&7NZ8$kJE&DgacEwqea=Ggc-kCqk)<*vB%HyAP4=@}!$kWu=^G*p=W_Y^#xvX<a
GXaWG(xSqcN

delta 629
zcmV-*0*d{h34;ZY8Gix*005AYXf^-<0!m3lK~yMHO-(y!RY4S-v%4=ZFE@E6BoU)Y
z1Whp530f!!Vh}9U)=IGwTYuQtSP3ek*k~_U2nu2;mPrt?GZrEe)R;ib=e_&ey?f5F
zxDlLYW|(tk=;_>&v*fIG)>vzdAtIwt5sfU7C5lum%o3xBsDCr0&KPIl3@j8P1O^!b
z6i|YwT2%oEs;W+z1yEJtXr1frONdPHWfeTLMv;0)1T4Z)Too!fkqSxDpQh>OkMm`o
z?%p>uG&&YlMZp3VgiuA1$m$ATg%FaY|MRDX*N<**t^5EmGP(cqgBRWIW~d@7SkUb2
zj|vfWSzb08jeqXe^2>WSdwUue?mSBdhu2qsZESA6x_^D+_mUwJ=F>MG4^2*2W#Q5+
z?;9BWGWR}P`*q^l!yVIyi|*#o^sX#RLw93r-^`&imx`=oTLXETs<6vS&$j&Y^ILDy
z#=z+6$_mFoWK>lYXtrtRbfZkg7+;nET<}4y7gb?Svws{dAAMo06JghEtu8LSxpl6$
zJ$&rSUDwkTX6Hjx8~R4ZITXu_AE!>9hk!wqPh;?dd-m@=a*9PN)>u}6IA4}NRLR7_
zq4BBj@1A$oR+{bM&|Tkq^eo3ftsSkI<1z1e@1d$tSL7K~O`~UG_G0tH+s@bdZminl
z2Ym3&R&GK>oz<Tb3K$Cjsx*7`2>}4eHJr8ZDG{M3sj6TlC=8Q@ssi<cD~lW;5TLm#
z$T~nZUne5K01;3q@Q++x6aWYSQQc9SZH-$0x8S|6(>mBb-9~M<`)m9Kb}fH%z!$-3
P00000NkvXXu0mjfx2Plc

diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index bbf1545cb..7596158a9 100755
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -35,7 +35,7 @@
 		"33": "web-server-extensions",
 		"34": "databases",
 		"35": "maps",
-		"36": "advertizing-networks"
+		"36": "advertising-networks"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -211,6 +211,11 @@
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": "PHP"
 		},
+		"BittAds": {
+			"cats": [ 36 ],
+			"script": "^https://server\\.bittads\\.com/js/bitt\\.js$",
+			"env": "^bitt$"
+		},
 		"Blip.tv": {
 			"cats": [ 14 ],
 			"html": "<(param|embed|iframe)[^>]+blip\\.tv/play"
@@ -416,6 +421,14 @@
 			"html": "&nbsp;Powered by (<a href=[^>]+cs-cart\\.com|CS-Cart)",
 			"implies": "PHP"
 		},
+		"Adobe ColdFusion": {
+			"cats": [ 18 ],
+			"url": "\\.cfm$",
+			"html": "<!-- START headerTags\\.cfm",
+			"script": "/cfajax/",
+			"env": "^_cfEmails$",
+			"implies": "CFML"
+		},
 		"CubeCart": {
 			"cats": [ 6 ],
 			"html": "(Powered by <a href=[^>]+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
@@ -642,6 +655,10 @@
 			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
+		"Fedora": {
+			"cats": [ 28 ],
+			"headers": { "Server": "Fedora" }
+		},
 		"FlexCMP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
@@ -822,6 +839,11 @@
 			"url": "/wcs/",
 			"implies": "Java"
 		},
+		"iCongo": {
+			"cats": [ 6 ],
+			"html": "<meta[^>]+\"iCongo",
+			"implies": "Adobe ColdFusion"
+		},
 		"IIS": {
 			"cats": [ 22 ],
 			"headers": { "Server": "IIS(/([\\d.]+))?\\;version:\\2" },
@@ -989,7 +1011,8 @@
 		},
 		"KineticJS": {
 			"cats": [ 25 ],
-			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2"
+			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2",
+			"env": "^Kinetic$"
 		},
 		"KISSmetrics": {
 			"cats": [ 10 ],
@@ -1044,6 +1067,10 @@
 			"cats": [ 19 ],
 			"headers": { "generator": "LimeSurvey" }
 		},
+		"LiteSpeed": {
+			"cats": [ 22 ],
+			"headers": { "Server": "^LiteSpeed$" }
+		},
 		"Livefyre": {
 			"cats": [ 15 ],
 			"script": "livefyre_init\\.js",
@@ -1106,6 +1133,7 @@
 		},
 		"Microsoft ASP.NET": {
 			"cats": [ 18 ],
+			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
 			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
 			"implies": [ "IIS", "Windows Server" ]
@@ -1113,7 +1141,8 @@
 		"Microsoft SharePoint": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Microsoft SharePoint" },
-			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" }
+			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" },
+			"env": "^_spBodyOnLoadCalled$"
 		},
 		"MiniBB": {
 			"cats": [ 2 ],
@@ -1387,7 +1416,7 @@
 		},
 		"phpAlbum":	{
 			"cats":	[ 7 ],
-			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"html":	"<!--phpalbum [.\\d\\s]+-->",
 			"implies": "PHP"
 		},
 		"phpBB": {
@@ -1629,6 +1658,13 @@
 			"cats": [ 5, 10 ],
 			"env": "^Shopalize$"
 		},
+		"Shopatron": {
+			"cats": [ 6 ],
+			"html": [ "<body class=\"shopatron", "<img[^>]+mediacdn\\.shopatron\\.com\\;confidence:50" ],
+			"script": "mediacdn\\.shopatron\\.com",
+			"meta": { "keywords": "Shopatron" },
+			"env": "^shptUrl$"
+		},
 		"Shopify": {
 			"cats": [ 6 ],
 			"html": "<link[^>]+=cdn\\.shopify\\.com",
@@ -1720,6 +1756,9 @@
 			"cats": [ 3 ],
 			"html": "(<title>SQL Buddy</title>|<[^>]+onclick=\"sideMainClick\\(\"home\\.php)"
 		},
+		"SQLite": {
+			"cats": [ 34 ]
+		},
 		"Squarespace": {
 			"cats": [ 1 ],
 			"html": "Squarespace\\.Constants\\.CURRENT_MODULE_ID",
@@ -1977,7 +2016,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": "PHP"
+			"implies": [ "PHP", "MySQL" ]
 		},
 		"WebsPlanet": {
 			"cats": [ 1 ],
@@ -2010,6 +2049,12 @@
 			"script": "(_base/js/base|wink).*\\.js",
 			"env": "^wink$"
 		},
+		"Wix": {
+			"cats": [ 1 ],
+			"script": "static\\.wix\\.com",
+			"headers": { "X-Wix-Dispatcher-Cache-Hit": ".+", "Set-Cookie": "Domain=\\.wix\\.com" },
+			"env": "^wix(Events|Data|Errors)"
+		},
 		"Wolf CMS": {
 			"cats": [ 1 ],
 			"html": "(<a href=\"[^>]+wolfcms\\.org.+Wolf CMS.+inside|Thank you for using <a[^>]+>Wolf CMS)"
@@ -2042,9 +2087,13 @@
 			"cats": [ 2 ],
 			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
 		},
-		"XiTi": {
+		"AT Internet Analyzer": {
+			"cats": [ 10 ],
+			"env": "^xtsite$"
+		},
+		"AT Internet XiTi": {
 			"cats": [ 10 ],
-			"html": "(<[^>]+src=\"[^>]+xiti\\.com/hit\\.xiti)",
+			"script": "xiti\\.com/hit\\.xiti",
 			"env": "^Xt_"
 		},
 		"XMB": {
diff --git a/drivers/firefox/locale/en-US/wappalyzer.dtd b/drivers/firefox/locale/en-US/wappalyzer.dtd
index e477b6488..6d111238f 100755
--- a/drivers/firefox/locale/en-US/wappalyzer.dtd
+++ b/drivers/firefox/locale/en-US/wappalyzer.dtd
@@ -53,4 +53,4 @@
 <!ENTITY wappalyzer.cat33             "Web Server Extensions">
 <!ENTITY wappalyzer.cat34             "Databases">
 <!ENTITY wappalyzer.cat35             "Maps">
-<!ENTITY wappalyzer.cat36             "Advertizing Networks">
+<!ENTITY wappalyzer.cat36             "Advertising Networks">
diff --git a/drivers/firefox/locale/en-US/wappalyzer.properties b/drivers/firefox/locale/en-US/wappalyzer.properties
index 576bdf83d..45341b4d2 100755
--- a/drivers/firefox/locale/en-US/wappalyzer.properties
+++ b/drivers/firefox/locale/en-US/wappalyzer.properties
@@ -37,4 +37,4 @@ wappalyzer.cat32          = Marketing Automation
 wappalyzer.cat33          = Web Server Extension
 wappalyzer.cat34          = Database
 wappalyzer.cat35          = Map 
-wappalyzer.cat36          = Advertizing Network
+wappalyzer.cat36          = Advertising Network
diff --git a/drivers/firefox/skin/images/icons/Amaya.png b/drivers/firefox/skin/images/icons/Amaya.png
index 900a305f5fa02c7c5a7f3f0617c71d9b3cdc2244..3b3042b2c24664a779d139ac644e777515e302d6 100644
GIT binary patch
delta 548
zcmV+<0^9wn2D}82BYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xUB853xgcP{_{0m(^3K~y-)&67_^(_t9LKihAAT-(T44*i)B)}p!?
zlVKr&LDE6JM5JCKiJ&^>u}dUgqQFDz;2(mR5JXU2qEJv55r6zh$FHVAQL}+D>!)sS
zI{Z2Jb_j<qjXc!@54^nJ_xZehpN9wj+t78YLK;^Xqy10stXm1$8BS>?Uq~}Zl(X9c
zjNGHyoF~a{USeg1B|82ZF#a01G(A@jH?Nc$s=RetZOiYpmYy(#d~OICHiT?3gmi4_
zX*le@{a(A1H-ChbYuTF|l+&4vTzB`u5b`8|Wqt9-x8cj5UtGU?;DSyfmm>Z{r^2aH
z?`c3mDgG-5oGAdlXM}(1QDeegS?9V|mf%_P$uGeIHU1#o)jb?5IbIBzv8|n^9v^H?
ze@eLmO%eJ^D(LrwsdQFR<EdqzJwQG-4o7}-tXcrHA%A?cQ6_zdTKs{gr<=?)%j$y&
zO2@^`r!W`e=IS#3^4d%34XU|}^I-(rgobO6iv87CaedS}dY^i8j`Maeac_BJ1CT1v
z-|3ip_hZ-JpnOZ=j8A}+g`NZFY&k)vvV*UVUG(_8j+h~25a<Hh^TCh{AR9UgrU^@n
m02yEaxE<m1S{DBO()|Q<|FmT{i{)<s0000<MNUMnLSTZXQ~oFb

delta 788
zcmV+v1MB>}1gZv*BYy(%Nkl<ZI1vTG&1+m$7{KA*Irq#*(#a(4Olmb>SVN?yM$%HL
zB2-Y9rBF&0M3=g>QV?AEAE;}0#f2y?L_sMEY8Me}Yi$HuVv})9HObthi8GU#x%Zs&
zzCMq+{PB_&ti>1uD5@X|QG_5$6eWlfq7b5x#YhN>k3tZ^C4bgn4PYRMq6#94k4jV}
zilV9j02nnG1F8^3a0cl6fG8x^($6D#j5uo%RYDN<Gfxo32O*C_9t2|zMitk~A``U=
zS%@@RZH|l`V5sQ$b7L2Pf=f8@*h3g&h@$u?1W|4`Qtt2UWA}O)k53%p?5SCHy927j
zC0={}2?{PDZGR7VYG#}_UV4)Ar)RnN>>RJ3ImYF)i<FCwv^&6NF>-UQMXge%K03^A
z%@ly?@hZE$jK!me`RYc4S3kVU%kO`~`c9Xxe{FJgd7Y?WV>GO6?BSy@Rj)EOT;g!G
z#B_ax;bMWA@e!`w`InW=|2RGOFjKV(?|pWiJSg2kz<&mfq@6yiTYDUP<RJ5tHMToB
zleG~}%^o51k)Q8vVXfuGg(>PIB`!QO%fJhnkJ#J`AqY!%H&~ddb7p>$D?j{!vxZlm
zo8$VuEt+YELXz<2M?Z4u$`bFMTjb=Ub+Y{on+L%f%kAbi#e!pGsK6J$H2CMiJ_}P-
zzWe<?oqs{#!R|h-y&j)@f0ym{faBALzz1yR1yN|UI;?H&vAWr2b*s&dwHB>*;M$!H
z%0<W9=T9<Lb{r@<Mk^&ceGkUq20=&+wEG#$fA7%C0=+zNb1mhkl}(!4T|jwZeu4{6
zAElQCnrVk`m)Bvah&lew=W2j~j~uL&$$X@lc7G@p9Fw&QxBg0zsEn2zZ=E~A*l>{#
zzP!bH+QAkbX7<vjs(`4{&m%qvQ6ckzJoDfZRDmc+F9#GeRK&OhRmJsv1Pr2zh!Pci
zh=?k-kPrk=#Uut-En|SFpsE14JO~C5QGzHTDnW!OiYTB8fGR{)00000{s#dxw*+i%
S5)GRG0000<MNUMnLSTYN^llme

diff --git a/drivers/firefox/skin/images/icons/CFML.png b/drivers/firefox/skin/images/icons/CFML.png
index 4b01af319cf32c6f22937a6dd9d32da0d10c1057..a9a4d8e12b84a5c5efa7f4ff2ebc8322d5e34988 100644
GIT binary patch
literal 1184
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2v2cW~I!Kh>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH
z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt
zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGf*%y)H5_T
zF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`JX@uVl9B=|ef{$C
za=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7N;32F6hI~>Cgqow
z*eU^C3h_d20o>TUVrVb{15Cdnu|VHY&j92lm_lD){7Q3k;i`*Ef>IIg#cFVINM%8)
zeo$(0erZuMFyhjbK~@!5ITxiSmgE<O<mczWLNOpCza+mnBfmhwIoMReH!(Rg55xzn
z_w}{%%quQQ%u7!7bg@+enxL1NnPTPU>T2R@ZeiwT=45JU=xS(TVQJxLVPb6QYGGz#
z<mv{~>yn>bnwy$e0@IrU)az{QX5eJ(W(3r0hE*>pDdZLaZFWg5$}CGwaVyHtRRDY0
zDigO`OmMpeqBjMLTcG|h#i>^x=oo!a#3DsBObD2IKumbD1#;jCKQ#}S+KYh6n*AN8
zG%!mf1o(uw7WdAvjLf|8`q!Ipzh3_Q@0nh4=i?tumk<q)NOkX+uEm?|<8s4_nw%2y
z=WRQ3;L`1<pMO34`v2j_U(?s`yY%RlmS4O<Q1bI{|6hFh_2}c@x>+kV+(I?nBh=j^
zwHyK*lZte^o6UiCt?+bl45_%~bM~TGlL1FV;<h^sl36#WoxJqD{&ZTY)j#oqbLET$
zmfLm2BPPAD_Y~G?atZ0YtulqpYi4}w%=kH;>NBRC;QfB_qSd<}jM|T754^n_wd&r3
zWzr>yhizhh|7pIrUAQtYAwFXLTj6CIQ>9#vUg4GU>aw2b){(?w_^ZHSDznz?Wd~G6
z);&7NZ8$kJE&DgacEwqea=Ggc-kCqk)<*vB%HyAP4=@}!$kWu=^G*p=W_Y^#xvX<a
GXaWG(xSqcN

delta 629
zcmV-*0*d{h34;ZY8Gix*005AYXf^-<0!m3lK~yMHO-(y!RY4S-v%4=ZFE@E6BoU)Y
z1Whp530f!!Vh}9U)=IGwTYuQtSP3ek*k~_U2nu2;mPrt?GZrEe)R;ib=e_&ey?f5F
zxDlLYW|(tk=;_>&v*fIG)>vzdAtIwt5sfU7C5lum%o3xBsDCr0&KPIl3@j8P1O^!b
z6i|YwT2%oEs;W+z1yEJtXr1frONdPHWfeTLMv;0)1T4Z)Too!fkqSxDpQh>OkMm`o
z?%p>uG&&YlMZp3VgiuA1$m$ATg%FaY|MRDX*N<**t^5EmGP(cqgBRWIW~d@7SkUb2
zj|vfWSzb08jeqXe^2>WSdwUue?mSBdhu2qsZESA6x_^D+_mUwJ=F>MG4^2*2W#Q5+
z?;9BWGWR}P`*q^l!yVIyi|*#o^sX#RLw93r-^`&imx`=oTLXETs<6vS&$j&Y^ILDy
z#=z+6$_mFoWK>lYXtrtRbfZkg7+;nET<}4y7gb?Svws{dAAMo06JghEtu8LSxpl6$
zJ$&rSUDwkTX6Hjx8~R4ZITXu_AE!>9hk!wqPh;?dd-m@=a*9PN)>u}6IA4}NRLR7_
zq4BBj@1A$oR+{bM&|Tkq^eo3ftsSkI<1z1e@1d$tSL7K~O`~UG_G0tH+s@bdZminl
z2Ym3&R&GK>oz<Tb3K$Cjsx*7`2>}4eHJr8ZDG{M3sj6TlC=8Q@ssi<cD~lW;5TLm#
z$T~nZUne5K01;3q@Q++x6aWYSQQc9SZH-$0x8S|6(>mBb-9~M<`)m9Kb}fH%z!$-3
P00000NkvXXu0mjfx2Plc

diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index bbf1545cb..7596158a9 100755
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -35,7 +35,7 @@
 		"33": "web-server-extensions",
 		"34": "databases",
 		"35": "maps",
-		"36": "advertizing-networks"
+		"36": "advertising-networks"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -211,6 +211,11 @@
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": "PHP"
 		},
+		"BittAds": {
+			"cats": [ 36 ],
+			"script": "^https://server\\.bittads\\.com/js/bitt\\.js$",
+			"env": "^bitt$"
+		},
 		"Blip.tv": {
 			"cats": [ 14 ],
 			"html": "<(param|embed|iframe)[^>]+blip\\.tv/play"
@@ -416,6 +421,14 @@
 			"html": "&nbsp;Powered by (<a href=[^>]+cs-cart\\.com|CS-Cart)",
 			"implies": "PHP"
 		},
+		"Adobe ColdFusion": {
+			"cats": [ 18 ],
+			"url": "\\.cfm$",
+			"html": "<!-- START headerTags\\.cfm",
+			"script": "/cfajax/",
+			"env": "^_cfEmails$",
+			"implies": "CFML"
+		},
 		"CubeCart": {
 			"cats": [ 6 ],
 			"html": "(Powered by <a href=[^>]+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
@@ -642,6 +655,10 @@
 			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
+		"Fedora": {
+			"cats": [ 28 ],
+			"headers": { "Server": "Fedora" }
+		},
 		"FlexCMP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
@@ -822,6 +839,11 @@
 			"url": "/wcs/",
 			"implies": "Java"
 		},
+		"iCongo": {
+			"cats": [ 6 ],
+			"html": "<meta[^>]+\"iCongo",
+			"implies": "Adobe ColdFusion"
+		},
 		"IIS": {
 			"cats": [ 22 ],
 			"headers": { "Server": "IIS(/([\\d.]+))?\\;version:\\2" },
@@ -989,7 +1011,8 @@
 		},
 		"KineticJS": {
 			"cats": [ 25 ],
-			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2"
+			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2",
+			"env": "^Kinetic$"
 		},
 		"KISSmetrics": {
 			"cats": [ 10 ],
@@ -1044,6 +1067,10 @@
 			"cats": [ 19 ],
 			"headers": { "generator": "LimeSurvey" }
 		},
+		"LiteSpeed": {
+			"cats": [ 22 ],
+			"headers": { "Server": "^LiteSpeed$" }
+		},
 		"Livefyre": {
 			"cats": [ 15 ],
 			"script": "livefyre_init\\.js",
@@ -1106,6 +1133,7 @@
 		},
 		"Microsoft ASP.NET": {
 			"cats": [ 18 ],
+			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
 			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
 			"implies": [ "IIS", "Windows Server" ]
@@ -1113,7 +1141,8 @@
 		"Microsoft SharePoint": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Microsoft SharePoint" },
-			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" }
+			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" },
+			"env": "^_spBodyOnLoadCalled$"
 		},
 		"MiniBB": {
 			"cats": [ 2 ],
@@ -1387,7 +1416,7 @@
 		},
 		"phpAlbum":	{
 			"cats":	[ 7 ],
-			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"html":	"<!--phpalbum [.\\d\\s]+-->",
 			"implies": "PHP"
 		},
 		"phpBB": {
@@ -1629,6 +1658,13 @@
 			"cats": [ 5, 10 ],
 			"env": "^Shopalize$"
 		},
+		"Shopatron": {
+			"cats": [ 6 ],
+			"html": [ "<body class=\"shopatron", "<img[^>]+mediacdn\\.shopatron\\.com\\;confidence:50" ],
+			"script": "mediacdn\\.shopatron\\.com",
+			"meta": { "keywords": "Shopatron" },
+			"env": "^shptUrl$"
+		},
 		"Shopify": {
 			"cats": [ 6 ],
 			"html": "<link[^>]+=cdn\\.shopify\\.com",
@@ -1720,6 +1756,9 @@
 			"cats": [ 3 ],
 			"html": "(<title>SQL Buddy</title>|<[^>]+onclick=\"sideMainClick\\(\"home\\.php)"
 		},
+		"SQLite": {
+			"cats": [ 34 ]
+		},
 		"Squarespace": {
 			"cats": [ 1 ],
 			"html": "Squarespace\\.Constants\\.CURRENT_MODULE_ID",
@@ -1977,7 +2016,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": "PHP"
+			"implies": [ "PHP", "MySQL" ]
 		},
 		"WebsPlanet": {
 			"cats": [ 1 ],
@@ -2010,6 +2049,12 @@
 			"script": "(_base/js/base|wink).*\\.js",
 			"env": "^wink$"
 		},
+		"Wix": {
+			"cats": [ 1 ],
+			"script": "static\\.wix\\.com",
+			"headers": { "X-Wix-Dispatcher-Cache-Hit": ".+", "Set-Cookie": "Domain=\\.wix\\.com" },
+			"env": "^wix(Events|Data|Errors)"
+		},
 		"Wolf CMS": {
 			"cats": [ 1 ],
 			"html": "(<a href=\"[^>]+wolfcms\\.org.+Wolf CMS.+inside|Thank you for using <a[^>]+>Wolf CMS)"
@@ -2042,9 +2087,13 @@
 			"cats": [ 2 ],
 			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
 		},
-		"XiTi": {
+		"AT Internet Analyzer": {
+			"cats": [ 10 ],
+			"env": "^xtsite$"
+		},
+		"AT Internet XiTi": {
 			"cats": [ 10 ],
-			"html": "(<[^>]+src=\"[^>]+xiti\\.com/hit\\.xiti)",
+			"script": "xiti\\.com/hit\\.xiti",
 			"env": "^Xt_"
 		},
 		"XMB": {
diff --git a/drivers/html/images/icons/Amaya.png b/drivers/html/images/icons/Amaya.png
index 900a305f5fa02c7c5a7f3f0617c71d9b3cdc2244..3b3042b2c24664a779d139ac644e777515e302d6 100644
GIT binary patch
delta 548
zcmV+<0^9wn2D}82BYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xUB853xgcP{_{0m(^3K~y-)&67_^(_t9LKihAAT-(T44*i)B)}p!?
zlVKr&LDE6JM5JCKiJ&^>u}dUgqQFDz;2(mR5JXU2qEJv55r6zh$FHVAQL}+D>!)sS
zI{Z2Jb_j<qjXc!@54^nJ_xZehpN9wj+t78YLK;^Xqy10stXm1$8BS>?Uq~}Zl(X9c
zjNGHyoF~a{USeg1B|82ZF#a01G(A@jH?Nc$s=RetZOiYpmYy(#d~OICHiT?3gmi4_
zX*le@{a(A1H-ChbYuTF|l+&4vTzB`u5b`8|Wqt9-x8cj5UtGU?;DSyfmm>Z{r^2aH
z?`c3mDgG-5oGAdlXM}(1QDeegS?9V|mf%_P$uGeIHU1#o)jb?5IbIBzv8|n^9v^H?
ze@eLmO%eJ^D(LrwsdQFR<EdqzJwQG-4o7}-tXcrHA%A?cQ6_zdTKs{gr<=?)%j$y&
zO2@^`r!W`e=IS#3^4d%34XU|}^I-(rgobO6iv87CaedS}dY^i8j`Maeac_BJ1CT1v
z-|3ip_hZ-JpnOZ=j8A}+g`NZFY&k)vvV*UVUG(_8j+h~25a<Hh^TCh{AR9UgrU^@n
m02yEaxE<m1S{DBO()|Q<|FmT{i{)<s0000<MNUMnLSTZXQ~oFb

delta 788
zcmV+v1MB>}1gZv*BYy(%Nkl<ZI1vTG&1+m$7{KA*Irq#*(#a(4Olmb>SVN?yM$%HL
zB2-Y9rBF&0M3=g>QV?AEAE;}0#f2y?L_sMEY8Me}Yi$HuVv})9HObthi8GU#x%Zs&
zzCMq+{PB_&ti>1uD5@X|QG_5$6eWlfq7b5x#YhN>k3tZ^C4bgn4PYRMq6#94k4jV}
zilV9j02nnG1F8^3a0cl6fG8x^($6D#j5uo%RYDN<Gfxo32O*C_9t2|zMitk~A``U=
zS%@@RZH|l`V5sQ$b7L2Pf=f8@*h3g&h@$u?1W|4`Qtt2UWA}O)k53%p?5SCHy927j
zC0={}2?{PDZGR7VYG#}_UV4)Ar)RnN>>RJ3ImYF)i<FCwv^&6NF>-UQMXge%K03^A
z%@ly?@hZE$jK!me`RYc4S3kVU%kO`~`c9Xxe{FJgd7Y?WV>GO6?BSy@Rj)EOT;g!G
z#B_ax;bMWA@e!`w`InW=|2RGOFjKV(?|pWiJSg2kz<&mfq@6yiTYDUP<RJ5tHMToB
zleG~}%^o51k)Q8vVXfuGg(>PIB`!QO%fJhnkJ#J`AqY!%H&~ddb7p>$D?j{!vxZlm
zo8$VuEt+YELXz<2M?Z4u$`bFMTjb=Ub+Y{on+L%f%kAbi#e!pGsK6J$H2CMiJ_}P-
zzWe<?oqs{#!R|h-y&j)@f0ym{faBALzz1yR1yN|UI;?H&vAWr2b*s&dwHB>*;M$!H
z%0<W9=T9<Lb{r@<Mk^&ceGkUq20=&+wEG#$fA7%C0=+zNb1mhkl}(!4T|jwZeu4{6
zAElQCnrVk`m)Bvah&lew=W2j~j~uL&$$X@lc7G@p9Fw&QxBg0zsEn2zZ=E~A*l>{#
zzP!bH+QAkbX7<vjs(`4{&m%qvQ6ckzJoDfZRDmc+F9#GeRK&OhRmJsv1Pr2zh!Pci
zh=?k-kPrk=#Uut-En|SFpsE14JO~C5QGzHTDnW!OiYTB8fGR{)00000{s#dxw*+i%
S5)GRG0000<MNUMnLSTYN^llme

diff --git a/drivers/html/images/icons/CFML.png b/drivers/html/images/icons/CFML.png
index 4b01af319cf32c6f22937a6dd9d32da0d10c1057..a9a4d8e12b84a5c5efa7f4ff2ebc8322d5e34988 100644
GIT binary patch
literal 1184
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2v2cW~I!Kh>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH
z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt
zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGf*%y)H5_T
zF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`JX@uVl9B=|ef{$C
za=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7N;32F6hI~>Cgqow
z*eU^C3h_d20o>TUVrVb{15Cdnu|VHY&j92lm_lD){7Q3k;i`*Ef>IIg#cFVINM%8)
zeo$(0erZuMFyhjbK~@!5ITxiSmgE<O<mczWLNOpCza+mnBfmhwIoMReH!(Rg55xzn
z_w}{%%quQQ%u7!7bg@+enxL1NnPTPU>T2R@ZeiwT=45JU=xS(TVQJxLVPb6QYGGz#
z<mv{~>yn>bnwy$e0@IrU)az{QX5eJ(W(3r0hE*>pDdZLaZFWg5$}CGwaVyHtRRDY0
zDigO`OmMpeqBjMLTcG|h#i>^x=oo!a#3DsBObD2IKumbD1#;jCKQ#}S+KYh6n*AN8
zG%!mf1o(uw7WdAvjLf|8`q!Ipzh3_Q@0nh4=i?tumk<q)NOkX+uEm?|<8s4_nw%2y
z=WRQ3;L`1<pMO34`v2j_U(?s`yY%RlmS4O<Q1bI{|6hFh_2}c@x>+kV+(I?nBh=j^
zwHyK*lZte^o6UiCt?+bl45_%~bM~TGlL1FV;<h^sl36#WoxJqD{&ZTY)j#oqbLET$
zmfLm2BPPAD_Y~G?atZ0YtulqpYi4}w%=kH;>NBRC;QfB_qSd<}jM|T754^n_wd&r3
zWzr>yhizhh|7pIrUAQtYAwFXLTj6CIQ>9#vUg4GU>aw2b){(?w_^ZHSDznz?Wd~G6
z);&7NZ8$kJE&DgacEwqea=Ggc-kCqk)<*vB%HyAP4=@}!$kWu=^G*p=W_Y^#xvX<a
GXaWG(xSqcN

delta 629
zcmV-*0*d{h34;ZY8Gix*005AYXf^-<0!m3lK~yMHO-(y!RY4S-v%4=ZFE@E6BoU)Y
z1Whp530f!!Vh}9U)=IGwTYuQtSP3ek*k~_U2nu2;mPrt?GZrEe)R;ib=e_&ey?f5F
zxDlLYW|(tk=;_>&v*fIG)>vzdAtIwt5sfU7C5lum%o3xBsDCr0&KPIl3@j8P1O^!b
z6i|YwT2%oEs;W+z1yEJtXr1frONdPHWfeTLMv;0)1T4Z)Too!fkqSxDpQh>OkMm`o
z?%p>uG&&YlMZp3VgiuA1$m$ATg%FaY|MRDX*N<**t^5EmGP(cqgBRWIW~d@7SkUb2
zj|vfWSzb08jeqXe^2>WSdwUue?mSBdhu2qsZESA6x_^D+_mUwJ=F>MG4^2*2W#Q5+
z?;9BWGWR}P`*q^l!yVIyi|*#o^sX#RLw93r-^`&imx`=oTLXETs<6vS&$j&Y^ILDy
z#=z+6$_mFoWK>lYXtrtRbfZkg7+;nET<}4y7gb?Svws{dAAMo06JghEtu8LSxpl6$
zJ$&rSUDwkTX6Hjx8~R4ZITXu_AE!>9hk!wqPh;?dd-m@=a*9PN)>u}6IA4}NRLR7_
zq4BBj@1A$oR+{bM&|Tkq^eo3ftsSkI<1z1e@1d$tSL7K~O`~UG_G0tH+s@bdZminl
z2Ym3&R&GK>oz<Tb3K$Cjsx*7`2>}4eHJr8ZDG{M3sj6TlC=8Q@ssi<cD~lW;5TLm#
z$T~nZUne5K01;3q@Q++x6aWYSQQc9SZH-$0x8S|6(>mBb-9~M<`)m9Kb}fH%z!$-3
P00000NkvXXu0mjfx2Plc

diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index bbf1545cb..7596158a9 100755
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -35,7 +35,7 @@
 		"33": "web-server-extensions",
 		"34": "databases",
 		"35": "maps",
-		"36": "advertizing-networks"
+		"36": "advertising-networks"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -211,6 +211,11 @@
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": "PHP"
 		},
+		"BittAds": {
+			"cats": [ 36 ],
+			"script": "^https://server\\.bittads\\.com/js/bitt\\.js$",
+			"env": "^bitt$"
+		},
 		"Blip.tv": {
 			"cats": [ 14 ],
 			"html": "<(param|embed|iframe)[^>]+blip\\.tv/play"
@@ -416,6 +421,14 @@
 			"html": "&nbsp;Powered by (<a href=[^>]+cs-cart\\.com|CS-Cart)",
 			"implies": "PHP"
 		},
+		"Adobe ColdFusion": {
+			"cats": [ 18 ],
+			"url": "\\.cfm$",
+			"html": "<!-- START headerTags\\.cfm",
+			"script": "/cfajax/",
+			"env": "^_cfEmails$",
+			"implies": "CFML"
+		},
 		"CubeCart": {
 			"cats": [ 6 ],
 			"html": "(Powered by <a href=[^>]+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
@@ -642,6 +655,10 @@
 			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
+		"Fedora": {
+			"cats": [ 28 ],
+			"headers": { "Server": "Fedora" }
+		},
 		"FlexCMP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
@@ -822,6 +839,11 @@
 			"url": "/wcs/",
 			"implies": "Java"
 		},
+		"iCongo": {
+			"cats": [ 6 ],
+			"html": "<meta[^>]+\"iCongo",
+			"implies": "Adobe ColdFusion"
+		},
 		"IIS": {
 			"cats": [ 22 ],
 			"headers": { "Server": "IIS(/([\\d.]+))?\\;version:\\2" },
@@ -989,7 +1011,8 @@
 		},
 		"KineticJS": {
 			"cats": [ 25 ],
-			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2"
+			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2",
+			"env": "^Kinetic$"
 		},
 		"KISSmetrics": {
 			"cats": [ 10 ],
@@ -1044,6 +1067,10 @@
 			"cats": [ 19 ],
 			"headers": { "generator": "LimeSurvey" }
 		},
+		"LiteSpeed": {
+			"cats": [ 22 ],
+			"headers": { "Server": "^LiteSpeed$" }
+		},
 		"Livefyre": {
 			"cats": [ 15 ],
 			"script": "livefyre_init\\.js",
@@ -1106,6 +1133,7 @@
 		},
 		"Microsoft ASP.NET": {
 			"cats": [ 18 ],
+			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
 			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
 			"implies": [ "IIS", "Windows Server" ]
@@ -1113,7 +1141,8 @@
 		"Microsoft SharePoint": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Microsoft SharePoint" },
-			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" }
+			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" },
+			"env": "^_spBodyOnLoadCalled$"
 		},
 		"MiniBB": {
 			"cats": [ 2 ],
@@ -1387,7 +1416,7 @@
 		},
 		"phpAlbum":	{
 			"cats":	[ 7 ],
-			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"html":	"<!--phpalbum [.\\d\\s]+-->",
 			"implies": "PHP"
 		},
 		"phpBB": {
@@ -1629,6 +1658,13 @@
 			"cats": [ 5, 10 ],
 			"env": "^Shopalize$"
 		},
+		"Shopatron": {
+			"cats": [ 6 ],
+			"html": [ "<body class=\"shopatron", "<img[^>]+mediacdn\\.shopatron\\.com\\;confidence:50" ],
+			"script": "mediacdn\\.shopatron\\.com",
+			"meta": { "keywords": "Shopatron" },
+			"env": "^shptUrl$"
+		},
 		"Shopify": {
 			"cats": [ 6 ],
 			"html": "<link[^>]+=cdn\\.shopify\\.com",
@@ -1720,6 +1756,9 @@
 			"cats": [ 3 ],
 			"html": "(<title>SQL Buddy</title>|<[^>]+onclick=\"sideMainClick\\(\"home\\.php)"
 		},
+		"SQLite": {
+			"cats": [ 34 ]
+		},
 		"Squarespace": {
 			"cats": [ 1 ],
 			"html": "Squarespace\\.Constants\\.CURRENT_MODULE_ID",
@@ -1977,7 +2016,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": "PHP"
+			"implies": [ "PHP", "MySQL" ]
 		},
 		"WebsPlanet": {
 			"cats": [ 1 ],
@@ -2010,6 +2049,12 @@
 			"script": "(_base/js/base|wink).*\\.js",
 			"env": "^wink$"
 		},
+		"Wix": {
+			"cats": [ 1 ],
+			"script": "static\\.wix\\.com",
+			"headers": { "X-Wix-Dispatcher-Cache-Hit": ".+", "Set-Cookie": "Domain=\\.wix\\.com" },
+			"env": "^wix(Events|Data|Errors)"
+		},
 		"Wolf CMS": {
 			"cats": [ 1 ],
 			"html": "(<a href=\"[^>]+wolfcms\\.org.+Wolf CMS.+inside|Thank you for using <a[^>]+>Wolf CMS)"
@@ -2042,9 +2087,13 @@
 			"cats": [ 2 ],
 			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
 		},
-		"XiTi": {
+		"AT Internet Analyzer": {
+			"cats": [ 10 ],
+			"env": "^xtsite$"
+		},
+		"AT Internet XiTi": {
 			"cats": [ 10 ],
-			"html": "(<[^>]+src=\"[^>]+xiti\\.com/hit\\.xiti)",
+			"script": "xiti\\.com/hit\\.xiti",
 			"env": "^Xt_"
 		},
 		"XMB": {
diff --git a/share/apps.json b/share/apps.json
index bbf1545cb..7596158a9 100755
--- a/share/apps.json
+++ b/share/apps.json
@@ -35,7 +35,7 @@
 		"33": "web-server-extensions",
 		"34": "databases",
 		"35": "maps",
-		"36": "advertizing-networks"
+		"36": "advertising-networks"
 	},
 	"apps": {
 		"1C-Bitrix": {
@@ -211,6 +211,11 @@
 			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
 			"implies": "PHP"
 		},
+		"BittAds": {
+			"cats": [ 36 ],
+			"script": "^https://server\\.bittads\\.com/js/bitt\\.js$",
+			"env": "^bitt$"
+		},
 		"Blip.tv": {
 			"cats": [ 14 ],
 			"html": "<(param|embed|iframe)[^>]+blip\\.tv/play"
@@ -416,6 +421,14 @@
 			"html": "&nbsp;Powered by (<a href=[^>]+cs-cart\\.com|CS-Cart)",
 			"implies": "PHP"
 		},
+		"Adobe ColdFusion": {
+			"cats": [ 18 ],
+			"url": "\\.cfm$",
+			"html": "<!-- START headerTags\\.cfm",
+			"script": "/cfajax/",
+			"env": "^_cfEmails$",
+			"implies": "CFML"
+		},
 		"CubeCart": {
 			"cats": [ 6 ],
 			"html": "(Powered by <a href=[^>]+cubecart\\.com|<p[^>]+>Powered by CubeCart)",
@@ -642,6 +655,10 @@
 			"html": "<input[^>]+ name=\"ParametricSearch",
 			"implies": [ "Microsoft SharePoint", "Microsoft ASP.NET" ]
 		},
+		"Fedora": {
+			"cats": [ 28 ],
+			"headers": { "Server": "Fedora" }
+		},
 		"FlexCMP": {
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
@@ -822,6 +839,11 @@
 			"url": "/wcs/",
 			"implies": "Java"
 		},
+		"iCongo": {
+			"cats": [ 6 ],
+			"html": "<meta[^>]+\"iCongo",
+			"implies": "Adobe ColdFusion"
+		},
 		"IIS": {
 			"cats": [ 22 ],
 			"headers": { "Server": "IIS(/([\\d.]+))?\\;version:\\2" },
@@ -989,7 +1011,8 @@
 		},
 		"KineticJS": {
 			"cats": [ 25 ],
-			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2"
+			"script": "kinetic(-v?([\\d.]+))?\\.js\\;version:\\2",
+			"env": "^Kinetic$"
 		},
 		"KISSmetrics": {
 			"cats": [ 10 ],
@@ -1044,6 +1067,10 @@
 			"cats": [ 19 ],
 			"headers": { "generator": "LimeSurvey" }
 		},
+		"LiteSpeed": {
+			"cats": [ 22 ],
+			"headers": { "Server": "^LiteSpeed$" }
+		},
 		"Livefyre": {
 			"cats": [ 15 ],
 			"script": "livefyre_init\\.js",
@@ -1106,6 +1133,7 @@
 		},
 		"Microsoft ASP.NET": {
 			"cats": [ 18 ],
+			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
 			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
 			"implies": [ "IIS", "Windows Server" ]
@@ -1113,7 +1141,8 @@
 		"Microsoft SharePoint": {
 			"cats": [ 1 ],
 			"meta": { "generator": "Microsoft SharePoint" },
-			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" }
+			"headers": { "MicrosoftSharePointTeamServices": "(.*)\\;version:\\1", "X-SharePointHealthScore": ".*", "SPRequestGuid": ".*", "SharePointHealthScore": ".*" },
+			"env": "^_spBodyOnLoadCalled$"
 		},
 		"MiniBB": {
 			"cats": [ 2 ],
@@ -1387,7 +1416,7 @@
 		},
 		"phpAlbum":	{
 			"cats":	[ 7 ],
-			"html":	"<!--phpalbum [\\.\\d\\s]+-->",
+			"html":	"<!--phpalbum [.\\d\\s]+-->",
 			"implies": "PHP"
 		},
 		"phpBB": {
@@ -1629,6 +1658,13 @@
 			"cats": [ 5, 10 ],
 			"env": "^Shopalize$"
 		},
+		"Shopatron": {
+			"cats": [ 6 ],
+			"html": [ "<body class=\"shopatron", "<img[^>]+mediacdn\\.shopatron\\.com\\;confidence:50" ],
+			"script": "mediacdn\\.shopatron\\.com",
+			"meta": { "keywords": "Shopatron" },
+			"env": "^shptUrl$"
+		},
 		"Shopify": {
 			"cats": [ 6 ],
 			"html": "<link[^>]+=cdn\\.shopify\\.com",
@@ -1720,6 +1756,9 @@
 			"cats": [ 3 ],
 			"html": "(<title>SQL Buddy</title>|<[^>]+onclick=\"sideMainClick\\(\"home\\.php)"
 		},
+		"SQLite": {
+			"cats": [ 34 ]
+		},
 		"Squarespace": {
 			"cats": [ 1 ],
 			"html": "Squarespace\\.Constants\\.CURRENT_MODULE_ID",
@@ -1977,7 +2016,7 @@
 		"WebsiteBaker": {
 			"cats": [ 1 ],
 			"meta": { "generator": "WebsiteBaker" },
-			"implies": "PHP"
+			"implies": [ "PHP", "MySQL" ]
 		},
 		"WebsPlanet": {
 			"cats": [ 1 ],
@@ -2010,6 +2049,12 @@
 			"script": "(_base/js/base|wink).*\\.js",
 			"env": "^wink$"
 		},
+		"Wix": {
+			"cats": [ 1 ],
+			"script": "static\\.wix\\.com",
+			"headers": { "X-Wix-Dispatcher-Cache-Hit": ".+", "Set-Cookie": "Domain=\\.wix\\.com" },
+			"env": "^wix(Events|Data|Errors)"
+		},
 		"Wolf CMS": {
 			"cats": [ 1 ],
 			"html": "(<a href=\"[^>]+wolfcms\\.org.+Wolf CMS.+inside|Thank you for using <a[^>]+>Wolf CMS)"
@@ -2042,9 +2087,13 @@
 			"cats": [ 2 ],
 			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
 		},
-		"XiTi": {
+		"AT Internet Analyzer": {
+			"cats": [ 10 ],
+			"env": "^xtsite$"
+		},
+		"AT Internet XiTi": {
 			"cats": [ 10 ],
-			"html": "(<[^>]+src=\"[^>]+xiti\\.com/hit\\.xiti)",
+			"script": "xiti\\.com/hit\\.xiti",
 			"env": "^Xt_"
 		},
 		"XMB": {
diff --git a/share/images/icons/AT Internet.png b/share/images/icons/AT Internet.png
deleted file mode 100644
index d62370881df3294d6273eae0e49177b8fc047d6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2x944=M&3Qsn>u0f|XO
zK~y-)ZPU+-jbRiA@XvYYPQ#dz(M(xM$%4pAwn8D9rG?nBv+?KHE6u{MCQ4)_Wu-C5
z)NIhGiMlSjG2<Sa=T1*=@2R)m=Q-c=J<mDcb0RZ!SwzfY9*M7+Iq1aI1Q8K9iUl0P
zRB;Wlg8Nv@DrlP^A|`MJ7ts{|2BtAn&Re*Hr7=lUWxk9{RWLlmtLogtHJlw^jKK%X
zvupc_=Xi|Gx@=sHi20h}0w!7nk1)U&ylDA$;xsf7(ZjJ8;9L2kB>7y(YCArzX&Sp)
z&fDmhvZC~1gzFV%HX@o{hqMEH$jo6x{K4<c>_@~_QK62Brf58@E??qYL>$06eniA!
zoW$!2*T<;I%uT$j93wo$Zk#C%{)eSj_P3dtV-=p1KsbS^%zRS@X(cm1Vo#Y;_*-UV
zTgLZzTK?y7Ga_cNj874<7q^Ohu$Y<a?NOe@4V)^VUsx=e&tpe<<pbQ!%u&}eHKkb#
y*k1-{4o9$xdsyyVrq(Jq*oW_!EVHta9pL}&Xp7fLc6Pb|0000<MNUMnLSTXc_2OXw

diff --git a/share/images/icons/Amaya.png b/share/images/icons/Amaya.png
index 900a305f5fa02c7c5a7f3f0617c71d9b3cdc2244..3b3042b2c24664a779d139ac644e777515e302d6 100644
GIT binary patch
delta 548
zcmV+<0^9wn2D}82BYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2xUB853xgcP{_{0m(^3K~y-)&67_^(_t9LKihAAT-(T44*i)B)}p!?
zlVKr&LDE6JM5JCKiJ&^>u}dUgqQFDz;2(mR5JXU2qEJv55r6zh$FHVAQL}+D>!)sS
zI{Z2Jb_j<qjXc!@54^nJ_xZehpN9wj+t78YLK;^Xqy10stXm1$8BS>?Uq~}Zl(X9c
zjNGHyoF~a{USeg1B|82ZF#a01G(A@jH?Nc$s=RetZOiYpmYy(#d~OICHiT?3gmi4_
zX*le@{a(A1H-ChbYuTF|l+&4vTzB`u5b`8|Wqt9-x8cj5UtGU?;DSyfmm>Z{r^2aH
z?`c3mDgG-5oGAdlXM}(1QDeegS?9V|mf%_P$uGeIHU1#o)jb?5IbIBzv8|n^9v^H?
ze@eLmO%eJ^D(LrwsdQFR<EdqzJwQG-4o7}-tXcrHA%A?cQ6_zdTKs{gr<=?)%j$y&
zO2@^`r!W`e=IS#3^4d%34XU|}^I-(rgobO6iv87CaedS}dY^i8j`Maeac_BJ1CT1v
z-|3ip_hZ-JpnOZ=j8A}+g`NZFY&k)vvV*UVUG(_8j+h~25a<Hh^TCh{AR9UgrU^@n
m02yEaxE<m1S{DBO()|Q<|FmT{i{)<s0000<MNUMnLSTZXQ~oFb

delta 788
zcmV+v1MB>}1gZv*BYy(%Nkl<ZI1vTG&1+m$7{KA*Irq#*(#a(4Olmb>SVN?yM$%HL
zB2-Y9rBF&0M3=g>QV?AEAE;}0#f2y?L_sMEY8Me}Yi$HuVv})9HObthi8GU#x%Zs&
zzCMq+{PB_&ti>1uD5@X|QG_5$6eWlfq7b5x#YhN>k3tZ^C4bgn4PYRMq6#94k4jV}
zilV9j02nnG1F8^3a0cl6fG8x^($6D#j5uo%RYDN<Gfxo32O*C_9t2|zMitk~A``U=
zS%@@RZH|l`V5sQ$b7L2Pf=f8@*h3g&h@$u?1W|4`Qtt2UWA}O)k53%p?5SCHy927j
zC0={}2?{PDZGR7VYG#}_UV4)Ar)RnN>>RJ3ImYF)i<FCwv^&6NF>-UQMXge%K03^A
z%@ly?@hZE$jK!me`RYc4S3kVU%kO`~`c9Xxe{FJgd7Y?WV>GO6?BSy@Rj)EOT;g!G
z#B_ax;bMWA@e!`w`InW=|2RGOFjKV(?|pWiJSg2kz<&mfq@6yiTYDUP<RJ5tHMToB
zleG~}%^o51k)Q8vVXfuGg(>PIB`!QO%fJhnkJ#J`AqY!%H&~ddb7p>$D?j{!vxZlm
zo8$VuEt+YELXz<2M?Z4u$`bFMTjb=Ub+Y{on+L%f%kAbi#e!pGsK6J$H2CMiJ_}P-
zzWe<?oqs{#!R|h-y&j)@f0ym{faBALzz1yR1yN|UI;?H&vAWr2b*s&dwHB>*;M$!H
z%0<W9=T9<Lb{r@<Mk^&ceGkUq20=&+wEG#$fA7%C0=+zNb1mhkl}(!4T|jwZeu4{6
zAElQCnrVk`m)Bvah&lew=W2j~j~uL&$$X@lc7G@p9Fw&QxBg0zsEn2zZ=E~A*l>{#
zzP!bH+QAkbX7<vjs(`4{&m%qvQ6ckzJoDfZRDmc+F9#GeRK&OhRmJsv1Pr2zh!Pci
zh=?k-kPrk=#Uut-En|SFpsE14JO~C5QGzHTDnW!OiYTB8fGR{)00000{s#dxw*+i%
S5)GRG0000<MNUMnLSTYN^llme

diff --git a/share/images/icons/CFML.png b/share/images/icons/CFML.png
index 4b01af319cf32c6f22937a6dd9d32da0d10c1057..a9a4d8e12b84a5c5efa7f4ff2ebc8322d5e34988 100644
GIT binary patch
literal 1184
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2v2cW~I!Kh>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH
z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt
zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v&`mZlGf*%y)H5_T
zF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`JX@uVl9B=|ef{$C
za=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7N;32F6hI~>Cgqow
z*eU^C3h_d20o>TUVrVb{15Cdnu|VHY&j92lm_lD){7Q3k;i`*Ef>IIg#cFVINM%8)
zeo$(0erZuMFyhjbK~@!5ITxiSmgE<O<mczWLNOpCza+mnBfmhwIoMReH!(Rg55xzn
z_w}{%%quQQ%u7!7bg@+enxL1NnPTPU>T2R@ZeiwT=45JU=xS(TVQJxLVPb6QYGGz#
z<mv{~>yn>bnwy$e0@IrU)az{QX5eJ(W(3r0hE*>pDdZLaZFWg5$}CGwaVyHtRRDY0
zDigO`OmMpeqBjMLTcG|h#i>^x=oo!a#3DsBObD2IKumbD1#;jCKQ#}S+KYh6n*AN8
zG%!mf1o(uw7WdAvjLf|8`q!Ipzh3_Q@0nh4=i?tumk<q)NOkX+uEm?|<8s4_nw%2y
z=WRQ3;L`1<pMO34`v2j_U(?s`yY%RlmS4O<Q1bI{|6hFh_2}c@x>+kV+(I?nBh=j^
zwHyK*lZte^o6UiCt?+bl45_%~bM~TGlL1FV;<h^sl36#WoxJqD{&ZTY)j#oqbLET$
zmfLm2BPPAD_Y~G?atZ0YtulqpYi4}w%=kH;>NBRC;QfB_qSd<}jM|T754^n_wd&r3
zWzr>yhizhh|7pIrUAQtYAwFXLTj6CIQ>9#vUg4GU>aw2b){(?w_^ZHSDznz?Wd~G6
z);&7NZ8$kJE&DgacEwqea=Ggc-kCqk)<*vB%HyAP4=@}!$kWu=^G*p=W_Y^#xvX<a
GXaWG(xSqcN

delta 629
zcmV-*0*d{h34;ZY8Gix*005AYXf^-<0!m3lK~yMHO-(y!RY4S-v%4=ZFE@E6BoU)Y
z1Whp530f!!Vh}9U)=IGwTYuQtSP3ek*k~_U2nu2;mPrt?GZrEe)R;ib=e_&ey?f5F
zxDlLYW|(tk=;_>&v*fIG)>vzdAtIwt5sfU7C5lum%o3xBsDCr0&KPIl3@j8P1O^!b
z6i|YwT2%oEs;W+z1yEJtXr1frONdPHWfeTLMv;0)1T4Z)Too!fkqSxDpQh>OkMm`o
z?%p>uG&&YlMZp3VgiuA1$m$ATg%FaY|MRDX*N<**t^5EmGP(cqgBRWIW~d@7SkUb2
zj|vfWSzb08jeqXe^2>WSdwUue?mSBdhu2qsZESA6x_^D+_mUwJ=F>MG4^2*2W#Q5+
z?;9BWGWR}P`*q^l!yVIyi|*#o^sX#RLw93r-^`&imx`=oTLXETs<6vS&$j&Y^ILDy
z#=z+6$_mFoWK>lYXtrtRbfZkg7+;nET<}4y7gb?Svws{dAAMo06JghEtu8LSxpl6$
zJ$&rSUDwkTX6Hjx8~R4ZITXu_AE!>9hk!wqPh;?dd-m@=a*9PN)>u}6IA4}NRLR7_
zq4BBj@1A$oR+{bM&|Tkq^eo3ftsSkI<1z1e@1d$tSL7K~O`~UG_G0tH+s@bdZminl
z2Ym3&R&GK>oz<Tb3K$Cjsx*7`2>}4eHJr8ZDG{M3sj6TlC=8Q@ssi<cD~lW;5TLm#
z$T~nZUne5K01;3q@Q++x6aWYSQQc9SZH-$0x8S|6(>mBb-9~M<`)m9Kb}fH%z!$-3
P00000NkvXXu0mjfx2Plc