From b647c4157826d018aac54dbc7e041b91a25121dc Mon Sep 17 00:00:00 2001
From: ElbertF <info@elbertf.com>
Date: Sat, 11 Feb 2012 15:09:59 +1100
Subject: [PATCH] Added several apps

---
 drivers/firefox/install.rdf         |   2 +-
 share/images/icons/Demandware.ico   | Bin 0 -> 2478 bytes
 share/images/icons/FlexCMP.ico      | Bin 0 -> 318 bytes
 share/images/icons/GoStats.ico      | Bin 0 -> 1057 bytes
 share/images/icons/Netmonitor.ico   | Bin 0 -> 1150 bytes
 share/images/icons/OXID eShop.ico   | Bin 0 -> 1150 bytes
 share/images/icons/Oxid.ico         | Bin 10134 -> 0 bytes
 share/images/icons/dashCommerce.ico | Bin 0 -> 1150 bytes
 share/js/apps.js                    |  16 ++++++++++------
 9 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 share/images/icons/Demandware.ico
 create mode 100644 share/images/icons/FlexCMP.ico
 create mode 100644 share/images/icons/GoStats.ico
 create mode 100644 share/images/icons/Netmonitor.ico
 create mode 100644 share/images/icons/OXID eShop.ico
 delete mode 100644 share/images/icons/Oxid.ico
 create mode 100644 share/images/icons/dashCommerce.ico

diff --git a/drivers/firefox/install.rdf b/drivers/firefox/install.rdf
index 344c89014..457fd474e 100644
--- a/drivers/firefox/install.rdf
+++ b/drivers/firefox/install.rdf
@@ -3,7 +3,7 @@
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>wappalyzer@crunchlabz.com</em:id>
-		<em:version>2.0.7</em:version>
+		<em:version>2.0.8</em:version>
 		<em:type>2</em:type>
 		<em:unpack>true</em:unpack>
 
