diff --git a/drivers/firefox/content/xul/preferences.xul b/drivers/firefox/content/xul/preferences.xul
index 02a1ecd7d..3ae791df0 100755
--- a/drivers/firefox/content/xul/preferences.xul
+++ b/drivers/firefox/content/xul/preferences.xul
@@ -36,6 +36,7 @@
 			<preference id="wappalyzer-cat26" name="extensions.wappalyzer.cat26" type="bool"/>
 			<preference id="wappalyzer-cat27" name="extensions.wappalyzer.cat27" type="bool"/>
 			<preference id="wappalyzer-cat28" name="extensions.wappalyzer.cat28" type="bool"/>
+			<preference id="wappalyzer-cat29" name="extensions.wappalyzer.cat29" type="bool"/>
 
 			<preference id="wappalyzer-tracking" name="extensions.wappalyzer.tracking" type="bool"/>
 		</preferences>
@@ -158,6 +159,9 @@
 									<hbox align="center">
 										<checkbox preference="wappalyzer-cat28" id="wappalyzer-option-cat28" label="&wappalyzer.cat28;"/>
 									</hbox>
+									<hbox align="center">
+										<checkbox preference="wappalyzer-cat29" id="wappalyzer-option-cat29" label="&wappalyzer.cat29;"/>
+									</hbox>
 								</row>
 							</rows>
 						</grid>
diff --git a/drivers/firefox/defaults/preferences/defaults.js b/drivers/firefox/defaults/preferences/defaults.js
index a10e3d5f1..27411d167 100644
--- a/drivers/firefox/defaults/preferences/defaults.js
+++ b/drivers/firefox/defaults/preferences/defaults.js
@@ -32,3 +32,5 @@ pref('extensions.wappalyzer.cat25',     true);
 pref('extensions.wappalyzer.cat26',     true);
 pref('extensions.wappalyzer.cat27',     true);
 pref('extensions.wappalyzer.cat28',     true);
+pref('extensions.wappalyzer.cat29',     true);
+
diff --git a/drivers/firefox/locale/en-US/wappalyzer.dtd b/drivers/firefox/locale/en-US/wappalyzer.dtd
index b02b25fcb..1d2f56512 100755
--- a/drivers/firefox/locale/en-US/wappalyzer.dtd
+++ b/drivers/firefox/locale/en-US/wappalyzer.dtd
@@ -43,3 +43,4 @@
 <!ENTITY wappalyzer.cat26       "Mobile Frameworks">
 <!ENTITY wappalyzer.cat27       "Programming Languages">
 <!ENTITY wappalyzer.cat28       "Operating Systems">
