diff --git a/chrome/content/apps.js b/chrome/content/apps.js
index 40c280c92..7d5aaefa3 100644
--- a/chrome/content/apps.js
+++ b/chrome/content/apps.js
@@ -1,226 +1,223 @@
-if ( typeof(wappalyzer) == 'undefined' )
-{
-	var wappalyzer = {};
-}
-
-wappalyzer.cats = {
-	 1: { name: 'CMS',                  plural: 'CMS' },
-	 2: { name: 'Message Board',        plural: 'Message Boards' },
-	 3: { name: 'Database manager',     plural: 'Database managers' },
-	 4: { name: 'Documentation tool',   plural: 'Documentation tools' },
-	 5: { name: 'Widget',               plural: 'Widgets' },
-	 6: { name: 'Web shop',             plural: 'Web shops' },
-	 7: { name: 'Photo gallery',        plural: 'Photo galleries' },
-	 8: { name: 'Wiki',                 plural: 'Wikis' },
-	 9: { name: 'Hosting panel',        plural: 'Hosting panels' },
-	10: { name: 'Analytics',            plural: 'Analytics' },
-	11: { name: 'Blog',                 plural: 'Blogs' },
-	12: { name: 'JavaScript framework', plural: 'JavaScript frameworks' },
-	13: { name: 'Issue tracker',        plural: 'Issue trackers' },
-	14: { name: 'Video Player',         plural: 'Video Players' },
-	15: { name: 'Comment System',       plural: 'Comment Systems' },
-	16: { name: 'CAPTCHA',              plural: 'CAPTCHAs' },
-	17: { name: 'Font script',          plural: 'Font scripts' },
-	18: { name: 'Web framework',        plural: 'Web frameworks' },
-	19: { name: 'Miscellaneous',        plural: 'Miscellaneous' },
-	20: { name: 'Editor',               plural: 'Editors' },
-	21: { name: 'LMS',                  plural: 'LMS' },
-	22: { name: 'Web server',           plural: 'Web servers' },
-	23: { name: 'Cache tool',           plural: 'Cache tools' },
-	24: { name: 'Rich text editor',     plural: 'Rich text editors' }
-	};
+if ( typeof wappalyzer != 'undefined' ) {
+	wappalyzer.cats = {
+		 1: { name: 'CMS',                  plural: 'CMS' },
+		 2: { name: 'Message Board',        plural: 'Message Boards' },
+		 3: { name: 'Database manager',     plural: 'Database managers' },
+		 4: { name: 'Documentation tool',   plural: 'Documentation tools' },
+		 5: { name: 'Widget',               plural: 'Widgets' },
+		 6: { name: 'Web shop',             plural: 'Web shops' },
+		 7: { name: 'Photo gallery',        plural: 'Photo galleries' },
+		 8: { name: 'Wiki',                 plural: 'Wikis' },
+		 9: { name: 'Hosting panel',        plural: 'Hosting panels' },
+		10: { name: 'Analytics',            plural: 'Analytics' },
+		11: { name: 'Blog',                 plural: 'Blogs' },
+		12: { name: 'JavaScript framework', plural: 'JavaScript frameworks' },
+		13: { name: 'Issue tracker',        plural: 'Issue trackers' },
+		14: { name: 'Video Player',         plural: 'Video Players' },
+		15: { name: 'Comment System',       plural: 'Comment Systems' },
+		16: { name: 'CAPTCHA',              plural: 'CAPTCHAs' },
+		17: { name: 'Font script',          plural: 'Font scripts' },
+		18: { name: 'Web framework',        plural: 'Web frameworks' },
+		19: { name: 'Miscellaneous',        plural: 'Miscellaneous' },
+		20: { name: 'Editor',               plural: 'Editors' },
+		21: { name: 'LMS',                  plural: 'LMS' },
+		22: { name: 'Web server',           plural: 'Web servers' },
+		23: { name: 'Cache tool',           plural: 'Cache tools' },
+		24: { name: 'Rich text editor',     plural: 'Rich text editors' }
+		};
 
-wappalyzer.apps = {
-	'1C-Bitrix':             { cats: { 1:  1 }, html: /(<link[^>]+components\/bitrix|<script[^>]+1c\-bitrix)/i },
-	'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 },
-	'BIGACE':                { cats: { 1:  1 }, html: /(<meta name=("|')generator("|') [^>]+BIGACE|Powered by <a href=("|')[^>]+BIGACE|<!--\s+Site is running BIGACE)/i },
-	'BigDump':               { cats: { 1:  3 }, html: /<!-- <h1>BigDump: Staggered MySQL Dump Importer/ },
-	'blip.tv':               { cats: { 1: 14 }, html: /<(param|embed)[^>]+blip\.tv\/play/i },
-	'Blogger':               { cats: { 1: 11 }, html: /<meta content=("|')blogger("|') [^>]+generator/i, url: /^(www.)?.+\.blogspot\.com/i },
-	'Bugzilla':              { cats: { 1: 13 }, html: /<[^>]+(id|title|name)=("|')bugzilla/i },
-	'Burning Board':         { cats: { 1:  2 }, html: /<a href=('|")[^>]+woltlab\.com.+Burning Board/i },
-	'chartbeat':             { cats: { 1: 10 }, html: /function loadChartbeat\(\) {/i },
-	'Chamilo':               { cats: { 1: 21 }, html: /<meta name=("|')generator("|') [^>]+Chamilo/i, headers: { 'X-Powered-By': /Chamilo/ } },
-	'ClickTale':             { cats: { 1: 10 }, html: /if\(typeof ClickTale(Tag)*==("|')function("|')\)/ },
-	'Clicky':                { cats: { 1: 10 }, html: /<script src=("|')http:\/\/static\.getclicky\.com/i },
-	'CMS Made Simple':       { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+CMS Made Simple/i },
-	'CO2Stats':              { cats: { 1: 10 }, html: /src=("|')http:\/\/www\.co2stats\.com\/propres\.php/ },
-	'comScore':              { cats: { 1: 10 }, html: /<i{1}frame[^>]* (id=("|')comscore("|')|scr=[^>]+comscore)/ },
-	'Concrete5':             { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+concrete5/i },
-	'Contao':                { cats: { 1:  1 }, html: /(<!--\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)/i },
-	'ConversionLab':         { cats: { 1: 10 }, html: /<script[^>]* src=("|')http:\/\/conversionlab\.trackset\.com\/track\/tsend\.js("|')/ },
-	'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=("|')[^>]+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/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, env: /dojo/ },
-	'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': /.*/, '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, env: /^Ext$/ },
-	'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|<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/ },
-	'Google Friend Connect': { cats: { 1:  5 }, html: /<script[^>]* src=("|')[^>]*google.com\/friendconnect/i },
-	'Google Maps':           { cats: { 1:  5 }, html: /(<script[^>]* src=("|')[^>]*maps\.google\.com\/maps\?file=api|maps\.google\.com\/maps\/api\/staticmap)/i },
-	'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, js: 'window.jQuery', env: /^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("|')/ },
-	'Kentico CMS':           { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Kentico CMS/i },
-	'Koego':                 { cats: { 1: 10 }, html: /<script[^>]* src=("|')http\:\/\/tracking\.koego\.com\/end\/ego\.js("|')/ },
-	'Kolibri CMS':           { cats: { 1:  1 }, html: /<meta name=("|')copyright("|') [^>]+Kolibri/i },
-	'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>|<[^>]+id=("|')t\-specialpages)/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/, '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, env: /^MochiKit$/ },
-	'Modernizr':             { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*modernizr[^>]*\.js/i },
-	'MODx':                  { cats: { 1:  1 }, html: /(<a[^>]+>Powered by MODx<\/a>|var el= \$\('modxhost'\);|<script type=("|')text\/javascript("|')>var MODX_MEDIA_PATH = "media";)/i },
-	'Mollom':                { cats: { 1: 16 }, html: /(<script[^>]* src=("|')[^>]*mollom\.js|<img[^>]+\/.mollom\/.com)/i },
-	'Moodle':                { cats: { 1: 21 }, html: /(var moodleConfigFn = function\(me\)|<img[^>]+moodlelogo)/i },
-	'Moogo':                 { cats: { 1:  1 }, html: /<script[^>]* src=("|')[^"']+kotisivukone.js/ },
-	'MooTools':              { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*mootools[^>]*\.js("|')/i, env: /^MooTools$/ },
-	'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 },
-	'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 } },
-	'nopCommerce':           { cats: { 1:  6 }, html: /(<!\-\-Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)/i },
-	'OneStat':               { cats: { 1: 10 }, html: /var p=("|')http("|')\+\(d\.URL\.indexOf\('https:'\)==0\?'s':''\)\+("|'):\/\/stat\.onestat\.com\/stat\.aspx\?tagver/i },
-	'OpenCart':              { cats: { 1:  6 }, html: /(Powered By <a href=("|')[^>]+OpenCart|route = getURLVar\(("|')route)/i },
-	'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 },
-	'phpBB':                 { cats: { 1:  2 }, html: /(Powered by (<a href=("|')[^>]+)?phpBB|<meta name=("|')copyright("|') [^>]+phpBB Group)/i },
-	'phpDocumentor':         { cats: { 1:  4 }, html: /<!-- Generated by phpDocumentor/ },
-	'phpMyAdmin':            { cats: { 1:  3 }, html: /(var pma_absolute_uri = '|PMA_sendHeaderLocation\(|<title>phpMyAdmin<\/title>)/i },
-	'phpPgAdmin':            { cats: { 1:  3 }, html: /(<title>phpPgAdmin<\/title>|<span class=("|')appname("|')>phpPgAdmin)/i },
-	'Piwik':                 { cats: { 1: 10 }, html: /var piwikTracker = Piwik\.getTracker\(/i },
-	'Plesk':                 { cats: { 1:  9 }, html: /<script[^>]* src=("|')[^>]*common\.js\?plesk/i },
-	'Plone':                 { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Plone/i },
-	'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|protoaculous)\.js("|')/i, env: /^Prototype$/ },
-	'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 },
-	'reCAPTCHA':             { cats: { 1: 16 }, html: /(<div[^>]+id=("|')recaptcha_image|<script[^>]+ src=("|')(api\-secure\.recaptcha\.net|recaptcha_ajax\.js))/ },
-	'Reddit':                { cats: { 1:  2 }, html: /(<script[^>]+>var reddit = {|<a[^>]+Powered by Reddit|powered by <a[^>]+>reddit<)/i, url: /^(www.)?reddit\.com/ },
-	'Redmine':               { cats: { 1: 13 }, html: /(<meta name=("|')description("|')Redmine("|')|Powered by <a href=("|')[^>]+Redmine)/i },
-	'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|protoaculous)\.js("|')/i, env: /^Scriptaculous$/ },
-	'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 },
-	'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/ } },
-	'Swiftlet':              { cats: { 1:  1, 2: 18 }, html: /(<meta name=("|')generator("|') [^>]+Swiftlet|Powered by <a href=("|')[^>]+Swiftlet)/i, headers: { 'X-Swiftlet-Cache': /.*/, 'X-Powered-By': /Swiftlet/ } },
-	'Textpattern CMS':       { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Textpattern/i },
-	'TomatoCart':            { cats: { 1:  6 }, html: /<meta name=("|')generator("|') [^>]+TomatoCart/i },
-	'Trac':                  { cats: { 1: 13 }, html: /(<a id=("|')tracpowered)/i },
-	'Tumblr':                { cats: { 1: 11 }, html: /<iframe src=("|')http:\/\/www\.tumblr\.com/i, url: /^(www.)?.+\.tumblr\.com/i, headers: { 'X-Tumblr-Usec': /.*/ } },
-	'Twilight CMS':          { cats: { 1:  1 }, headers: { 'X-Powered-CMS': /Twilight CMS/ } },
-	'Typekit':               { cats: { 1: 17 }, html: /<script[^>]* src=("|')[^>]*use.typekit.com/i },
-	'TypePad':               { cats: { 1: 11 }, html: /<meta name=("|')generator("|') [^>]+typepad/i, url: /^(www.)?.+\.typepad\.com/i },
-	'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 },
-	'Umbraco':               { cats: { 1:  1 }, headers: { 'X-Umbraco-Version': /.+/ } },
-	'Vanilla':               { cats: { 1:  2 }, html: /<body id=("|')(DiscussionsPage|vanilla)/i, headers: { 'X-Powered-By': /Vanilla/ } },
-	'Varnish':               { cats: { 1: 22 }, headers: { 'X-Varnish': /.+/, 'X-Varnish-Age': /.+/, 'X-Varnish-Cache': /.+/, 'X-Varnish-Action': /.+/, 'X-Varnish-Hostname': /.+/, '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("|')/ },
-	'Vox':                   { cats: { 1: 11 }, url: /^(www.)?.+\.vox\.com/i },
-	'VP-ASP':                { cats: { 1:  6 }, html: /(<a[^>]+>Powered By VP\-ASP Shopping Cart<\/a>|<script[^>]* src=("|')[^>]*vs350\.js)/ },
-	'W3Counter':             { cats: { 1: 10 }, html: /<script[^>]* src=("|')http:\/\/www\.w3counter\.com\/tracker\.js("|')>/i },
-	'Web Optimizer':         { cats: { 1: 10 }, html: /<title [^>]*lang=("|')wo("|')>/ },
-	'webEdition':            { cats: { 1:  1 }, html: /(<meta name=("|')generator("|') [^>]+webEdition|<meta name=("|')DC.title("|') [^>]+webEdition)/i },
-	'WebGUI':                { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+WebGUI/i },
-	'WebPublisher':          { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+WEB\|Publisher/i },
-	'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 },
-	'WordPress':             { cats: { 1:  1, 2: 11 }, html: /(<link rel=("|')stylesheet("|') [^>]+wp-content|<meta name=("|')generator("|') [^>]+WordPress)/i },
-	'xajax':                 { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*xajax_core\.js/i },
-	'XenForo':               { cats: { 1:  2 }, html: /(jQuery\.extend\(true, XenForo|Forum software by XenForo&trade;|<!\-\-XF:branding)/ },
-	'XiTi':                  { cats: { 1: 10 }, html: /<[^>]+src=("|')[^>]+xiti.com\/hit.xiti/i },
-	'XMB':                   { cats: { 1:  2 }, html: /<!-- Powered by XMB/i },
-	'XOOPS':                 { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+XOOPS/i },
-	'xtCommerce':            { cats: { 1:  6 }, html: /(<meta name=("|')generator("|') [^>]+xt:Commerce|<div class=("|')copyright("|')>.+<a[^>]+>xt:Commerce)/i },
-	'YaBB':                  { cats: { 1:  2 }, html: /Powered by <a href=("|')[^>]+yabbforum/i },
-	'Yahoo! Web Analytics':  { cats: { 1: 10 }, html: /<script[^>]* src=("|')[^>]*http:\/\/d\.yimg\.com\/mi\/ywa\.js/ },
-	'Yandex.Metrika':        { cats: { 1: 10 }, html: /<script[^>]* src=("|')[^"']+mc\.yandex\.ru\/metrika\/watch\.js("|')/ },
-	'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)[^'"]*("|')/, env: /^YAHOO$/ },
-	'Zen Cart':              { cats: { 1:  6 }, html: /<meta name=("|')generator("|') [^>]+Zen Cart/i },
-	'Zend':                  { cats: { 1: 18 }, headers: { 'X-Powered-By': /Zend/ } }
-	};
+	wappalyzer.apps = {
+		'1C-Bitrix':             { cats: { 1:  1 }, html: /(<link[^>]+components\/bitrix|<script[^>]+1c\-bitrix)/i },
+		'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 },
+		'BIGACE':                { cats: { 1:  1 }, html: /(<meta name=("|')generator("|') [^>]+BIGACE|Powered by <a href=("|')[^>]+BIGACE|<!--\s+Site is running BIGACE)/i },
+		'BigDump':               { cats: { 1:  3 }, html: /<!-- <h1>BigDump: Staggered MySQL Dump Importer/ },
+		'blip.tv':               { cats: { 1: 14 }, html: /<(param|embed)[^>]+blip\.tv\/play/i },
+		'Blogger':               { cats: { 1: 11 }, html: /<meta content=("|')blogger("|') [^>]+generator/i, url: /^(www.)?.+\.blogspot\.com/i },
+		'Bugzilla':              { cats: { 1: 13 }, html: /<[^>]+(id|title|name)=("|')bugzilla/i },
+		'Burning Board':         { cats: { 1:  2 }, html: /<a href=('|")[^>]+woltlab\.com.+Burning Board/i },
+		'chartbeat':             { cats: { 1: 10 }, html: /function loadChartbeat\(\) {/i },
+		'Chamilo':               { cats: { 1: 21 }, html: /<meta name=("|')generator("|') [^>]+Chamilo/i, headers: { 'X-Powered-By': /Chamilo/ } },
+		'ClickTale':             { cats: { 1: 10 }, html: /if\(typeof ClickTale(Tag)*==("|')function("|')\)/ },
+		'Clicky':                { cats: { 1: 10 }, html: /<script src=("|')http:\/\/static\.getclicky\.com/i },
+		'CMS Made Simple':       { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+CMS Made Simple/i },
+		'CO2Stats':              { cats: { 1: 10 }, html: /src=("|')http:\/\/www\.co2stats\.com\/propres\.php/ },
+		'comScore':              { cats: { 1: 10 }, html: /<i{1}frame[^>]* (id=("|')comscore("|')|scr=[^>]+comscore)/ },
+		'Concrete5':             { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+concrete5/i },
+		'Contao':                { cats: { 1:  1 }, html: /(<!--\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)/i },
+		'ConversionLab':         { cats: { 1: 10 }, html: /<script[^>]* src=("|')http:\/\/conversionlab\.trackset\.com\/track\/tsend\.js("|')/ },
+		'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=("|')[^>]+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/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, env: /dojo/ },
+		'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': /.*/, '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, env: /^Ext$/ },
+		'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|<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/ },
+		'Google Friend Connect': { cats: { 1:  5 }, html: /<script[^>]* src=("|')[^>]*google.com\/friendconnect/i },
+		'Google Maps':           { cats: { 1:  5 }, html: /(<script[^>]* src=("|')[^>]*maps\.google\.com\/maps\?file=api|maps\.google\.com\/maps\/api\/staticmap)/i },
+		'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, js: 'window.jQuery', env: /^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("|')/ },
+		'Kentico CMS':           { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Kentico CMS/i },
+		'Koego':                 { cats: { 1: 10 }, html: /<script[^>]* src=("|')http\:\/\/tracking\.koego\.com\/end\/ego\.js("|')/ },
+		'Kolibri CMS':           { cats: { 1:  1 }, html: /<meta name=("|')copyright("|') [^>]+Kolibri/i },
+		'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>|<[^>]+id=("|')t\-specialpages)/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/, '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, env: /^MochiKit$/ },
+		'Modernizr':             { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*modernizr[^>]*\.js/i },
+		'MODx':                  { cats: { 1:  1 }, html: /(<a[^>]+>Powered by MODx<\/a>|var el= \$\('modxhost'\);|<script type=("|')text\/javascript("|')>var MODX_MEDIA_PATH = "media";)/i },
+		'Mollom':                { cats: { 1: 16 }, html: /(<script[^>]* src=("|')[^>]*mollom\.js|<img[^>]+\/.mollom\/.com)/i },
+		'Moodle':                { cats: { 1: 21 }, html: /(var moodleConfigFn = function\(me\)|<img[^>]+moodlelogo)/i },
+		'Moogo':                 { cats: { 1:  1 }, html: /<script[^>]* src=("|')[^"']+kotisivukone.js/ },
+		'MooTools':              { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*mootools[^>]*\.js("|')/i, env: /^MooTools$/ },
+		'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 },
+		'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 } },
+		'nopCommerce':           { cats: { 1:  6 }, html: /(<!\-\-Powered by nopCommerce|Powered by: <a[^>]+nopcommerce)/i },
+		'OneStat':               { cats: { 1: 10 }, html: /var p=("|')http("|')\+\(d\.URL\.indexOf\('https:'\)==0\?'s':''\)\+("|'):\/\/stat\.onestat\.com\/stat\.aspx\?tagver/i },
+		'OpenCart':              { cats: { 1:  6 }, html: /(Powered By <a href=("|')[^>]+OpenCart|route = getURLVar\(("|')route)/i },
+		'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 },
+		'phpBB':                 { cats: { 1:  2 }, html: /(Powered by (<a href=("|')[^>]+)?phpBB|<meta name=("|')copyright("|') [^>]+phpBB Group)/i },
+		'phpDocumentor':         { cats: { 1:  4 }, html: /<!-- Generated by phpDocumentor/ },
+		'phpMyAdmin':            { cats: { 1:  3 }, html: /(var pma_absolute_uri = '|PMA_sendHeaderLocation\(|<title>phpMyAdmin<\/title>)/i },
+		'phpPgAdmin':            { cats: { 1:  3 }, html: /(<title>phpPgAdmin<\/title>|<span class=("|')appname("|')>phpPgAdmin)/i },
+		'Piwik':                 { cats: { 1: 10 }, html: /var piwikTracker = Piwik\.getTracker\(/i },
+		'Plesk':                 { cats: { 1:  9 }, html: /<script[^>]* src=("|')[^>]*common\.js\?plesk/i },
+		'Plone':                 { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Plone/i },
+		'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|protoaculous)\.js("|')/i, env: /^Prototype$/ },
+		'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 },
+		'reCAPTCHA':             { cats: { 1: 16 }, html: /(<div[^>]+id=("|')recaptcha_image|<script[^>]+ src=("|')(api\-secure\.recaptcha\.net|recaptcha_ajax\.js))/ },
+		'Reddit':                { cats: { 1:  2 }, html: /(<script[^>]+>var reddit = {|<a[^>]+Powered by Reddit|powered by <a[^>]+>reddit<)/i, url: /^(www.)?reddit\.com/ },
+		'Redmine':               { cats: { 1: 13 }, html: /(<meta name=("|')description("|')Redmine("|')|Powered by <a href=("|')[^>]+Redmine)/i },
+		'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|protoaculous)\.js("|')/i, env: /^Scriptaculous$/ },
+		'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 },
+		'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/ } },
+		'Swiftlet':              { cats: { 1:  1, 2: 18 }, html: /(<meta name=("|')generator("|') [^>]+Swiftlet|Powered by <a href=("|')[^>]+Swiftlet)/i, headers: { 'X-Swiftlet-Cache': /.*/, 'X-Powered-By': /Swiftlet/ } },
+		'Textpattern CMS':       { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Textpattern/i },
+		'TomatoCart':            { cats: { 1:  6 }, html: /<meta name=("|')generator("|') [^>]+TomatoCart/i },
+		'Trac':                  { cats: { 1: 13 }, html: /(<a id=("|')tracpowered)/i },
+		'Tumblr':                { cats: { 1: 11 }, html: /<iframe src=("|')http:\/\/www\.tumblr\.com/i, url: /^(www.)?.+\.tumblr\.com/i, headers: { 'X-Tumblr-Usec': /.*/ } },
+		'Twilight CMS':          { cats: { 1:  1 }, headers: { 'X-Powered-CMS': /Twilight CMS/ } },
+		'Typekit':               { cats: { 1: 17 }, html: /<script[^>]* src=("|')[^>]*use.typekit.com/i },
+		'TypePad':               { cats: { 1: 11 }, html: /<meta name=("|')generator("|') [^>]+typepad/i, url: /^(www.)?.+\.typepad\.com/i },
+		'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 },
+		'Umbraco':               { cats: { 1:  1 }, headers: { 'X-Umbraco-Version': /.+/ } },
+		'Vanilla':               { cats: { 1:  2 }, html: /<body id=("|')(DiscussionsPage|vanilla)/i, headers: { 'X-Powered-By': /Vanilla/ } },
+		'Varnish':               { cats: { 1: 22 }, headers: { 'X-Varnish': /.+/, 'X-Varnish-Age': /.+/, 'X-Varnish-Cache': /.+/, 'X-Varnish-Action': /.+/, 'X-Varnish-Hostname': /.+/, '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("|')/ },
+		'Vox':                   { cats: { 1: 11 }, url: /^(www.)?.+\.vox\.com/i },
+		'VP-ASP':                { cats: { 1:  6 }, html: /(<a[^>]+>Powered By VP\-ASP Shopping Cart<\/a>|<script[^>]* src=("|')[^>]*vs350\.js)/ },
+		'W3Counter':             { cats: { 1: 10 }, html: /<script[^>]* src=("|')http:\/\/www\.w3counter\.com\/tracker\.js("|')>/i },
+		'Web Optimizer':         { cats: { 1: 10 }, html: /<title [^>]*lang=("|')wo("|')>/ },
+		'webEdition':            { cats: { 1:  1 }, html: /(<meta name=("|')generator("|') [^>]+webEdition|<meta name=("|')DC.title("|') [^>]+webEdition)/i },
+		'WebGUI':                { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+WebGUI/i },
+		'WebPublisher':          { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+WEB\|Publisher/i },
+		'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 },
+		'WordPress':             { cats: { 1:  1, 2: 11 }, html: /(<link rel=("|')stylesheet("|') [^>]+wp-content|<meta name=("|')generator("|') [^>]+WordPress)/i },
+		'xajax':                 { cats: { 1: 12 }, html: /<script[^>]* src=("|')[^>]*xajax_core\.js/i },
+		'XenForo':               { cats: { 1:  2 }, html: /(jQuery\.extend\(true, XenForo|Forum software by XenForo&trade;|<!\-\-XF:branding)/ },
+		'XiTi':                  { cats: { 1: 10 }, html: /<[^>]+src=("|')[^>]+xiti.com\/hit.xiti/i },
+		'XMB':                   { cats: { 1:  2 }, html: /<!-- Powered by XMB/i },
+		'XOOPS':                 { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+XOOPS/i },
+		'xtCommerce':            { cats: { 1:  6 }, html: /(<meta name=("|')generator("|') [^>]+xt:Commerce|<div class=("|')copyright("|')>.+<a[^>]+>xt:Commerce)/i },
+		'YaBB':                  { cats: { 1:  2 }, html: /Powered by <a href=("|')[^>]+yabbforum/i },
+		'Yahoo! Web Analytics':  { cats: { 1: 10 }, html: /<script[^>]* src=("|')[^>]*http:\/\/d\.yimg\.com\/mi\/ywa\.js/ },
+		'Yandex.Metrika':        { cats: { 1: 10 }, html: /<script[^>]* src=("|')[^"']+mc\.yandex\.ru\/metrika\/watch\.js("|')/ },
+		'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)[^'"]*("|')/, env: /^YAHOO$/ },
+		'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 782d70f64..459a0a5e1 100644
--- a/chrome/content/content.js
+++ b/chrome/content/content.js
@@ -1,99 +1,108 @@
-var wappalyzer = {};
-
-wappalyzer =
-{
-	prevUrl: '',
-
-	init: function()
-	{
-		wappalyzer.log('init');
-
-		addEventListener('DOMContentLoaded', wappalyzer.onPageLoad, false);
-	},
-
-	log: function(message)
-	{
-		var consoleService = Components.classes["@mozilla.org/consoleservice;1"].getService(Components.interfaces.nsIConsoleService);
-
-		consoleService.logStringMessage("Wappalyzer content.js: " + message);
-	},
-
-	onPageLoad: function(e)
-	{
-		wappalyzer.log('onPageLoad');
-
-		sendAsyncMessage('wappalyzer:onPageLoad', {
-			href:            content.document.location.href,
-			html:            content.document.documentElement.innerHTML,
-			headers:         [],
-			environmentVars: wappalyzer.getEnvironmentVars()
-			});
-	},
-
-	onUrlChange: function(request)
-	{
-		wappalyzer.log('onUrlChange');
-	},
-
-	urlChange:
-	{
-		QueryInterface: function(iid)
-		{
-			if ( iid.equals(Components.interfaces.nsIWebProgressListener)   ||
-			     iid.equals(Components.interfaces.nsISupportsWeakReference) ||
-			     iid.equals(Components.interfaces.nsISupports) )
-			{
-				return this;
-			}
+(function() {
+	self = {
+		prevUrl: '',
+
+		init: function() {
+			self.log('init');
 
-			throw Components.results.NS_NOINTERFACE;
+			addEventListener('DOMContentLoaded', self.onPageLoad, false);
 		},
 
-		onLocationChange: function(progress, request, url)
-		{
-			if ( !url )
-			{
-				wappalyzer.prevUrl = '';
+		log: function(message) {
+			var consoleService = Components.classes["@mozilla.org/consoleservice;1"].getService(Components.interfaces.nsIConsoleService);
 
-				return;
-			}
+			consoleService.logStringMessage("Wappalyzer content.js: " + message);
+		},
 
-			if ( url.spec != wappalyzer.prevUrl )
-			{
-				wappalyzer.prevUrl = url.spec;
+		onPageLoad: function(e) {
+			self.log('onPageLoad');
 
-				wappalyzer.onUrlChange(request);
-			}
+			self.getEnvironmentVars();
+		},
+
+		onUrlChange: function(request) {
+			self.log('onUrlChange');
+
+			self.getEnvironmentVars();
+		},
+
+		urlChange: {
+			QueryInterface: function(iid) {
+				if ( iid.equals(Components.interfaces.nsIWebProgressListener)   ||
+					 iid.equals(Components.interfaces.nsISupportsWeakReference) ||
+					 iid.equals(Components.interfaces.nsISupports) ) {
+					return this;
+				}
+
+				throw Components.results.NS_NOINTERFACE;
+			},
+
+			onLocationChange: function(progress, request, url) {
+				if ( !url ) {
+					self.prevUrl = '';
+
+					return;
+				}
+
+				if ( url.spec != self.prevUrl ) {
+					self.prevUrl = url.spec;
+
+					self.onUrlChange(request);
+				}
+			},
+
+			onStateChange:    function(a, b, c, d)       {},
+			onProgressChange: function(a, b, c, d, e, f) {},
+			onStatusChange:   function(a, b, c, d)       {},
+			onSecurityChange: function(a, b, c)          {}
 		},
 
-		onStateChange:    function(a, b, c, d)       {},
-		onProgressChange: function(a, b, c, d, e, f) {},
-		onStatusChange:   function(a, b, c, d)       {},
-		onSecurityChange: function(a, b, c)          {}
-	},
+		getEnvironmentVars: function() {
+			self.log('getEnvironmentVars');
+
+			var environmentVars = '';
+
+			try {
+				var element = content.document.createElement('wappalyzerData');
 
-	getEnvironmentVars: function()
-	{
-		var element = content.document.createElement('wappalyzerData');
+				element.setAttribute('id', 'wappalyzerData');
 
-		element.setAttribute('id',    'wappalyzer-data');
-		element.setAttribute('style', 'display: none;');
+				element.addEventListener('wappalyzerEvent', (function(event) {
+					environmentVars = event.target.innerHTML.split(' ');
 
-		content.document.documentElement.appendChild(element);
+					self.log('getEnvironmentVars: ' + environmentVars);
 
-		var script = content.document.createElement('script');
+					element.parentNode.removeChild(element);
 
-		script.innerHTML = 'for ( i in window ) document.getElementById("wappalyzer-data").innerHTML += i + " ";';
+					sendAsyncMessage('wappalyzer:onPageLoad', {
+						href:            content.document.location.href,
+						html:            content.document.documentElement.innerHTML,
+						headers:         [],
+						environmentVars: environmentVars
+						});
+				}), true);
 
-		content.document.documentElement.appendChild(script);
+				content.document.documentElement.appendChild(element);
 
-		var environmentVars = content.document.getElementById('wappalyzer-data').innerHTML.split(' ');
+				content.location.href = 'javascript:' +
+					'(function() {' +
+						'try {' +
+							'for ( i in window ) {' +
+								'window.document.getElementById("wappalyzerData").innerHTML += i + " ";' +
+							'}' +
 
-		element.parentNode.removeChild(element);
-		script .parentNode.removeChild(script);
+							'var event = document.createEvent("Events");' + 'event.initEvent("wappalyzerEvent", true, false);' +
+
+							'document.getElementById("wappalyzerData").dispatchEvent(event);' +
+						'}' +
+						'catch(e) { }' +
+					'})();';
+			}
+			catch(e) { }
 
-		return environmentVars;
+			return environmentVars;
+		}
 	}
-};
 
-wappalyzer.init();
+	self.init();
+})();
diff --git a/chrome/content/custom.js b/chrome/content/custom.js
index 30f8493c7..9985186f1 100644
--- a/chrome/content/custom.js
+++ b/chrome/content/custom.js
@@ -1,80 +1,62 @@
-if ( typeof('wappalyzer') != 'undefined' )
-{
-	var wappalyzer = {};
-}
-
-wappalyzer.evaluateCustomApps = function(feedback)
-{
-	wappalyzer.log('evaluateCustomApps');
+if ( typeof 'wappalyzer'  != 'undefined' ) {
+	wappalyzer.evaluateCustomApps = function(feedback) {
+		wappalyzer.log('evaluateCustomApps');
 
-	if ( wappalyzer.customApps )
-	{
-		try
-		{
-			var customAppsJSON = JSON.parse(wappalyzer.customApps);
+		if ( wappalyzer.customApps ) {
+			try {
+				var customAppsJSON = JSON.parse(wappalyzer.customApps);
 
-			for ( appName in customAppsJSON )
-			{
-				wappalyzer.apps[appName] = {};
+				for ( appName in customAppsJSON ) {
+					wappalyzer.apps[appName] = {};
 
-				// Icon
-				if ( typeof(customAppsJSON[appName].icon) == 'string' )
-				{
-					wappalyzer.apps[appName].icon = customAppsJSON[appName].icon;
-				}
-				else
-				{
-					wappalyzer.apps[appName].icon = 'chrome://wappalyzer/skin/app_icons/_placeholder.ico';
-				}
+					// Icon
+					if ( typeof(customAppsJSON[appName].icon) == 'string' ) {
+						wappalyzer.apps[appName].icon = customAppsJSON[appName].icon;
+					}
+					else {
+						wappalyzer.apps[appName].icon = 'chrome://wappalyzer/skin/app_icons/_placeholder.ico';
+					}
 
-				// Categories
-				if ( typeof(customAppsJSON[appName].categories) == 'object' )
-				{
-					wappalyzer.apps[appName].cats = {};
+					// Categories
+					if ( typeof(customAppsJSON[appName].categories) == 'object' ) {
+						wappalyzer.apps[appName].cats = {};
 
-					for ( i in customAppsJSON[appName].categories )
-					{
-						wappalyzer.apps[appName].cats[i] = parseInt(customAppsJSON[appName].categories[i]);
+						for ( i in customAppsJSON[appName].categories ) {
+							wappalyzer.apps[appName].cats[i] = parseInt(customAppsJSON[appName].categories[i]);
+						}
 					}
-				}
 
-				// HTML
-				if ( typeof(customAppsJSON[appName].html) == 'string' )
-				{
-					wappalyzer.apps[appName].html = new RegExp(customAppsJSON[appName].html, 'i');
-				}
+					// HTML
+					if ( typeof(customAppsJSON[appName].html) == 'string' ) {
+						wappalyzer.apps[appName].html = new RegExp(customAppsJSON[appName].html, 'i');
+					}
 
-				// URL
-				if ( typeof(customAppsJSON[appName].url) == 'string' )
-				{
-					wappalyzer.apps[appName].url = new RegExp(customAppsJSON[appName].url, 'i');
-				}
+					// URL
+					if ( typeof(customAppsJSON[appName].url) == 'string' ) {
+						wappalyzer.apps[appName].url = new RegExp(customAppsJSON[appName].url, 'i');
+					}
 
-				// Headers
-				if ( typeof(customAppsJSON[appName].headers) == 'object' )
-				{
-					wappalyzer.apps[appName].headers = {};
+					// Headers
+					if ( typeof(customAppsJSON[appName].headers) == 'object' ) {
+						wappalyzer.apps[appName].headers = {};
 
-					for ( headerName in customAppsJSON[appName].headers )
-					{
-						wappalyzer.apps[appName].headers[headerName] = new RegExp(customAppsJSON[appName].headers[headerName], 'i');
+						for ( headerName in customAppsJSON[appName].headers ) {
+							wappalyzer.apps[appName].headers[headerName] = new RegExp(customAppsJSON[appName].headers[headerName], 'i');
+						}
 					}
 				}
-			}
 
-			if ( feedback )
-			{
-				alert('Ok');
+				if ( feedback ) {
+					alert('Ok');
+				}
 			}
-		}
-		catch(e)
-		{
-			wappalyzer.log('JSON error in custom applications');
+			catch(e) {
+				wappalyzer.log('JSON error in custom applications');
 
-			if ( feedback )
-			{
-				alert('Error: malformed JSON');
+				if ( feedback ) {
+					alert('Error: malformed JSON');
+				}
 			}
 		}
-	}
-};
+	};
+}
diff --git a/chrome/content/wappalyzer.js b/chrome/content/wappalyzer.js
index 1a7eb2613..c4424d38b 100644
--- a/chrome/content/wappalyzer.js
+++ b/chrome/content/wappalyzer.js
@@ -1,718 +1,643 @@
 // Wappalyzer by ElbertF 2009 http://elbertf.com
 
-var wappalyzer = {};
-
-addEventListener('load',   function() { wappalyzer.init();       }, false);
-addEventListener('unload', function() { wappalyzer.sendReport(); }, false);
-
-wappalyzer =
-{
-	apps:           {},
-	appsDetected:   0,
-	autoDetect:     true,
-	browser:        false,
-	cats:           {},
-	checkUnique:    {},
-	currentTab:     false,
-	customApps:     '',
-	debug:          false,
-	enableTracking: true,
-	history:        {},
-	hitCount:       0,
-	homeUrl:        'http://wappalyzer.com/',
-	hoverTimeout:   false,
-	newInstall:     false,
-	prevUrl:        '',
-	prefs:          {},
-	regexBlacklist: /(dev\.|\/admin|\.local)/,
-	regexDomain:    /^[a-z0-9._\-]+\.[a-z]+/,
-	req:            false,
-	request:        false,
-	showApps:       1,
-	showCats:       [],
-	strings:        {},
-	version:        '',
-
-	init: function()
-	{
-		wappalyzer.log('init');
-
-		wappalyzer.browser = gBrowser;
-
-		wappalyzer.strings = document.getElementById('wappalyzer-strings');
-
-		// Preferences
-		wappalyzer.prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefService).getBranch('wappalyzer.');
-
-		wappalyzer.prefs.QueryInterface(Components.interfaces.nsIPrefBranch2);
-		wappalyzer.prefs.addObserver('', wappalyzer, false);
-
-		wappalyzer.showApps       = wappalyzer.prefs.getIntPref('showApps');
-		wappalyzer.autoDetect     = wappalyzer.prefs.getBoolPref('autoDetect');
-		wappalyzer.customApps     = wappalyzer.prefs.getCharPref('customApps');
-		wappalyzer.debug          = wappalyzer.prefs.getBoolPref('debug');
-		wappalyzer.enableTracking = wappalyzer.prefs.getBoolPref('enableTracking');
-		wappalyzer.newInstall     = wappalyzer.prefs.getBoolPref('newInstall');
-		wappalyzer.version        = wappalyzer.prefs.getCharPref('version');
-
-		for ( var i = 1; i <= 23; i ++ )
-		{
-			wappalyzer.showCats[i] = wappalyzer.prefs.getBoolPref('cat' + i);
-		}
+var wappalyzer = (function() {
+	self = {
+		apps:           {},
+		appsDetected:   0,
+		autoDetect:     true,
+		browser:        false,
+		cats:           {},
+		checkUnique:    {},
+		currentTab:     false,
+		customApps:     '',
+		debug:          false,
+		enableTracking: true,
+		history:        {},
+		hitCount:       0,
+		homeUrl:        'http://wappalyzer.com/',
+		hoverTimeout:   false,
+		newInstall:     false,
+		prevUrl:        '',
+		prefs:          {},
+		regexBlacklist: /(dev\.|\/admin|\.local)/,
+		regexDomain:    /^[a-z0-9._\-]+\.[a-z]+/,
+		req:            false,
+		request:        false,
+		showApps:       1,
+		showCats:       [],
+		strings:        {},
+		version:        '',
+
+		init: function() {
+			self.log('init');
+
+			self.browser = gBrowser;
+
+			self.strings = document.getElementById('wappalyzer-strings');
+
+			// Preferences
+			self.prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefService).getBranch('wappalyzer.');
+
+			self.prefs.QueryInterface(Components.interfaces.nsIPrefBranch2);
+			self.prefs.addObserver('', wappalyzer, false);
+
+			self.showApps       = self.prefs.getIntPref( 'showApps');
+			self.autoDetect     = self.prefs.getBoolPref('autoDetect');
+			self.customApps     = self.prefs.getCharPref('customApps');
+			self.debug          = self.prefs.getBoolPref('debug');
+			self.enableTracking = self.prefs.getBoolPref('enableTracking');
+			self.newInstall     = self.prefs.getBoolPref('newInstall');
+			self.version        = self.prefs.getCharPref('version');
+
+			for ( var i = 1; i <= 23; i ++ ) {
+				self.showCats[i] = self.prefs.getBoolPref('cat' + i);
+			}
 
-		var locationPref = wappalyzer.prefs.getIntPref('location');
+			var locationPref = self.prefs.getIntPref('location');
 
-		wappalyzer.moveLocation(locationPref);
+			self.moveLocation(locationPref);
 
-		// Open page after upgrade
-		try
-		{
-			var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
+			// Open page after upgrade
+			try {
+				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 enabledItems = prefs.getCharPref('extensions.enabledAddons');
+				var version      = enabledItems.replace(/(^.*wappalyzer[^:]+:)([^,]+),.*$/, '$2');
 
-			if ( version && wappalyzer.version != version )
-			{
-				wappalyzer.browser.addEventListener('load', wappalyzer.upgradeSuccess, false);
+				if ( version && self.version != version ) {
+					self.browser.addEventListener('load', self.upgradeSuccess, false);
 
-				wappalyzer.version = version;
+					self.version = version;
 
-				wappalyzer.prefs.setCharPref('version', wappalyzer.version);
+					self.prefs.setCharPref('version', self.version);
+				}
 			}
-		}
-		catch(e)
-		{
-		}
+			catch(e) { }
 
-		// Open page after installation
-		if ( wappalyzer.newInstall )
-		{
-			wappalyzer.prefs.setBoolPref('newInstall', false);
+			// Open page after installation
+			if ( self.newInstall ) {
+				self.prefs.setBoolPref('newInstall', false);
 
-			wappalyzer.browser.addEventListener('load', wappalyzer.installSuccess, false);
-		}
+				self.browser.addEventListener('load', self.installSuccess, false);
+			}
 
-		if ( typeof messageManager != 'undefined' )
-		{
 			// Listen messages sent from the content process
-			messageManager.addMessageListener('wappalyzer:onPageLoad', wappalyzer.onContentPageLoad);
+			if ( typeof messageManager != 'undefined' ) {
+				messageManager.addMessageListener('wappalyzer:onPageLoad', self.onContentPageLoad);
 
-			messageManager.loadFrameScript('chrome://wappalyzer/content/content.js', true);
-		}
+				messageManager.loadFrameScript('chrome://wappalyzer/content/content.js', true);
+			}
 
-		// Listen for URL changes
-		wappalyzer.browser.addProgressListener(wappalyzer.urlChange, Components.interfaces.nsIWebProgress.NOTIFY_LOCATION);
+			// Listen for URL changes
+			self.browser.addProgressListener(self.urlChange, Components.interfaces.nsIWebProgress.NOTIFY_LOCATION);
 
-		// Listen for page loads
-		wappalyzer.browser.addEventListener('DOMContentLoaded', wappalyzer.onPageLoad, true);
+			// Listen for page loads
+			self.browser.addEventListener('DOMContentLoaded', self.onPageLoad, true);
 
-		wappalyzer.evaluateCustomApps();
-	},
+			self.evaluateCustomApps();
+		},
 
-	log: function(message)
-	{
-		if ( wappalyzer.debug && message )
-		{
-			var consoleService = Components.classes["@mozilla.org/consoleservice;1"].getService(Components.interfaces.nsIConsoleService);
+		// Log messages to console
+		log: function(message) {
+			if ( self.debug && message ) {
+				var consoleService = Components.classes["@mozilla.org/consoleservice;1"].getService(Components.interfaces.nsIConsoleService);
 
-			consoleService.logStringMessage("Wappalyzer: " + message);
-		}
-	},
+				consoleService.logStringMessage("Wappalyzer: " + message);
+			}
+		},
 
-	observe: function(subject, topic, data)
-	{
-		if ( topic != 'nsPref:changed' )
-		{
-			return;
-		}
+		// Listen for preference changes
+		observe: function(subject, topic, data) {
+			if ( topic != 'nsPref:changed' ) {
+				return;
+			}
 
-		switch(data)
-		{
-			case 'autoDetect':
-				wappalyzer.autoDetect = wappalyzer.prefs.getBoolPref('autoDetect');
-
-				break;
-			case 'customApps':
-				wappalyzer.customApps = wappalyzer.prefs.getCharPref('customApps');
-
-				break;
-			case 'debug':
-				wappalyzer.debug = wappalyzer.prefs.getBoolPref('debug');
-
-				break;
-			case 'enableTracking':
-				wappalyzer.enableTracking = wappalyzer.prefs.getBoolPref('enableTracking');
-
-				break;
-			case 'showApps':
-				wappalyzer.showApps = wappalyzer.prefs.getIntPref('showApps');
-
-				break;
-			case 'location':
-				var locationPref = wappalyzer.prefs.getIntPref('location');
-
-				wappalyzer.moveLocation(locationPref);
-
-				break;
-			case 'cat1':  wappalyzer.showCats[1]  = wappalyzer.prefs.getIntPref('cat1');  break;
-			case 'cat2':  wappalyzer.showCats[2]  = wappalyzer.prefs.getIntPref('cat2');  break;
-			case 'cat3':  wappalyzer.showCats[3]  = wappalyzer.prefs.getIntPref('cat3');  break;
-			case 'cat4':  wappalyzer.showCats[4]  = wappalyzer.prefs.getIntPref('cat4');  break;
-			case 'cat5':  wappalyzer.showCats[5]  = wappalyzer.prefs.getIntPref('cat5');  break;
-			case 'cat6':  wappalyzer.showCats[6]  = wappalyzer.prefs.getIntPref('cat6');  break;
-			case 'cat7':  wappalyzer.showCats[7]  = wappalyzer.prefs.getIntPref('cat7');  break;
-			case 'cat8':  wappalyzer.showCats[8]  = wappalyzer.prefs.getIntPref('cat8');  break;
-			case 'cat9':  wappalyzer.showCats[9]  = wappalyzer.prefs.getIntPref('cat9');  break;
-			case 'cat10': wappalyzer.showCats[10] = wappalyzer.prefs.getIntPref('cat10'); break;
-			case 'cat11': wappalyzer.showCats[11] = wappalyzer.prefs.getIntPref('cat11'); break;
-			case 'cat12': wappalyzer.showCats[12] = wappalyzer.prefs.getIntPref('cat12'); break;
-			case 'cat13': wappalyzer.showCats[13] = wappalyzer.prefs.getIntPref('cat13'); break;
-			case 'cat14': wappalyzer.showCats[14] = wappalyzer.prefs.getIntPref('cat14'); break;
-			case 'cat15': wappalyzer.showCats[15] = wappalyzer.prefs.getIntPref('cat15'); break;
-			case 'cat16': wappalyzer.showCats[16] = wappalyzer.prefs.getIntPref('cat16'); break;
-			case 'cat17': wappalyzer.showCats[17] = wappalyzer.prefs.getIntPref('cat17'); break;
-			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 '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;
-		}
-	},
+			switch(data) {
+				case 'autoDetect':
+					self.autoDetect = self.prefs.getBoolPref('autoDetect');
 
-	openTab: function(url)
-	{
-		wappalyzer.browser.selectedTab = wappalyzer.browser.addTab(url);
-	},
+					break;
+				case 'customApps':
+					self.customApps = self.prefs.getCharPref('customApps');
 
-	moveLocation: function(locationPref) {
-		wappalyzer.log('moveLocation');
+					break;
+				case 'debug':
+					self.debug = self.prefs.getBoolPref('debug');
 
-		switch ( locationPref )
-		{
-			case 1:
-				var containerId = 'wappalyzer-statusbar';
+					break;
+				case 'enableTracking':
+					self.enableTracking = self.prefs.getBoolPref('enableTracking');
 
-				// Show status bar panel
-				document.getElementById('wappalyzer-statusbar').style.visibility = '';
-				document.getElementById('wappalyzer-statusbar').style.padding    = '1px';
+					break;
+				case 'showApps':
+					self.showApps = self.prefs.getIntPref('showApps');
 
-				break;
-			default:
-				var containerId = 'urlbar-icons';
+					break;
+				case 'location':
+					var locationPref = self.prefs.getIntPref('location');
 
-				// Hide status bar panel
-				document.getElementById('wappalyzer-statusbar').style.visibility = 'hidden';
-				document.getElementById('wappalyzer-statusbar').style.padding    = '0';
-		}
+					self.moveLocation(locationPref);
 
-		var e         = document.getElementById(containerId);
-		var container = document.getElementById('wappalyzer-container');
+					break;
+				case  'cat1': self.showCats[ 1] = self.prefs.getIntPref( 'cat1'); break;
+				case  'cat2': self.showCats[ 2] = self.prefs.getIntPref( 'cat2'); break;
+				case  'cat3': self.showCats[ 3] = self.prefs.getIntPref( 'cat3'); break;
+				case  'cat4': self.showCats[ 4] = self.prefs.getIntPref( 'cat4'); break;
+				case  'cat5': self.showCats[ 5] = self.prefs.getIntPref( 'cat5'); break;
+				case  'cat6': self.showCats[ 6] = self.prefs.getIntPref( 'cat6'); break;
+				case  'cat7': self.showCats[ 7] = self.prefs.getIntPref( 'cat7'); break;
+				case  'cat8': self.showCats[ 8] = self.prefs.getIntPref( 'cat8'); break;
+				case  'cat9': self.showCats[ 9] = self.prefs.getIntPref( 'cat9'); break;
+				case 'cat10': self.showCats[10] = self.prefs.getIntPref('cat10'); break;
+				case 'cat11': self.showCats[11] = self.prefs.getIntPref('cat11'); break;
+				case 'cat12': self.showCats[12] = self.prefs.getIntPref('cat12'); break;
+				case 'cat13': self.showCats[13] = self.prefs.getIntPref('cat13'); break;
+				case 'cat14': self.showCats[14] = self.prefs.getIntPref('cat14'); break;
+				case 'cat15': self.showCats[15] = self.prefs.getIntPref('cat15'); break;
+				case 'cat16': self.showCats[16] = self.prefs.getIntPref('cat16'); break;
+				case 'cat17': self.showCats[17] = self.prefs.getIntPref('cat17'); break;
+				case 'cat18': self.showCats[18] = self.prefs.getIntPref('cat18'); break;
+				case 'cat19': self.showCats[19] = self.prefs.getIntPref('cat19'); break;
+				case 'cat20': self.showCats[20] = self.prefs.getIntPref('cat20'); break;
+				case 'cat21': self.showCats[21] = self.prefs.getIntPref('cat21'); break;
+				case 'cat22': self.showCats[22] = self.prefs.getIntPref('cat22'); break;
+				case 'cat23': self.showCats[23] = self.prefs.getIntPref('cat23'); break;
+			}
+		},
 
-		e.appendChild(container);
-	},
+		openTab: function(url) {
+			self.browser.selectedTab = self.browser.addTab(url);
+		},
 
-	onPageLoad: function(event)
-	{
-		wappalyzer.log('onPageLoad');
+		moveLocation: function(locationPref) {
+			self.log('moveLocation');
 
-		var target = event.originalTarget;
+			switch ( locationPref ) {
+				case 1:
+					var containerId = 'wappalyzer-statusbar';
 
-		if ( !target.request )
-		{
-			wappalyzer.request = false;
-		}
+					// Show status bar panel
+					document.getElementById('wappalyzer-statusbar').style.visibility = '';
+					document.getElementById('wappalyzer-statusbar').style.padding    = '1px';
 
-		wappalyzer.analyzePage(
-			target.location.href,
-			target.documentElement.innerHTML,
-			[],
-			[],
-			true,
-			false
-			);
-	},
-
-	onContentPageLoad: function(message)
-	{
-		wappalyzer.log('onContentPageLoad');
-
-		wappalyzer.analyzePage(
-			message.json.href,
-			message.json.html,
-			message.json.headers,
-			message.json.environmentVars,
-			true,
-			false
-			);
-	},
-
-	onUrlChange: function(request)
-	{
-		wappalyzer.log('onUrlChange');
-
-		wappalyzer.clearDetectedApps();
-
-		var doc = wappalyzer.browser.contentDocument;
-
-		if ( !doc.request )
-		{
-			doc.request = request;
-		}
+					break;
+				default:
+					var containerId = 'urlbar-icons';
 
-		wappalyzer.request = doc.request;
-
-		wappalyzer.currentTab = false;
-
-		wappalyzer.analyzePage(
-			doc.location.href   ? doc.location.href             : '',
-			doc.documentElement ? doc.documentElement.innerHTML : '',
-			[],
-			[],
-			false,
-			false
-			);
-	},
-
-	urlChange:
-	{
-		QueryInterface: function(iid)
-		{
-			if ( iid.equals(Components.interfaces.nsIWebProgressListener)   ||
-			     iid.equals(Components.interfaces.nsISupportsWeakReference) ||
-			     iid.equals(Components.interfaces.nsISupports) )
-			{
-				return this;
+					// Hide status bar panel
+					document.getElementById('wappalyzer-statusbar').style.visibility = 'hidden';
+					document.getElementById('wappalyzer-statusbar').style.padding    = '0';
 			}
 
-			throw Components.results.NS_NOINTERFACE;
+			var e         = document.getElementById(containerId);
+			var container = document.getElementById('wappalyzer-container');
+
+			e.appendChild(container);
 		},
 
-		onLocationChange: function(progress, request, url)
-		{
-			wappalyzer.log('urlChange.onLocationChange');
+		onPageLoad: function(event) {
+			self.log('onPageLoad');
 
-			if ( !url )
-			{
-				wappalyzer.prevUrl = '';
+			var target = event.originalTarget;
 
-				return;
+			if ( !target.request ) {
+				self.request = false;
 			}
 
-			if ( url.spec != wappalyzer.prevUrl )
-			{
-				wappalyzer.prevUrl = url.spec;
+			self.analyzePage(
+				target.documentElement,
+				target.location.href,
+				target.documentElement.innerHTML,
+				[],
+				[],
+				true,
+				false
+				);
+		},
 
-				wappalyzer.onUrlChange(request);
-			}
+		onContentPageLoad: function(message) {
+			self.log('onContentPageLoad');
+
+			self.analyzePage(
+				null,
+				message.json.href,
+				message.json.html,
+				message.json.headers,
+				message.json.environmentVars,
+				true,
+				false
+				);
 		},
 
-		onStateChange:    function(a, b, c, d)       {},
-		onProgressChange: function(a, b, c, d, e, f) {},
-		onStatusChange:   function(a, b, c, d)       {},
-		onSecurityChange: function(a, b, c)          {}
-	},
+		onUrlChange: function(request) {
+			self.log('onUrlChange');
 
-	analyzePage: function(href, html, headers, environmentVars, doCount, manualDetect)
-	{
-		wappalyzer.log('analyzePage');
+			self.clearDetectedApps();
 
-		wappalyzer.currentTab = false;
+			var doc = self.browser.contentDocument;
 
-		if ( href == wappalyzer.browser.contentDocument.location.href )
-		{
-			wappalyzer.currentTab = true;
+			self.request = doc.request ? doc.request : request;
 
-			wappalyzer.clearDetectedApps();
-		}
+			self.currentTab = false;
 
-		if ( typeof html == 'undefined' )
-		{
-			html = '';
-		}
+			self.analyzePage(
+				doc,
+				doc.location.href   ? doc.location.href             : '',
+				doc.documentElement ? doc.documentElement.innerHTML : '',
+				[],
+				[],
+				false,
+				false
+				);
+		},
 
-		if ( wappalyzer.autoDetect || ( !wappalyzer.autoDetect && manualDetect ) )
-		{
-			// Scan URL, domain and response headers for patterns
-			if ( html.length > 50000 ) // Prevent large documents from slowing things down
-			{
-				html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
+		urlChange: {
+			QueryInterface: function(iid) {
+				if ( iid.equals(Components.interfaces.nsIWebProgressListener)   ||
+					 iid.equals(Components.interfaces.nsISupportsWeakReference) ||
+					 iid.equals(Components.interfaces.nsISupports) ) {
+					return this;
+				}
+
+				throw Components.results.NS_NOINTERFACE;
+			},
+
+			onLocationChange: function(progress, request, url) {
+				self.log('urlChange.onLocationChange');
+
+				if ( !url ) {
+					self.prevUrl = '';
+
+					return;
+				}
+
+				if ( url.spec != self.prevUrl ) {
+					self.prevUrl = url.spec;
+
+					self.onUrlChange(request);
+				}
+			},
+
+			onStateChange:    function(a, b, c, d)       {},
+			onProgressChange: function(a, b, c, d, e, f) {},
+			onStatusChange:   function(a, b, c, d)       {},
+			onSecurityChange: function(a, b, c)          {}
+		},
+
+		analyzePage: function(doc, href, html, headers, environmentVars, doCount, manualDetect) {
+			self.log('analyzePage');
+
+			self.currentTab = false;
+
+			if ( href == self.browser.contentDocument.location.href ) {
+				self.currentTab = true;
+
+				if ( !doc ) {
+					doc = self.browser.contentDocument;
+				}
+
+				self.clearDetectedApps();
+			}
+
+			if ( typeof html == 'undefined' ) {
+				html = '';
 			}
 
-			if ( html )
-			{
-				// Check cached application names
-				if ( typeof wappalyzer.browser.contentDocument.wappalyzerApps != 'undefined' )
-				{
-					for ( i in wappalyzer.browser.contentDocument.wappalyzerApps )
-					{
-						var appName = wappalyzer.browser.contentDocument.wappalyzerApps[i];
+			if ( self.autoDetect || ( !self.autoDetect && manualDetect ) ) {
+				// Prevent large documents from slowing things down
+				if ( html.length > 50000 ) {
+					html = html.substring(0, 25000) + html.substring(html.length - 25000, html.length);
+				}
+
+				// Scan URL, domain and response headers for patterns
+				if ( html ) {
+					// Check cached application names
+					if ( doc && typeof doc.detectedApps != 'undefined' ) {
+						for ( i in doc.detectedApps ) {
+							var appName = doc.detectedApps[i];
 
-						if ( typeof wappalyzer.checkUnique[appName] == 'undefined' )
-						{
-							wappalyzer.showApp(appName, href, doCount);
+							if ( typeof self.checkUnique[appName] == 'undefined' ) {
+								self.log('CACHE'); //
 
-							wappalyzer.checkUnique[appName] = true;
+								self.showApp(appName, doc, href, doCount);
+
+								self.checkUnique[appName] = true;
+							}
 						}
 					}
-				}
 
-				for ( var appName in wappalyzer.apps )
-				{
-					if ( typeof wappalyzer.checkUnique[appName] == 'undefined' ) // Don't scan for apps that have already been detected
-					{
-						// Scan HTML
-						if ( typeof wappalyzer.apps[appName].html != 'undefined' )
-						{
-							var regex = wappalyzer.apps[appName].html;
-
-							if ( regex.test(html) )
-							{
-								wappalyzer.showApp(appName, href, doCount);
+					for ( var appName in self.apps ) {
+						// Don't scan for apps that have already been detected
+						if ( typeof self.checkUnique[appName] == 'undefined' ) {
+							// Scan HTML
+							if ( typeof self.apps[appName].html != 'undefined' ) {
+								var regex = self.apps[appName].html;
+
+								if ( regex.test(html) ) {
+									self.showApp(appName, doc, href, doCount);
+								}
 							}
-						}
 
-						// Scan URL
-						if ( href && typeof wappalyzer.apps[appName].url != 'undefined' )
-						{
-							var regex = wappalyzer.apps[appName].url;
+							// Scan URL
+							if ( href && typeof self.apps[appName].url != 'undefined' ) {
+								var regex = self.apps[appName].url;
 
-							if ( regex.test(href) )
-							{
-								wappalyzer.showApp(appName, href, doCount);
+								if ( regex.test(href) ) {
+									self.showApp(appName, doc, href, doCount);
+								}
 							}
-						}
 
-						// Scan response headers
-						if ( typeof wappalyzer.apps[appName].headers != 'undefined' && wappalyzer.request )
-						{
-							for ( var header in wappalyzer.apps[appName].headers )
-							{
-								var regex = wappalyzer.apps[appName].headers[header];
-
-								try
-								{
-									if ( regex.test(wappalyzer.request.nsIHttpChannel.getResponseHeader(header)) )
-									{
-										wappalyzer.showApp(appName, href, doCount);
+							// Scan response headers
+							if ( typeof self.apps[appName].headers != 'undefined' && self.request ) {
+								for ( var header in self.apps[appName].headers ) {
+									var regex = self.apps[appName].headers[header];
+
+									try {
+										if ( regex.test(self.request.nsIHttpChannel.getResponseHeader(header)) ) {
+											self.showApp(appName, doc, href, doCount);
+										}
 									}
-								}
-								catch(e)
-								{
+									catch(e) { }
 								}
 							}
-						}
 
-						// Scan environment variables
-						if ( environmentVars && typeof wappalyzer.apps[appName].env != 'undefined' )
-						{
-							var regex = wappalyzer.apps[appName].env;
-
-							for ( var i in environmentVars )
-							{
-								try
-								{
-									if ( regex.test(environmentVars[i]) )
-									{
-										wappalyzer.showApp(appName, href, doCount);
+							// Scan environment variables
+							if ( environmentVars && typeof self.apps[appName].env != 'undefined' ) {
+								var regex = self.apps[appName].env;
+
+								for ( var i in environmentVars ) {
+									try {
+										if ( regex.test(environmentVars[i]) ) {
+											self.showApp(appName, doc, href, doCount);
+										}
 									}
-								}
-								catch(e)
-								{
+									catch(e) { }
 								}
 							}
 						}
 					}
 				}
-			}
 
-			html = ''; // Free memory
-		}
-	},
+				html = ''; // Free memory
+			}
+		},
 
-	showApp: function(detectedApp, href, doCount)
-	{
-		wappalyzer.log('showApp ' + detectedApp);
+		showApp: function(detectedApp, doc, href, doCount) {
+			self.log('showApp ' + detectedApp);
 
-		// Keep detected application names in memory
-		if ( typeof wappalyzer.browser.contentDocument.wappalyzerApps == 'undefined' )
-		{
-			wappalyzer.browser.contentDocument.wappalyzerApps = [];
-		}
+			self.report(detectedApp, href);
 
-		wappalyzer.browser.contentDocument.wappalyzerApps.push(detectedApp);
+			// Keep detected application names in memory
+			if ( doc ) {
+				if ( typeof doc.detectedApps == 'undefined' ) {
+					doc.detectedApps = [];
+				}
 
-		wappalyzer.report(detectedApp, href);
+				doc.detectedApps.push(detectedApp);
+			}
 
-		if ( detectedApp && typeof wappalyzer.checkUnique[detectedApp] == 'undefined' )
-		{
-			var show = false;
+			if ( detectedApp && typeof self.checkUnique[detectedApp] == 'undefined' ) {
+				var show = false;
 
-			for ( var i in wappalyzer.apps[detectedApp].cats )
-			{
-				if ( wappalyzer.showCats[wappalyzer.apps[detectedApp].cats[i]] )
-				{
-					show = true;
+				for ( var i in self.apps[detectedApp].cats ) {
+					if ( self.showCats[self.apps[detectedApp].cats[i]] ) {
+						show = true;
 
-					break;
+						break;
+					}
 				}
-			}
 
-			if ( show )
-			{
-				var e = document.getElementById('wappalyzer-detected-apps');
+				if ( show && self.currentTab ) {
+					var e = document.getElementById('wappalyzer-detected-apps');
+
+					if ( self.autoDetect ) {
+						if ( self.showApps == 2 ) {
+							document.getElementById('wappalyzer-icon').setAttribute('src', 'chrome://wappalyzer/skin/icon16x16_hot.ico');
+
+							document.getElementById('wappalyzer-detected-apps').style.display = 'none';
+						}
+						else {
+							// Hide Wappalyzer icon
+							document.getElementById('wappalyzer-icon').style.display = 'none';
+
+							document.getElementById('wappalyzer-detected-apps').style.display = '';
+						}
+
+						// Show app icon and label
+						var child = document.createElement('image');
+
+						if ( typeof self.apps[detectedApp].icon == 'string' ) {
+							child.setAttribute('src', self.apps[detectedApp].icon);
+						}
+						else {
+							child.setAttribute('src', 'chrome://wappalyzer/skin/icons/' + detectedApp + '.ico');
+						}
+
+						child.setAttribute('class', 'wappalyzer-icon');
 
-				if ( wappalyzer.autoDetect )
-				{
-					if ( wappalyzer.showApps == 2 )
-					{
-						document.getElementById('wappalyzer-icon').setAttribute('src', 'chrome://wappalyzer/skin/icon16x16_hot.ico');
+						if ( self.appsDetected ) {
+							child.setAttribute('style', 'margin-left: .5em');
+						}
 
-						document.getElementById('wappalyzer-detected-apps').style.display = 'none';
+						e.appendChild(child);
 					}
-					else
-					{
-						// Hide Wappalyzer icon
-						document.getElementById('wappalyzer-icon').style.display = 'none';
 
-						document.getElementById('wappalyzer-detected-apps').style.display = '';
+					if ( self.showApps == 0 ) {
+						var child = document.createElement('label');
+
+						child.setAttribute('value', detectedApp);
+						child.setAttribute('class', 'wappalyzer-app-name');
+
+						e.appendChild(child);
 					}
 
-					// Show app icon and label
-					var child = document.createElement('image');
+					// Show application in popup
+					var e = document.getElementById('wappalyzer-apps');
 
-					if ( typeof wappalyzer.apps[detectedApp].icon == 'string' )
-					{
-						child.setAttribute('src', wappalyzer.apps[detectedApp].icon);
+					if ( !self.appsDetected ) {
+						// Remove "no apps detected" message
+						document.getElementById('wappalyzer-apps').removeChild(document.getElementById('wappalyzer-no-detected-apps'));
 					}
-					else
-					{
-						child.setAttribute('src', 'chrome://wappalyzer/skin/icons/' + detectedApp + '.ico');
+					else {
+						var child = document.createElement('menuseparator');
+
+						e.appendChild(child);
 					}
 
-					child.setAttribute('class', 'wappalyzer-icon');
+					var child = document.createElement('menuitem');
+
+					child.setAttribute('class', 'menuitem-iconic');
+					child.setAttribute('type',  '');
+
+					child.addEventListener('command', function() { self.openTab(self.homeUrl + 'stats/app/' + escape(detectedApp)); }, false);
 
-					if ( wappalyzer.appsDetected )
-					{
-						child.setAttribute('style', 'margin-left: .5em');
+					if ( typeof self.apps[detectedApp].custom == 'undefined' ) {
+						child.setAttribute('label', detectedApp);
+						child.setAttribute('image', 'chrome://wappalyzer/skin/icons/' + detectedApp + '.ico');
+					}
+					else {
+						child.setAttribute('label',    detectedApp + ' (' + self.strings.getString('wappalyzer.custom') + ')');
+						child.setAttribute('disabled', 'true');
+						child.setAttribute('image',    self.apps[detectedApp].icon);
 					}
 
 					e.appendChild(child);
-				}
 
-				if ( wappalyzer.showApps == 0 )
-				{
-					var child = document.createElement('label');
+					if ( self.apps[detectedApp].cats ) {
+						for ( var i in self.apps[detectedApp].cats ) {
+							var child = document.createElement('menuitem');
 
-					child.setAttribute('value', detectedApp);
-					child.setAttribute('class', 'wappalyzer-app-name');
+							child.setAttribute('label',    self.cats[self.apps[detectedApp].cats[i]].name);
+							child.setAttribute('disabled', 'true');
 
-					e.appendChild(child);
+							e.appendChild(child);
+						}
+					}
 				}
 
-				// Show application in popup
-				var e = document.getElementById('wappalyzer-apps');
-
-				if ( !wappalyzer.appsDetected )
-				{
-					// Remove "no apps detected" message
-					document.getElementById('wappalyzer-apps').removeChild(document.getElementById('wappalyzer-no-detected-apps'));
+				if ( doCount ) {
+					self.report(detectedApp, href);
 				}
-				else
-				{
-					var child = document.createElement('menuseparator');
 
-					e.appendChild(child);
-				}
+				self.appsDetected ++;
 
-				var child = document.createElement('menuitem');
+				self.checkUnique[detectedApp] = true;
+			}
+		},
 
-				child.setAttribute('class',     'menuitem-iconic');
-				child.setAttribute('type',      '');
-				child.setAttribute('oncommand', 'wappalyzer.openTab(\'' + wappalyzer.homeUrl + 'stats/app/' + escape(detectedApp) + '\');');
+		report: function(detectedApp, href) {
+			self.log('report');
 
-				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);
-				}
+			if ( typeof self.apps[detectedApp].custom == 'undefined' ) {
+				var
+					regex  = /:\/\/(.[^/]+)/,
+					domain = href.match(regex) ? href.match(regex)[1] : ''
+					;
 
-				e.appendChild(child);
+				if ( self.enableTracking && self.regexDomain.test(domain) && !self.regexBlacklist.test(href) ) {
+					if ( typeof self.history[domain] == 'undefined' ) {
+						self.history[domain] = [];
+					}
 
-				if ( wappalyzer.apps[detectedApp].cats )
-				{
-					for ( var i in wappalyzer.apps[detectedApp].cats )
-					{
-						var child = document.createElement('menuitem');
+					if ( typeof self.history[domain][detectedApp] == 'undefined' ) {
+						self.history[domain][detectedApp] = 0;
+					}
 
-						child.setAttribute('label',    wappalyzer.cats[wappalyzer.apps[detectedApp].cats[i]].name);
-						child.setAttribute('disabled', 'true');
+					self.history[domain][detectedApp] ++;
 
-						e.appendChild(child);
+					self.hitCount ++;
+
+					if ( self.hitCount > 200 ) {
+						self.sendReport();
 					}
 				}
 			}
+		},
 
-			if ( doCount )
-			{
-				wappalyzer.report(detectedApp, href);
-			}
+		// Anonymously send the name of the detected apps and domains to wappalyzer.com
+		// You can turn this off in the options dialog
+		// This is used to track the distribution of software, stats are publicly available on the site
+		sendReport: function() {
+			self.log('sendReport');
 
-			wappalyzer.appsDetected ++;
+			if ( self.enableTracking && !self.req ) {
+				var report = '';
 
-			wappalyzer.checkUnique[detectedApp] = true;
-		}
-	},
-
-	report: function(detectedApp, href)
-	{
-		wappalyzer.log('report');
-
-		if ( typeof wappalyzer.apps[detectedApp].custom == 'undefined' )
-		{
-			var
-				regex  = /:\/\/(.[^/]+)/,
-				domain = href.match(regex) ? href.match(regex)[1] : ''
-				;
-
-			if ( wappalyzer.enableTracking && wappalyzer.regexDomain.test(domain) && !wappalyzer.regexBlacklist.test(href) )
-			{
-				if ( typeof wappalyzer.history[domain] == 'undefined' )
-				{
-					wappalyzer.history[domain] = [];
-				}
+				if ( self.history ) {
+					for ( var i in self.history ) {
+						report += '[' + i;
 
-				if ( typeof wappalyzer.history[domain][detectedApp] == 'undefined' )
-				{
-					wappalyzer.history[domain][detectedApp] = 0;
+						for ( var j in self.history[i] ) {
+							report += '|' + j + ':' + self.history[i][j];
+						}
+
+						report += ']';
+					}
 				}
 
-				wappalyzer.history[domain][detectedApp] ++;
+				// Make POST request
+				self.req = new XMLHttpRequest();
 
-				wappalyzer.hitCount ++;
+				self.req.open('POST', self.homeUrl + 'report/', true);
 
-				if ( wappalyzer.hitCount > 200 )
-				{
-					wappalyzer.sendReport();
-				}
-			}
-		}
-	},
-
-	sendReport: function()
-	// Anonymously send the name of the detected apps and domains to wappalyzer.com
-	// You can turn this off in the options dialog
-	// This is used to track the distribution of software, stats are publicly available on the site
-	{
-		wappalyzer.log('sendReport');
-
-		if ( wappalyzer.enableTracking && !wappalyzer.req )
-		{
-			var report = '';
-
-			if ( wappalyzer.history )
-			{
-				for ( var i in wappalyzer.history )
-				{
-					report += '[' + i;
-
-					for ( var j in wappalyzer.history[i] )
-					{
-						report += '|' + j + ':' + wappalyzer.history[i][j];
-					}
+				self.req.channel.loadFlags |= Components.interfaces.nsIRequest.LOAD_BYPASS_CACHE;
 
-					report += ']';
-				}
-			}
+				self.req.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
 
-			// Make POST request
-			wappalyzer.req = new XMLHttpRequest();
+				self.req.onreadystatechange = function(e) {
+					if ( self.req.readyState == 4 ) {
+						if ( self.req.status == 200 ) {
+							// Reset
+							report = '';
 
-			wappalyzer.req.open('POST', wappalyzer.homeUrl + 'report/', true);
+							self.hitCount = 0;
+							self.history  = [];
+						}
 
-			wappalyzer.req.channel.loadFlags |= Components.interfaces.nsIRequest.LOAD_BYPASS_CACHE;
+						self.req.close();
 
-			wappalyzer.req.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+						self.req = false;
+					}
+				};
 
-			wappalyzer.req.onreadystatechange = function(e)
-			{
-				if ( wappalyzer.req.readyState == 4 )
-				{
-					if ( wappalyzer.req.status == 200 )
-					{
-						// Reset
-						report = '';
+				self.req.send('d=' + encodeURIComponent(report));
+			}
+		},
 
-						wappalyzer.hitCount = 0;
-						wappalyzer.history  = [];
-					}
+		clearDetectedApps: function() {
+			self.log('clearDetectedApps');
 
-					wappalyzer.req.close();
+			self.appsDetected = 0;
+			self.checkUnique  = [];
 
-					wappalyzer.req = false;
-				}
-			};
+			// Show Wappalyzer icon
+			document.getElementById('wappalyzer-icon').setAttribute('src', 'chrome://wappalyzer/skin/icon16x16.ico');
+			document.getElementById('wappalyzer-icon').style.display = '';
 
-			wappalyzer.req.send('d=' + encodeURIComponent(report));
-		}
-	},
+			// Clear app icons and labels
+			var e = document.getElementById('wappalyzer-detected-apps');
 
-	clearDetectedApps: function()
-	{
-		wappalyzer.log('clearDetectedApps');
+			while ( e.childNodes.length > 0 ) {
+				e.removeChild(e.childNodes.item(0));
+			}
 
-		wappalyzer.appsDetected = 0;
-		wappalyzer.checkUnique  = [];
+			// Clear application popup
+			var e = document.getElementById('wappalyzer-apps');
 
-		// Show Wappalyzer icon
-		document.getElementById('wappalyzer-icon').setAttribute('src', 'chrome://wappalyzer/skin/icon16x16.ico');
-		document.getElementById('wappalyzer-icon').style.display = '';
+			while ( e.childNodes.length > 0 ) {
+				e.removeChild(e.childNodes.item(0));
+			}
 
-		// Clear app icons and labels
-		var e = document.getElementById('wappalyzer-detected-apps');
+			var child = document.createElement('menuitem');
 
-		while ( e.childNodes.length > 0 )
-		{
-			e.removeChild(e.childNodes.item(0));
-		}
+			child.setAttribute('label',     self.strings.getString('wappalyzer.noDetectedApps'));
+			child.setAttribute('id',        'wappalyzer-no-detected-apps');
+			child.setAttribute('class',     'menuitem-iconic');
+			child.setAttribute('disabled', 	'true');
+			child.setAttribute('type',      '');
 
-		// Clear application popup
-		var e = document.getElementById('wappalyzer-apps');
+			e.appendChild(child);
+		},
 
-		while ( e.childNodes.length > 0 )
-		{
-			e.removeChild(e.childNodes.item(0));
-		}
+		installSuccess: function() {
+			self.log('installSuccess');
 
-		var child = document.createElement('menuitem');
+			self.browser.removeEventListener('load', self.installSuccess, false);
 
-		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',      '');
+			self.openTab(self.homeUrl + 'install/success/');
+		},
 
-		e.appendChild(child);
-	},
+		upgradeSuccess: function() {
+			self.log('upgradeSuccess');
 
-	installSuccess: function()
-	{
-		wappalyzer.browser.removeEventListener('load', wappalyzer.installSuccess, false);
+			self.browser.removeEventListener('load', self.upgradeSuccess, false);
 
-		wappalyzer.openTab(wappalyzer.homeUrl + 'install/success/');
-	},
+			self.openTab(self.homeUrl + 'install/upgraded/');
+		}
+	};
 
-	upgradeSuccess: function()
-	{
-		wappalyzer.browser.removeEventListener('load', wappalyzer.upgradeSuccess, false);
+	addEventListener('load',   function() { self.init();       }, false);
+	addEventListener('unload', function() { self.sendReport(); }, false);
 
-		wappalyzer.openTab(wappalyzer.homeUrl + 'install/upgraded/');
-	}
-};
+	return self;
+})();
diff --git a/install.rdf b/install.rdf
index 845ea71a8..019bc6dd3 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,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>1.15</em:version>
+		<em:version>1.15.2</em:version>
 		<em:type>2</em:type>
 		<em:unpack>true</em:unpack>
 
@@ -14,7 +14,7 @@
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>4.0</em:minVersion>
-				<em:maxVersion>7.*</em:maxVersion>
+				<em:maxVersion>8.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 
diff --git a/wappalyzer.xpi b/wappalyzer.xpi
index 9819f7f08..9bc0a63d2 100644
Binary files a/wappalyzer.xpi and b/wappalyzer.xpi differ