diff --git a/share/images/icons/Demandware.ico b/share/images/icons/Demandware.ico
new file mode 100644
index 0000000000000000000000000000000000000000..39c13ea66975c170e5772c17eb3a29c94bd6a93e
GIT binary patch
literal 2478
zcmb`IF=%5)5J1N{2kXFac4G(_;<$?Ig@CIB7wHVwxQ)A2%5+i@uqu6l3R?sW+g*_a
zQsj!`yOIl4SHxS}O$-JX7feXxv&9KgOy11@a_*8Va&gvwc6VlHXWpM(eT&S=16f*H
z5^EpNiG0GiwpQuCyeIMnwt88<d|%}AdHnD(k2PdYFwjQczpd+t@JOdq4fITrj*Lbl
z7Stb6wHd;nnXH?&J>8$`zQ}BB_pG6}igwHF_4r@x9g<kwSFh^vE0LBp-iddAXL-P$
z1>{jxr!~TVhRo_D)O6OYhE=7_((&hBb+Rzl7Q8-nXFAoK*3b0+(Eky?J!@LUFN$9E
z)cS0>{qNS_HGa|R)fqf~!STJ8ztP%nw_aOc;GVGKu0BOe+cO8--zu~yx@~`jTJOEF
z-kLUx;;;2?d)n;P3Cy4P&0gV`k;^2~X!e@>#hx9(-qb9uHvapr7w*t&cH4eFZQrm!
zyz0ETg*0@20Os$@vfvlgI@d4oxUY<e(Wylk|1R~~qmjsm7b2e`dx&1hoWA)zXoxp{
zJ9o|IcY5co_uRe(qn}4I{^@&}pP!dTqallni?Y1DEGsK3vbwq|>+9>Xv9TdLJ3F$y
zy)9c?Te7*iDV?uX9zRz3MovY4&GP*8cR79WLJofTk;DOsNJ4U@25bRaz!uELx5iu|
z_Q)h+kJux2+m^5=><J}dPuLkGW6#(#_KYE8S9C?!?3n|7Ab229U{m1x=IQAI3;~7!
zLx91NU<fb-7y=9d2FHXUzz|>vFa#JJ9fklyfFZyTU<is0jsQn64!)&OIYp$8utZoQ
zEdI){M3P4mMS@0HybLTxCJ~khi<bqC2uFk?!V%%{Qo#{nh%iJLtaK5M2t$M+`<Fde
zB_vPvhwkOI>Oe*AgrAq1+zF;c(nNv;QzCa_F_AlwJCWOu!*gRNe<FV(za3E`f1)-C
zh6F>R4t8u*#orzaBfT9XHOS=4uw^(h`TS^&gBoNwvT^WYe%x%zuw+;=5SfI21z^c+
z%s6EX85SOdIGjm_C0jk5#cqS00yY>F28BUkP#6>jzfLe@7!(GDA;Ulz1b-M528BUk
zAT)v<28BUkPym$tnPAFB#VHaaqDMH?W1CNukK{Yq-QBf+fzs`E<?!%OPEJnb*|TSI
zc6KJ`=jU>Hc_~*{S8{!QEz{{##($`M`{arLPba%S1hW}paT!gg-3-gJ9FA>j&9uP)
z%VefLeED)XI4F<IaMLdzn*Fw{CPxQl<u}3OR&_8q@@=YPcNh$Ys*~gMiB6uDO!1oN
zalgE-T^IW0c&6L>ZNDrhZ2drQpL(WYza0K%{zs+7S3SbeFOR{jkSD`2{+RCGz*3LL
V?p(2$UQ_vSJt%J~opRi({RwpX)yV(=

literal 0
HcmV?d00001

diff --git a/share/images/icons/FlexCMP.ico b/share/images/icons/FlexCMP.ico
new file mode 100644
index 0000000000000000000000000000000000000000..3b26809f816b001269067a8dda245811eb133bf5
GIT binary patch
literal 318
zcmZQzU<5(|0RaXO&|qX>5ChRb3=&ZQVnzlQAj!aR08By%h-wCgb}tczkE?SS9-Q9J
z@Ucme;ncKjh97SqGThxdnc>@XM}{9KXEB_~l400g@6T{>VJE|%T~!P}ZXICw^Y=Hy
z%xp)7cQD`|2WIKLVgu27Veb}vdiU;0-Xpp93|w12+<PY#=fJ?g^-k}}j7JO%U-cs1
zRjz%sJFxGq+^d;W5-sE29gmZoIdl5EcMmHb&75g^@7+7$+P7&jeed2qH!kcc1{r?X
a*w_$c_S<6PQV{*_?TNT|3=IGOQ-T4SQIgI8

literal 0
HcmV?d00001

diff --git a/share/images/icons/GoStats.ico b/share/images/icons/GoStats.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5cd344cfe778ce0948aa4c79bf8c29779a61c6f9
GIT binary patch
literal 1057
zcmV++1m63JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#vq?ljRCwBA
zWDsNk0~Q8G24*HkAj#nP>-WFte?J*4fE-DN{|rn(=@-oG498elnU(<A`~Uv?&+rE*
z0RjL4#0WEhm4T7(|NsBJe}6M18R_XWc{qA9$jZqxF#P||@aWM)h8_F2Gn~JC=^qO#
z!`%Ojj3qz=K7sTB1Q6H&psjq2e;8Kt^YOZM)^{^F_&NN)^78`2qi^>?atv}@iVWIp
z1`K;Q>|?BKE@Sxg<;$-B%nYGGH+%vJAVwyT3;r?87U1DaS-W@x1EcPr|1}4T7(e~^
z_+Oew4(NdY3{Ss4W)$EQWN5PO{{Q{lZ^r1PNQO^eKhI)hVn_!F06_r0{{RLO0Y3r^
z0REhtn*YP@z5XPi6aR3)W&hpq+Wz|e`v3a<`TyJS+5c<4VE-|uA^z_F>;9CMk^ce<
z0R06L0XzbTfti<Kp0SnQ{|9gH{j*uC`#=9+%D?|Oz`0kaz;fTeegCg*s`{Uqk6|`I
z0I~f2#bDv>?8k8F`&ovM-##!D8CEl(gDY<@{6F#HD8sWaPZ&<WJpMmfCyUY5!JXmi
zrP~$&0R)OY2{}1Ah6kVTGRX4E|CiyB1BDyIpMQTCF1<O=F!$<||9c<rU}R=wX5eMx
zV|elPIfIn2^nXnyZIC)CfB<5FTLa|&hsG@ky#4W-A$NZw!<Rpw856ZK{`)J3F-URC
zF#2q?Ww`t4HUkF(KS<esfB<3v#=!GOj~)q{@)$5Y{``>f@t24H<#`nu#knLI>MT0`
zEAp!_s0nC*UG?zueTI*}J}@Y9D>IyUbOt2!3?P6&fj9>gh!5Z1|7W{a?|<HbBw#>c
zh9l5R|I_wF{j*<Z@c+S^`~M8gwLpP56Ci*XKv4mV#=oFwJo0WIFd9Yv=j~7af9w7A
z|386I`18+CFdGz&peR22{=mQK)2IGt1V$q;30MIH5F@i7&~^X*&*10bOJBESBLkDp
zzyH+-3mHHBc+VioCH)^1GS9y~V-(^PW@xeR`~U0wKgN*wKu|)O&cMW&1rR{6q|D3s
zmtmCvFRw>OT{nYMfYbkLzb-L61}0?&Xj0Z>)nnMbem7%fQ#r%uuV1$RV`c~kn*JFe
zfZ&;ljfsip-=BY7fB!I~8tLh=xI20=$OAJIC@DXD^nhW<zHJQWuUz@f!oo0{iG`{B
z*S~*XK>7dz2w?y)VKXv<v$O55-+v>4+1U~l&(K(X3e3(YSXr5t0c|}3G?U@i|9@Z!
bfB*vkJBhSvgTk9t00000NkvXXu0mjf2S)-p

literal 0
HcmV?d00001

diff --git a/share/images/icons/Netmonitor.ico b/share/images/icons/Netmonitor.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a7f918920d56eb6131a0f734d5ac17fe4f3c7349
GIT binary patch
literal 1150
zcmZ{idrZ?;6vr=Ny1=raaiZ02Y^x6*N|_=gJRAfo9dV(93=yGhJVphqPz+Eu0fjNb
zqXM=aLaPJ_I>JLxi`5|AoSm%{sS*`JV%Qi0%GPcjU`zYmuO%$}<M-x!?#;R9b93*_
zA;f_i>(&t}en7Zy5aLP*ai>hBsLXPnn(U%`6Jqo0R9#jOz&#Qo`#hL7!ep#{5$Lsk
zmKC^dB>hWv)1?+!$m_TZjrGpQ6Ay?#+qcFN<xdbFLOIkCEWfvLV9#3!^jwPo4`&E+
zQlt};lP;^zp;#yG;r)uZ&@JG7;fdS?Z&aKNhqxpG*(ryR5)*{ja8E?<cS9hr5Zs=p
zzfRA-uszSNyo@+u@}b@M=Ieu~`IZCqKsStrIs9!f;7WH7+FDy6Dih$apaTB&W7uAz
zMPc{Y1si;>x|EU1-fJ%8MnHTf1ruXBtjKDyLN337zMf9hbg1ClV1!rcD7NPf!!1LD
zp>adNsjLJc|7b9Tf;c?*MZSW<Y&Ju2<0eGHN=RC-VPCBg^fD9Z`O|Pq8;0vqEkZdG
zY0g(HZAoS%T55A)n47lqCX)%rxEY|iZbn!b3tq>R*qZ+e?`G+-g*ydWtQwmmmDm&{
ze#Ga5&It44A#baJX>s1ptJP|3SiceU59x4^sK7fBz1Wfb5I)&|fRR29_n3Zs6#gUL
z4-`GmOFB3sDoVnw4hhBoYv(nZ``Ai*58LP-pzrj>CK?@Auiu8=xP-aC=5f9KBF>&l
zN9Gac)aes3gY{?9C|(Ss{-vEaFD;>{@H80Sd*Ho`ft+kU%%;WVy#)h)?rlI*#c`a7
z_18(tb1UmhGjOY2jNitFVYOQAbr$OH@7+`5?p>ArFYQSxOg(#y{>~rJT3dib*3SBy
zJ+1Cl0?y*K=4xpA+wtej@32}dE9L*swsQ?HpJQ;K3w>>MRG%bS!go9Ewe>)=xb*vm
z?=o?_s}aL@u3~y(6!ZV+VScqhc@Yan17;`3@lYj)vRj7Bk|HEWc+}Zgn{*GfZ_0#%
z?u%7980eBhOZDHA!2vvbtf71#qeDMoNO^^NcN4m#W#GpLDL$bS=Vf|1jy)M!)74T}
z)mY9mb(}A;-$m8e236lB-05wG;<5;`O8yd;?Q@P|omR7}*H0e}`YJl5lBSw`-TAW2
znTB%SY;^%g$Bz$|u>Cgpt**7L^)9JdN=IH=v4hX9Vuw^7A-q&VPEuw^5yFfnBr1`R
b7$zY$G%~E%Av&_yA&RMVjQ&*b68!Oh%Vc3_

literal 0
HcmV?d00001

diff --git a/share/images/icons/OXID eShop.ico b/share/images/icons/OXID eShop.ico
new file mode 100644
index 0000000000000000000000000000000000000000..067b03e602d34b8a5c570a3e1c17f34b831d7649
GIT binary patch
literal 1150
zcmajdO+<rn9Ki8kmPpYoWsDSg{)y<6c3M)mbQ;mALsCSi7}1-EQDl-)N_taShYm3v
z#&~!X5fS5I>C`DAMXK+A>&fG>+UB$0>od=rNCjWNU-)g7@k)_K5orT0I>kOgdYIMM
z6zRI$XJg)IMX20fsd;kI2qKFN>PqeW*V|k&+F>CL-+#N_+4izgi&x|@ix&3|buUZ|
zx%*DO8#n53j|NP^f{6(Pu!N-M9OI4$t40X7o}Qw&fE>~|LdpAbvSx(wglPob|D$ty
z5hT#$ot>>4Rk%hJG30T9Vbpr}z4dugEnvmzliwhU1Z?c0-<iAP#g^*C9jbMo*a6eo
zA&=-9`>^r*TrPK16>boA_Q~Uzbk&>GQC$;L=*sM=6U-osXT%VK4>kgNpIH4<7tW2`
zLNI%%LWm)ZCd?uS3)d*zGvW|_pEtRUKi^C9ScQ?mBaUF9aBV~%Y<*tkKGv!7VGt?g
z5&x;P<&O2vuTm<2F=Vi<=bv*TACaQBZjm>7?-^oD<e9hgg)4j*5iv&@^kINq?%-Di
G@*>|0)B@iC

