diff --git a/chrome/content/apps.js b/chrome/content/apps.js
index 358bff396..3fee8f32d 100644
--- a/chrome/content/apps.js
+++ b/chrome/content/apps.js
@@ -50,7 +50,7 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'chartbeat':             { cats: { 1: 10 }, html: /function loadChartbeat\(\) {/i },
 		'Chamilo':               { cats: { 1: 21 }, html: /<meta name=("|')generator("|') [^>]+Chamilo/i, headers: { 'X-Powered-By': /Chamilo/ } },
 		'Cherokee':              { cats: { 1: 22 }, headers: { 'Server': /Cherokee/i } },
-		'ClickHeat':             { cats: { 1: 10 }, html: /<script[^>]*src=[^>]+clickheat[^>]*\.js/i, env: '/^clickHeatBrowser$/' }, 
+		'ClickHeat':             { cats: { 1: 10 }, html: /<script[^>]*src=[^>]+clickheat[^>]*\.js/i, env: '/^clickHeatBrowser$/' },
 		'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 },
@@ -144,7 +144,7 @@ if ( typeof wappalyzer != 'undefined' ) {
 		'Mynetcap':              { cats: { 1:  1 }, html: /<meta name=("|')generator("|') [^>]+Mynetcap/i },
 		'Nedstat':               { cats: { 1: 10 }, html: /sitestat\(("|')http:\/\/nl\.sitestat\.com/ },
 		'Nginx':                 { cats: { 1: 22 }, headers: { 'Server': /nginx/i } },
-		'NOIX':                  { cats: { 1: 19 }, html: /(src|href)=\"(\/media\/noix|\/media\/skeleton|\/components\/com_util).*"|\<\!\-\- NOIX.*/i },
+		'NOIX':                  { cats: { 1: 19 }, html: /<[^>]+(src|href)=[^>]*(\/media\/noix)|<!\-\- NOIX/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 },