diff --git a/chrome/content/apps.js b/chrome/content/apps.js
index 6adfd10b1..ba19f2cdf 100644
--- a/chrome/content/apps.js
+++ b/chrome/content/apps.js
@@ -28,7 +28,7 @@ if ( typeof wappalyzer != 'undefined' ) {
 	};
 
 	wappalyzer.apps = {
-		'1C-Bitrix':             { cats: { 1:  1 }, html: /<link[^>]+components\/bitrix/i, script: /<script[^>]+1c\-bitrix/i },
+		'1C-Bitrix':             { cats: { 1:  1 }, html: /<link[^>]+components\/bitrix/i, script: /1c\-bitrix/i },
 		'2z Project':            { cats: { 1:  1 }, meta: { 'generator': /2z project/i } },
 		'AddThis':               { cats: { 1:  5 }, script: /addthis\.com\/js/ },
 		'Adobe GoLive':          { cats: { 1: 20 }, meta: { 'generator': /Adobe GoLive/i } },
@@ -40,7 +40,7 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'Atlassian Jira':        { cats: { 1: 13 }, html: /Powered by <a href=.http:\/\/www\.atlassian\.com\/software\/jira/i },
 		'AWStats':               { cats: { 1: 10 }, meta: { 'generator': /AWStats/i } },
 		'Banshee':               { cats: { 1:  1, 2: 18 }, html: /Built upon the <a href=("|')[^>]+banshee-php\.org/i },
-		'Backbone.js':           { cats: { 1: 12 }, script: /backbone[^>]*\.js/, env: /^Backbone$/ },
+		'Backbone.js':           { cats: { 1: 12 }, script: /backbone.*\.js/, env: /^Backbone$/ },
 		'BIGACE':                { cats: { 1:  1 }, meta: { 'generator': /BIGACE/ }, html: /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 },
@@ -50,30 +50,30 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'chartbeat':             { cats: { 1: 10 }, html: /function loadChartbeat\(\) {/i },
 		'Chamilo':               { cats: { 1: 21 }, meta: { 'generator': /Chamilo/i }, headers: { 'X-Powered-By': /Chamilo/ } },
 		'Cherokee':              { cats: { 1: 22 }, headers: { 'Server': /Cherokee/i } },
-		'ClickHeat':             { cats: { 1: 10 }, script: /clickheat[^>]*\.js/i, env: '/^clickHeatBrowser$/' },
+		'ClickHeat':             { cats: { 1: 10 }, script: /clickheat.*\.js/i, env: '/^clickHeatBrowser$/' },
 		'ClickTale':             { cats: { 1: 10 }, html: /if\(typeof ClickTale(Tag)*==("|')function("|')\)/ },
-		'Clicky':                { cats: { 1: 10 }, script: /http:\/\/static\.getclicky\.com/ },
+		'Clicky':                { cats: { 1: 10 }, script: /static\.getclicky\.com/ },
 		'CMS Made Simple':       { cats: { 1:  1 }, meta: { 'generator': /CMS Made Simple/i } },
 		'CO2Stats':              { cats: { 1: 10 }, html: /src=("|')http:\/\/www\.co2stats\.com\/propres\.php/ },
 		'comScore':              { cats: { 1: 10 }, html: /<i{1}frame[^>]* (id=("|')comscore("|')|scr=[^>]+comscore)/ },
 		'Concrete5':             { cats: { 1:  1 }, meta: { 'generator': /concrete5/i } },
 		'Contao':                { cats: { 1:  1 }, html: /(<!--\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)/i },
 		'Contens':               { cats: { 1:  1 }, meta: { 'generator': /contens/i } },
-		'ConversionLab':         { cats: { 1: 10 }, script: /http:\/\/conversionlab\.trackset\.com\/track\/tsend\.js("|')/ },
+		'ConversionLab':         { cats: { 1: 10 }, script: /conversionlab\.trackset\.com\/track\/tsend\.js/ },
 		'Coppermine':            { cats: { 1:  7 }, html: /<!--Coppermine Photo Gallery/i },
 		'Cotonti':               { cats: { 1:  1 }, meta: { 'generator': /Cotonti/i } },
 		'cPanel':                { cats: { 1:  9 }, html: /<!-- cPanel/i },
-		'Crazy Egg':             { cats: { 1: 10 }, script: /cetrk\.com\/pages\/scripts\/[0-9]+\/[0-9]+\.js("|')/ },
+		'Crazy Egg':             { cats: { 1: 10 }, script: /cetrk\.com\/pages\/scripts\/[0-9]+\/[0-9]+\.js/ },
 		'CS Cart':               { cats: { 1:  6 }, html: /&nbsp;Powered by (<a href=.http:\/\/www\.cs\-cart\.com|CS\-Cart)/i },
 		'CubeCart':              { cats: { 1:  6 }, html: /Powered by <a href=.http:\/\/www\.cubecart\.com/i },
 		'cufon':                 { cats: { 1: 17 }, script: /cufon\-yui\.js/, env: /^Cufon$/ },
-		'd3':                    { cats: { 1: 25 }, script: /d3(\.min)?\.js/i, env: '/^d3$/' },
+		'd3':                    { cats: { 1: 25 }, script: /d3(\.min)?\.js/, env: '/^d3$/' },
 		'Danneo CMS':            { cats: { 1:  1 }, meta: { 'generator': /Danneo/i } },
 		'DataLife Engine':       { cats: { 1:  1 }, meta: { 'generator': /DataLife Engine/i } },
 		'DHTMLX':                { cats: { 1: 12 }, script: /dhtmlxcommon\.js/ },
 		'DirectAdmin':           { cats: { 1:  9 }, html: /<a[^>]+>DirectAdmin<\/a> Web Control Panel/i },
 		'Disqus':                { cats: { 1: 15 }, script: /disqus_url/, html: /<div[^>]+id=("|')disqus_thread("|')/ },
-		'dojo':                  { cats: { 1: 12 }, script: /dojo(\.xd)?\.js/i, env: /^dojo$/ },
+		'dojo':                  { cats: { 1: 12 }, script: /dojo(\.xd)?\.js/, env: /^dojo$/ },
 		'Dokeos':                { cats: { 1: 21 }, meta: { 'generator': /Dokeos/i }, html: /Portal <a[^>]+>Dokeos|@import "[^"]+dokeos_blue/i, headers: { 'X-Powered-By': /Dokeos/ } },
 		'DokuWiki':              { cats: { 1:  8 }, meta: { 'generator': /DokuWiki/i } },
 		'DotNetNuke':            { cats: { 1:  1 }, meta: { 'generator': /DotNetNuke/i }, html: /<!\-\- by DotNetNuke Corporation/i },
@@ -81,7 +81,7 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'Drupal':                { cats: { 1:  1 }, script: /drupal\.js/, html: /(jQuery\.extend\(Drupal\.settings, \{|Drupal\.extend\(\{ settings: \{|<link[^>]+sites\/(default|all)\/themes\/|<style[^>]+sites\/(default|all)\/(themes|modules)\/)/i, headers: { 'X-Drupal-Cache': /.*/, 'Expires': /19 Nov 1978/ }, env: /^Drupal$/ },
 		'Dynamicweb':            { cats: { 1:  1 }, meta: { 'generator': /Dynamicweb/i } },
 		'e107':                  { cats: { 1:  1 }, script: /e107\.js/ },
-		'Exhibit':               { cats: { 1: 25 }, script: /exhibit[^>]*\.js/, env: '/^Exhibit$/' },
+		'Exhibit':               { cats: { 1: 25 }, script: /exhibit.*\.js/, env: '/^Exhibit$/' },
 		'ExtJS':                 { cats: { 1: 12 }, script: /ext\-base\.js/, env: /^Ext$/ },
 		'ExpressionEngine':      { cats: { 1:  1 }, headers: { 'Set-Cookie': /exp_last_activity/ } },
 		'eZ Publish':            { cats: { 1:  1 }, meta: { 'generator': /eZ Publish/i } },
@@ -96,23 +96,23 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'Graffiti CMS':          { cats: { 1:  1 }, meta: { 'generator': /Graffiti CMS/i } },
 		'Gravity Insights':      { cats: { 1: 10 }, html: /gravityInsightsParams\.site_guid = '/ },
 		'Hiawatha':              { cats: { 1: 22 }, headers: { 'Server': /Hiawatha/i } },
-		'Highcharts':            { cats: { 1: 25 }, script: /highcharts[^>]*\.js/, env: '/^Highcharts$/' },
+		'Highcharts':            { cats: { 1: 25 }, script: /highcharts.*\.js/, env: '/^Highcharts$/' },
 		'Hotaru CMS':            { cats: { 1:  1 }, meta: { 'generator': /Hotaru CMS/i } },
 		'IIS':                   { cats: { 1: 22 }, headers: { 'Server': /IIS/i } },
 		'InstantCMS':            { cats: { 1:  1 }, meta: { 'generator': /InstantCMS/i } },
-		'IPB':                   { cats: { 1:  2 }, script: /jscripts\/ips_/i },
+		'IPB':                   { cats: { 1:  2 }, script: /jscripts\/ips_/ },
 		'iWeb':                  { cats: { 1: 20 }, meta: { 'generator': /iWeb/i } },
 		'Jalios':                { cats: { 1:  1 }, meta: { 'generator': /Jalios/i } },
-		'Javascript Infovis Toolkit': { cats: { 1: 25 }, script: /jit[^>]*\.js/i, env: '/^\$jit$/' },
+		'Javascript Infovis Toolkit': { cats: { 1: 25 }, script: /jit.*\.js/, env: '/^\$jit$/' },
 		'Joomla':                { cats: { 1:  1 }, meta: { 'generator': /Joomla/i }, html: /<!\-\- JoomlaWorks "K2"/i, headers: { 'X-Content-Encoded-By': /Joomla/ } },
-		'jqPlot':                { cats: { 1: 25 }, script: /jqplot[^>]*\.js/, env: '/^jQuery.jqplot$/' },
-		'jQuery UI':             { cats: { 1: 12 }, script: /jquery\-ui[^>]*\.js/ },
+		'jqPlot':                { cats: { 1: 25 }, script: /jqplot.*\.js/, env: '/^jQuery.jqplot$/' },
+		'jQuery UI':             { cats: { 1: 12 }, script: /jquery\-ui.*\.js/ },
 		'jQuery':                { cats: { 1: 12 }, script: /jquery.*.js/, env: /^jQuery$/ },
-		'jQuery Sparklines':     { cats: { 1: 25 }, script: /sparkline[^>]*\.js/i, env: '/^jQuery.fn.sparkline$/' },
-		'JS Charts':             { cats: { 1: 25 }, script: /jscharts[^>]*\.js/i, env: '/^JSChart$/' },
+		'jQuery Sparklines':     { cats: { 1: 25 }, script: /sparkline.*\.js/i, env: '/^jQuery.fn.sparkline$/' },
+		'JS Charts':             { cats: { 1: 25 }, script: /jscharts.*\.js/i, env: '/^JSChart$/' },
 		'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 }, script: /http:\/\/cf\.kampyle\.com\/k_button\.js/ },
+		'Kampyle':               { cats: { 1: 10 }, script: /cf\.kampyle\.com\/k_button\.js/ },
 		'Kentico CMS':           { cats: { 1:  1 }, meta: { 'generator': /Kentico CMS/i } },
 		'Koego':                 { cats: { 1: 10 }, script: /tracking\.koego\.com\/end\/ego\.js/ },
 		'Kolibri CMS':           { cats: { 1:  1 }, meta: { 'generator': /Kolibri/i } },
@@ -132,12 +132,12 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'Mint':                  { cats: { 1: 10 }, script: /mint\/\?js/ },
 		'Mixpanel':              { cats: { 1: 10 }, script: /api\.mixpanel\.com\/track/ },
 		'MochiKit':              { cats: { 1: 12 }, script: /MochiKit\.js/, env: /^MochiKit$/ },
-		'Modernizr':             { cats: { 1: 12 }, script: /modernizr[^>]*\.js/ },
+		'Modernizr':             { cats: { 1: 12 }, script: /modernizr.*\.js/ },
 		'MODx':                  { cats: { 1:  1 }, html: /(<a[^>]+>Powered by MODx<\/a>|var el= \$\('modxhost'\);|<script type=("|')text\/javascript("|')>var MODX_MEDIA_PATH = "media";)|<(link|script)[^>]+assets\/(templates|snippets)\//i },
 		'Mollom':                { cats: { 1: 16 }, script: /mollom\.js/, html: /<img[^>]+\/.mollom\/.com/i },
 		'Moodle':                { cats: { 1: 21 }, html: /(var moodleConfigFn = function\(me\)|<img[^>]+moodlelogo)/i },
 		'Moogo':                 { cats: { 1:  1 }, script: /kotisivukone.js/ },
-		'MooTools':              { cats: { 1: 12 }, script: /mootools[^>]*\.js/, env: /^MooTools$/ },
+		'MooTools':              { cats: { 1: 12 }, script: /mootools.*\.js/, env: /^MooTools$/ },
 		'Movable Type':          { cats: { 1:  1 }, meta: { '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 }, script: /pub\.mybloglog\.com/i },
@@ -166,11 +166,11 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'posterous':             { cats: { 1:  1, 2: 11 }, html: /<div class=("|')posterous/i },
 		'Prestashop':            { cats: { 1:  6 }, meta: { 'generator': /PrestaShop/i }, html: /Powered by <a href=("|')[^>]+PrestaShop/i },
 		'Prototype':             { cats: { 1: 12 }, script: /(prototype|protoaculous)\.js/, env: /^Prototype$/ },
-		'Protovis':              { cats: { 1: 25 }, script: /protovis[^>]*\.js/, env: /^protovis$/ },
+		'Protovis':              { cats: { 1: 25 }, script: /protovis.*\.js/, env: /^protovis$/ },
 		'punBB':                 { cats: { 1:  2 }, html: /Powered by <a href=("|')[^>]+punbb/i },
-		'Quantcast':             { cats: { 1: 10 }, script: /edge\.quantserve\.com\/quant\.js>/, env: /^quantserve$/ },
+		'Quantcast':             { cats: { 1: 10 }, script: /edge\.quantserve\.com\/quant\.js/, env: /^quantserve$/ },
 		'Quick.Cart':            { cats: { 1:  6 }, html: /<a href="[^>]+opensolution\.org\/">Powered by/i },
-		'Raphael':               { cats: { 1: 25 }, script: /raphael[^>]*\.js/, env: /^Raphael$/ },
+		'Raphael':               { cats: { 1: 25 }, script: /raphael.*\.js/, env: /^Raphael$/ },
 		'reCAPTCHA':             { cats: { 1: 16 }, script: /(api\-secure\.recaptcha\.net|recaptcha_ajax\.js)/, html: /<div[^>]+id=("|')recaptcha_image/ },
 		'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 }, meta: { 'description': /Redmine/i }, html: /Powered by <a href=("|')[^>]+Redmine/i },
@@ -192,12 +192,12 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'Squarespace':           { cats: { 1:  1 }, html: /Squarespace\.Constants\.CURRENT_MODULE_ID/i },
 		'Squiz Matrix':          { cats: { 1:  1 }, meta: { 'generator': /Squiz Matrix/ }, html: /  Running (MySource|Squiz) Matrix/i, 'X-Powered-By': /Squiz Matrix/ },
 		'StatCounter':           { cats: { 1: 10 }, script: /statcounter\.com\/counter\/counter/ },
-		'SWFObject':             { cats: { 1: 19 }, script: /swfobject[^"']*\.js/i },
+		'SWFObject':             { cats: { 1: 19 }, script: /swfobject.*\.js/i },
 		'swift.engine':          { cats: { 1:  1 }, headers: { 'X-Powered-By': /swift\.engine/ } },
 		'Swiftlet':              { cats: { 1:  1, 2: 18 }, meta: { 'generator': /Swiftlet/i }, html: /Powered by <a href=("|')[^>]+Swiftlet/i, headers: { 'X-Swiftlet-Cache': /.*/, 'X-Powered-By': /Swiftlet/ } },
 		'Textpattern CMS':       { cats: { 1:  1 }, meta: { 'generator': /Textpattern/i } },
-		'Timeline':              { cats: { 1: 25 }, script: /timeline[^>]*\.js/, env: '/^Timeline$/' },
-		'Timeplot':              { cats: { 1: 25 }, script: /timeplot[^>]*\.js/, env: '/^Timeplot$/' },
+		'Timeline':              { cats: { 1: 25 }, script: /timeline.*\.js/, env: '/^Timeline$/' },
+		'Timeplot':              { cats: { 1: 25 }, script: /timeplot.*\.js/, env: '/^Timeplot$/' },
 		'TomatoCart':            { cats: { 1:  6 }, meta: { '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': /.*/ } },
@@ -207,7 +207,7 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'TYPO3':                 { cats: { 1:  1 }, meta: { 'generator': /TYPO3/i }, html: /(<(script[^>]* src|link[^>]* href)=[^>]*fileadmin)/i, url: /\/typo3/i },
 		'Ubercart':              { cats: { 1:  6 }, script: /uc_cart\/uc_cart_block\.js/ },
 		'Umbraco':               { cats: { 1:  1 }, headers: { 'X-Umbraco-Version': /.+/ } },
-		'Underscore.js':         { cats: { 1: 12 }, script: /underscore[^>]*\.js/, env: /^_.VERSION$/ },
+		'Underscore.js':         { cats: { 1: 12 }, script: /underscore.*\.js/, env: /^_.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 }, meta: { 'generator': /vBulletin/i } },
@@ -238,7 +238,7 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'XOOPS':                 { cats: { 1:  1 }, meta: { 'generator': /XOOPS/i } },
 		'xtCommerce':            { cats: { 1:  6 }, meta: { 'generator': /xt:Commerce/ }, html: /<div class=("|')copyright("|')>.+<a[^>]+>xt:Commerce/i },
 		'YaBB':                  { cats: { 1:  2 }, html: /Powered by <a href=("|')[^>]+yabbforum/i },
-		'Yahoo! Web Analytics':  { cats: { 1: 10 }, script: /http:\/\/d\.yimg\.com\/mi\/ywa\.js/ },
+		'Yahoo! Web Analytics':  { cats: { 1: 10 }, script: /d\.yimg\.com\/mi\/ywa\.js/ },
 		'Yandex.Metrika':        { cats: { 1: 10 }, script: /mc\.yandex\.ru\/metrika\/watch\.js/ },
 		'YouTube':               { cats: { 1: 14 }, html: /<(param|embed)[^>]+youtube\.com\/v/i },
 		'YUI Doc':               { cats: { 1:  4 }, html: /<html[^>]* yuilibrary\.com\/rdf\/[0-9.]+\/yui\.rdf/i },