diff --git a/drivers/firefox/content/js/driver.js b/drivers/firefox/content/js/driver.js
index ac3c2d4d0..e1906c960 100644
--- a/drivers/firefox/content/js/driver.js
+++ b/drivers/firefox/content/js/driver.js
@@ -93,7 +93,7 @@
 				});
 			};
 
-			window.addEventListener('load',   handler,         false);
+			window.addEventListener('load',   handler,        false);
 			window.addEventListener('unload', w.driver.track, false);
 		},
 
@@ -101,7 +101,7 @@
 		 * Display apps
 		 */
 		displayApps: function() {
-			var url = gBrowser.currentURI.spec;
+			var url = gBrowser.currentURI.spec.split('#')[0];
 
 			w$('#wappalyzer-container > image, #wappalyzer-menu > menuitem, #wappalyzer-menu > menuseparator').remove();
 
diff --git a/drivers/firefox/install.rdf b/drivers/firefox/install.rdf
index 570913591..0e49df98c 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.1.0</em:version>
+		<em:version>2.2.0</em:version>
 		<em:type>2</em:type>
 		<em:unpack>true</em:unpack>
 
diff --git a/share/images/icons/BrowserCMS.png b/share/images/icons/BrowserCMS.png
new file mode 100644
index 000000000..61da2a4b4
Binary files /dev/null and b/share/images/icons/BrowserCMS.png differ
diff --git a/share/images/icons/CPG Dragonfly.png b/share/images/icons/CPG Dragonfly.png
new file mode 100644
index 000000000..ef860d7ea
Binary files /dev/null and b/share/images/icons/CPG Dragonfly.png differ
diff --git a/share/images/icons/Contenido.png b/share/images/icons/Contenido.png
new file mode 100644
index 000000000..502de80dc
Binary files /dev/null and b/share/images/icons/Contenido.png differ
diff --git a/share/images/icons/Doxygen.png b/share/images/icons/Doxygen.png
new file mode 100644
index 000000000..a216f578c
Binary files /dev/null and b/share/images/icons/Doxygen.png differ
diff --git a/share/images/icons/EPiServer.png b/share/images/icons/EPiServer.png
new file mode 100644
index 000000000..b94f30cd6
Binary files /dev/null and b/share/images/icons/EPiServer.png differ
diff --git a/share/images/icons/ImpressPages.png b/share/images/icons/ImpressPages.png
new file mode 100644
index 000000000..0f2b18c5a
Binary files /dev/null and b/share/images/icons/ImpressPages.png differ
diff --git a/share/images/icons/LEPTON.png b/share/images/icons/LEPTON.png
new file mode 100644
index 000000000..3469168dd
Binary files /dev/null and b/share/images/icons/LEPTON.png differ
diff --git a/share/images/icons/Shopware.png b/share/images/icons/Shopware.png
new file mode 100644
index 000000000..2e99e296a
Binary files /dev/null and b/share/images/icons/Shopware.png differ
diff --git a/share/js/apps.js b/share/js/apps.js
index e773b8361..fc39f75cc 100644
--- a/share/js/apps.js
+++ b/share/js/apps.js
@@ -61,6 +61,7 @@
 		'Bigware':                          { cats: [  6 ], html: /<center>[^<]+<a href="http:\/\/www\.bigware\.de[^"]*" target="_blank">\s*<u>Shopsoftware\s*<\/u>\s*<\/a>[^<]+<\/center>/i, url: /(\?|&)bigWAdminID=[a-z0-9]+(&|$)/i, headers: { 'Set-Cookie': /bigwareCsid|bigWAdminID/ }, implies: [ 'PHP' ] },
 		'blip.tv':                          { cats: [ 14 ], html: /<(param|embed)[^>]+blip\.tv\/play/i },
 		'Blogger':                          { cats: [ 11 ], meta: { 'generator': /blogger/i }, url: /^(www.)?.+\.blogspot\.com/i },
+		'BrowserCMS':                       { cats: [  1 ], meta: { 'generator': /BrowserCMS/i }, implies: [ 'Ruby' ] },
 		'Bugzilla':                         { cats: [ 13 ], html: /href="enter_bug\.cgi">/, implies: [ 'Perl' ] },
 		'Burning Board':                    { cats: [  2 ], html: /<a href=('|")[^>]+woltlab\.com.+Burning Board/i, implies: [ 'PHP' ] },
 		'Business Catalyst':                { cats: [  1 ], script: /CatalystScripts/, html: /<!-- BC_OBNW -->/ },
@@ -82,6 +83,7 @@
 		'comScore':                         { cats: [ 10 ], html: /<i{1}frame[^>]* (id=("|')comscore("|')|scr=[^>]+comscore)/, env: /^_?COMSCORE$/i },
 		'Concrete5':                        { cats: [  1 ], meta: { 'generator': /concrete5/i } },
 		'Contao':                           { cats: [  1, 6 ], html: /(<!--\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)/i, implies: [ 'PHP' ] },
+		'Contenido':                        { cats: [  1 ], meta: { 'generator': /Contenido/i }, implies: [ 'PHP' ] },
 		'Contens':                          { cats: [  1 ], meta: { 'generator': /contens/i } },
 		'ConversionLab':                    { cats: [ 10 ], script: /conversionlab\.trackset\.com\/track\/tsend\.js/ },
 		'Coppermine':                       { cats: [  7 ], html: /<!--Coppermine Photo Gallery/i, implies: [ 'PHP' ] },
@@ -89,11 +91,12 @@
 		'Cotonti':                          { cats: [  1 ], meta: { 'generator': /Cotonti/i } },
 		'CouchDB':                          { cats: [ 22 ], headers: { 'Server': /CouchDB/i } },
 		'cPanel':                           { cats: [  9 ], headers: { 'Server':/cpsrvd/i }, html: /<!-- cPanel/i },
+		'CPG Dragonfly':                    { cats: [  1 ], meta: { 'generator': /CPG Dragonfly/i }, implies: [ 'PHP' ] },
 		'Crazy Egg':                        { cats: [ 10 ], script: /cetrk\.com\/pages\/scripts\/[0-9]+\/[0-9]+\.js/ },
 		'CS Cart':                          { cats: [  6 ], html: /&nbsp;Powered by (<a href=.http:\/\/www\.cs\-cart\.com|CS\-Cart)/i },
 		'CubeCart':                         { cats: [  6 ], html: /(Powered by <a href=.http:\/\/www\.cubecart\.com|<p[^>]+>Powered by CubeCart)/i },
 		'cufon':                            { cats: [ 17 ], script: /cufon\-yui\.js/, env: /^Cufon$/ },
-		//'dashCommerce':          { cats: [ 6 ], html: /name\="\_\_EVENTTARGET" id\="\_\_EVENTTARGET"/, implies: [ 'Microsoft ASP.NET', 'IIS', 'Windows Server' ]  },
+		//'dashCommerce':                   { cats: [ 6 ], implies: [ 'Microsoft ASP.NET', 'IIS', 'Windows Server' ]  },
 		'd3':                               { cats: [ 25 ], script: /d3(\.min)?\.js/ },
 		'Dancer':                           { cats: [ 18 ], headers: { 'X-Powered-By': /Perl Dancer/, 'Server': /Perl Dancer/ }, implies: [ 'Perl' ] },
 		'Danneo CMS':                       { cats: [  1 ], meta: { 'generator': /Danneo/i } },
@@ -105,18 +108,20 @@
 		'DHTMLX':                           { cats: [ 12 ], script: /dhtmlxcommon\.js/ },
 		'DirectAdmin':                      { cats: [  9 ], html: /<a[^>]+>DirectAdmin<\/a> Web Control Panel/i },
 		'Disqus':                           { cats: [ 15 ], script: /disqus_url/, html: /<div[^>]+id=("|')disqus_thread("|')/, env: /^DISQUS/i },
-		'Django':                           { cats: [ 18 ] },
+		'Django':                           { cats: [ 18 ], html: /powered by <a[^>]+>Django/i },
 		'Django CMS':                       { cats: [  1 ], script: /media\/cms\/js\/csrf\.js/, headers: { 'Set-Cookie': /django/ }, implies: [ 'Django' ] },
 		'dojo':                             { cats: [ 12 ], script: /dojo(\.xd)?\.js/, env: /^dojo$/ },
 		'Dokeos':                           { cats: [ 21 ], meta: { 'generator': /Dokeos/i }, html: /Portal <a[^>]+>Dokeos|@import "[^"]+dokeos_blue/i, headers: { 'X-Powered-By': /Dokeos/ } },
 		'DokuWiki':                         { cats: [  8 ], meta: { 'generator': /DokuWiki/i } },
 		'DotNetNuke':                       { cats: [  1 ], meta: { 'generator': /DotNetNuke/i }, html: /(<!\-\- by DotNetNuke Corporation|<link[^>]+\/portals\/_default\/[^>]+\.css)/i, env: /^(DDN|DotNetNuke)/i },
+		'Doxygen':                          { cats: [  4 ], html: /(<!-- Generated by Doxygen|<link[^>]+doxygen.css)/i },
 		'DreamWeaver':                      { cats: [ 20 ], html: /(<!\-\-[^>]*(InstanceBeginEditable|Dreamweaver[^>]+target|DWLayoutDefaultTable)|function MM_preloadImages\(\) {)/ },
 		'Drupal':                           { cats: [  1 ], script: /drupal\.js/, html: /(jQuery\.extend\(Drupal\.settings, \{|Drupal\.extend\(\{ settings: \{|<link[^>]+sites\/(default|all)\/themes\/|<style[^>]+sites\/(default|all)\/(themes|modules)\/)/i, headers: { 'X-Drupal-Cache': /.*/, 'X-Generator': /Drupal/, 'Expires': /19 Nov 1978/ }, env: /^Drupal$/, implies: [ 'PHP' ] },
 		'Drupal Commerce':                  { cats: [  6 ], html: /id="block[_-]commerce[_-]cart[_-]cart|class="commerce[_-]product[_-]field/i, implies: [ 'PHP' ] },
 		'Dynamicweb':                       { cats: [  1 ], meta: { 'generator': /Dynamicweb/i } },
 		'e107':                             { cats: [  1 ], script: /e107\.js/ },
 		'Ecodoo':                           { cats: [  6 ], script: /addons\/lytebox\/lytebox\.js/ },
+		'EPiServer':                        { cats: [  1 ], meta: { 'generator': /EPiServer/i } },
 		'Exhibit':                          { cats: [ 25 ], script: /exhibit.*\.js/, env: /^Exhibit$/ },
 		'ExtJS':                            { cats: [ 12 ], script: /ext\-base\.js/, env: /^Ext$/ },
 		'ExpressionEngine':                 { cats: [  1 ], headers: { 'Set-Cookie': /(exp_last_activity|exp_tracker)/ } },
@@ -131,7 +136,7 @@
 		'FWP':                              { cats: [  6 ], meta: {'generator': /FWP Shop/ } },
 		'FrontPage':                        { cats: [ 20 ], meta: { 'generator': /Microsoft FrontPage/ }, html: /<html[^>]+urn:schemas\-microsoft\-com:office:office/i },
 		'Gallery':                          { cats: [  7 ], env: /galleryAuthToken/, html: /<div id="gsNavBar" class="gcBorder1">/ },
-		'Gambio':                           { cats: [  6 ], html: /brought to you by XT-Commerce|[Gg]ambio|content\.php\?coID=\d/},
+		//'Gambio':                         { cats: [  6 ], },
 		'Gauges':                           { cats: [ 10 ], html: /t\.src = '\/\/secure\.gaug\.es\/track\.js/, env: /^_gauges$/ },
 		'Gentoo' :                          { cats: [ 28 ], headers: { 'X-Powered-By': /-?gentoo/} },
 		'Get Satisfaction':                 { cats: [ 13 ], html: /var feedback_widget = new GSFN\.feedback_widget\(feedback_widget_options\)/ },
@@ -151,6 +156,7 @@
 		'Hotaru CMS':                       { cats: [  1 ], meta: { 'generator': /Hotaru CMS/i } },
 		'Hybris':                           { cats: [  6 ], html: /\/sys_master\/|\/hybr\//, header: { 'Set-Cookie': /_hybris/ }, implies: [ 'Java' ] },
 		'IIS':                              { cats: [ 22 ], headers: { 'Server': /IIS/i }, implies: [ 'Windows Server' ] },
+		'ImpressPages':                     { cats: [  1 ], meta: { 'generator': /ImpressPages/i }, implies: [ 'PHP' ] },
 		'Indexhibit':                       { cats: [  1 ], html: /<link [^>]+ndxz-studio/i },
 		'InstantCMS':                       { cats: [  1 ], meta: { 'generator': /InstantCMS/i } },
 		'Intershop':                        { cats: [  6 ], url: /is-bin|INTERSHOP/i, script: /is-bin|INTERSHOP/i },
@@ -177,6 +183,7 @@
 		'Kohana':                           { cats: [ 18 ], headers: { 'Set-Cookie': /kohanasession/i, 'X-Powered-By': /Kohana/ }, implies: [ 'PHP' ] },
 		'Kolibri CMS':                      { cats: [  1 ], meta: { 'generator': /Kolibri/i } },
 		'Koobi':                            { cats: [  1 ], meta: { 'generator': /Koobi/i } },
+		'LEPTON':                           { cats: [  1 ], meta: { 'generator': /LEPTON/i }, implies: [ 'PHP' ] },
 		'lighttpd':                         { cats: [ 22 ], headers: { 'Server': /lighttpd/i } },
 		'LiveJournal':                      { cats: [ 11 ], url: /^(www.)?.+\.livejournal\.com/i },
 		'Liferay':                          { cats: [  1 ], env: /^Liferay$/, headers: { 'Liferay-Portal': /.*/i } },
@@ -267,6 +274,7 @@
 		'Seoshop':                          { cats: [  6 ], html: /http:\/\/www\.getseoshop\.com/ },
 		'ShareThis':                        { cats: [  5 ], script: /w\.sharethis\.com\//, env: /^SHARETHIS$/ },
 		'Shopify':                          { cats: [  6 ], html: /<link[^>]+=cdn\.shopify\.com/, env: /^Shopify$/ },
+		'Shopware':                         { cats: [  6 ], meta: { 'application-name': /Shopware/ }, script: /shopware\.js/, env: /^Shopify$/, implies: [ 'PHP' ] },
 		'sIFR':                             { cats: [ 17 ], script: /sifr\.js/ },
 		'Site Meter':                       { cats: [ 10 ], script: /sitemeter.com\/js\/counter\.js\?site=/ },
 		'SiteCatalyst':                     { cats: [ 10 ], html: /var s_code=s\.t\(\);if\(s_code\)document\.write\(s_code\)/i, env: /^s_account$/ },