diff --git a/drivers/firefox/content/js/driver.js b/drivers/firefox/content/js/driver.js
index 793ce0c8f..730cdc064 100644
--- a/drivers/firefox/content/js/driver.js
+++ b/drivers/firefox/content/js/driver.js
@@ -139,7 +139,7 @@
 						w$('#wappalyzer-menu').append(menuSeparator);
 
 						var menuItem = w$('<menuitem/>')
-							.attr('class', 'wappalyzer-application')
+							.attr('class', 'wappalyzer-application menuitem-iconic')
 							.attr('image', 'chrome://wappalyzer/skin/images/icons/' + app + '.ico')
 							.attr('label', app)
 							;
diff --git a/drivers/firefox/content/xul/wappalyzer.xul b/drivers/firefox/content/xul/wappalyzer.xul
index e531c24c4..eaa0ef01d 100755
--- a/drivers/firefox/content/xul/wappalyzer.xul
+++ b/drivers/firefox/content/xul/wappalyzer.xul
@@ -14,25 +14,25 @@
 	</stringbundleset>
 
 	<hbox id="urlbar-icons">
-		<hbox id="wappalyzer-container" popup="wappalyzer-menu">
+		<hbox id="wappalyzer-container" tooltiptext="&wappalyzer.help;" context="wappalyzer-menu" popup="wappalyzer-menu">
 			<menupopup id="wappalyzer-menu" position="after_end">
 				<menu label="&wappalyzer.name;">
 					<menupopup>
-						<menuitem id="wappalyzer-menu-icons"       label="&wappalyzer.showIcons;"  />
-						<menuitem id="wappalyzer-menu-addonbar"    label="&wappalyzer.addonBar;"   />
-						<menuitem id="wappalyzer-menu-preferences" label="&wappalyzer.preferences;"/> 
+						<menuitem id="wappalyzer-menu-icons"       label="&wappalyzer.showIcons;"   class="menuitem-iconic"/>
+						<menuitem id="wappalyzer-menu-addonbar"    label="&wappalyzer.addonBar;"    class="menuitem-iconic"/>
+						<menuitem id="wappalyzer-menu-preferences" label="&wappalyzer.preferences;" class="menuitem-iconic"/> 
 
 						<menuseparator/>
 
-						<menuitem id="wappalyzer-menu-donate"     label="&wappalyzer.donate;"  />
-						<menuitem id="wappalyzer-menu-feedback"   label="&wappalyzer.feedback;"/>
-						<menuitem id="wappalyzer-menu-website"    label="&wappalyzer.website;" />
+						<menuitem id="wappalyzer-menu-donate"     label="&wappalyzer.donate;"   class="menuitem-iconic"/>
+						<menuitem id="wappalyzer-menu-feedback"   label="&wappalyzer.feedback;" class="menuitem-iconic"/>
+						<menuitem id="wappalyzer-menu-website"    label="&wappalyzer.website;"  class="menuitem-iconic"/>
 
 						<menuseparator/>
 
-						<menuitem id="wappalyzer-menu-github"     label="&wappalyzer.github;"  image="chrome://wappalyzer/skin/images/github.ico" />
-						<menuitem id="wappalyzer-menu-twitter"    label="&wappalyzer.twitter;" image="chrome://wappalyzer/skin/images/twitter.ico"/>
-						<menuitem id="wappalyzer-menu-gplus"      label="&wappalyzer.gplus;"   image="chrome://wappalyzer/skin/images/gplus.ico"  />
+						<menuitem id="wappalyzer-menu-github"     label="&wappalyzer.github;"  image="chrome://wappalyzer/skin/images/github.ico"  class="menuitem-iconic"/>
+						<menuitem id="wappalyzer-menu-twitter"    label="&wappalyzer.twitter;" image="chrome://wappalyzer/skin/images/twitter.ico" class="menuitem-iconic"/>
+						<menuitem id="wappalyzer-menu-gplus"      label="&wappalyzer.gplus;"   image="chrome://wappalyzer/skin/images/gplus.ico"   class="menuitem-iconic"/>
 					</menupopup>
 				</menu>
 
diff --git a/drivers/firefox/install.rdf b/drivers/firefox/install.rdf
index 39d37082b..f452f0115 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.2</em:version>
+		<em:version>2.0.4</em:version>
 		<em:type>2</em:type>
 		<em:unpack>true</em:unpack>
 
@@ -21,8 +21,8 @@
 		-->
 
 		<em:name>Wappalyzer</em:name>
-		<em:description>Wappalyzer is an add-on for Firefox that uncovers the technologies used on websites.</em:description>
-		<em:iconURL>chrome://wappalyzer/skin/icon32x32.png</em:iconURL>
+		<em:description>Identifies software on the web.</em:description>
+		<em:iconURL>chrome://wappalyzer/skin/images/icon128x128.png</em:iconURL>
 		<em:creator>Elbert Foo</em:creator>
 		<em:homepageURL>http://wappalyzer.com</em:homepageURL>
 	</Description>
