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 000000000..39c13ea66
Binary files /dev/null and b/share/images/icons/Demandware.ico differ
diff --git a/share/images/icons/FlexCMP.ico b/share/images/icons/FlexCMP.ico
new file mode 100644
index 000000000..3b26809f8
Binary files /dev/null and b/share/images/icons/FlexCMP.ico differ
diff --git a/share/images/icons/GoStats.ico b/share/images/icons/GoStats.ico
new file mode 100644
index 000000000..5cd344cfe
Binary files /dev/null and b/share/images/icons/GoStats.ico differ
diff --git a/share/images/icons/Netmonitor.ico b/share/images/icons/Netmonitor.ico
new file mode 100644
index 000000000..a7f918920
Binary files /dev/null and b/share/images/icons/Netmonitor.ico differ
diff --git a/share/images/icons/OXID eShop.ico b/share/images/icons/OXID eShop.ico
new file mode 100644
index 000000000..067b03e60
Binary files /dev/null and b/share/images/icons/OXID eShop.ico differ
diff --git a/share/images/icons/Oxid.ico b/share/images/icons/Oxid.ico
deleted file mode 100644
index 4bde8997b..000000000
Binary files a/share/images/icons/Oxid.ico and /dev/null differ
diff --git a/share/images/icons/dashCommerce.ico b/share/images/icons/dashCommerce.ico
new file mode 100644
index 000000000..36829b9a5
Binary files /dev/null and b/share/images/icons/dashCommerce.ico differ
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 },