+<!ENTITY wappalyzer.cat29       "Search Engines">
diff --git a/share/images/icons/1und1.ico b/share/images/icons/1und1.ico
new file mode 100644
index 000000000..7a40576dc
Binary files /dev/null and b/share/images/icons/1und1.ico differ
diff --git a/share/images/icons/Cosmoshop.ico b/share/images/icons/Cosmoshop.ico
new file mode 100644
index 000000000..c115ec478
Binary files /dev/null and b/share/images/icons/Cosmoshop.ico differ
diff --git a/share/images/icons/Ecodoo.ico b/share/images/icons/Ecodoo.ico
new file mode 100644
index 000000000..e250dc184
Binary files /dev/null and b/share/images/icons/Ecodoo.ico differ
diff --git a/share/images/icons/FWP.ico b/share/images/icons/FWP.ico
new file mode 100644
index 000000000..6b6723672
Binary files /dev/null and b/share/images/icons/FWP.ico differ
diff --git a/share/images/icons/Gambio.ico b/share/images/icons/Gambio.ico
new file mode 100644
index 000000000..6a7fbaf0b
Binary files /dev/null and b/share/images/icons/Gambio.ico differ
diff --git a/share/images/icons/Hybris.ico b/share/images/icons/Hybris.ico
new file mode 100644
index 000000000..ac20476a5
Binary files /dev/null and b/share/images/icons/Hybris.ico differ
diff --git a/share/images/icons/LiteCommerce.ico b/share/images/icons/LiteCommerce.ico
new file mode 100644
index 000000000..f24163e62
Binary files /dev/null and b/share/images/icons/LiteCommerce.ico differ
diff --git a/share/images/icons/Mondo Media.ico b/share/images/icons/Mondo Media.ico
new file mode 100644
index 000000000..3cfde427b
Binary files /dev/null and b/share/images/icons/Mondo Media.ico differ
diff --git a/share/images/icons/Oxid.ico b/share/images/icons/Oxid.ico
new file mode 100644
index 000000000..4bde8997b
Binary files /dev/null and b/share/images/icons/Oxid.ico differ
diff --git a/share/images/icons/Plentymarkets.ico b/share/images/icons/Plentymarkets.ico
new file mode 100644
index 000000000..9e893d15f
Binary files /dev/null and b/share/images/icons/Plentymarkets.ico differ
diff --git a/share/images/icons/Powergap.ico b/share/images/icons/Powergap.ico
new file mode 100644
index 000000000..880352fa1
Binary files /dev/null and b/share/images/icons/Powergap.ico differ
diff --git a/share/images/icons/Seoshop.ico b/share/images/icons/Seoshop.ico
new file mode 100644
index 000000000..7916f77e4
Binary files /dev/null and b/share/images/icons/Seoshop.ico differ
diff --git a/share/images/icons/Smartstore.ico b/share/images/icons/Smartstore.ico
new file mode 100644
index 000000000..9df2f10d2
Binary files /dev/null and b/share/images/icons/Smartstore.ico differ
diff --git a/share/images/icons/Store Systems.ico b/share/images/icons/Store Systems.ico
new file mode 100644
index 000000000..948cb4a23
Binary files /dev/null and b/share/images/icons/Store Systems.ico differ
diff --git a/share/images/icons/Websale.ico b/share/images/icons/Websale.ico
new file mode 100644
index 000000000..7be33bfe5
Binary files /dev/null and b/share/images/icons/Websale.ico differ
diff --git a/share/images/icons/Xanario.ico b/share/images/icons/Xanario.ico
new file mode 100644
index 000000000..003ae38f7
Binary files /dev/null and b/share/images/icons/Xanario.ico differ
diff --git a/share/js/apps.js b/share/js/apps.js
index d05e92957..0d1306555 100644
--- a/share/js/apps.js
+++ b/share/js/apps.js
@@ -31,10 +31,12 @@
 		25: { name: 'Javascript Graphics',  plural: 'Javascript Graphics' },
 		26: { name: 'Mobile Framework',     plural: 'Mobile Frameworks' },
 		27: { name: 'Programming Language', plural: 'Programming Languages' },
-		28: { name: 'Operating System',     plural: 'Operating Systems' }
+		28: { name: 'Operating System',     plural: 'Operating Systems' },
+		29: { name: 'Search Engine',		plural: 'Search Engines'}
 	};
 
 	w.apps = {
+		'1und1': 			     { cats: { 1:  6 }, url: /\/shop\/catalog\/browse\?sessid\=/ },
 		'1C-Bitrix':             { cats: { 1:  1 }, html: /<link[^>]+components\/bitrix/i, script: /1c\-bitrix/i },
 		'2z Project':            { cats: { 1:  1 }, meta: { 'generator': /2z project/i } },
 		'AddThis':               { cats: { 1:  5 }, script: /addthis\.com\/js/, env: /^addthis$/ },
@@ -77,6 +79,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/ },	
 		'Cotonti':               { cats: { 1:  1 }, meta: { 'generator': /Cotonti/i } },
 		'CouchDB':               { cats: { 1: 22 }, headers: { 'Server': /CouchDB/i } },
 		'cPanel':                { cats: { 1:  9 }, html: /<!-- cPanel/i },
@@ -84,6 +87,7 @@
 		'CS Cart':               { cats: { 1:  6 }, html: /&nbsp;Powered by (<a href=.http:\/\/www\.cs\-cart\.com|CS\-Cart)/i },
 		'CubeCart':              { cats: { 1:  6 }, html: /(Powered by <a href=.http:\/\/www\.cubecart\.com|<p[^>]+>Powered by CubeCart)/i },
 		'cufon':                 { cats: { 1: 17 }, script: /cufon\-yui\.js/, env: /^Cufon$/ },