diff --git a/drivers/firefox/locale/en-US/wappalyzer.dtd b/drivers/firefox/locale/en-US/wappalyzer.dtd
index 7d25c760f..b02b25fcb 100755
--- a/drivers/firefox/locale/en-US/wappalyzer.dtd
+++ b/drivers/firefox/locale/en-US/wappalyzer.dtd
@@ -1,4 +1,5 @@
 <!ENTITY wappalyzer.name        "Wappalyzer">
+<!ENTITY wappalyzer.help        "Wappalyzer - Click for more detail and settings">
 
 <!ENTITY wappalyzer.showIcons   "Show application icons">
 <!ENTITY wappalyzer.preferences "More options...">
diff --git a/share/images/icons/Google App Engine.ico b/share/images/icons/Google App Engine.ico
index ee7c943ab..1a71ea772 100644
Binary files a/share/images/icons/Google App Engine.ico and b/share/images/icons/Google App Engine.ico differ
diff --git a/share/images/icons/Google Maps.ico b/share/images/icons/Google Maps.ico
index ee7c943ab..ea5b4c82b 100644
Binary files a/share/images/icons/Google Maps.ico and b/share/images/icons/Google Maps.ico differ
diff --git a/share/js/apps.js b/share/js/apps.js
index 57beed736..be281f046 100644
--- a/share/js/apps.js
+++ b/share/js/apps.js
@@ -41,6 +41,7 @@
 		'Adobe GoLive':          { cats: { 1: 20 }, meta: { 'generator': /Adobe GoLive/i } },
 		'Advanced Web Stats':    { cats: { 1: 10 }, html: /aws.src = [^<]+caphyon\-analytics/i },
 		'Amiro.CMS':             { cats: { 1:  1 }, meta: { 'generator': /Amiro/i } },
+		'AOLserver':             { cats: { 1: 22 }, headers: { 'Server': /AOLserver/i } },
 		'Apache':                { cats: { 1: 22 }, headers: { 'Server': /(Apache($|[^-])|HTTPD)/i } },
 		'Apache Tomcat':         { cats: { 1: 22 }, headers: { 'Server': /Apache-Coyote/i } },
 		'Arc Forum':             { cats: { 1:  2 }, html: /ping\.src = node\.href;/ },