literal 0
HcmV?d00001

diff --git a/share/images/icons/Oxid.ico b/share/images/icons/Oxid.ico
deleted file mode 100644
index 4bde8997ba74fb7e5bddac6373c040edaa889e96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10134
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
OWJ4b@zUltjtosja_8_SM

diff --git a/share/images/icons/dashCommerce.ico b/share/images/icons/dashCommerce.ico
new file mode 100644
index 0000000000000000000000000000000000000000..36829b9a5194426788a086ffabc266061549a29c
GIT binary patch
literal 1150
zcmbtSeN4=89R8%EKN>ZSjkU?xFf&`xN=;Xs8dA=sVbVeiTg@b!P=B#$Z8k4MFGePB
z)hJ0+!mJbtrS*E3>0EVJQoE>rkLR+4HGgoo&+l{h{65di_eI2xUuS3G(@kPjA~Qu~
zA&U@^A2{2D9{}>dHKA}=*d$ROaF#Xk(?uOQg)?@4&W-tg=!F;uAl(W$k~~Q~_c_fA
zOY~lukXzt;r1+7W?pUa(V`hsw+1|{&#u132@AurJ`aV&P&g&AFE{jY}^E}aP@wy5u
zF9N(WtY6&sX63tTlhoq9)5$hF=56bvT+axn<q^k|J&sm<^1TeK%?32r0p9{({Uact
z81TF>VDZ|Ues+=e(5zoIWO3N!=u<_h?&lQ*WC0=MZX#E61MsK+2J&@f)MWS02X<W2
zXNyO)>Su=DHran&pSdCf2qriDHn8!A0!^-hwa>_Z0&K4UHa`VcGsmt%rSxlO>-f11
zndD%e>6Rb8bveK`daTbGLhyYBx>_K#n%Hal)-VG#_LSiz2F>GqSR}sSbIB^^-BJi_
zB`^5SFhZF(yaCX@qwX6Z>OFH&Yxi?Be`u&3&yN8~D6zf`yh|T)*5!{tTReg|&L?!y
zx0%>0YSnXJs1@-7rk45|$Dixx8N`(j8G`O{ww(Exb)TMVtpxm-H`)Ni8p)$hNF6n*
z(bwME=rYE)_L)`Mhv-<q?1AJip@z#X7WZ<-HFloGd}{kwaV>4ECRjgq80U`hZT(!s
z@JaI9Bpr%e092X4RPN_g-k~X1IB=0gd~qHcvh+$yzs2-hew)U(?iN*5YnRXAawTO^
zHX7v&!P9_i7Cy$7BCWF35;WY?;qa@k?RRHKyYv{_#oDPC^fU|lngrc?hX-|L&CQw~
vUH>P;v{8)j22BR(H5x`af9m|(f8jk4QIbRk=ZNSXL>}A!y=-$fj;+1}#fz*i

literal 0
HcmV?d00001

diff --git a/share/js/apps.js b/share/js/apps.js
index 4d7145ab8..9a4671fe6 100644
--- a/share/js/apps.js
+++ b/share/js/apps.js
@@ -80,7 +80,7 @@
 		'Contens':               { cats: { 1:  1 }, meta: { 'generator': /contens/i } },
 		'ConversionLab':         { cats: { 1: 10 }, script: /conversionlab\.trackset\.com\/track\/tsend\.js/ },
 		'Coppermine':            { cats: { 1:  7 }, html: /<!--Coppermine Photo Gallery/i },
-		'Cosmoshop':             { cats: { 1:  6 }, script: /cosmoshop_functions\.js/ },	
+		'Cosmoshop':             { cats: { 1:  6 }, script: /cosmoshop_functions\.js/ },
 		'Cotonti':               { cats: { 1:  1 }, meta: { 'generator': /Cotonti/i } },
 		'CouchDB':               { cats: { 1: 22 }, headers: { 'Server': /CouchDB/i } },
 		'cPanel':                { cats: { 1:  9 }, html: /<!-- cPanel/i },
@@ -93,6 +93,7 @@
 		'Danneo CMS':            { cats: { 1:  1 }, meta: { 'generator': /Danneo/i } },
 		'DataLife Engine':       { cats: { 1:  1 }, meta: { 'generator': /DataLife Engine/i } },
 		'Debian':                { cats: { 1: 28 }, headers: { 'Server': /Debian/i, 'X-Powered-By': /(Debian|dotdeb|etch|lenny|squeeze|wheezy)/i } },
+		'Demandware':            { cats: { 1:  6 }, html: /<[^>]+demandware.edgesuite/, env: /^dwAnalytics/ },
 		'DHTMLX':                { cats: { 1: 12 }, script: /dhtmlxcommon\.js/ },
 		'DirectAdmin':           { cats: { 1:  9 }, html: /<a[^>]+>DirectAdmin<\/a> Web Control Panel/i },
 		'Disqus':                { cats: { 1: 15 }, script: /disqus_url/, html: /<div[^>]+id=("|')disqus_thread("|')/, env: /^DISQUS/i },
@@ -112,9 +113,10 @@
 		'ExtJS':                 { cats: { 1: 12 }, script: /ext\-base\.js/, env: /^Ext$/ },
 		'ExpressionEngine':      { cats: { 1:  1 }, headers: { 'Set-Cookie': /(exp_last_activity|exp_tracker)/ } },
 		'eZ Publish':            { cats: { 1:  1 }, meta: { 'generator': /eZ Publish/i } },
-		'FAST Search for SharePoint': {cats: {1: 29}, url: /Pages\/SearchResults\.aspx\?k\=/ },  
+		'FAST Search for SharePoint': {cats: {1: 29}, url: /Pages\/SearchResults\.aspx\?k\=/ },
 		'FAST ESP':              { cats: { 1: 29 }, html: /fastsearch|searchProfile\=|searchCategory\=/i, url: /esppublished|searchProfile\=|searchCategory\=/i },
 		'Fact Finder':           { cats: { 1: 29 }, html: /fact-finder|\/images\/fact-finder\.gif|ViewParametricSearch|factfinder|Suggest\.ff|FFSuggest/i, url: /ViewParametricSearch|factfinder|ffsuggest/i },
+		'FlexCMP':               { cats: { 1:  1 }, meta: { 'generator': /FlexCMP/ }, headers: { 'X-Powered-By': /FlexCMP/ } },
 		'FluxBB':                { cats: { 1:  2 }, html: /Powered by (<strong>)?<a href=("|')[^>]+fluxbb/i },
 		'Flyspray':              { cats: { 1: 13 }, html: /(<a[^>]+>Powered by Flyspray|<map id=("|')projectsearchform)/ },
 		'FreeBSD':               { cats: { 1: 28 }, headers: { 'Server': /FreeBSD/i } },
@@ -129,6 +131,7 @@
 		'Google Friend Connect': { cats: { 1:  5 }, script: /google.com\/friendconnect/ },
 		'Google Maps':           { cats: { 1:  5 }, script: /(maps\.google\.com\/maps\?file=api|maps\.google\.com\/maps\/api\/staticmap)/ },
 		'Google Sites':          { cats: { 1:  1 }, url: /sites.google.com/ },
+		'GoStats':               { cats: { 1: 10 }, env: /^_go(stats|_track)/i },
 		'Graffiti CMS':          { cats: { 1:  1 }, meta: { 'generator': /Graffiti CMS/i } },
 		'Gravatar':              { cats: { 1: 19 }, env: /^Gravatar$/ },
 		'Gravity Insights':      { cats: { 1: 10 }, html: /gravityInsightsParams\.site_guid = '/, env: /^GravityInsights$/ },
@@ -188,10 +191,11 @@
 		'Movable Type':          { cats: { 1:  1 }, meta: { 'generator': /Movable Type/i } },
 		'Mustache':              { cats: { 1: 12 }, env: /^Mustache$/ },
 		'Hiawatha':              { cats: { 1: 22 }, headers: { 'Server': /Hiawatha/i } },
-		'MyBB':                  { cats: { 1:  2 }, html: /(<script [^>]+\s+<!--\s+lang\.no_new_posts|<a[^>]* title=("|')Powered By MyBB)/i },
+		'MyBB':                  { cats: { 1:  2 }, html: /(<script [^>]+\s+<!--\s+lang\.no_new_posts|<a[^>]* title=("|')Powered By MyBB)/i, env: /^MyBB/ },
 		'MyBlogLog':             { cats: { 1:  5 }, script: /pub\.mybloglog\.com/i },
 		'Mynetcap':              { cats: { 1:  1 }, meta: { 'generator': /Mynetcap/i } },
 		'Nedstat':               { cats: { 1: 10 }, html: /sitestat\(("|')http:\/\/nl\.sitestat\.com/ },
+		'Netmonitor':            { cats: { 1: 10 }, script: /netmonitor\.fi\/nmtracker\.js/, env: /^netmonitor/ },
 		'Nginx':                 { cats: { 1: 22 }, headers: { 'Server': /nginx/i } },
 		'NOIX':                  { cats: { 1: 19 }, html: /<[^>]+(src|href)=[^>]*(\/media\/noix)|<!\-\- NOIX/i },
 		'nopCommerce':           { cats: { 1:  6 }, html: /(<!\-\-Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)/i },
@@ -203,14 +207,14 @@
 		'Optimizely':            { cats: { 1: 10 }, env: /^optimizely/ },
 		'osCommerce':            { cats: { 1:  6 }, html: /<a[^>]*osCsid/i },
 		'osCSS':                 { cats: { 1:  6 }, html: /<body onload=("|')window\.defaultStatus='oscss templates';("|')/i },
-		'Oxid': 				 { cats: { 1:  6 }, html: /<!--.*OXID eShop/ },
+		'OXID eShop':            { cats: { 1:  6 }, html: /<!--.*OXID eShop/, env: /^ox(TopMenu|ModalPopup|LoginBox|InputValidator)/ },
 		'PANSITE':               { cats: { 1:  1 }, meta: { 'generator': /PANSITE/i } },
 		'papaya CMS':            { cats: { 1:  1 }, html: /<link[^>]*\/papaya-themes\//i },
 		'Parse.ly':              { cats: { 1: 10 }, env: /^PARSELY$/ },
 		'PHP':                   { cats: { 1: 27 }, headers: { 'Server': /php/i, 'X-Powered-By': /php/i, 'Set-Cookie': /PHPSESSID/ }, url: /\.php$/ },
 		'PHP-Fusion':            { cats: { 1:  1 }, html: /Powered by <a href=("|')[^>]+php-fusion/i },
 		'PHP-Nuke':              { cats: { 1:  2 }, meta: { 'generator': /PHP-Nuke/i }, html: /<[^>]+Powered by PHP\-Nuke/i },
-		'phpBB':                 { cats: { 1:  2 }, meta: { 'copyright': /phpBB Group/ }, html: /(Powered by <a[^>]+phpbb|<a[^>]+phpbb[^>]+class=.copyright|\tphpBB style name|<[^>]+styles\/(sub|pro)silver\/theme)/i, env: /^(style_cookie_settings|phpbb_)/, headers: { 'Set-Cookie': /^phpbb/ } },
+		'phpBB':                 { cats: { 1:  2 }, meta: { 'copyright': /phpBB Group/ }, html: /(Powered by <a[^>]+phpbb|<a[^>]+phpbb[^>]+class=.copyright|\tphpBB style name|<[^>]+styles\/(sub|pro)silver\/theme|<img[^>]+i_icon_mini)/i, env: /^(style_cookie_settings|phpbb_)/, headers: { 'Set-Cookie': /^phpbb/ } },
 		'phpDocumentor':         { cats: { 1:  4 }, html: /<!-- Generated by phpDocumentor/ },
 		'phpMyAdmin':            { cats: { 1:  3 }, html: /(var pma_absolute_uri = '|PMA_sendHeaderLocation\(|<title>phpMyAdmin<\/title>)/i },
 		'phpPgAdmin':            { cats: { 1:  3 }, html: /(<title>phpPgAdmin<\/title>|<span class=("|')appname("|')>phpPgAdmin)/i },
@@ -248,7 +252,7 @@
 		'SiteCatalyst':          { cats: { 1: 10 }, html: /var s_code=s\.t\(\);if\(s_code\)document\.write\(s_code\)/i },
 		'SiteEdit':              { cats: { 1:  1 }, meta: { 'generator': /SiteEdit/i } },
 		'Smartstore':            { cats: { 1:  6 }, script: /smjslib\.js/ },
-		'SMF':                   { cats: { 1:  2 }, html: /<script [^>]+\s+var smf_/i },
+		'SMF':                   { cats: { 1:  2 }, html: /<script [^>]+\s+var smf_/i, env: /^smf_/ },
 		'sNews':                 { cats: { 1:  1 }, meta: { 'generator': /sNews/ } },
 		'Snoobi':                { cats: { 1: 10 }, script: /snoobi\.com\/snoop\.php/ },
 		'SOBI 2':                { cats: { 1: 19 }, html: /(<!\-\- start of Sigsiu Online Business Index|<div[^>]* class=("|')sobi2)/i },