+		'dashCommerce':          { cats: { 1:  6 }, html: /name\="\_\_EVENTTARGET" id\="\_\_EVENTTARGET"/ },
 		'd3':                    { cats: { 1: 25 }, script: /d3(\.min)?\.js/ },
 		'Danneo CMS':            { cats: { 1:  1 }, meta: { 'generator': /Danneo/i } },
 		'DataLife Engine':       { cats: { 1:  1 }, meta: { 'generator': /DataLife Engine/i } },
@@ -102,14 +106,18 @@
 		'Drupal Commerce':       { cats: { 1:  6 }, html: /id\=\"block\-commerce\-cart\-cart|class\=\"commerce\-product\-field/i },
 		'Dynamicweb':            { cats: { 1:  1 }, meta: { 'generator': /Dynamicweb/i } },
 		'e107':                  { cats: { 1:  1 }, script: /e107\.js/ },
+		'Ecodoo':                { cats: { 1:  6 }, script: /addons\/lytebox\/lytebox\.js/ },
 		'Exhibit':               { cats: { 1: 25 }, script: /exhibit.*\.js/, env: /^Exhibit$/ },
 		'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 } },
+		'Fact Finder':           { cats: { 1: 29 }, html: /fact-finder|\/images\/fact-finder\.gif|ViewParametricSearch|factfinder|Suggest\.ff|FFSuggest/i, url: /ViewParametricSearch|factfinder|ffsuggest/i },
 		'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 } },
+		'FWP':                   { cats: { 1:  6 }, meta: {'generator': /FWP Shop/ } },
 		'FrontPage':             { cats: { 1: 20 }, meta: { 'generator': /Microsoft FrontPage/ }, html: /<html[^>]+urn:schemas\-microsoft\-com:office:office/i },
+		'Gambio':                { cats: { 1:  6 }, html: /brought to you by XT-Commerce|[Gg]ambio|content\.php\?coID=\d/},
 		'Gauges':                { cats: { 1: 10 }, html: /t\.src = '\/\/secure\.gaug\.es\/track\.js/, env: /^_gauges$/ },
 		'Get Satisfaction':      { cats: { 1: 13 }, html: /var feedback_widget = new GSFN\.feedback_widget\(feedback_widget_options\)/ },
 		'Google Analytics':      { cats: { 1: 10 }, script: /(\.google\-analytics\.com\/ga\.js|google-analytics\.com\/urchin\.js)/, env: /^gaGlobal$/ },
@@ -125,9 +133,11 @@
 		'Hiawatha':              { cats: { 1: 22 }, headers: { 'Server': /Hiawatha/i } },
 		'Highcharts':            { cats: { 1: 25 }, script: /highcharts.*\.js/, env: /^Highcharts$/ },
 		'Hotaru CMS':            { cats: { 1:  1 }, meta: { 'generator': /Hotaru CMS/i } },
+		'Hybris': 				 { cats: { 1:  6 }, html: /\/sys_master\/|\/hybr\// },
 		'IIS':                   { cats: { 1: 22 }, headers: { 'Server': /IIS/i } },
 		'Indexhibit':            { cats: { 1:  1 }, html: /<link [^>]+ndxz-studio/i },
 		'InstantCMS':            { cats: { 1:  1 }, meta: { 'generator': /InstantCMS/i } },
+		'Intershop':			 { cats: { 1:  6 }, url: /is-bin|INTERSHOP/i, script: /is-bin|INTERSHOP/i },
 		'IPB':                   { cats: { 1:  2 }, script: /jscripts\/ips_/ },
 		'iWeb':                  { cats: { 1: 20 }, meta: { 'generator': /iWeb/i } },
 		'Jalios':                { cats: { 1:  1 }, meta: { 'generator': /Jalios/i } },
@@ -167,6 +177,7 @@
 		'Modernizr':             { cats: { 1: 12 }, script: /modernizr.*\.js/, env: /^Modernizr$/ },
 		'MODx':                  { cats: { 1:  1 }, html: /(<a[^>]+>Powered by MODx<\/a>|var el= \$\('modxhost'\);|<script type=("|')text\/javascript("|')>var MODX_MEDIA_PATH = "media";)|<(link|script)[^>]+assets\/snippets\//i },
 		'Mollom':                { cats: { 1: 16 }, script: /mollom\.js/, html: /<img[^>]+\/.mollom\/.com/i },
+		'Mondo Media':           { cats: { 1:  6 }, meta: { 'generator': /Mondo Shop/ } },
 		'Mongrel':               { cats: { 1: 22 }, headers: { 'Server': /Mongrel/ } },
 		'Moodle':                { cats: { 1: 21 }, html: /(var moodleConfigFn = function\(me\)|<img[^>]+moodlelogo)/i },
 		'Moogo':                 { cats: { 1:  1 }, script: /kotisivukone.js/ },
@@ -187,8 +198,9 @@
 		'OpenGSE':               { cats: { 1: 22 }, headers: { 'Server': /GSE/i } },
         'OpenLayers':            { cats: { 1:  5 }, script: /openlayers/, env:/^OpenLayers$/ },
 		'Optimizely':            { cats: { 1: 10 }, env: /^optimizely/ },
-		'osCommerce':            { cats: { 1:  6 }, html: /<!-- header_eof \/\/-->|<a[^>]*(osCsid|cPath)/i },
+		'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/ },
 		'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$/ },
@@ -200,15 +212,17 @@
 		'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 },
 		'Piwik':                 { cats: { 1: 10 }, html: /var piwikTracker = Piwik\.getTracker\(/i, env: /^Piwik$/ },
+		'Plentymarkets':         { cats: { 1:  6 }, meta: { 'generator': /www\.plentyMarkets\./i } },
 		'Plesk':                 { cats: { 1:  9 }, script: /common\.js\?plesk/i },
 		'Plone':                 { cats: { 1:  1 }, meta: { 'generator': /Plone/i } },
 		'Plura':                 { cats: { 1: 19 }, html: /<iframe src="http:\/\/pluraserver\.com/ },
 		'posterous':             { cats: { 1:  1, 2: 11 }, html: /<div class=("|')posterous/i, env: /^Posterous/i },
+		'Powergap':              { cats: { 1:  6 }, html: /(s\d\d)\.php\?shopid=\1/ },
 		'Prestashop':            { cats: { 1:  6 }, meta: { 'generator': /PrestaShop/i }, html: /Powered by <a href=("|')[^>]+PrestaShop/i },
 		'Prototype':             { cats: { 1: 12 }, script: /(prototype|protoaculous)\.js/, env: /^Prototype$/ },
 		'Protovis':              { cats: { 1: 25 }, script: /protovis.*\.js/, env: /^protovis$/ },
 		'punBB':                 { cats: { 1:  2 }, html: /Powered by <a href=("|')[^>]+punbb/i },
-		'Python':                { cats: { 1:  27 }, script: /media\/cms\/js\/csrf\.js/, html: /(Powered by <a[^>]+>Django|<input[^>]name=.csrfmiddlewaretoken)/i, headers: { 'Set-Cookie': /django/ } },
+		'Python':                { cats: { 1: 27 }, script: /media\/cms\/js\/csrf\.js/, html: /(Powered by <a[^>]+>Django|<input[^>]name=.csrfmiddlewaretoken)/i, headers: { 'Set-Cookie': /django/ } },
 		'Quantcast':             { cats: { 1: 10 }, script: /edge\.quantserve\.com\/quant\.js/, env: /^quantserve$/ },
 		'Quick.Cart':            { cats: { 1:  6 }, html: /<a href="[^>]+opensolution\.org\/">Powered by/i },
 		'Red Hat':               { cats: { 1: 28 }, headers: { 'Server': /Red Hat/i, 'X-Powered-By': /Red Hat/i } },
@@ -223,12 +237,14 @@
 		's9y':                   { cats: { 1:  1 }, meta: { 'generator': /Serendipity/i } },
 		'script.aculo.us':       { cats: { 1: 12 }, script: /(scriptaculous|protoaculous)\.js/, env: /^Scriptaculous$/ },
 		'Sencha Touch':          { cats: { 1: 26, 2: 12}, script: /sencha\-touch.*\.js/ },
+		'Seoshop':               { cats: { 1:  6 }, html: /http:\/\/www\.getseoshop\.com/ },
 		'ShareThis':             { cats: { 1:  5 }, script: /w\.sharethis\.com\//, env: /^SHARETHIS$/ },
 		'Shopify':               { cats: { 1:  6 }, html: /<link[^>]+=cdn\.shopify\.com/, env: /^Shopify$/ },
 		'sIFR':                  { cats: { 1: 17 }, script: /sifr\.js/ },
 		'Site Meter':            { cats: { 1: 10 }, script: /sitemeter.com\/js\/counter\.js\?site=/ },
 		'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 },
 		'sNews':                 { cats: { 1:  1 }, meta: { 'generator': /sNews/ } },
 		'Snoobi':                { cats: { 1: 10 }, script: /snoobi\.com\/snoop\.php/ },
@@ -239,6 +255,7 @@
 		'Squarespace':           { cats: { 1:  1 }, html: /Squarespace\.Constants\.CURRENT_MODULE_ID/i },
 		'Squiz Matrix':          { cats: { 1:  1 }, meta: { 'generator': /Squiz Matrix/ }, html: /  Running (MySource|Squiz) Matrix/i, 'X-Powered-By': /Squiz Matrix/ },
 		'StatCounter':           { cats: { 1: 10 }, script: /statcounter\.com\/counter\/counter/ },
+		'Store Systems':         { cats: { 1:  6 }, html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/ },
 		'SWFObject':             { cats: { 1: 19 }, script: /swfobject.*\.js/i, env: /^SWFObject$/ },
 		'swift.engine':          { cats: { 1:  1 }, headers: { 'X-Powered-By': /swift\.engine/ } },
 		'Swiftlet':              { cats: { 1:  1, 2: 18 }, meta: { 'generator': /Swiftlet/i }, html: /Powered by <a href=("|')[^>]+Swiftlet/i, headers: { 'X-Swiftlet-Cache': /.*/, 'X-Powered-By': /Swiftlet/ } },
@@ -272,6 +289,7 @@
 		'VP-ASP':                { cats: { 1:  6 }, script: /vs350\.js/, html: /<a[^>]+>Powered By VP\-ASP Shopping Cart<\/a>/ },
 		'W3Counter':             { cats: { 1: 10 }, script: /w3counter\.com\/tracker\.js/ },
 		'Web Optimizer':         { cats: { 1: 10 }, html: /<title [^>]*lang=("|')wo("|')>/ },
+		'Websale':               { cats: { 1:  6 }, url: /\/websale7\// },
 		'webEdition':            { cats: { 1:  1 }, meta: { 'generator': /webEdition/i, 'DC.title': /webEdition/i } },
 		'WebGUI':                { cats: { 1:  1 }, meta: { 'generator': /WebGUI/i } },
 		'WebPublisher':          { cats: { 1:  1 }, meta: { 'generator': /WEB\|Publisher/i } },
@@ -285,6 +303,7 @@
 		'Woopra':                { cats: { 1: 10 }, script: /static\.woopra\.com/ },
 		'WordPress':             { cats: { 1:  1, 2: 11 }, meta: { 'generator': /WordPress/i }, html: /<link rel=("|')stylesheet("|') [^>]+wp-content/i, env: /^wp_username$/ },
 		'xajax':                 { cats: { 1: 12 }, script: /xajax_core.*\.js/i },
+		'Xanario':               { cats: { 1:  6 }, meta: { 'generator': /xanario shopsoftware/i } },
 		'XenForo':               { cats: { 1:  2 }, html: /(jQuery\.extend\(true, XenForo|Forum software by XenForo&trade;|<!\-\-XF:branding)/ },
 		'XiTi':                  { cats: { 1: 10 }, html: /<[^>]+src=("|')[^>]+xiti.com\/hit.xiti/i, env: /^Xt_/ },
 		'XMB':                   { cats: { 1:  2 }, html: /<!-- Powered by XMB/i },