@@ -56,6 +57,7 @@
 		'Bugzilla':              { cats: { 1: 13 }, html: /<[^>]+(id|title|name)=("|')bugzilla/i },
 		'Burning Board':         { cats: { 1:  2 }, html: /<a href=('|")[^>]+woltlab\.com.+Burning Board/i },
 		'CakePHP':               { cats: { 1: 18 }, headers: { 'Set-Cookie': /CAKEPHP=/ }, meta: { 'application-name': /CakePHP/ } },
+		'Cargo':                 { cats: { 1:  1 }, script: /\/cargo\./i, html: /<link [^>]+Cargo feed/ },
 		'CentOS':                { cats: { 1: 28 }, headers: { 'Server': /CentOS/i, 'X-Powered-By': /CentOS/i } },
 		'Chameleon':             { cats: { 1:  1 }, meta: { 'generator': /chameleon\-cms/i } },
 		'chartbeat':             { cats: { 1: 10 }, html: /function loadChartbeat\(\) {/i },
@@ -66,6 +68,7 @@
 		'Clicky':                { cats: { 1: 10 }, script: /static\.getclicky\.com/ },
 		'CMS Made Simple':       { cats: { 1:  1 }, meta: { 'generator': /CMS Made Simple/i } },
 		'CO2Stats':              { cats: { 1: 10 }, html: /src=("|')http:\/\/www\.co2stats\.com\/propres\.php/ },
+		'CodeIgniter':           { cats: { 1: 18 }, headers: { 'Set-Cookie': /(exp_last_activity|exp_tracker|ci_session)/ } },
 		'comScore':              { cats: { 1: 10 }, html: /<i{1}frame[^>]* (id=("|')comscore("|')|scr=[^>]+comscore)/ },
 		'Concrete5':             { cats: { 1:  1 }, meta: { 'generator': /concrete5/i } },
 		'Contao':                { cats: { 1:  1 }, html: /(<!--\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)/i },
@@ -77,9 +80,9 @@
 		'cPanel':                { cats: { 1:  9 }, html: /<!-- cPanel/i },
 		'Crazy Egg':             { cats: { 1: 10 }, script: /cetrk\.com\/pages\/scripts\/[0-9]+\/[0-9]+\.js/ },
 		'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/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$/ },
-		'd3':                    { cats: { 1: 25 }, script: /d3(\.min)?\.js/, env: /^d3$/ },
+		'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 } },
 		'Debian':                { cats: { 1: 28 }, headers: { 'Server': /Debian/i, 'X-Powered-By': /(Debian|dotdeb|etch|lenny|squeeze|wheezy)/i } },
@@ -97,7 +100,7 @@
 		'e107':                  { cats: { 1:  1 }, script: /e107\.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/ } },
+		'ExpressionEngine':      { cats: { 1:  1 }, headers: { 'Set-Cookie': /(exp_last_activity|exp_tracker)/ } },
 		'eZ Publish':            { cats: { 1:  1 }, meta: { 'generator': /eZ Publish/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)/ },
@@ -116,12 +119,13 @@
 		'Highcharts':            { cats: { 1: 25 }, script: /highcharts.*\.js/, env: /^Highcharts$/ },
 		'Hotaru CMS':            { cats: { 1:  1 }, meta: { 'generator': /Hotaru CMS/i } },
 		'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 } },
 		'IPB':                   { cats: { 1:  2 }, script: /jscripts\/ips_/ },
 		'iWeb':                  { cats: { 1: 20 }, meta: { 'generator': /iWeb/i } },
 		'Jalios':                { cats: { 1:  1 }, meta: { 'generator': /Jalios/i } },
 		'Javascript Infovis Toolkit': { cats: { 1: 25 }, script: /jit.*\.js/, env: /^\$jit$/ },
-		'Jo':                    { cats: { 1: 26, 2: 12 }, script: /[^a-zA-Z]jo.*\.js/i },
+		'Jo':                    { cats: { 1: 26, 2: 12 }, script: /[^a-z]?jo(\.[^>]+)?\.js/i },
 		'Joomla':                { cats: { 1:  1 }, meta: { 'generator': /Joomla/i }, html: /<!\-\- JoomlaWorks "K2"/i, headers: { 'X-Content-Encoded-By': /Joomla/ } },
 		'jqPlot':                { cats: { 1: 25 }, script: /jqplot.*\.js/, env: /^jQuery.jqplot$/ },
 		'jQTouch':               { cats: { 1: 26 }, script: /jqtouch.*\.js/i, env:/^jQT$/ },
@@ -135,6 +139,7 @@
 		'Kampyle':               { cats: { 1: 10 }, script: /cf\.kampyle\.com\/k_button\.js/ },
 		'Kentico CMS':           { cats: { 1:  1 }, meta: { 'generator': /Kentico CMS/i } },
 		'Koego':                 { cats: { 1: 10 }, script: /tracking\.koego\.com\/end\/ego\.js/ },
+		'Kohana':                { cats: { 1: 18 }, headers: { 'Set-Cookie': /kohanasession/i, 'X-Powered-By': /Kohana/ } },
 		'Kolibri CMS':           { cats: { 1:  1 }, meta: { 'generator': /Kolibri/i } },
 		'Koobi':                 { cats: { 1:  1 }, meta: { 'generator': /Koobi/i } },
 		'lighttpd':              { cats: { 1: 22 }, headers: { 'Server': /lighttpd/i } },
@@ -267,7 +272,7 @@
 		'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 },
 		'XMB':                   { cats: { 1:  2 }, html: /<!-- Powered by XMB/i },
-		'XUI':                   { cats: { 1: 26, 2: 12 }, script: /[^a-zA-Z]xui.*\.js/i, env: /^x\$$/ },
+		'xui':                   { cats: { 1: 26, 2: 12 }, script: /[^a-zA-Z]xui.*\.js/i, env: /^x\$$/ },
 		'XOOPS':                 { cats: { 1:  1 }, meta: { 'generator': /XOOPS/i } },
 		'xtCommerce':            { cats: { 1:  6 }, meta: { 'generator': /xt:Commerce/ }, html: /<div class=("|')copyright("|')>.+<a[^>]+>xt:Commerce/i },
 		'YaBB':                  { cats: { 1:  2 }, html: /Powered by <a href=("|')[^>]+yabbforum/i },
@@ -277,6 +282,7 @@
 		'YUI Doc':               { cats: { 1:  4 }, html: /<html[^>]* yuilibrary\.com\/rdf\/[0-9.]+\/yui\.rdf/i },
 		'YUI':                   { cats: { 1: 12 }, script: /\/yui\/|yui\.yahooapis\.com/, env: /^YAHOO$/ },
 		'Zen Cart':              { cats: { 1:  6 }, meta: { 'generator': /Zen Cart/i } },
-		'Zend':                  { cats: { 1: 18 }, headers: { 'X-Powered-By': /Zend/ } }
+		'Zend':                  { cats: { 1: 22 }, headers: { 'X-Powered-By': /Zend/ } },
+		'Zepto':                 { cats: { 1: 12 }, script: /zepto.*.js/, env: /^Zepto$/ }
 		};
 })();
diff --git a/v1/install.rdf b/v1/install.rdf
index 6348deaf6..c57a57069 100644
--- a/v1/install.rdf
+++ b/v1/install.rdf
@@ -20,7 +20,7 @@
 
 		<em:name>Wappalyzer</em:name>
 		<em:description>Wappalyzer is an add-on for Firefox that uncovers the technologies used on websites.</em:description>
-		<em:iconURL>chrome://wappalyzer/skin/icon32x32.png</em:iconURL>
+		<em:iconURL>chrome://wappalyzer/skin/images/icon32x32.png</em:iconURL>
 		<em:creator>ElbertF</em:creator>
 		<em:homepageURL>http://wappalyzer.com</em:homepageURL>
 	</Description>