diff --git a/chrome.manifest b/chrome.manifest
index 808d7b4ae..aae2e82f5 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,9 +1,5 @@
-content wappalyzer chrome/content/
-locale  wappalyzer en-US chrome/locale/en-US/
-skin    wappalyzer classic/1.0 chrome/skin/
-
-overlay chrome://browser/content/browser.xul chrome://wappalyzer/content/overlay.xul
-
-override chrome://wappalyzer/content/overlay.xul chrome://wappalyzer/content/mobile/overlay.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
-override chrome://wappalyzer/content/options.xul chrome://wappalyzer/content/mobile/options.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
-override chrome://wappalyzer/skin/overlay.css    chrome://wappalyzer/skin/mobile/overlay.css    application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
+content wappalyzer chrome/content/
+locale  wappalyzer en-US chrome/locale/en-US/
+skin    wappalyzer classic/1.0 chrome/skin/
+
+overlay chrome://browser/content/browser.xul chrome://wappalyzer/content/overlay.xul
diff --git a/chrome/content/apps.js b/chrome/content/apps.js
index e31c20a27..19810a0b2 100644
--- a/chrome/content/apps.js
+++ b/chrome/content/apps.js
@@ -25,7 +25,8 @@ wappalyzer.cats = {
 	19: { name: 'Miscellaneous',        plural: 'Miscellaneous' },
 	20: { name: 'Editor',               plural: 'Editors' },
 	21: { name: 'LMS',                  plural: 'LMS' },
-	22: { name: 'Web server',           plural: 'Web servers' }
+	22: { name: 'Web server',           plural: 'Web servers' },
+	23: { name: 'Cache tool',           plural: 'Cache tools' }
 	};
 
 wappalyzer.apps = {
@@ -33,6 +34,7 @@ wappalyzer.apps = {
 	'2z Project':            { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+2z project/i },
 	'AddThis':               { cats: { 1:  5 }, html: /<script[^>]* src=("|')[^>]*addthis\.com\/js/ },
 	'Adobe GoLive':          { cats: { 1: 20 }, html: /<meta name=("|')generator("|') [^>]+Adobe GoLive/i },
+	'Advanced Web Stats':    { cats: { 1: 10 }, html: /aws.src = [^<]+caphyon\-analytics/i },
 	'Amiro.CMS':             { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Amiro/i },
 	'Apache':                { cats: { 1: 22 }, headers: { 'Server': /Apache/i } },
 	'AWStats':               { cats: { 1: 10 }, html: /<meta name=("|')generator("|') [^>]+AWStats/i },
@@ -55,25 +57,28 @@ wappalyzer.apps = {
 	'Coppermine':            { cats: { 1:  7 }, html: /<!--Coppermine Photo Gallery/i },
 	'Cotonti':               { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Cotonti/i },
 	'cPanel':                { cats: { 1:  9 }, html: /<!-- cPanel/i },
-	'Crazy Egg':             { cats: { 1: 10 }, html: /<script type=("|')text\/javascript("|') src=("|')http:\/\/cetrk\.com\/pages\/scripts\/[0-9]+\/[0-9]+\.js("|')/ },
+	'Crazy Egg':             { cats: { 1: 10 }, html: /<script type=("|')text\/javascript("|') src=("|')[^>]+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 },
 	'cufon':                 { cats: { 1: 17 }, html: /(<script[^>]* src=("|')[^>]*cufon\-yui\.js|<script[^>]*>[^<]+Cufon\.now\(\))/i },
-	'Danneo CMS':            { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Danneo CMS/i },
+	'Danneo CMS':            { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Danneo/i },
 	'DataLife Engine':       { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+DataLife Engine/i },
 	'DirectAdmin':           { cats: { 1:  9 }, html: /<a[^>]+>DirectAdmin<\/a> Web Control Panel/i },
 	'Disqus':                { cats: { 1: 15 }, html: /(<div[^>]+id=("|')disqus_thread("|')|<script[^>]+disqus_url)/ },
-	'dojo':                  { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*dojo(\.xd)?\.js("|')/i },
+	'dojo':                  { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*dojo(\.xd)?\.js/i },
+	'Dokeos':                { cats: { 1: 21 }, html: /(<meta name=("|')generator("|') [^>]+Dokeos|Portal <a[^>]+>Dokeos|@import "[^"]+dokeos_blue)/i, headers: { 'X-Powered-By': /Dokeos/ } },
 	'DokuWiki':              { cats: { 1:  8 }, html: /<meta name=("|')generator("|') [^>]+DokuWiki/i },
 	'DotNetNuke':            { cats: { 1:  1 }, html: /(<meta name=("|')generator("|') [^>]+DotNetNuke|<!\-\- by DotNetNuke Corporation)/i },
 	'DreamWeaver':           { cats: { 1: 20 }, html: /(<!\-\-[^>]*(InstanceBeginEditable|Dreamweaver[^>]+target|DWLayoutDefaultTable)|function MM_preloadImages\(\) {)/ },
-	'Drupal':                { cats: { 1:  1 }, html: /(<script [^>]+drupal\.js|jQuery\.extend\(Drupal\.settings, \{|Drupal\.extend\(\{ settings: \{|<link[^>]+sites\/(default|all)\/themes\/|<style.+sites\/(default|all)\/(themes|modules)\/)/i, headers: { 'X-Drupal-Cache': /.*/ } },
+	'Drupal':                { cats: { 1:  1 }, html: /(<script [^>]+drupal\.js|jQuery\.extend\(Drupal\.settings, \{|Drupal\.extend\(\{ settings: \{|<link[^>]+sites\/(default|all)\/themes\/|<style[^>]+sites\/(default|all)\/(themes|modules)\/)/i, headers: { 'X-Drupal-Cache': /.*/, 'Expires': /19 Nov 1978/ } },
+	'Dynamicweb':            { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Dynamicweb/i },
 	'e107':                  { cats: { 1:  1 }, html: /<script [^>]+e107\.js/i },
 	'ExtJS':                 { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*ext\-base\.js("|')/i },
+	'ExpressionEngine':      { cats: { 1:  1 }, headers: { 'Set-Cookie': /exp_last_activity/ } },
 	'eZ Publish':            { cats: { 1:  1 }, html: /<meta name=("|')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)/ },
-	'FrontPage':             { cats: { 1: 20 }, html: /<meta name=("|')GENERATOR("|') [^>]+Microsoft FrontPage/i },
+	'FrontPage':             { cats: { 1: 20 }, html: /(<meta name=("|')GENERATOR("|') [^>]+Microsoft FrontPage|<html[^>]+urn:schemas\-microsoft\-com:office:office)/i },
 	'Get Satisfaction':      { cats: { 1: 13 }, html: /var feedback_widget = new GSFN\.feedback_widget\(feedback_widget_options\)/ },
 	'Google Analytics':      { cats: { 1: 10 }, html: /(\.google\-analytics\.com\/ga\.js|<script src=("|')[^"]+google-analytics\.com\/urchin\.js("|'))/i },
 	'Google Font API':       { cats: { 1: 17 }, html: /<link[^>]* href=("|')http:\/\/fonts\.googleapis\.com/ },
@@ -82,11 +87,14 @@ wappalyzer.apps = {
 	'Graffiti CMS':          { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Graffiti CMS/i },
 	'Gravity Insights':      { cats: { 1: 10 }, html: /gravityInsightsParams\.site_guid = '/ },
 	'Hotaru CMS':            { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Hotaru CMS/i },
+	'IIS':                   { cats: { 1: 22 }, headers: { 'Server': /IIS/i } },
 	'InstantCMS':            { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+InstantCMS/i },
 	'IPB':                   { cats: { 1:  2 }, html: /<script [^>]+jscripts\/ips_/i },
+	'iWeb':                  { cats: { 1: 20 }, html: /<meta name=("|')generator("|') [^>]+iWeb/i },
+	'Jalios':                { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Jalios/i },
 	'Joomla':                { cats: { 1:  1 }, html: /(<meta name=("|')generator("|') [^>]+Joomla|<!\-\- JoomlaWorks "K2")/i, headers: { 'X-Content-Encoded-By': /Joomla/ } },
 	'jQuery UI':             { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*jquery\-ui[^>]*\.js/i },
-	'jQuery':                { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*jquery[^>]*\.js/i },
+	'jQuery':                { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*jquery[^>]*\.js/i, js: 'window.jQuery' },
 	'JTL Shop':              { cats: { 1:  6 }, html: /(<input[^>]+name=('|")JTLSHOP|<a href=('|")jtl\.php)/i },
 	'K2':                    { cats: { 1: 19 }, html: /<!\-\- JoomlaWorks "K2"/ },
 	'Kampyle':               { cats: { 1: 10 }, html: /<script[^>]* src=("|')http:\/\/cf\.kampyle\.com\/k_button\.js("|')/ },
@@ -96,13 +104,15 @@ wappalyzer.apps = {
 	'Koobi':                 { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Koobi/i },
 	'lighttpd':              { cats: { 1: 22 }, headers: { 'Server': /lighttpd/i } },
 	'LiveJournal':           { cats: { 1: 11 }, url: /^(www.)?.+\.livejournal\.com/i },
+	'Lotus Domino':          { cats: { 1: 22 }, headers: { 'Server': /Lotus\-Domino/i } },
 	'Magento':               { cats: { 1:  6 }, html: /var BLANK_URL = '[^>]+js\/blank\.html'/i },
 	'Mambo':                 { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Mambo/i },
 	'MantisBT':              { cats: { 1: 13 }, html: /<img[^>]+ alt=("|')Powered by Mantis Bugtracker/i },
 	'MaxSite CMS':           { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+MaxSite CMS/i },
 	'MediaWiki':             { cats: { 1:  8 }, html: /(<meta name=("|')generator("|') [^>]+MediaWiki|<a[^>]+>Powered by MediaWiki<\/a>)/i },
 	'Meebo':                 { cats: { 1:  5 }, html: /(<iframe id=("|')meebo\-iframe("|')|Meebo\('domReady'\))/ },
-	'Microsoft ASP.NET':     { cats: { 1: 18 }, html: /<input[^>]+name=("|')__VIEWSTATE/, headers: { 'X-Powered-By': /ASP\.NET/ } },
+	'Microsoft ASP.NET':     { cats: { 1: 18 }, html: /<input[^>]+name=("|')__VIEWSTATE/, headers: { 'X-Powered-By': /ASP\.NET/, 'X-AspNet-Version': /.+/ } },
+	'Microsoft SharePoint':  { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Microsoft SharePoint/i, headers: { 'MicrosoftSharePointTeamServices': /.*/, 'X-SharePointHealthScore': /.*/, 'SPRequestGuid': /.*/ } },
 	'MiniBB':                { cats: { 1:  2 }, html: /<a href=("|')[^>]+minibb.+\s+<!--End of copyright link/i },
 	'Mint':                  { cats: { 1: 10 }, html: /<script[^>]* src=("|')[^>]*mint\/\?js/i },
 	'MochiKit':              { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*MochiKit\.js/i },
@@ -113,7 +123,7 @@ wappalyzer.apps = {
 	'Moogo':                 { cats: { 1:  1 }, html: /<script[^>]* src=("|')[^"']+kotisivukone.js/ },
 	'MooTools':              { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*mootools[^>]*\.js("|')/i },
 	'Movable Type':          { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Movable Type/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 },
 	'MyBlogLog':             { cats: { 1:  5 }, html: /<script[^>]* src=("|')[^>]*pub\.mybloglog\.com/i },
 	'Nedstat':               { cats: { 1: 10 }, html: /sitestat\(("|')http:\/\/nl\.sitestat\.com/ },
 	'Nginx':                 { cats: { 1: 22 }, headers: { 'Server': /nginx/i } },
@@ -123,6 +133,7 @@ wappalyzer.apps = {
 	'openEngine':            { cats: { 1:  1 }, html: /<meta[^>]+openEngine/i },
 	'osCommerce':            { cats: { 1:  6 }, html: /<!-- header_eof \/\/-->/i },
 	'osCSS':                 { cats: { 1:  6 }, html: /<body onload=("|')window\.defaultStatus='oscss templates';("|')/i },
+	'PANSITE':               { cats: { 1:  1 }, html: /<meta NAME=("|')(DC\.)?Generator("|')[^>]+PANSITE/i },
 	'papaya CMS':            { cats: { 1:  1 }, html: /<link[^>]*\/papaya-themes\//i },
 	'PHP-Fusion':            { cats: { 1:  1 }, html: /Powered by <a href=("|')[^>]+php-fusion/i },
 	'PHP-Nuke':              { cats: { 1:  2 }, html: /(<meta name=("|')generator("|') [^>]+PHP-Nuke|<[^>]+Powered by PHP\-Nuke)/i },
@@ -136,7 +147,7 @@ wappalyzer.apps = {
 	'Plura':                 { cats: { 1: 19 }, html: /<iframe src="http:\/\/pluraserver\.com/ },
 	'posterous':             { cats: { 1:  1, 2: 11 }, html: /<div class=("|')posterous/i },
 	'Prestashop':            { cats: { 1:  6 }, html: /(<meta name=("|')generator("|') [^>]+PrestaShop|Powered by <a href=("|')[^>]+PrestaShop)/i },
-	'Prototype':             { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*prototype\.js("|')/i },
+	'Prototype':             { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*(prototype|protoaculous)\.js("|')/i },
 	'punBB':                 { cats: { 1:  2 }, html: /Powered by <a href=("|')[^>]+punbb/i },
 	'Quantcast':             { cats: { 1: 10 }, html: /<script[^>]* src=("|')http:\/\/edge\.quantserve\.com\/quant\.js("|')>/i },
 	'Quick.Cart':            { cats: { 1:  6 }, html: /<a href="[^>]+opensolution\.org\/">Powered by/i },
@@ -146,19 +157,20 @@ wappalyzer.apps = {
 	'Reinvigorate':          { cats: { 1: 10 }, html: /reinvigorate\.track\("/ },
 	'S.Builder':             { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+S\.Builder/i },
 	's9y':                   { cats: { 1:  1 }, html: /<meta name=("|')Powered-By("|') [^>]+Serendipity/i },
-	'script.aculo.us':       { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*scriptaculous\.js("|')/i },
+	'script.aculo.us':       { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*(scriptaculous|protoaculous)\.js("|')/i },
 	'ShareThis':             { cats: { 1:  5 }, html: /<script[^>]+ src=("|')[^"']+w\.sharethis\.com\//i },
 	'sIFR':                  { cats: { 1: 17 }, html: /<script[^>]* src=("|')[^>]*sifr\.js/i },
 	'Site Meter':            { cats: { 1: 10 }, html: /<script[^>]* src=("|')http:\/\/[^.]+\.sitemeter.com\/js\/counter\.js\?site=/i },
 	'SiteCatalyst':          { cats: { 1: 10 }, html: /var s_code=s\.t\(\);if\(s_code\)document\.write\(s_code\)/i },
 	'SiteEdit':              { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+SiteEdit/i },
-	'SMF':                   { cats: { 1:  2 }, html: /<script .+\s+var smf_/i },
+	'SMF':                   { cats: { 1:  2 }, html: /<script [^>]+\s+var smf_/i },
 	'sNews':                 { cats: { 1:  1 }, html: /<meta name=("|')Generator("|') [^>]+sNews/ },
 	'Snoobi':                { cats: { 1: 10 }, html: /<script[^>]* src=("|')[^"']+snoobi\.com\/snoop\.php/ },
 	'SOBI 2':                { cats: { 1: 19 }, html: /(<!\-\- start of Sigsiu Online Business Index|<div[^>]* class=("|')sobi2)/i },
 	'SPIP':                  { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+SPIP/i, headers: { 'X-Spip-Cache': /.*/ } },
 	'SQL Buddy':             { cats: { 1:  3 }, html: /(<title>SQL Buddy<\/title>|<[^>]+onclick=("|')sideMainClick\(("|')home\.php)/i },
 	'Squarespace':           { cats: { 1:  1 }, html: /Squarespace\.Constants\.CURRENT_MODULE_ID/i },
+	'Squiz Matrix':          { cats: { 1:  1 }, html: /(  Running (MySource|Squiz) Matrix|<meta name=("|')generator("|') [^>]+Squiz Matrix)/i, 'X-Powered-By': /Squiz Matrix/ },
 	'StatCounter':           { cats: { 1: 10 }, html: /<script[^>]* src=("|')http:\/\/www\.statcounter\.com\/counter\/counter/i },
 	'SWFObject':             { cats: { 1: 19 }, html: /<script[^>]+swfobject[^"']*\.js/i },
 	'swift.engine':          { cats: { 1:  1 }, headers: { 'X-Powered-By': /swift\.engine/ } },
@@ -173,8 +185,10 @@ wappalyzer.apps = {
 	'TYPO3':                 { cats: { 1:  1 }, html: /(<meta name=("|')generator("|') [^>]+TYPO3|<(script[^>]* src|link[^>]* href)=[^>]*fileadmin)/i, url: /\/typo3/i },
 	'Ubercart':              { cats: { 1:  6 }, html: /<script[^>]* src=("|')[^>]*uc_cart\/uc_cart_block\.js/i },
 	'Vanilla':               { cats: { 1:  2 }, html: /<body id=("|')(DiscussionsPage|vanilla)/i, headers: { 'X-Powered-By': /Vanilla/ } },
+	'Varnish':               { cats: { 1: 22 }, headers: { 'X-Varnish': /.+/, 'Via': /Varnish/ } },
 	'vBulletin':             { cats: { 1:  2 }, html: /<meta name=("|')generator("|') [^>]+vBulletin/i },
 	'viennaCMS':             { cats: { 1:  1 }, html: /powered by <a href=("|')[^>]+viennacms/i },
+	'Vignette':              { cats: { 1:  1 }, html: /<[^>]+?=("|')(vgn\-ext|vgnext)/i },
 	'Vimeo':                 { cats: { 1: 14 }, html: /<(param|embed)[^>]+vimeo\.com\/moogaloop/i },
 	'VirtueMart':            { cats: { 1:  6 }, html: /<div id=("|')vmMainPage/ },
 	'VisualPath':            { cats: { 1: 10 }, html: /<script[^>]* src=("|')http:\/\/visualpath[^\/]*\.trackset\.it\/[^\/]+\/track\/include\.js("|')/ },
@@ -188,6 +202,7 @@ wappalyzer.apps = {
 	'WebsiteBaker':          { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+WebsiteBaker/i },
 	'Webtrekk':              { cats: { 1: 10 }, html: /var webtrekk = new Object/ },
 	'Webtrends':             { cats: { 1: 10 }, html: /<img[^>]+id=("|')DCSIMG("|')[^>]+webtrends/i },
+	'Weebly':                { cats: { 1:  1 }, html: /<[^>]+class=("|')weebly/i },
 	'WikkaWiki':             { cats: { 1:  8 }, html: /(Powered by <a href=("|')[^>]+WikkaWiki|<meta name=("|')generator("|') [^>]+WikkaWiki)/i },
 	'Wolf CMS':              { cats: { 1:  1 }, html: /<a href=("|')[^>]+wolfcms.org.+Wolf CMS.+inside/i },
 	'Woopra':                { cats: { 1: 10 }, html: /<script[^>]* src=("|')[^>]*static\.woopra\.com/i },
@@ -204,5 +219,6 @@ wappalyzer.apps = {
 	'YouTube':               { cats: { 1: 14 }, html: /<(param|embed)[^>]+youtube\.com\/v/i },
 	'YUI Doc':               { cats: { 1: 12 }, html: /<html[^>]* yuilibrary\.com\/rdf\/[0-9.]+\/yui\.rdf/i },
 	'YUI':                   { cats: { 1:  4 }, html: /<script[^>]* src=("|')[^'"]*(\/yui\/|yui\.yahooapis\.com)[^'"]*("|')/ },
-	'Zen Cart':              { cats: { 1:  6 }, html: /<meta name=("|')generator("|') [^>]+Zen Cart/i }
+	'Zen Cart':              { cats: { 1:  6 }, html: /<meta name=("|')generator("|') [^>]+Zen Cart/i },
+	'Zend':                  { cats: { 1: 18 }, headers: { 'X-Powered-By': /Zend/ } }
 	};
diff --git a/chrome/content/content.js b/chrome/content/content.js
index 98efb792f..712dc5373 100644
--- a/chrome/content/content.js
+++ b/chrome/content/content.js
@@ -13,8 +13,6 @@ wappalyzer =
 
 	log: function(message)
 	{
-		return;
-
 		var consoleService = Components.classes["@mozilla.org/consoleservice;1"].getService(Components.interfaces.nsIConsoleService);
 
 		consoleService.logStringMessage("Wappalyzer content.js: " + message);
@@ -22,6 +20,8 @@ wappalyzer =
 
 	onPageLoad: function(e)
 	{
+		wappalyzer.log('onPageLoad');
+
 		sendAsyncMessage('wappalyzer:onPageLoad', {
 			href:    content.document.location.href,
 			html:    content.document.documentElement.innerHTML,
diff --git a/chrome/content/evaluate.js b/chrome/content/evaluate.js
index 1b4385b56..7f4866e69 100644
--- a/chrome/content/evaluate.js
+++ b/chrome/content/evaluate.js
@@ -100,22 +100,26 @@ wappalyzer.evaluateCustomApps = function(customApps, feedback)
 						}
 					}
 
-					text += '\n    Icon [' + ( wappalyzer.apps[appName].icon ? 'Yes' : 'No' ) + ']';
+					text += '\n    Icon [' + ( wappalyzer.apps[appName].icon != 'chrome://wappalyzer/skin/app_icons/_placeholder.ico' ? 'Yes' : 'No' ) + ']';
 
 					text +=
 						'  HTML ['    + ( typeof(wappalyzer.apps[appName].html) == 'object' ? 'Yes' : 'No' ) + ']' +
 						'  URL ['     + ( typeof(wappalyzer.apps[appName].url)  == 'object' ? 'Yes' : 'No' ) + ']'
 						;
 
+					text += '  Headers';
+
 					if ( typeof(wappalyzer.apps[appName].headers) == 'object' )
 					{
-						text += '  Headers';
-
 						for ( header in wappalyzer.apps[appName].headers )
 						{
 							text += ' [' + header + ']';
 						}
 					}
+					else
+					{
+						text += ' [No]';
+					}
 
 					count ++;
 				}
diff --git a/chrome/content/mobile/dialogs/prompt.xul b/chrome/content/mobile/dialogs/prompt.xul
deleted file mode 100755
index 701c19f9d..000000000
--- a/chrome/content/mobile/dialogs/prompt.xul
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://wappalyzer/locale/overlay.dtd">
-
-<dialog id="wappalyzer-prompt" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	title="TEST"
-	buttons="accept,cancel"
-	style="min-height: 100px;"
-	onload=""
-	ondialogaccept="">
-	<hbox>
-		<vbox align="center" pack="start">
-			<image src="chrome://wappalyzer/skin/icon32x32.png" style="padding: 20px;"/>
-		</vbox>
-	</hbox>
-</dialog>
diff --git a/chrome/content/mobile/options.xul b/chrome/content/mobile/options.xul
deleted file mode 100755
index 93b116e52..000000000
--- a/chrome/content/mobile/options.xul
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://wappalyzer/locale/overlay.dtd">
-
-<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-</vbox>
diff --git a/chrome/content/mobile/overlay.xul b/chrome/content/mobile/overlay.xul
deleted file mode 100755
index 99feaff2a..000000000
--- a/chrome/content/mobile/overlay.xul
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet type="text/css" href="chrome://wappalyzer/skin/overlay.css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://wappalyzer/locale/overlay.dtd">
-
-<overlay id="wappalyzer-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<script type="application/x-javascript" src="chrome://wappalyzer/content/overlay.js"/>
-	<script type="application/x-javascript" src="chrome://wappalyzer/content/apps.js"/>
-	
-	<stringbundleset id="stringbundleset">
-		<stringbundle id="wappalyzer-strings" src="chrome://wappalyzer/locale/overlay.properties" />
-	</stringbundleset>
-
-	<script type="application/x-javascript">
-		<![CDATA[
-		if ( typeof(wappalyzer) != 'undefined' )
-		{
-			wappalyzer.isMobile = true;
-		}
-		]]>
-	</script>
-
-	<hbox id="urlbar-container">
-		<hbox id="wappalyzer-detected-apps" align="middle">
-		</hbox>
-		<hbox id="wappalyzer-icon" align="middle">
-			<image src="chrome://wappalyzer/skin/icon32x32.png" class="wappalyzer-icon"/>
-		</hbox>
-	</hbox>
-</overlay>
diff --git a/chrome/content/options.xul b/chrome/content/options.xul
index 6fde3dda1..8751e7fca 100755
--- a/chrome/content/options.xul
+++ b/chrome/content/options.xul
@@ -18,7 +18,7 @@
 			<preference id="wappalyzer-location"        name="wappalyzer.location"       type="int"   />
 			<preference id="wappalyzer-auto-detect"     name="wappalyzer.autoDetect"     type="bool"  />
 			<preference id="wappalyzer-enable-tracking" name="wappalyzer.enableTracking" type="bool"  />
-			<preference id="wappalyzer-show-app-names"  name="wappalyzer.showAppNames"   type="int"   />
+			<preference id="wappalyzer-show-names"      name="wappalyzer.showNames"      type="bool"  />
 			<preference id="wappalyzer-custom-apps"     name="wappalyzer.customApps"     type="string"/>
 			<preference id="wappalyzer-cat1"            name="wappalyzer.cat1"           type="bool"  />
 			<preference id="wappalyzer-cat2"            name="wappalyzer.cat2"           type="bool"  />
@@ -42,6 +42,7 @@
 			<preference id="wappalyzer-cat20"           name="wappalyzer.cat20"          type="bool"  />
 			<preference id="wappalyzer-cat21"           name="wappalyzer.cat21"          type="bool"  />
 			<preference id="wappalyzer-cat22"           name="wappalyzer.cat22"          type="bool"  />
+			<preference id="wappalyzer-cat23"           name="wappalyzer.cat23"          type="bool"  />
 		</preferences>
 
 		<tabbox>
@@ -87,14 +88,13 @@
 								</row>
 								<row>
 									<hbox align="center">
-										<label control="wappalyzer-show-app-names" value="&wappalyzer.appNames;:"/>
+										<label control="wappalyzer-auto-detect" value="&wappalyzer.showNames;:"/>
 									</hbox>
 									<hbox align="center">
-										<menulist preference="wappalyzer-show-app-names" id="wappalyzer-option-show-app-names">
+										<menulist preference="wappalyzer-show-names" id="wappalyzer-show-names">
 											<menupopup>
-												<menuitem label="&wappalyzer.always;"  value="1"/>
-												<menuitem label="&wappalyzer.tooltip;" value="2"/>
-												<menuitem label="&wappalyzer.hover;"   value="3"/>
+												<menuitem label="&wappalyzer.inline;" value="true"/>
+												<menuitem label="&wappalyzer.popup;"  value="false"/>
 											</menupopup>
 										</menulist>
 									</hbox>
@@ -208,6 +208,9 @@
 									<hbox align="center">
 										<checkbox preference="wappalyzer-cat22" id="wappalyzer-option-cat22" label="&wappalyzer.cat22;"/>
 									</hbox>
+									<hbox align="center">
+										<checkbox preference="wappalyzer-cat23" id="wappalyzer-option-cat23" label="&wappalyzer.cat23;"/>
+									</hbox>
 								</row>
 							</rows>
 						</grid>
diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js
index 716bf8e06..509f43132 100644
--- a/chrome/content/overlay.js
+++ b/chrome/content/overlay.js
@@ -20,15 +20,14 @@ wappalyzer =
 	history:        {},
 	hitCount:       0,
 	homeUrl:        'http://wappalyzer.com/',
-	isBookmarklet:  false,
-	isMobile:       false,
+	hoverTimeout:   false,
 	newInstall:     false,
 	prevUrl:        '',
 	prefs:          {},
 	regexDomain:    /^[a-z0-9._\-]+\.[a-z]+/,
 	req:            false,
 	request:        false,
-	showAppNames:   3,
+	showNames:      0,
 	showCats:       [],
 	strings:        {},
 	version:        '',
@@ -37,7 +36,7 @@ wappalyzer =
 	{
 		wappalyzer.log('init');
 
-		wappalyzer.browser = typeof(Browser) != 'undefined' ? Browser.selectedBrowser : gBrowser;
+		wappalyzer.browser = gBrowser;
 
 		wappalyzer.strings = document.getElementById('wappalyzer-strings');
 
@@ -47,7 +46,7 @@ wappalyzer =
 		wappalyzer.prefs.QueryInterface(Components.interfaces.nsIPrefBranch2);
 		wappalyzer.prefs.addObserver('', wappalyzer, false);
 
-		wappalyzer.showAppNames   = wappalyzer.prefs.getIntPref( 'showAppNames');
+		wappalyzer.showNames      = wappalyzer.prefs.getBoolPref('showNames');
 		wappalyzer.autoDetect     = wappalyzer.prefs.getBoolPref('autoDetect');
 		wappalyzer.customApps     = wappalyzer.prefs.getCharPref('customApps');
 		wappalyzer.debug          = wappalyzer.prefs.getBoolPref('debug');
@@ -55,7 +54,7 @@ wappalyzer =
 		wappalyzer.newInstall     = wappalyzer.prefs.getBoolPref('newInstall');
 		wappalyzer.version        = wappalyzer.prefs.getCharPref('version');
 
-		for ( i = 1; i <= 22; i ++ )
+		for ( i = 1; i <= 23; i ++ )
 		{
 			wappalyzer.showCats[i] = wappalyzer.prefs.getBoolPref('cat' + i);
 		}
@@ -70,7 +69,7 @@ wappalyzer =
 			var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
 
 			var enabledItems = prefs.getCharPref('extensions.enabledItems');
-			var version       = enabledItems.replace(/(^.*wappalyzer[^:]+:)([^,]+),.*$/, '$2');
+			var version      = enabledItems.replace(/(^.*wappalyzer[^:]+:)([^,]+),.*$/, '$2');
 
 			if ( wappalyzer.version != version )
 			{
@@ -145,8 +144,8 @@ wappalyzer =
 				wappalyzer.enableTracking = wappalyzer.prefs.getBoolPref('enableTracking');
 
 				break;
-			case 'showAppNames':
-				wappalyzer.showAppNames = wappalyzer.prefs.getIntPref('showAppNames');
+			case 'showNames':
+				wappalyzer.showNames = wappalyzer.prefs.getBoolPref('showNames');
 
 				break;
 			case 'location':
@@ -175,8 +174,9 @@ wappalyzer =
 			case 'cat18': wappalyzer.showCats[18] = wappalyzer.prefs.getIntPref('cat18'); break;
 			case 'cat19': wappalyzer.showCats[19] = wappalyzer.prefs.getIntPref('cat19'); break;
 			case 'cat20': wappalyzer.showCats[20] = wappalyzer.prefs.getIntPref('cat20'); break;
-			case 'cat20': wappalyzer.showCats[21] = wappalyzer.prefs.getIntPref('cat21'); break;
-			case 'cat20': wappalyzer.showCats[22] = wappalyzer.prefs.getIntPref('cat22'); break;
+			case 'cat21': wappalyzer.showCats[21] = wappalyzer.prefs.getIntPref('cat21'); break;
+			case 'cat22': wappalyzer.showCats[22] = wappalyzer.prefs.getIntPref('cat22'); break;
+			case 'cat23': wappalyzer.showCats[23] = wappalyzer.prefs.getIntPref('cat23'); break;
 		}
 	},
 
@@ -216,16 +216,17 @@ wappalyzer =
 	{
 		wappalyzer.log('onPageLoad');
 
-		var doc = event.originalTarget;
+		var target = event.originalTarget;
 
-		if ( !doc.request )
+		if ( !target.request )
 		{
 			wappalyzer.request = false;
 		}
 
 		wappalyzer.analyzePage(
-			doc.location.href,
-			doc.documentElement.innerHTML,
+			target,
+			target.location.href,
+			target.documentElement.innerHTML,
 			[],
 			true,
 			false
@@ -237,6 +238,7 @@ wappalyzer =
 		wappalyzer.log('onContentPageLoad');
 
 		wappalyzer.analyzePage(
+			null,
 			message.json.href,
 			message.json.html,
 			message.json.headers,
@@ -263,6 +265,7 @@ wappalyzer =
 		wappalyzer.currentTab = false;
 
 		wappalyzer.analyzePage(
+			wappalyzer.browser.contentWindow,
 			doc.location.href   ? doc.location.href             : '',
 			doc.documentElement ? doc.documentElement.innerHTML : '',
 			[],
@@ -310,20 +313,17 @@ wappalyzer =
 		onSecurityChange: function(a, b, c)          {}
 	},
 
-	analyzePage: function(href, html, headers, doCount, manualDetect)
+	analyzePage: function(windowObject, href, html, headers, doCount, manualDetect)
 	{
 		wappalyzer.log('analyzePage');
 
 		wappalyzer.currentTab = false;
 
-		if ( !wappalyzer.isBookmarklet )
+		if ( href == wappalyzer.browser.contentDocument.location.href )
 		{
-			if ( href == wappalyzer.browser.contentDocument.location.href )
-			{
-				wappalyzer.currentTab = true;
+			wappalyzer.currentTab = true;
 
-				wappalyzer.clearDetectedApps();
-			}
+			wappalyzer.clearDetectedApps();
 		}
 
 		if ( typeof(html) == 'undefined' )
@@ -367,7 +367,7 @@ wappalyzer =
 							}
 						}
 
-						// Scan response header
+						// Scan response headers
 						if ( typeof(wappalyzer.apps[appName].headers) != 'undefined' && wappalyzer.request )
 						{
 							for ( var header in wappalyzer.apps[appName].headers )
@@ -398,151 +398,115 @@ wappalyzer =
 	{
 		wappalyzer.log('showApp ' + detectedApp);
 
-		if ( !wappalyzer.currentTab && !wappalyzer.isBookmarklet )
-		{
-			wappalyzer.report(detectedApp, href);
-
-			return;
-		}
+		wappalyzer.report(detectedApp, href);
 
 		if ( detectedApp && typeof(wappalyzer.checkUnique[detectedApp]) == 'undefined' )
 		{
-			var show = true;
+			var show = false;
 
-			if ( !wappalyzer.isBookmarklet )
+			for ( i in wappalyzer.apps[detectedApp].cats )
 			{
-				var show = false;
-
-				for ( i in wappalyzer.apps[detectedApp].cats )
+				if ( wappalyzer.showCats[wappalyzer.apps[detectedApp].cats[i]] )
 				{
-					if ( wappalyzer.showCats[wappalyzer.apps[detectedApp].cats[i]] )
-					{
-						show = true;
+					show = true;
 
-						break;
-					}
+					break;
 				}
 			}
 
 			if ( show )
 			{
-				switch ( true )
-				{
-					case wappalyzer.isBookmarklet:
-						var e = document.getElementById('wappalyzer-bookmarklet-apps');
-
-						if ( e )
-						{
-							if ( !wappalyzer.appsDetected )
-							{
-								e.innerHTML = '';
-							}
+				var e = document.getElementById('wappalyzer-detected-apps');
 
-							e.innerHTML +=
-								'<br/>' +
-								'<strong>' +
-									'<a href="' + wappalyzer.homeUrl + 'stats/app/' + escape(detectedApp) + '" style="color: #332;">' +
-									'<img src="' + wappalyzer.homeUrl + '_view/images/app_icons/' + escape(detectedApp) + '.ico" width="16" height="16" style="margin-right: 6px; vertical-align: middle;"/>' +
-									detectedApp +
-									'</a>' +
-								'</strong>'
-								;
-
-							if ( wappalyzer.apps[detectedApp].cats )
-							{
-								for ( i in wappalyzer.apps[detectedApp].cats )
-								{
-									e.innerHTML += '<br/><span style="margin-left: 22px;">' + wappalyzer.cats[wappalyzer.apps[detectedApp].cats[i]].name + '</span>';
-								}
-
-								e.innerHTML += '<br/>';
-							}
-						}
-
-						break;
-					case wappalyzer.isMobile:
-					default:
-						// Hide Wappalyzer icon
-						document.getElementById('wappalyzer-icon').style.display = 'none';
-
-						// Show app icon and label
-						var e = document.getElementById('wappalyzer-detected-apps');
+				if ( wappalyzer.autoDetect )
+				{
+					// Hide Wappalyzer icon
+					document.getElementById('wappalyzer-icon').style.display = 'none';
 
-						var child = document.createElement('image');
+					// Show app icon and label
+					var child = document.createElement('image');
 
-						if ( typeof(wappalyzer.apps[detectedApp].icon) == 'string' )
-						{
-							child.setAttribute('src', wappalyzer.apps[detectedApp].icon);
-						}
-						else
-						{
-							child.setAttribute('src', 'chrome://wappalyzer/skin/app_icons/' + detectedApp + '.ico');
-						}
+					if ( typeof(wappalyzer.apps[detectedApp].icon) == 'string' )
+					{
+						child.setAttribute('src', wappalyzer.apps[detectedApp].icon);
+					}
+					else
+					{
+						child.setAttribute('src', 'chrome://wappalyzer/skin/icons/' + detectedApp + '.ico');
+					}
 
-						child.setAttribute('class', 'wappalyzer-icon');
+					child.setAttribute('class', 'wappalyzer-icon');
 
-						if ( !wappalyzer.isMobile )
-						{
-							if ( wappalyzer.showAppNames == 2 )
-							{
-								var container = document.getElementById('wappalyzer-container').parentNode;
+					if ( wappalyzer.appsDetected )
+					{
+						child.setAttribute('style', 'margin-left: .5em');
+					}
 
-								var tooltiptext = container.getAttribute('tooltiptext') + '\n' + detectedApp;
+					e.appendChild(child);
+				}
 
-								if ( wappalyzer.apps[detectedApp].cats )
-								{
-									for ( i in wappalyzer.apps[detectedApp].cats )
-									{
-										tooltiptext += '\n    ' + wappalyzer.cats[wappalyzer.apps[detectedApp].cats[i]].name;
-									}
+				child = document.createElement('label');
 
-									tooltiptext += '\n';
-								}
+				child.setAttribute('value', detectedApp);
+				child.setAttribute('class', 'wappalyzer-app-name');
 
-								container.setAttribute('tooltiptext', tooltiptext);
-							}
+				if ( !wappalyzer.showNames )
+				{
+					child.setAttribute('style', 'display: none;');
+				}
 
-							if ( wappalyzer.appsDetected )
-							{
-								child.setAttribute('style', 'margin-left: .5em');
-							}
-						}
+				e.appendChild(child);
 
-						e.appendChild(child);
+				// Show application in popup
+				var e = document.getElementById('wappalyzer-apps');
 
-						if ( !wappalyzer.isMobile && typeof(wappalyzer.apps[detectedApp].custom) == 'undefined' )
-						{
-							child = document.createElement('label');
+				if ( !wappalyzer.appsDetected )
+				{
+					// Remove "no apps detected" message
+					document.getElementById('wappalyzer-apps').removeChild(document.getElementById('wappalyzer-no-detected-apps'));
+				}
+				else
+				{
+					var child = document.createElement('menuseparator');
 
-							child.setAttribute('value', detectedApp);
-							child.setAttribute('class', 'wappalyzer-app-name');
+					e.appendChild(child);
+				}
 
-							if ( wappalyzer.showAppNames != 1 )
-							{
-								child.setAttribute('style', 'display: none;');
-							}
+				var child = document.createElement('menuitem');
 
-							e.appendChild(child);
+				child.setAttribute('class',     'menuitem-iconic');
+				child.setAttribute('type',      '');
+				child.setAttribute('oncommand', 'wappalyzer.openTab(\'' + wappalyzer.homeUrl + 'stats/app/' + escape(detectedApp) + '\');');
 
-							// Enable application statistics menu item
-							var e = document.getElementById('wappalyzer-app-stats');
+				if ( typeof(wappalyzer.apps[detectedApp].custom) == 'undefined' )
+				{
+					child.setAttribute('label', detectedApp);
+					child.setAttribute('image', 'chrome://wappalyzer/skin/icons/' + detectedApp + '.ico');
+				}
+				else
+				{
+					child.setAttribute('label',    detectedApp + ' (' + wappalyzer.strings.getString('wappalyzer.custom') + ')');
+					child.setAttribute('disabled', 'true');
+					child.setAttribute('image',    wappalyzer.apps[detectedApp].icon);
+				}
 
-							e.parentNode.setAttribute('disabled', false);
+				e.appendChild(child);
 
-							var child = document.createElement('menuitem');
+				if ( wappalyzer.apps[detectedApp].cats )
+				{
+					for ( i in wappalyzer.apps[detectedApp].cats )
+					{
+						var child = document.createElement('menuitem');
 
-							child.setAttribute('label',     detectedApp);
-							child.setAttribute('class',     'menuitem-iconic');
-							child.setAttribute('type',      '');
-							child.setAttribute('image',     'chrome://wappalyzer/skin/app_icons/' + detectedApp + '.ico');
-							child.setAttribute('oncommand', 'wappalyzer.openTab(\'' + wappalyzer.homeUrl + 'stats/app/' + escape(detectedApp) + '\');');
+						child.setAttribute('label',    wappalyzer.cats[wappalyzer.apps[detectedApp].cats[i]].name);
+						child.setAttribute('disabled', 'true');
 
-							e.appendChild(child);
-						}
+						e.appendChild(child);
+					}
 				}
 			}
 
-			if ( doCount && typeof(wappalyzer.apps[detectedApp].custom) == 'undefined' )
+			if ( doCount )
 			{
 				wappalyzer.report(detectedApp, href);
 			}
@@ -557,27 +521,30 @@ wappalyzer =
 	{
 		wappalyzer.log('report');
 
-		domain = href.match(/:\/\/(.[^/]+)/)[1];
-
-		if ( wappalyzer.enableTracking && wappalyzer.regexDomain.test(domain) )
+		if ( typeof(wappalyzer.apps[detectedApp].custom) == 'undefined' )
 		{
-			if ( typeof(wappalyzer.history[domain]) == 'undefined' )
-			{
-				wappalyzer.history[domain] = [];
-			}
+			var domain = href.match(regex = /:\/\/(.[^/]+)/) ? href.match(regex)[1] : '';
 
-			if ( typeof(wappalyzer.history[domain][detectedApp]) == 'undefined' )
+			if ( wappalyzer.enableTracking && wappalyzer.regexDomain.test(domain) )
 			{
-				wappalyzer.history[domain][detectedApp] = 0;
-			}
+				if ( typeof(wappalyzer.history[domain]) == 'undefined' )
+				{
+					wappalyzer.history[domain] = [];
+				}
 
-			wappalyzer.history[domain][detectedApp] ++;
+				if ( typeof(wappalyzer.history[domain][detectedApp]) == 'undefined' )
+				{
+					wappalyzer.history[domain][detectedApp] = 0;
+				}
 
-			wappalyzer.hitCount ++;
+				wappalyzer.history[domain][detectedApp] ++;
 
-			if ( wappalyzer.hitCount > 100 )
-			{
-				wappalyzer.sendReport();
+				wappalyzer.hitCount ++;
+
+				if ( wappalyzer.hitCount > 200 )
+				{
+					wappalyzer.sendReport();
+				}
 			}
 		}
 	},
@@ -660,36 +627,23 @@ wappalyzer =
 			e.removeChild(e.childNodes.item(0));
 		}
 
-		if ( !wappalyzer.isMobile )
-		{
-			// Clear tooltip
-			var container = document.getElementById('wappalyzer-container').parentNode;
-
-			container.setAttribute('tooltiptext', wappalyzer.strings.getString('wappalyzer.title') + ( wappalyzer.showAppNames == 2 ? '\n---' : '' ));
+		// Clear application popup
+		e = document.getElementById('wappalyzer-apps');
 
-			// Disable and clear application statistics menu item
-			e = document.getElementById('wappalyzer-app-stats');
-
-			e.parentNode.setAttribute('disabled', true);
-
-			while ( e.childNodes.length > 0 )
-			{
-				e.removeChild(e.childNodes.item(0));
-			}
+		while ( e.childNodes.length > 0 )
+		{
+			e.removeChild(e.childNodes.item(0));
 		}
-	},
 
-	showLabels: function(show)
-	{
-		if ( wappalyzer.showAppNames == 3 )
-		{
-			e = document.getElementsByClassName('wappalyzer-app-name');
+		var child = document.createElement('menuitem');
 
-			for ( i = 0; i < e.length; i ++ )
-			{
-				e[i].style.display = show ? 'inline' : 'none';
-			}
-		}
+		child.setAttribute('label',     wappalyzer.strings.getString('wappalyzer.noDetectedApps'));
+		child.setAttribute('id',        'wappalyzer-no-detected-apps');
+		child.setAttribute('class',     'menuitem-iconic');
+		child.setAttribute('disabled', 	'true');
+		child.setAttribute('type',      '');
+
+		e.appendChild(child);
 	},
 
 	installSuccess: function()
@@ -704,69 +658,5 @@ wappalyzer =
 		wappalyzer.browser.removeEventListener('load', wappalyzer.upgradeSuccess, false);
 
 		wappalyzer.openTab(wappalyzer.homeUrl + 'install/upgraded/');
-	},
-
-	bookmarklet: function()
-	{
-		if ( !wappalyzer.browser )
-		{
-			wappalyzer.isBookmarklet = true;
-
-			if ( !document.getElementById('wappalyzer-bookmarklet') )
-			{
-				var body = document.getElementsByTagName('body')[0];
-
-				if ( body )
-				{
-					var container = document.createElement('div');
-
-					container.innerHTML =
-						'<div id="wappalyzer-bookmarklet" style="' +
-						'	color: #332;' +
-						'	font: 12px \'Trebuchet MS\';' +
-						'	line-height: 16px;' +
-						'	position: fixed;' +
-						'	text-align: right;' +
-						'	right: 2em;' +
-						'	top: 2em;' +
-						'	z-index: 9999999999;' +
-						'	">' +
-						'	<div id="wappalyzer-container" style="' +
-						'		-moz-box-shadow: 0 0 5px rgba(0, 0, 0, .4);' +
-						'		-moz-border-radius: 7px;' +
-						'		-webkit-border-radius: 7px;' +
-						'		background: #FAFAFA;' +
-						'		border: 7px solid #332;' +
-						'		margin-bottom: .3em;' +
-						'		min-width: 15em;' +
-						'		padding: 1em 1.5em 1.4em 1.5em;' +
-						'		text-align: left;' +
-						'		">' +
-						'		<div style="' +
-						'			border-bottom: 1px solid #DDC;' +
-						'			font-size: 13px;' +
-						'			padding-bottom: 1em;' +
-						'			text-align: center;' +
-						'			"><strong>Wappalyzer</strong></div>' +
-						'		<span id="wappalyzer-bookmarklet-apps"><br/><em>No apps detected</em></span>' +
-						'	</div>' +
-						'	<span style="float: left;"><a href="http://wappalyzer.com" style="color: #332 !important;">home</a> | <a href="http://twitter.com/ElbertF" style="color: #332 !important;">follow me</a></span>' +
-						'   <span style="float: right;">click to close</span>' +
-						'</div>'
-						;
-
-					container.onclick = function() { body.removeChild(container); };
-
-					body.appendChild(container);
-
-					wappalyzer.analyzePage(
-						document.location.href,
-						document.documentElement.innerHTML,
-						[],
-						false
-						);
-				}
-			}
-		}
 	}
 };
diff --git a/chrome/content/overlay.xul b/chrome/content/overlay.xul
index 66c56be42..fd0203729 100755
--- a/chrome/content/overlay.xul
+++ b/chrome/content/overlay.xul
@@ -17,8 +17,9 @@
 		<hbox
 			id="wappalyzer-container"
 			context="wappalyzer-menu"
-			onmouseover="wappalyzer.showLabels(true);"
-			onmouseout="wappalyzer.showLabels(false);"
+			popup="wappalyzer-apps"
+			onmouseover="wappalyzer.hoverTimeout = setTimeout(function() { document.getElementById('wappalyzer-apps').openPopup(document.getElementById('wappalyzer-container'), 'after_end'); }, 1000);"
+			onmouseout="clearTimeout(wappalyzer.hoverTimeout);"
 			>
 			<image
 				id="wappalyzer-icon"
@@ -28,7 +29,10 @@
 			
 			<box align="start" id="wappalyzer-detected-apps"/>
 
-			<menupopup id="wappalyzer-menu" position="at_pointer">
+			<menupopup id="wappalyzer-apps" position="after_end">
+			</menupopup>
+
+			<menupopup id="wappalyzer-menu">
 				<menuitem label="&wappalyzer.options;" oncommand="
 					window.openDialog('chrome://wappalyzer/content/options.xul', 'wappalyzer-options', 'chrome, dialog, centerscreen');
 					"/>
@@ -36,17 +40,12 @@
 				<menuitem label="&wappalyzer.donate;"   oncommand="wappalyzer.openTab(wappalyzer.homeUrl + 'donate/');"/>
 				<menuitem label="&wappalyzer.feedback;" oncommand="wappalyzer.openTab(wappalyzer.homeUrl + '?redirect=feedback');"/>
 				<menuitem label="&wappalyzer.home;"     oncommand="wappalyzer.openTab(wappalyzer.homeUrl);"/>
-				<menuseparator/>
-				<menu label="&wappalyzer.appStats;" disabled="true">
-					<menupopup id="wappalyzer-app-stats"/>
-				</menu>
 			</menupopup>
 		</hbox>
 	</hbox>
 
 	<hbox
 		id="urlbar-icons"
-		tooltiptext="&wappalyzer.title;"
 		onclick="if ( !wappalyzer.autoDetect ) wappalyzer.analyzePage(wappalyzer.browser.contentDocument.location.href, wappalyzer.browser.contentDocument.documentElement.innerHTML, false, true, true);"
 		/>
 
@@ -55,10 +54,8 @@
 			id="wappalyzer-statusbar"
 			class="statusbarpanel-iconic"
 			context="wappalyzer-menu"
-			tooltiptext="&wappalyzer.title;"
+			popup="wappalyzer-apps"
 			onclick="if ( !wappalyzer.autoDetect ) wappalyzer.analyzePage(wappalyzer.browser.contentDocument.location.href, wappalyzer.browser.contentDocument.documentElement.innerHTML, false, true, true);"
-			onmouseover="wappalyzer.showLabels(true);"
-			onmouseout="wappalyzer.showLabels(false);"
 			/>
 	</statusbar>
 </overlay>
diff --git a/chrome/locale/en-US/overlay.dtd b/chrome/locale/en-US/overlay.dtd
index 8b1e11e59..63d9395ad 100755
--- a/chrome/locale/en-US/overlay.dtd
+++ b/chrome/locale/en-US/overlay.dtd
@@ -10,14 +10,12 @@
 <!ENTITY wappalyzer.detect         "Detect applications">
 <!ENTITY wappalyzer.auto           "Automatically">
 <!ENTITY wappalyzer.manual         "On click">
-<!ENTITY wappalyzer.appNames       "Show application names">
-<!ENTITY wappalyzer.always         "Always">
-<!ENTITY wappalyzer.tooltip        "Tooltip">
-<!ENTITY wappalyzer.hover          "Expand on mouse over">
+<!ENTITY wappalyzer.inline         "Inline">
+<!ENTITY wappalyzer.popup          "In popup on click">
+<!ENTITY wappalyzer.showNames      "Show application names">
 <!ENTITY wappalyzer.categories     "Categories">
 <!ENTITY wappalyzer.home           "Go to Wappalyzer">
 <!ENTITY wappalyzer.privacy        "Privacy">
-<!ENTITY wappalyzer.appStats       "View application statistics">
 <!ENTITY wappalyzer.donate         "Donate">
 <!ENTITY wappalyzer.evaluate       "Evaluate code">
 <!ENTITY wappalyzer.customBody     "Add applications for personal use with JSON and regular expressions.">
@@ -45,4 +43,5 @@
 <!ENTITY wappalyzer.cat20          "Editors">
 <!ENTITY wappalyzer.cat21          "LMS">
 <!ENTITY wappalyzer.cat22          "Web servers">
+<!ENTITY wappalyzer.cat23          "Cache tools">
 
diff --git a/chrome/locale/en-US/overlay.properties b/chrome/locale/en-US/overlay.properties
index 20108bcd6..82179bc44 100755
--- a/chrome/locale/en-US/overlay.properties
+++ b/chrome/locale/en-US/overlay.properties
@@ -1 +1,3 @@
-wappalyzer.title=Wappalyzer
+wappalyzer.title          = Wappalyzer
+wappalyzer.noDetectedApps = No applications detected
+wappalyzer.custom         = custom
diff --git a/chrome/skin/app_icons/1C-Bitrix.ico b/chrome/skin/icons/1C-Bitrix.ico
similarity index 100%
rename from chrome/skin/app_icons/1C-Bitrix.ico
rename to chrome/skin/icons/1C-Bitrix.ico
diff --git a/chrome/skin/app_icons/2z Project.ico b/chrome/skin/icons/2z Project.ico
similarity index 100%
rename from chrome/skin/app_icons/2z Project.ico
rename to chrome/skin/icons/2z Project.ico
diff --git a/chrome/skin/app_icons/AWStats.ico b/chrome/skin/icons/AWStats.ico
similarity index 100%
rename from chrome/skin/app_icons/AWStats.ico
rename to chrome/skin/icons/AWStats.ico
diff --git a/chrome/skin/app_icons/AddThis.ico b/chrome/skin/icons/AddThis.ico
similarity index 100%
rename from chrome/skin/app_icons/AddThis.ico
rename to chrome/skin/icons/AddThis.ico
diff --git a/chrome/skin/app_icons/Adobe GoLive.ico b/chrome/skin/icons/Adobe GoLive.ico
similarity index 100%
rename from chrome/skin/app_icons/Adobe GoLive.ico
rename to chrome/skin/icons/Adobe GoLive.ico
diff --git a/chrome/skin/icons/Advanced Web Stats.ico b/chrome/skin/icons/Advanced Web Stats.ico
new file mode 100644
index 000000000..b1ae829e6
Binary files /dev/null and b/chrome/skin/icons/Advanced Web Stats.ico differ
diff --git a/chrome/skin/app_icons/Amiro.CMS.ico b/chrome/skin/icons/Amiro.CMS.ico
similarity index 100%
rename from chrome/skin/app_icons/Amiro.CMS.ico
rename to chrome/skin/icons/Amiro.CMS.ico
diff --git a/chrome/skin/app_icons/Apache.ico b/chrome/skin/icons/Apache.ico
similarity index 100%
rename from chrome/skin/app_icons/Apache.ico
rename to chrome/skin/icons/Apache.ico
diff --git a/chrome/skin/app_icons/BIGACE.ico b/chrome/skin/icons/BIGACE.ico
similarity index 100%
rename from chrome/skin/app_icons/BIGACE.ico
rename to chrome/skin/icons/BIGACE.ico
diff --git a/chrome/skin/app_icons/BigDump.ico b/chrome/skin/icons/BigDump.ico
similarity index 100%
rename from chrome/skin/app_icons/BigDump.ico
rename to chrome/skin/icons/BigDump.ico
diff --git a/chrome/skin/app_icons/Blogger.ico b/chrome/skin/icons/Blogger.ico
similarity index 100%
rename from chrome/skin/app_icons/Blogger.ico
rename to chrome/skin/icons/Blogger.ico
diff --git a/chrome/skin/app_icons/Bugzilla.ico b/chrome/skin/icons/Bugzilla.ico
similarity index 100%
rename from chrome/skin/app_icons/Bugzilla.ico
rename to chrome/skin/icons/Bugzilla.ico
diff --git a/chrome/skin/app_icons/Burning Board.ico b/chrome/skin/icons/Burning Board.ico
similarity index 100%
rename from chrome/skin/app_icons/Burning Board.ico
rename to chrome/skin/icons/Burning Board.ico
diff --git a/chrome/skin/app_icons/CMS Made Simple.ico b/chrome/skin/icons/CMS Made Simple.ico
similarity index 100%
rename from chrome/skin/app_icons/CMS Made Simple.ico
rename to chrome/skin/icons/CMS Made Simple.ico
diff --git a/chrome/skin/app_icons/CO2Stats.ico b/chrome/skin/icons/CO2Stats.ico
similarity index 100%
rename from chrome/skin/app_icons/CO2Stats.ico
rename to chrome/skin/icons/CO2Stats.ico
diff --git a/chrome/skin/app_icons/CS Cart.ico b/chrome/skin/icons/CS Cart.ico
similarity index 100%
rename from chrome/skin/app_icons/CS Cart.ico
rename to chrome/skin/icons/CS Cart.ico
diff --git a/chrome/skin/app_icons/Chamilo.ico b/chrome/skin/icons/Chamilo.ico
similarity index 100%
rename from chrome/skin/app_icons/Chamilo.ico
rename to chrome/skin/icons/Chamilo.ico
diff --git a/chrome/skin/app_icons/ClickTale.ico b/chrome/skin/icons/ClickTale.ico
similarity index 100%
rename from chrome/skin/app_icons/ClickTale.ico
rename to chrome/skin/icons/ClickTale.ico
diff --git a/chrome/skin/app_icons/Clicky.ico b/chrome/skin/icons/Clicky.ico
similarity index 100%
rename from chrome/skin/app_icons/Clicky.ico
rename to chrome/skin/icons/Clicky.ico
diff --git a/chrome/skin/app_icons/Concrete5.ico b/chrome/skin/icons/Concrete5.ico
similarity index 100%
rename from chrome/skin/app_icons/Concrete5.ico
rename to chrome/skin/icons/Concrete5.ico
diff --git a/chrome/skin/app_icons/Contao.ico b/chrome/skin/icons/Contao.ico
similarity index 100%
rename from chrome/skin/app_icons/Contao.ico
rename to chrome/skin/icons/Contao.ico
diff --git a/chrome/skin/app_icons/ConversionLab.ico b/chrome/skin/icons/ConversionLab.ico
similarity index 100%
rename from chrome/skin/app_icons/ConversionLab.ico
rename to chrome/skin/icons/ConversionLab.ico
diff --git a/chrome/skin/app_icons/Coppermine.ico b/chrome/skin/icons/Coppermine.ico
similarity index 100%
rename from chrome/skin/app_icons/Coppermine.ico
rename to chrome/skin/icons/Coppermine.ico
diff --git a/chrome/skin/app_icons/Cotonti.ico b/chrome/skin/icons/Cotonti.ico
similarity index 100%
rename from chrome/skin/app_icons/Cotonti.ico
rename to chrome/skin/icons/Cotonti.ico
diff --git a/chrome/skin/app_icons/Crazy Egg.ico b/chrome/skin/icons/Crazy Egg.ico
similarity index 100%
rename from chrome/skin/app_icons/Crazy Egg.ico
rename to chrome/skin/icons/Crazy Egg.ico
diff --git a/chrome/skin/app_icons/CubeCart.ico b/chrome/skin/icons/CubeCart.ico
similarity index 100%
rename from chrome/skin/app_icons/CubeCart.ico
rename to chrome/skin/icons/CubeCart.ico
diff --git a/chrome/skin/app_icons/Danneo CMS.ico b/chrome/skin/icons/Danneo CMS.ico
similarity index 100%
rename from chrome/skin/app_icons/Danneo CMS.ico
rename to chrome/skin/icons/Danneo CMS.ico
diff --git a/chrome/skin/app_icons/DataLife Engine.ico b/chrome/skin/icons/DataLife Engine.ico
similarity index 100%
rename from chrome/skin/app_icons/DataLife Engine.ico
rename to chrome/skin/icons/DataLife Engine.ico
diff --git a/chrome/skin/app_icons/DirectAdmin.ico b/chrome/skin/icons/DirectAdmin.ico
similarity index 100%
rename from chrome/skin/app_icons/DirectAdmin.ico
rename to chrome/skin/icons/DirectAdmin.ico
diff --git a/chrome/skin/app_icons/Disqus.ico b/chrome/skin/icons/Disqus.ico
similarity index 100%
rename from chrome/skin/app_icons/Disqus.ico
rename to chrome/skin/icons/Disqus.ico
diff --git a/chrome/skin/icons/Dokeos.ico b/chrome/skin/icons/Dokeos.ico
new file mode 100644
index 000000000..52d5afdea
Binary files /dev/null and b/chrome/skin/icons/Dokeos.ico differ
diff --git a/chrome/skin/app_icons/DokuWiki.ico b/chrome/skin/icons/DokuWiki.ico
similarity index 100%
rename from chrome/skin/app_icons/DokuWiki.ico
rename to chrome/skin/icons/DokuWiki.ico
diff --git a/chrome/skin/app_icons/DotNetNuke.ico b/chrome/skin/icons/DotNetNuke.ico
similarity index 100%
rename from chrome/skin/app_icons/DotNetNuke.ico
rename to chrome/skin/icons/DotNetNuke.ico
diff --git a/chrome/skin/app_icons/Dotclear.ico b/chrome/skin/icons/Dotclear.ico
similarity index 100%
rename from chrome/skin/app_icons/Dotclear.ico
rename to chrome/skin/icons/Dotclear.ico
diff --git a/chrome/skin/app_icons/DreamWeaver.ico b/chrome/skin/icons/DreamWeaver.ico
similarity index 100%
rename from chrome/skin/app_icons/DreamWeaver.ico
rename to chrome/skin/icons/DreamWeaver.ico
diff --git a/chrome/skin/app_icons/Drupal.ico b/chrome/skin/icons/Drupal.ico
similarity index 100%
rename from chrome/skin/app_icons/Drupal.ico
rename to chrome/skin/icons/Drupal.ico
diff --git a/chrome/skin/icons/Dynamicweb.ico b/chrome/skin/icons/Dynamicweb.ico
new file mode 100644
index 000000000..8fa15232e
Binary files /dev/null and b/chrome/skin/icons/Dynamicweb.ico differ
diff --git a/chrome/skin/icons/ExpressionEngine.ico b/chrome/skin/icons/ExpressionEngine.ico
new file mode 100644
index 000000000..69348a630
Binary files /dev/null and b/chrome/skin/icons/ExpressionEngine.ico differ
diff --git a/chrome/skin/app_icons/ExtJS.ico b/chrome/skin/icons/ExtJS.ico
similarity index 100%
rename from chrome/skin/app_icons/ExtJS.ico
rename to chrome/skin/icons/ExtJS.ico
diff --git a/chrome/skin/app_icons/FluxBB.ico b/chrome/skin/icons/FluxBB.ico
similarity index 100%
rename from chrome/skin/app_icons/FluxBB.ico
rename to chrome/skin/icons/FluxBB.ico
diff --git a/chrome/skin/app_icons/Flyspray.ico b/chrome/skin/icons/Flyspray.ico
similarity index 100%
rename from chrome/skin/app_icons/Flyspray.ico
rename to chrome/skin/icons/Flyspray.ico
diff --git a/chrome/skin/app_icons/FrontPage.ico b/chrome/skin/icons/FrontPage.ico
similarity index 100%
rename from chrome/skin/app_icons/FrontPage.ico
rename to chrome/skin/icons/FrontPage.ico
diff --git a/chrome/skin/app_icons/Get Satisfaction.ico b/chrome/skin/icons/Get Satisfaction.ico
similarity index 100%
rename from chrome/skin/app_icons/Get Satisfaction.ico
rename to chrome/skin/icons/Get Satisfaction.ico
diff --git a/chrome/skin/app_icons/Google Analytics.ico b/chrome/skin/icons/Google Analytics.ico
similarity index 100%
rename from chrome/skin/app_icons/Google Analytics.ico
rename to chrome/skin/icons/Google Analytics.ico
diff --git a/chrome/skin/app_icons/Google Font API.ico b/chrome/skin/icons/Google Font API.ico
similarity index 100%
rename from chrome/skin/app_icons/Google Font API.ico
rename to chrome/skin/icons/Google Font API.ico
diff --git a/chrome/skin/app_icons/Google Friend Connect.ico b/chrome/skin/icons/Google Friend Connect.ico
similarity index 100%
rename from chrome/skin/app_icons/Google Friend Connect.ico
rename to chrome/skin/icons/Google Friend Connect.ico
diff --git a/chrome/skin/app_icons/Google Maps.ico b/chrome/skin/icons/Google Maps.ico
similarity index 100%
rename from chrome/skin/app_icons/Google Maps.ico
rename to chrome/skin/icons/Google Maps.ico
diff --git a/chrome/skin/app_icons/Graffiti CMS.ico b/chrome/skin/icons/Graffiti CMS.ico
similarity index 100%
rename from chrome/skin/app_icons/Graffiti CMS.ico
rename to chrome/skin/icons/Graffiti CMS.ico
diff --git a/chrome/skin/app_icons/Gravity Insights.ico b/chrome/skin/icons/Gravity Insights.ico
similarity index 100%
rename from chrome/skin/app_icons/Gravity Insights.ico
rename to chrome/skin/icons/Gravity Insights.ico
diff --git a/chrome/skin/app_icons/Hotaru CMS.ico b/chrome/skin/icons/Hotaru CMS.ico
similarity index 100%
rename from chrome/skin/app_icons/Hotaru CMS.ico
rename to chrome/skin/icons/Hotaru CMS.ico
diff --git a/chrome/skin/icons/IIS.ico b/chrome/skin/icons/IIS.ico
new file mode 100644
index 000000000..3045d9ea5
Binary files /dev/null and b/chrome/skin/icons/IIS.ico differ
diff --git a/chrome/skin/app_icons/IPB.ico b/chrome/skin/icons/IPB.ico
similarity index 100%
rename from chrome/skin/app_icons/IPB.ico
rename to chrome/skin/icons/IPB.ico
diff --git a/chrome/skin/app_icons/InstantCMS.ico b/chrome/skin/icons/InstantCMS.ico
similarity index 100%
rename from chrome/skin/app_icons/InstantCMS.ico
rename to chrome/skin/icons/InstantCMS.ico
diff --git a/chrome/skin/app_icons/JTL Shop.ico b/chrome/skin/icons/JTL Shop.ico
similarity index 100%
rename from chrome/skin/app_icons/JTL Shop.ico
rename to chrome/skin/icons/JTL Shop.ico
diff --git a/chrome/skin/icons/Jalios.ico b/chrome/skin/icons/Jalios.ico
new file mode 100644
index 000000000..32797ede0
Binary files /dev/null and b/chrome/skin/icons/Jalios.ico differ
diff --git a/chrome/skin/app_icons/Joomla.ico b/chrome/skin/icons/Joomla.ico
similarity index 100%
rename from chrome/skin/app_icons/Joomla.ico
rename to chrome/skin/icons/Joomla.ico
diff --git a/chrome/skin/app_icons/K2.ico b/chrome/skin/icons/K2.ico
similarity index 100%
rename from chrome/skin/app_icons/K2.ico
rename to chrome/skin/icons/K2.ico
diff --git a/chrome/skin/app_icons/Kampyle.ico b/chrome/skin/icons/Kampyle.ico
similarity index 100%
rename from chrome/skin/app_icons/Kampyle.ico
rename to chrome/skin/icons/Kampyle.ico
diff --git a/chrome/skin/app_icons/Kentico CMS.ico b/chrome/skin/icons/Kentico CMS.ico
similarity index 100%
rename from chrome/skin/app_icons/Kentico CMS.ico
rename to chrome/skin/icons/Kentico CMS.ico
diff --git a/chrome/skin/app_icons/Koego.ico b/chrome/skin/icons/Koego.ico
similarity index 100%
rename from chrome/skin/app_icons/Koego.ico
rename to chrome/skin/icons/Koego.ico
diff --git a/chrome/skin/app_icons/Kolibri CMS.ico b/chrome/skin/icons/Kolibri CMS.ico
similarity index 100%
rename from chrome/skin/app_icons/Kolibri CMS.ico
rename to chrome/skin/icons/Kolibri CMS.ico
diff --git a/chrome/skin/app_icons/Koobi.ico b/chrome/skin/icons/Koobi.ico
similarity index 100%
rename from chrome/skin/app_icons/Koobi.ico
rename to chrome/skin/icons/Koobi.ico
diff --git a/chrome/skin/app_icons/LiveJournal.ico b/chrome/skin/icons/LiveJournal.ico
similarity index 100%
rename from chrome/skin/app_icons/LiveJournal.ico
rename to chrome/skin/icons/LiveJournal.ico
diff --git a/chrome/skin/icons/Lotus Domino.ico b/chrome/skin/icons/Lotus Domino.ico
new file mode 100644
index 000000000..8fccac6a3
Binary files /dev/null and b/chrome/skin/icons/Lotus Domino.ico differ
diff --git a/chrome/skin/app_icons/MODx.ico b/chrome/skin/icons/MODx.ico
similarity index 100%
rename from chrome/skin/app_icons/MODx.ico
rename to chrome/skin/icons/MODx.ico
diff --git a/chrome/skin/app_icons/Magento.ico b/chrome/skin/icons/Magento.ico
similarity index 100%
rename from chrome/skin/app_icons/Magento.ico
rename to chrome/skin/icons/Magento.ico
diff --git a/chrome/skin/app_icons/Mambo.ico b/chrome/skin/icons/Mambo.ico
similarity index 100%
rename from chrome/skin/app_icons/Mambo.ico
rename to chrome/skin/icons/Mambo.ico
diff --git a/chrome/skin/app_icons/MantisBT.ico b/chrome/skin/icons/MantisBT.ico
similarity index 100%
rename from chrome/skin/app_icons/MantisBT.ico
rename to chrome/skin/icons/MantisBT.ico
diff --git a/chrome/skin/app_icons/MaxSite CMS.ico b/chrome/skin/icons/MaxSite CMS.ico
similarity index 100%
rename from chrome/skin/app_icons/MaxSite CMS.ico
rename to chrome/skin/icons/MaxSite CMS.ico
diff --git a/chrome/skin/app_icons/MediaWiki.ico b/chrome/skin/icons/MediaWiki.ico
similarity index 100%
rename from chrome/skin/app_icons/MediaWiki.ico
rename to chrome/skin/icons/MediaWiki.ico
diff --git a/chrome/skin/app_icons/Meebo.ico b/chrome/skin/icons/Meebo.ico
similarity index 100%
rename from chrome/skin/app_icons/Meebo.ico
rename to chrome/skin/icons/Meebo.ico
diff --git a/chrome/skin/app_icons/Microsoft ASP.NET.ico b/chrome/skin/icons/Microsoft ASP.NET.ico
similarity index 100%
rename from chrome/skin/app_icons/Microsoft ASP.NET.ico
rename to chrome/skin/icons/Microsoft ASP.NET.ico
diff --git a/chrome/skin/icons/Microsoft SharePoint.ico b/chrome/skin/icons/Microsoft SharePoint.ico
new file mode 100644
index 000000000..77e829225
Binary files /dev/null and b/chrome/skin/icons/Microsoft SharePoint.ico differ
diff --git a/chrome/skin/app_icons/MiniBB.ico b/chrome/skin/icons/MiniBB.ico
similarity index 100%
rename from chrome/skin/app_icons/MiniBB.ico
rename to chrome/skin/icons/MiniBB.ico
diff --git a/chrome/skin/app_icons/Mint.ico b/chrome/skin/icons/Mint.ico
similarity index 100%
rename from chrome/skin/app_icons/Mint.ico
rename to chrome/skin/icons/Mint.ico
diff --git a/chrome/skin/app_icons/MochiKit.ico b/chrome/skin/icons/MochiKit.ico
similarity index 100%
rename from chrome/skin/app_icons/MochiKit.ico
rename to chrome/skin/icons/MochiKit.ico
diff --git a/chrome/skin/app_icons/Modernizr.ico b/chrome/skin/icons/Modernizr.ico
similarity index 100%
rename from chrome/skin/app_icons/Modernizr.ico
rename to chrome/skin/icons/Modernizr.ico
diff --git a/chrome/skin/app_icons/Mollom.ico b/chrome/skin/icons/Mollom.ico
similarity index 100%
rename from chrome/skin/app_icons/Mollom.ico
rename to chrome/skin/icons/Mollom.ico
diff --git a/chrome/skin/app_icons/MooTools.ico b/chrome/skin/icons/MooTools.ico
similarity index 100%
rename from chrome/skin/app_icons/MooTools.ico
rename to chrome/skin/icons/MooTools.ico
diff --git a/chrome/skin/app_icons/Moodle.ico b/chrome/skin/icons/Moodle.ico
similarity index 100%
rename from chrome/skin/app_icons/Moodle.ico
rename to chrome/skin/icons/Moodle.ico
diff --git a/chrome/skin/app_icons/Moogo.ico b/chrome/skin/icons/Moogo.ico
similarity index 100%
rename from chrome/skin/app_icons/Moogo.ico
rename to chrome/skin/icons/Moogo.ico
diff --git a/chrome/skin/app_icons/Movable Type.ico b/chrome/skin/icons/Movable Type.ico
similarity index 100%
rename from chrome/skin/app_icons/Movable Type.ico
rename to chrome/skin/icons/Movable Type.ico
diff --git a/chrome/skin/app_icons/MyBB.ico b/chrome/skin/icons/MyBB.ico
similarity index 100%
rename from chrome/skin/app_icons/MyBB.ico
rename to chrome/skin/icons/MyBB.ico
diff --git a/chrome/skin/app_icons/MyBlogLog.ico b/chrome/skin/icons/MyBlogLog.ico
similarity index 100%
rename from chrome/skin/app_icons/MyBlogLog.ico
rename to chrome/skin/icons/MyBlogLog.ico
diff --git a/chrome/skin/app_icons/Nedstat.ico b/chrome/skin/icons/Nedstat.ico
similarity index 100%
rename from chrome/skin/app_icons/Nedstat.ico
rename to chrome/skin/icons/Nedstat.ico
diff --git a/chrome/skin/app_icons/Nginx.ico b/chrome/skin/icons/Nginx.ico
similarity index 100%
rename from chrome/skin/app_icons/Nginx.ico
rename to chrome/skin/icons/Nginx.ico
diff --git a/chrome/skin/app_icons/OneStat.ico b/chrome/skin/icons/OneStat.ico
similarity index 100%
rename from chrome/skin/app_icons/OneStat.ico
rename to chrome/skin/icons/OneStat.ico
diff --git a/chrome/skin/app_icons/OpenCart.ico b/chrome/skin/icons/OpenCart.ico
similarity index 100%
rename from chrome/skin/app_icons/OpenCart.ico
rename to chrome/skin/icons/OpenCart.ico
diff --git a/chrome/skin/icons/PANSITE.ico b/chrome/skin/icons/PANSITE.ico
new file mode 100644
index 000000000..f242ff890
Binary files /dev/null and b/chrome/skin/icons/PANSITE.ico differ
diff --git a/chrome/skin/app_icons/PHP-Fusion.ico b/chrome/skin/icons/PHP-Fusion.ico
similarity index 100%
rename from chrome/skin/app_icons/PHP-Fusion.ico
rename to chrome/skin/icons/PHP-Fusion.ico
diff --git a/chrome/skin/app_icons/PHP-Nuke.ico b/chrome/skin/icons/PHP-Nuke.ico
similarity index 100%
rename from chrome/skin/app_icons/PHP-Nuke.ico
rename to chrome/skin/icons/PHP-Nuke.ico
diff --git a/chrome/skin/app_icons/Piwik.ico b/chrome/skin/icons/Piwik.ico
similarity index 100%
rename from chrome/skin/app_icons/Piwik.ico
rename to chrome/skin/icons/Piwik.ico
diff --git a/chrome/skin/app_icons/Plesk.ico b/chrome/skin/icons/Plesk.ico
similarity index 100%
rename from chrome/skin/app_icons/Plesk.ico
rename to chrome/skin/icons/Plesk.ico
diff --git a/chrome/skin/app_icons/Plone.ico b/chrome/skin/icons/Plone.ico
similarity index 100%
rename from chrome/skin/app_icons/Plone.ico
rename to chrome/skin/icons/Plone.ico
diff --git a/chrome/skin/app_icons/Plura.ico b/chrome/skin/icons/Plura.ico
similarity index 100%
rename from chrome/skin/app_icons/Plura.ico
rename to chrome/skin/icons/Plura.ico
diff --git a/chrome/skin/app_icons/Prestashop.ico b/chrome/skin/icons/Prestashop.ico
similarity index 100%
rename from chrome/skin/app_icons/Prestashop.ico
rename to chrome/skin/icons/Prestashop.ico
diff --git a/chrome/skin/app_icons/Prototype.ico b/chrome/skin/icons/Prototype.ico
similarity index 100%
rename from chrome/skin/app_icons/Prototype.ico
rename to chrome/skin/icons/Prototype.ico
diff --git a/chrome/skin/app_icons/Quantcast.ico b/chrome/skin/icons/Quantcast.ico
similarity index 100%
rename from chrome/skin/app_icons/Quantcast.ico
rename to chrome/skin/icons/Quantcast.ico
diff --git a/chrome/skin/app_icons/Quick.Cart.ico b/chrome/skin/icons/Quick.Cart.ico
similarity index 100%
rename from chrome/skin/app_icons/Quick.Cart.ico
rename to chrome/skin/icons/Quick.Cart.ico
diff --git a/chrome/skin/app_icons/Reddit.ico b/chrome/skin/icons/Reddit.ico
similarity index 100%
rename from chrome/skin/app_icons/Reddit.ico
rename to chrome/skin/icons/Reddit.ico
diff --git a/chrome/skin/app_icons/Redmine.ico b/chrome/skin/icons/Redmine.ico
similarity index 100%
rename from chrome/skin/app_icons/Redmine.ico
rename to chrome/skin/icons/Redmine.ico
diff --git a/chrome/skin/app_icons/Reinvigorate.ico b/chrome/skin/icons/Reinvigorate.ico
similarity index 100%
rename from chrome/skin/app_icons/Reinvigorate.ico
rename to chrome/skin/icons/Reinvigorate.ico
diff --git a/chrome/skin/app_icons/S.Builder.ico b/chrome/skin/icons/S.Builder.ico
similarity index 100%
rename from chrome/skin/app_icons/S.Builder.ico
rename to chrome/skin/icons/S.Builder.ico
diff --git a/chrome/skin/app_icons/SMF.ico b/chrome/skin/icons/SMF.ico
similarity index 100%
rename from chrome/skin/app_icons/SMF.ico
rename to chrome/skin/icons/SMF.ico
diff --git a/chrome/skin/app_icons/SOBI 2.ico b/chrome/skin/icons/SOBI 2.ico
similarity index 100%
rename from chrome/skin/app_icons/SOBI 2.ico
rename to chrome/skin/icons/SOBI 2.ico
diff --git a/chrome/skin/app_icons/SPIP.ico b/chrome/skin/icons/SPIP.ico
similarity index 100%
rename from chrome/skin/app_icons/SPIP.ico
rename to chrome/skin/icons/SPIP.ico
diff --git a/chrome/skin/app_icons/SQL Buddy.ico b/chrome/skin/icons/SQL Buddy.ico
similarity index 100%
rename from chrome/skin/app_icons/SQL Buddy.ico
rename to chrome/skin/icons/SQL Buddy.ico
diff --git a/chrome/skin/app_icons/SWFObject.ico b/chrome/skin/icons/SWFObject.ico
similarity index 100%
rename from chrome/skin/app_icons/SWFObject.ico
rename to chrome/skin/icons/SWFObject.ico
diff --git a/chrome/skin/app_icons/ShareThis.ico b/chrome/skin/icons/ShareThis.ico
similarity index 100%
rename from chrome/skin/app_icons/ShareThis.ico
rename to chrome/skin/icons/ShareThis.ico
diff --git a/chrome/skin/app_icons/Site Meter.ico b/chrome/skin/icons/Site Meter.ico
similarity index 100%
rename from chrome/skin/app_icons/Site Meter.ico
rename to chrome/skin/icons/Site Meter.ico
diff --git a/chrome/skin/app_icons/SiteCatalyst.ico b/chrome/skin/icons/SiteCatalyst.ico
similarity index 100%
rename from chrome/skin/app_icons/SiteCatalyst.ico
rename to chrome/skin/icons/SiteCatalyst.ico
diff --git a/chrome/skin/app_icons/SiteDNK.ico b/chrome/skin/icons/SiteDNK.ico
similarity index 100%
rename from chrome/skin/app_icons/SiteDNK.ico
rename to chrome/skin/icons/SiteDNK.ico
diff --git a/chrome/skin/app_icons/SiteEdit.ico b/chrome/skin/icons/SiteEdit.ico
similarity index 100%
rename from chrome/skin/app_icons/SiteEdit.ico
rename to chrome/skin/icons/SiteEdit.ico
diff --git a/chrome/skin/app_icons/Snoobi.ico b/chrome/skin/icons/Snoobi.ico
similarity index 100%
rename from chrome/skin/app_icons/Snoobi.ico
rename to chrome/skin/icons/Snoobi.ico
diff --git a/chrome/skin/app_icons/Squarespace.ico b/chrome/skin/icons/Squarespace.ico
similarity index 100%
rename from chrome/skin/app_icons/Squarespace.ico
rename to chrome/skin/icons/Squarespace.ico
diff --git a/chrome/skin/icons/Squiz Matrix.ico b/chrome/skin/icons/Squiz Matrix.ico
new file mode 100644
index 000000000..3cf8760c0
Binary files /dev/null and b/chrome/skin/icons/Squiz Matrix.ico differ
diff --git a/chrome/skin/app_icons/StatCounter.ico b/chrome/skin/icons/StatCounter.ico
similarity index 100%
rename from chrome/skin/app_icons/StatCounter.ico
rename to chrome/skin/icons/StatCounter.ico
diff --git a/chrome/skin/app_icons/Swiftlet.ico b/chrome/skin/icons/Swiftlet.ico
similarity index 100%
rename from chrome/skin/app_icons/Swiftlet.ico
rename to chrome/skin/icons/Swiftlet.ico
diff --git a/chrome/skin/app_icons/TYPO3.ico b/chrome/skin/icons/TYPO3.ico
similarity index 100%
rename from chrome/skin/app_icons/TYPO3.ico
rename to chrome/skin/icons/TYPO3.ico
diff --git a/chrome/skin/app_icons/TYPOlight.ico b/chrome/skin/icons/TYPOlight.ico
similarity index 100%
rename from chrome/skin/app_icons/TYPOlight.ico
rename to chrome/skin/icons/TYPOlight.ico
diff --git a/chrome/skin/app_icons/Textpattern CMS.ico b/chrome/skin/icons/Textpattern CMS.ico
similarity index 100%
rename from chrome/skin/app_icons/Textpattern CMS.ico
rename to chrome/skin/icons/Textpattern CMS.ico
diff --git a/chrome/skin/app_icons/TomatoCart.ico b/chrome/skin/icons/TomatoCart.ico
similarity index 100%
rename from chrome/skin/app_icons/TomatoCart.ico
rename to chrome/skin/icons/TomatoCart.ico
diff --git a/chrome/skin/app_icons/Trac.ico b/chrome/skin/icons/Trac.ico
similarity index 100%
rename from chrome/skin/app_icons/Trac.ico
rename to chrome/skin/icons/Trac.ico
diff --git a/chrome/skin/app_icons/Tumblr.ico b/chrome/skin/icons/Tumblr.ico
similarity index 100%
rename from chrome/skin/app_icons/Tumblr.ico
rename to chrome/skin/icons/Tumblr.ico
diff --git a/chrome/skin/app_icons/Twilight CMS.ico b/chrome/skin/icons/Twilight CMS.ico
similarity index 100%
rename from chrome/skin/app_icons/Twilight CMS.ico
rename to chrome/skin/icons/Twilight CMS.ico
diff --git a/chrome/skin/app_icons/TypePad.ico b/chrome/skin/icons/TypePad.ico
similarity index 100%
rename from chrome/skin/app_icons/TypePad.ico
rename to chrome/skin/icons/TypePad.ico
diff --git a/chrome/skin/app_icons/Typekit.ico b/chrome/skin/icons/Typekit.ico
similarity index 100%
rename from chrome/skin/app_icons/Typekit.ico
rename to chrome/skin/icons/Typekit.ico
diff --git a/chrome/skin/app_icons/Ubercart.ico b/chrome/skin/icons/Ubercart.ico
similarity index 100%
rename from chrome/skin/app_icons/Ubercart.ico
rename to chrome/skin/icons/Ubercart.ico
diff --git a/chrome/skin/app_icons/VP-ASP.ico b/chrome/skin/icons/VP-ASP.ico
similarity index 100%
rename from chrome/skin/app_icons/VP-ASP.ico
rename to chrome/skin/icons/VP-ASP.ico
diff --git a/chrome/skin/app_icons/Vanilla.ico b/chrome/skin/icons/Vanilla.ico
similarity index 100%
rename from chrome/skin/app_icons/Vanilla.ico
rename to chrome/skin/icons/Vanilla.ico
diff --git a/chrome/skin/icons/Varnish.ico b/chrome/skin/icons/Varnish.ico
new file mode 100644
index 000000000..e9fa1c235
Binary files /dev/null and b/chrome/skin/icons/Varnish.ico differ
diff --git a/chrome/skin/icons/Vignette.ico b/chrome/skin/icons/Vignette.ico
new file mode 100644
index 000000000..86cde70cf
Binary files /dev/null and b/chrome/skin/icons/Vignette.ico differ
diff --git a/chrome/skin/app_icons/Vimeo.ico b/chrome/skin/icons/Vimeo.ico
similarity index 100%
rename from chrome/skin/app_icons/Vimeo.ico
rename to chrome/skin/icons/Vimeo.ico
diff --git a/chrome/skin/app_icons/VirtueMart.ico b/chrome/skin/icons/VirtueMart.ico
similarity index 100%
rename from chrome/skin/app_icons/VirtueMart.ico
rename to chrome/skin/icons/VirtueMart.ico
diff --git a/chrome/skin/app_icons/VisualPath.ico b/chrome/skin/icons/VisualPath.ico
similarity index 100%
rename from chrome/skin/app_icons/VisualPath.ico
rename to chrome/skin/icons/VisualPath.ico
diff --git a/chrome/skin/app_icons/Vox.ico b/chrome/skin/icons/Vox.ico
similarity index 100%
rename from chrome/skin/app_icons/Vox.ico
rename to chrome/skin/icons/Vox.ico
diff --git a/chrome/skin/app_icons/W3Counter.ico b/chrome/skin/icons/W3Counter.ico
similarity index 100%
rename from chrome/skin/app_icons/W3Counter.ico
rename to chrome/skin/icons/W3Counter.ico
diff --git a/chrome/skin/app_icons/Web Optimizer.ico b/chrome/skin/icons/Web Optimizer.ico
similarity index 100%
rename from chrome/skin/app_icons/Web Optimizer.ico
rename to chrome/skin/icons/Web Optimizer.ico
diff --git a/chrome/skin/app_icons/WebGUI.ico b/chrome/skin/icons/WebGUI.ico
similarity index 100%
rename from chrome/skin/app_icons/WebGUI.ico
rename to chrome/skin/icons/WebGUI.ico
diff --git a/chrome/skin/app_icons/WebPublisher.ico b/chrome/skin/icons/WebPublisher.ico
similarity index 100%
rename from chrome/skin/app_icons/WebPublisher.ico
rename to chrome/skin/icons/WebPublisher.ico
diff --git a/chrome/skin/app_icons/WebsiteBaker.ico b/chrome/skin/icons/WebsiteBaker.ico
similarity index 100%
rename from chrome/skin/app_icons/WebsiteBaker.ico
rename to chrome/skin/icons/WebsiteBaker.ico
diff --git a/chrome/skin/app_icons/Webtrekk.ico b/chrome/skin/icons/Webtrekk.ico
similarity index 100%
rename from chrome/skin/app_icons/Webtrekk.ico
rename to chrome/skin/icons/Webtrekk.ico
diff --git a/chrome/skin/app_icons/Webtrends.ico b/chrome/skin/icons/Webtrends.ico
similarity index 100%
rename from chrome/skin/app_icons/Webtrends.ico
rename to chrome/skin/icons/Webtrends.ico
diff --git a/chrome/skin/icons/Weebly.ico b/chrome/skin/icons/Weebly.ico
new file mode 100644
index 000000000..7fec9a63e
Binary files /dev/null and b/chrome/skin/icons/Weebly.ico differ
diff --git a/chrome/skin/app_icons/WikkaWiki.ico b/chrome/skin/icons/WikkaWiki.ico
similarity index 100%
rename from chrome/skin/app_icons/WikkaWiki.ico
rename to chrome/skin/icons/WikkaWiki.ico
diff --git a/chrome/skin/app_icons/Wolf CMS.ico b/chrome/skin/icons/Wolf CMS.ico
similarity index 100%
rename from chrome/skin/app_icons/Wolf CMS.ico
rename to chrome/skin/icons/Wolf CMS.ico
diff --git a/chrome/skin/app_icons/Woopra.ico b/chrome/skin/icons/Woopra.ico
similarity index 100%
rename from chrome/skin/app_icons/Woopra.ico
rename to chrome/skin/icons/Woopra.ico
diff --git a/chrome/skin/app_icons/WordPress.ico b/chrome/skin/icons/WordPress.ico
similarity index 100%
rename from chrome/skin/app_icons/WordPress.ico
rename to chrome/skin/icons/WordPress.ico
diff --git a/chrome/skin/app_icons/XMB.ico b/chrome/skin/icons/XMB.ico
similarity index 100%
rename from chrome/skin/app_icons/XMB.ico
rename to chrome/skin/icons/XMB.ico
diff --git a/chrome/skin/app_icons/XOOPS.ico b/chrome/skin/icons/XOOPS.ico
similarity index 100%
rename from chrome/skin/app_icons/XOOPS.ico
rename to chrome/skin/icons/XOOPS.ico
diff --git a/chrome/skin/app_icons/XenForo.ico b/chrome/skin/icons/XenForo.ico
similarity index 100%
rename from chrome/skin/app_icons/XenForo.ico
rename to chrome/skin/icons/XenForo.ico
diff --git a/chrome/skin/app_icons/XiTi.ico b/chrome/skin/icons/XiTi.ico
similarity index 100%
rename from chrome/skin/app_icons/XiTi.ico
rename to chrome/skin/icons/XiTi.ico
diff --git a/chrome/skin/app_icons/YUI Doc.ico b/chrome/skin/icons/YUI Doc.ico
similarity index 100%
rename from chrome/skin/app_icons/YUI Doc.ico
rename to chrome/skin/icons/YUI Doc.ico
diff --git a/chrome/skin/app_icons/YUI.ico b/chrome/skin/icons/YUI.ico
similarity index 100%
rename from chrome/skin/app_icons/YUI.ico
rename to chrome/skin/icons/YUI.ico
diff --git a/chrome/skin/app_icons/YaBB.ico b/chrome/skin/icons/YaBB.ico
similarity index 100%
rename from chrome/skin/app_icons/YaBB.ico
rename to chrome/skin/icons/YaBB.ico
diff --git a/chrome/skin/app_icons/Yahoo! Web Analytics.ico b/chrome/skin/icons/Yahoo! Web Analytics.ico
similarity index 100%
rename from chrome/skin/app_icons/Yahoo! Web Analytics.ico
rename to chrome/skin/icons/Yahoo! Web Analytics.ico
diff --git a/chrome/skin/app_icons/Yandex.Metrika.ico b/chrome/skin/icons/Yandex.Metrika.ico
similarity index 100%
rename from chrome/skin/app_icons/Yandex.Metrika.ico
rename to chrome/skin/icons/Yandex.Metrika.ico
diff --git a/chrome/skin/app_icons/YouTube.ico b/chrome/skin/icons/YouTube.ico
similarity index 100%
rename from chrome/skin/app_icons/YouTube.ico
rename to chrome/skin/icons/YouTube.ico
diff --git a/chrome/skin/app_icons/Zen Cart.ico b/chrome/skin/icons/Zen Cart.ico
similarity index 100%
rename from chrome/skin/app_icons/Zen Cart.ico
rename to chrome/skin/icons/Zen Cart.ico
diff --git a/chrome/skin/icons/Zend.ico b/chrome/skin/icons/Zend.ico
new file mode 100644
index 000000000..b93a0b448
Binary files /dev/null and b/chrome/skin/icons/Zend.ico differ
diff --git a/chrome/skin/app_icons/_placeholder.ico b/chrome/skin/icons/_placeholder.ico
similarity index 100%
rename from chrome/skin/app_icons/_placeholder.ico
rename to chrome/skin/icons/_placeholder.ico
diff --git a/chrome/skin/app_icons/blip.tv.ico b/chrome/skin/icons/blip.tv.ico
similarity index 100%
rename from chrome/skin/app_icons/blip.tv.ico
rename to chrome/skin/icons/blip.tv.ico
diff --git a/chrome/skin/app_icons/cPanel.ico b/chrome/skin/icons/cPanel.ico
similarity index 100%
rename from chrome/skin/app_icons/cPanel.ico
rename to chrome/skin/icons/cPanel.ico
diff --git a/chrome/skin/app_icons/chartbeat.ico b/chrome/skin/icons/chartbeat.ico
similarity index 100%
rename from chrome/skin/app_icons/chartbeat.ico
rename to chrome/skin/icons/chartbeat.ico
diff --git a/chrome/skin/app_icons/comScore.ico b/chrome/skin/icons/comScore.ico
similarity index 100%
rename from chrome/skin/app_icons/comScore.ico
rename to chrome/skin/icons/comScore.ico
diff --git a/chrome/skin/app_icons/cufon.ico b/chrome/skin/icons/cufon.ico
similarity index 100%
rename from chrome/skin/app_icons/cufon.ico
rename to chrome/skin/icons/cufon.ico
diff --git a/chrome/skin/app_icons/dojo.ico b/chrome/skin/icons/dojo.ico
similarity index 100%
rename from chrome/skin/app_icons/dojo.ico
rename to chrome/skin/icons/dojo.ico
diff --git a/chrome/skin/app_icons/e107.ico b/chrome/skin/icons/e107.ico
similarity index 100%
rename from chrome/skin/app_icons/e107.ico
rename to chrome/skin/icons/e107.ico
diff --git a/chrome/skin/app_icons/eZ Publish.ico b/chrome/skin/icons/eZ Publish.ico
similarity index 100%
rename from chrome/skin/app_icons/eZ Publish.ico
rename to chrome/skin/icons/eZ Publish.ico
diff --git a/chrome/skin/icons/iWeb.ico b/chrome/skin/icons/iWeb.ico
new file mode 100644
index 000000000..34e6eb1a5
Binary files /dev/null and b/chrome/skin/icons/iWeb.ico differ
diff --git a/chrome/skin/app_icons/jQuery UI.ico b/chrome/skin/icons/jQuery UI.ico
similarity index 100%
rename from chrome/skin/app_icons/jQuery UI.ico
rename to chrome/skin/icons/jQuery UI.ico
diff --git a/chrome/skin/app_icons/jQuery.ico b/chrome/skin/icons/jQuery.ico
similarity index 100%
rename from chrome/skin/app_icons/jQuery.ico
rename to chrome/skin/icons/jQuery.ico
diff --git a/chrome/skin/app_icons/lighttpd.ico b/chrome/skin/icons/lighttpd.ico
similarity index 100%
rename from chrome/skin/app_icons/lighttpd.ico
rename to chrome/skin/icons/lighttpd.ico
diff --git a/chrome/skin/app_icons/nopCommerce.ico b/chrome/skin/icons/nopCommerce.ico
similarity index 100%
rename from chrome/skin/app_icons/nopCommerce.ico
rename to chrome/skin/icons/nopCommerce.ico
diff --git a/chrome/skin/app_icons/openEngine.ico b/chrome/skin/icons/openEngine.ico
similarity index 100%
rename from chrome/skin/app_icons/openEngine.ico
rename to chrome/skin/icons/openEngine.ico
diff --git a/chrome/skin/app_icons/osCSS.ico b/chrome/skin/icons/osCSS.ico
similarity index 100%
rename from chrome/skin/app_icons/osCSS.ico
rename to chrome/skin/icons/osCSS.ico
diff --git a/chrome/skin/app_icons/osCommerce.ico b/chrome/skin/icons/osCommerce.ico
similarity index 100%
rename from chrome/skin/app_icons/osCommerce.ico
rename to chrome/skin/icons/osCommerce.ico
diff --git a/chrome/skin/app_icons/papaya CMS.ico b/chrome/skin/icons/papaya CMS.ico
similarity index 100%
rename from chrome/skin/app_icons/papaya CMS.ico
rename to chrome/skin/icons/papaya CMS.ico
diff --git a/chrome/skin/app_icons/phpBB.ico b/chrome/skin/icons/phpBB.ico
similarity index 100%
rename from chrome/skin/app_icons/phpBB.ico
rename to chrome/skin/icons/phpBB.ico
diff --git a/chrome/skin/app_icons/phpDocumentor.ico b/chrome/skin/icons/phpDocumentor.ico
similarity index 100%
rename from chrome/skin/app_icons/phpDocumentor.ico
rename to chrome/skin/icons/phpDocumentor.ico
diff --git a/chrome/skin/app_icons/phpMyAdmin.ico b/chrome/skin/icons/phpMyAdmin.ico
similarity index 100%
rename from chrome/skin/app_icons/phpMyAdmin.ico
rename to chrome/skin/icons/phpMyAdmin.ico
diff --git a/chrome/skin/app_icons/phpPgAdmin.ico b/chrome/skin/icons/phpPgAdmin.ico
similarity index 100%
rename from chrome/skin/app_icons/phpPgAdmin.ico
rename to chrome/skin/icons/phpPgAdmin.ico
diff --git a/chrome/skin/app_icons/posterous.ico b/chrome/skin/icons/posterous.ico
similarity index 100%
rename from chrome/skin/app_icons/posterous.ico
rename to chrome/skin/icons/posterous.ico
diff --git a/chrome/skin/app_icons/punBB.ico b/chrome/skin/icons/punBB.ico
similarity index 100%
rename from chrome/skin/app_icons/punBB.ico
rename to chrome/skin/icons/punBB.ico
diff --git a/chrome/skin/app_icons/reCAPTCHA.ico b/chrome/skin/icons/reCAPTCHA.ico
similarity index 100%
rename from chrome/skin/app_icons/reCAPTCHA.ico
rename to chrome/skin/icons/reCAPTCHA.ico
diff --git a/chrome/skin/app_icons/s9y.ico b/chrome/skin/icons/s9y.ico
similarity index 100%
rename from chrome/skin/app_icons/s9y.ico
rename to chrome/skin/icons/s9y.ico
diff --git a/chrome/skin/app_icons/sIFR.ico b/chrome/skin/icons/sIFR.ico
similarity index 100%
rename from chrome/skin/app_icons/sIFR.ico
rename to chrome/skin/icons/sIFR.ico
diff --git a/chrome/skin/app_icons/sNews.ico b/chrome/skin/icons/sNews.ico
similarity index 100%
rename from chrome/skin/app_icons/sNews.ico
rename to chrome/skin/icons/sNews.ico
diff --git a/chrome/skin/app_icons/script.aculo.us.ico b/chrome/skin/icons/script.aculo.us.ico
similarity index 100%
rename from chrome/skin/app_icons/script.aculo.us.ico
rename to chrome/skin/icons/script.aculo.us.ico
diff --git a/chrome/skin/app_icons/swift.engine.ico b/chrome/skin/icons/swift.engine.ico
similarity index 100%
rename from chrome/skin/app_icons/swift.engine.ico
rename to chrome/skin/icons/swift.engine.ico
diff --git a/chrome/skin/app_icons/vBulletin.ico b/chrome/skin/icons/vBulletin.ico
similarity index 100%
rename from chrome/skin/app_icons/vBulletin.ico
rename to chrome/skin/icons/vBulletin.ico
diff --git a/chrome/skin/app_icons/viennaCMS.ico b/chrome/skin/icons/viennaCMS.ico
similarity index 100%
rename from chrome/skin/app_icons/viennaCMS.ico
rename to chrome/skin/icons/viennaCMS.ico
diff --git a/chrome/skin/app_icons/webEdition.ico b/chrome/skin/icons/webEdition.ico
similarity index 100%
rename from chrome/skin/app_icons/webEdition.ico
rename to chrome/skin/icons/webEdition.ico
diff --git a/chrome/skin/app_icons/xajax.ico b/chrome/skin/icons/xajax.ico
similarity index 100%
rename from chrome/skin/app_icons/xajax.ico
rename to chrome/skin/icons/xajax.ico
diff --git a/chrome/skin/app_icons/xtCommerce.ico b/chrome/skin/icons/xtCommerce.ico
similarity index 100%
rename from chrome/skin/app_icons/xtCommerce.ico
rename to chrome/skin/icons/xtCommerce.ico
diff --git a/defaults/preferences/defaults.js b/defaults/preferences/defaults.js
index a2e09ead1..1892e79e1 100644
--- a/defaults/preferences/defaults.js
+++ b/defaults/preferences/defaults.js
@@ -3,7 +3,7 @@ pref('wappalyzer.debug',                 false);
 pref('wappalyzer.location',              0);
 pref('wappalyzer.enableTracking',        true);
 pref('wappalyzer.newInstall',            true);
-pref('wappalyzer.showAppNames',          2);
+pref('wappalyzer.showNames',             false);
 pref('wappalyzer.customApps',            '');
 pref('wappalyzer.version',               '');
 
@@ -29,5 +29,6 @@ pref('wappalyzer.cat19',                 true);
 pref('wappalyzer.cat20',                 true);
 pref('wappalyzer.cat21',                 true);
 pref('wappalyzer.cat22',                 true);
+pref('wappalyzer.cat23',                 true);
 
 pref('browser.preferences.instantApply', true);
diff --git a/install.rdf b/install.rdf
index a3a4f09d1..a3436cb58 100644
--- a/install.rdf
+++ b/install.rdf
@@ -1,18 +1,19 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE overlay SYSTEM "chrome://wappalyzer/locale/overlay.dtd">
+<!--DOCTYPE overlay SYSTEM "chrome://wappalyzer/locale/overlay.dtd"-->
 
 <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>1.12.8</em:version>
+		<em:version>1.13.1</em:version>
 		<em:type>2</em:type>
+		<em:unpack>true</em:unpack>
 
 		<em:targetApplication>
 			<!-- Firefox -->
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-				<em:minVersion>3.5</em:minVersion>
+				<em:minVersion>4.0</em:minVersion>
 				<em:maxVersion>4.0.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
@@ -22,7 +23,6 @@
 		<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:author>ElbertF</em:author>
 		<em:creator>ElbertF</em:creator>
 		<em:homepageURL>http://wappalyzer.com</em:homepageURL>
 	</Description>      
diff --git a/wappalyzer.xpi b/wappalyzer.xpi
new file mode 100644
index 000000000..427ffbe59
Binary files /dev/null and b/wappalyzer.xpi differ