diff --git a/drivers/chrome/js/driver.js b/drivers/chrome/js/driver.js
index fe4b3d023..c9490deb5 100644
--- a/drivers/chrome/js/driver.js
+++ b/drivers/chrome/js/driver.js
@@ -18,7 +18,7 @@
 		/**
 		 * Initialize
 		 */
-		init: function(callback) {
+		init: function() {
 			w.log('init');
 
 			chrome.browserAction.setBadgeBackgroundColor({ color: [255, 102, 0, 255] });
@@ -44,14 +44,14 @@
 				var version = chrome.app.getDetails().version;
 
 				if ( localStorage['version'] == null ) {
-					w.config.firstRun = true;
+					firstRun = true;
 
 					// Set defaults
 					for ( option in defaults ) {
 						localStorage[option] = defaults[option];
 					}
 				} else if ( version !== localStorage['version'] && localStorage['upgradeMessage'] ) {
-					w.config.upgraded = true;
+					upgraded = true;
 				}
 
 				localStorage['version'] = version;
@@ -112,7 +112,14 @@
 				tabCache[tabId] = null;
 			});
 
-			callback();
+			if ( firstRun ) {
+				driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
+					firstRun = false;
+				}
+			if ( upgraded ) {
+				driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
+				upgraded = false;
+			}
 		},
 
 		goToURL: function(args) {
diff --git a/drivers/firefox/content/js/driver.js b/drivers/firefox/content/js/driver.js
index 19ea3c3b6..f6e910b4b 100644
--- a/drivers/firefox/content/js/driver.js
+++ b/drivers/firefox/content/js/driver.js
@@ -7,7 +7,10 @@
 
 	if ( wappalyzer == null ) return;
 
-	var w = wappalyzer, prefs, strings;
+	var w = wappalyzer,
+		firstRun = false,
+		upgraded = false,
+		prefs, strings;
 
 	const
 		d  = document,
@@ -30,7 +33,7 @@
 		/**
 		 * Initialize
 		 */
-		init: function(callback) {
+		init: function() {
 			var handler = function() {
 				window.removeEventListener('load', handler, false);
 
@@ -68,9 +71,9 @@
 					addon.version = addon.version;
 
 					if ( !prefs.getCharPref('version') ) {
-						w.config.firstRun = true;
+						firstRun = true;
 					} else if ( prefs.getCharPref('version') != addon.version ) {
-						w.config.upgraded = true;
+						upgraded = true;
 					}
 
 					prefs.setCharPref('version', addon.version);
@@ -109,7 +112,17 @@
 
 					gBrowser.tabContainer.addEventListener('TabSelect', w.driver.displayApps, false);
 
-					callback();
+					if ( firstRun ) {
+						driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
+
+						firstRun = false;
+					}
+
+					if ( upgraded ) {
+						driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
+
+						upgraded = false;
+					}
 				});
 			};
 
diff --git a/share/apps.json b/share/apps.json
index 2f81cf511..9a0da89ea 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -42,7 +42,7 @@
 			"website": "www.1c-bitrix.ru",
 			"cats": [ 1 ],
 			"headers": { "X-Powered-CMS": "Bitrix Site Manager", "Set-Cookie": "BITRIX_" },
-			"html": "<link[^>]+components\/bitrix|(src|href)=\"\/bitrix\/(js|templates)",
+			"html": "(<link[^>]+components\/bitrix|(src|href)=\"\/bitrix\/(js|templates))",
 			"script": "1c-bitrix",
 			"implies": "PHP"
 		},
@@ -75,6 +75,15 @@
 			"script": "addthis\\.com\/js\/(\\d+)?\\;version:\\1",
 			"env": "^addthis"
 		},
+		"Adobe ColdFusion": {
+			"website": "adobe.com\/products\/coldfusion-family.html",
+			"cats": [ 18 ],
+			"url": "\\.cfm$",
+			"html": "<!-- START headerTags\\.cfm",
+			"script": "\/cfajax\/",
+			"env": "^_cfEmails$",
+			"implies": "CFML"
+		},
 		"Adobe CQ5": {
 			"website": "adobe.com\/products\/cq.html",
 			"cats": [ 1 ],
@@ -219,7 +228,7 @@
 			"website": "bigace.de",
 			"cats": [ 1 ],
 			"meta": { "generator": "BIGACE ([\\d.]+)\\;version:\\1" },
-			"html": "Powered by <a href=\"[^>]+BIGACE|<!--\\s+Site is running BIGACE",
+			"html": "(Powered by <a href=\"[^>]+BIGACE|<!--\\s+Site is running BIGACE)",
 			"implies": "PHP"
 		},
 		"Bigcommerce": {
@@ -239,9 +248,9 @@
 		"Bigware": {
 			"website": "bigware.de",
 			"cats": [ 6 ],
-			"html": "Diese <a href=.+bigware\\.de|<a href=[^>]+\/main_bigware_\\d+\\.php",
+			"html": "(Diese <a href=.+bigware\\.de|<a href=[^>]+\/main_bigware_\\d+\\.php)",
 			"url": "(\\?|&)bigWAdminID=[a-z\\d]+(&|$)",
-			"headers": { "Set-Cookie": "bigwareCsid|bigWAdminID" },
+			"headers": { "Set-Cookie": "(bigwareCsid|bigWAdminID)" },
 			"implies": "PHP"
 		},
 		"BittAds": {
@@ -496,15 +505,6 @@
 			"html": "&nbsp;Powered by (<a href=[^>]+cs-cart\\.com|CS-Cart)",
 			"implies": "PHP"
 		},
-		"Adobe ColdFusion": {
-			"website": "adobe.com\/products\/coldfusion-family.html",
-			"cats": [ 18 ],
-			"url": "\\.cfm$",
-			"html": "<!-- START headerTags\\.cfm",
-			"script": "\/cfajax\/",
-			"env": "^_cfEmails$",
-			"implies": "CFML"
-		},
 		"CubeCart": {
 			"website": "www.cubecart.com",
 			"cats": [ 6 ],
@@ -556,8 +556,7 @@
 		"Debian": {
 			"website": "debian.org",
 			"cats": [ 28 ],
-			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|(sarge|etch|lenny|queeze|wheezy|jessie))\\;version:\\2"
-			}
+			"headers": { "Server": "Debian", "X-Powered-By": "(Debian|dotdeb|(sarge|etch|lenny|queeze|wheezy|jessie))\\;version:\\2" }
 		},
 		"DedeCMS": {
 			"website": "dedecms.com",
@@ -616,7 +615,7 @@
 			"website": "dokeos.com",
 			"cats": [ 21 ],
 			"meta": { "generator": "Dokeos" },
-			"html": "Portal <a[^>]+>Dokeos|@import \"[^\"]+dokeos_blue",
+			"html": "(Portal <a[^>]+>Dokeos|@import \"[^\"]+dokeos_blue)",
 			"headers": { "X-Powered-By": "Dokeos" },
 			"implies": [ "PHP", "Xajax", "jQuery", "CKEditor" ]
 		},
@@ -631,8 +630,7 @@
 			"website": "dotnetnuke.com",
 			"cats": [ 1 ],
 			"meta": { "generator": "DotNetNuke" },
-			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=.+"
-			},
+			"headers": { "X-Compressed-By": "DotNetNuke", "Set-Cookie": "DotNetNukeAnonymous=.+" },
 			"html": "<!-- by DotNetNuke Corporation",
 			"env": "^DotNetNuke$",
 			"implies": "Microsoft ASP.NET"
@@ -640,7 +638,7 @@
 		"Doxygen": {
 			"website": "stack.nl\/~dimitri\/doxygen",
 			"cats": [ 4 ],
-			"html": "(<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\1"
+			"html": "(<!-- Generated by Doxygen ([\\d.]+)|<link[^>]+doxygen.css)\\;version:\\2"
 		},
 		"DreamWeaver": {
 			"website": "www.adobe.com\/products\/dreamweaver",
@@ -659,7 +657,7 @@
 		"Drupal Commerce": {
 			"website": "drupalcommerce.org",
 			"cats": [ 6 ],
-			"html": "id=\"block[_-]commerce[_-]cart[_-]cart|class=\"commerce[_-]product[_-]field",
+			"html": "(id=\"block[_-]commerce[_-]cart[_-]cart|class=\"commerce[_-]product[_-]field)",
 			"implies": "Drupal"
 		},
 		"Dynamicweb": {
@@ -761,7 +759,7 @@
 			"cats": [ 29 ],
 			"html": "<!-- Factfinder",
 			"script": "Suggest\\.ff",
-			"url": "\/ViewParametricSearch|ffsuggest\\.[a-z]htm"
+			"url": "(\/ViewParametricSearch|ffsuggest\\.[a-z]htm)"
 		},
 		"FAST ESP": {
 			"website": "microsoft.com\/enterprisesearch",
@@ -785,8 +783,7 @@
 			"cats": [ 1 ],
 			"meta": { "generator": "FlexCMP" },
 			"html": "<!--[^>]+FlexCMP[^>v]+v\\. ([\\d.]+)\\;version:\\1",
-			"headers": { "X-Powered-By": "FlexCMP.+\\[v\\. ([\\d.]+)\\;version:\\1", "X-Flex-Lang": ".+"
-			}
+			"headers": { "X-Powered-By": "FlexCMP.+\\[v\\. ([\\d.]+)\\;version:\\1", "X-Flex-Lang": ".+" }
 		},
 		"FluxBB": {
 			"website": "fluxbb.org",
@@ -825,7 +822,7 @@
 		"Gambio": {
 			"website": "gambio.de",
 			"cats": [ 6 ],
-			"html": "<link[^>]* href=\"templates\/gambio\/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->",
+			"html": "(<link[^>]* href=\"templates\/gambio\/|<a[^>]content\\.php\\?coID=\\d|<!-- gambio eof -->)",
 			"implies": "PHP"
 		},
 		"Gauges": {
@@ -1014,8 +1011,7 @@
 			"cats": [ 1 ],
 			"script": "include\/linkexternal\\.js",
 			"meta": { "generator": "ImpressCMS" },
-			"headers": { "X-Powered-By": "ImpressCMS", "Set-Cookie": "ICMSession[^;]+="
-			},
+			"headers": { "X-Powered-By": "ImpressCMS", "Set-Cookie": "ICMSession[^;]+=" },
 			"implies": "PHP"
 		},
 		"ImpressPages": {
@@ -1045,7 +1041,7 @@
 		"Intershop": {
 			"website": "intershop.com",
 			"cats": [ 6 ],
-			"script": "is-bin|INTERSHOP"
+			"script": "(is-bin|INTERSHOP)"
 		},
 		"IPB": {
 			"website": "www.invisionpower.com",
@@ -1221,8 +1217,7 @@
 		"Kohana": {
 			"website": "kohanaframework.org",
 			"cats": [ 18 ],
-			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana Framework ([\\d.]+)\\;version:\\1"
-			},
+			"headers": { "Set-Cookie": "kohanasession", "X-Powered-By": "Kohana Framework ([\\d.]+)\\;version:\\1" },
 			"implies": "PHP"
 		},
 		"Kolibri CMS": {
@@ -1274,7 +1269,7 @@
 			"headers": { "Server": "lighttpd(\/([\\d.]+))?\\;version:\\2" }
 		},
 		"LimeSurvey": {
-			"website": "limesurvey.org/",
+			"website": "limesurvey.org\/",
 			"cats": [ 19 ],
 			"headers": { "generator": "LimeSurvey" }
 		},
@@ -1361,8 +1356,7 @@
 			"cats": [ 18 ],
 			"url": "\\.aspx$",
 			"html": "<input[^>]+name=\"__VIEWSTATE",
-			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1"
-			},
+			"headers": { "X-Powered-By": "ASP\\.NET;\\confidence:50", "X-AspNet-Version": "(.+)\\;version:\\1" },
 			"implies": [ "IIS", "Windows Server" ]
 		},
 		"Microsoft SharePoint": {
@@ -1404,10 +1398,9 @@
 		"MODx": {
 			"website": "modxcms.com",
 			"cats": [ 1 ],
-			"html": "<a[^>]+>Powered by MODx<\/a>|<(link|script)[^>]+assets\/snippets\/",
+			"html": "(<a[^>]+>Powered by MODx<\/a>|<(link|script)[^>]+assets\/snippets\/)",
 			"env": "^MODX_MEDIA_PATH$",
-			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}"
-			},
+			"headers": { "X-Powered-By": "^MODx", "Set-Cookie": "SN4[a-f\\d]{12}" },
 			"implies": "PHP"
 		},
 		"mod_fastcgi": {
@@ -1425,15 +1418,13 @@
 		"mod_rack": {
 			"website": "phusionpassenger.com",
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rack(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(\/([\\d.]+))?\\;version:\\2"
-			},
+			"headers": { "Server": "mod_rack(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rack(\/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_rails": {
 			"website": "phusionpassenger.com",
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_rails(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(\/([\\d.]+))?\\;version:\\2"
-			},
+			"headers": { "Server": "mod_rails(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_rails(\/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Ruby on Rails\\;confidence:50", "Apache" ]
 		},
 		"mod_ssl": {
@@ -1445,8 +1436,7 @@
 		"mod_wsgi": {
 			"website": "code.google.com\/p\/modwsgi",
 			"cats": [ 33 ],
-			"headers": { "Server": "mod_wsgi(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(\/([\\d.]+))?\\;version:\\2"
-			},
+			"headers": { "Server": "mod_wsgi(\/([\\d.]+))?\\;version:\\2", "X-Powered-By": "mod_wsgi(\/([\\d.]+))?\\;version:\\2" },
 			"implies": [ "Python\\;confidence:50", "Apache" ]
 		},
 		"MoinMoin": {
@@ -1515,7 +1505,7 @@
 		"MyBB": {
 			"website": "www.mybboard.net",
 			"cats": [ 2 ],
-			"html": "<script [^>]+\\s+<!--\\s+lang\\.no_new_posts|<a[^>]* title=\"Powered By MyBB",
+			"html": "(<script [^>]+\\s+<!--\\s+lang\\.no_new_posts|<a[^>]* title=\"Powered By MyBB)",
 			"env": "^MyBB$"
 		},
 		"MyBlogLog": {
@@ -1546,7 +1536,7 @@
 		"New Relic": {
 			"website": "newrelic.com",
 			"cats": [ 10 ],
-			"html": "<script[^>]+>(var NREUMQ=NREUMQ|if \\(!NREUMQ\\.f)",
+			"html": "(<script[^>]+>(var NREUMQ=NREUMQ|if \\(!NREUMQ\\.f))",
 			"env": "^NREUM"
 		},
 		"Nginx": {
@@ -1565,7 +1555,7 @@
 		"NOIX": {
 			"website": "www.noix.com.br\/tecnologias\/joomla",
 			"cats": [ 19 ],
-			"html": "<[^>]+(src|href)=[^>]*(\/media\/noix)|<!-- NOIX"
+			"html": "(<[^>]+(src|href)=[^>]*(\/media\/noix)|<!-- NOIX)"
 		},
 		"nopCommerce": {
 			"website": "www.nopcommerce.com",
@@ -1586,7 +1576,7 @@
 		"OpenCart": {
 			"website": "www.opencart.com",
 			"cats": [ 6 ],
-			"html": "index\\.php\\?route=[a-z]+\/|Powered By <a href=\"[^>]+OpenCart",
+			"html": "(index\\.php\\?route=[a-z]+\/|Powered By <a href=\"[^>]+OpenCart)",
 			"implies": "PHP"
 		},
 		"openEngine": {
@@ -1923,7 +1913,7 @@
 			"env": "^requirejs$"
 		},
 		"Reveal.js": {
-			"website": "lab.hakim.se/reveal-js",
+			"website": "lab.hakim.se\/reveal-js",
 			"cats": [ 12 ],
 			"script": "reveal(\\.min)?\\.js",
 			"env": "^Reveal$"
@@ -1962,8 +1952,7 @@
 		"s9y": {
 			"website": "s9y.org",
 			"cats": [ 1 ],
-			"meta": { "generator": "Serendipity", "Powered-By": "Serendipity"
-			}
+			"meta": { "generator": "Serendipity", "Powered-By": "Serendipity v\\.(.+)\\;version:\\1" }
 		},
 		"SAP": {
 			"website": "sap.com",
@@ -2087,7 +2076,7 @@
 			"implies": "Joomla"
 		},
 		"SobiPro": {
-			"website": "sigsiu.net/sobipro.html",
+			"website": "sigsiu.net\/sobipro.html",
 			"cats": [ 19 ],
 			"env": "^SobiProUrl$",
 			"html": " <(script|link)[^>].*com_sobipro.*>",
@@ -2296,8 +2285,7 @@
 		"Ubuntu": {
 			"website": "ubuntu.com\/business\/server\/overview",
 			"cats": [ 28 ],
-			"headers": { "Server": "Ubuntu", "X-Powered-By": "Ubuntu"
-			}
+			"headers": { "Server": "Ubuntu", "X-Powered-By": "Ubuntu" }
 		},
 		"Umbraco": {
 			"website": "umbraco.com",
@@ -2367,7 +2355,7 @@
 		"Vimeo": {
 			"website": "vimeo.com",
 			"cats": [ 14 ],
-			"html": "<(param|embed)[^>]+vimeo\\.com\/moogaloop|<iframe[^>]player\\.vimeo\\.com"
+			"html": "(<(param|embed)[^>]+vimeo\\.com\/moogaloop|<iframe[^>]player\\.vimeo\\.com)"
 		},
 		"VirtueMart": {
 			"website": "virtuemart.net",
@@ -2411,6 +2399,7 @@
 			"website": "www.w3-edge.com\/wordpress-plugins\/w3-total-cache",
 			"cats": [ 23 ],
 			"html": "<!--[^>]+W3 Total Cache",
+			"headers": { "X-Powered-By": "W3 Total Cache(\/([\\d.]+))?\\;version:\\2" },
 			"implies": "WordPress"
 		},
 		"Web Optimizer": {
@@ -2421,8 +2410,7 @@
 		"webEdition": {
 			"website": "webedition.de\/en",
 			"cats": [ 1 ],
-			"meta": { "generator": "webEdition", "DC.title": "webEdition"
-			}
+			"meta": { "generator": "webEdition", "DC.title": "webEdition" }
 		},
 		"WebGUI": {
 			"website": "www.webgui.org",
@@ -2487,8 +2475,7 @@
 			"website": "wix.com",
 			"cats": [ 1 ],
 			"script": "static\\.wix\\.com",
-			"headers": { "X-Wix-Dispatcher-Cache-Hit": ".+", "Set-Cookie": "Domain=\\.wix\\.com"
-			},
+			"headers": { "X-Wix-Dispatcher-Cache-Hit": ".+", "Set-Cookie": "Domain=\\.wix\\.com" },
 			"env": "^wix(Events|Data|Errors)"
 		},
 		"Wolf CMS": {
@@ -2528,7 +2515,7 @@
 		"XenForo": {
 			"website": "xenforo.com",
 			"cats": [ 2 ],
-			"html": "jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding"
+			"html": "(jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding)"
 		},
 		"AT Internet Analyzer": {
 			"website": "atinternet.com\/en",
@@ -2601,7 +2588,7 @@
 		"YUI": {
 			"website": "yuilibrary.com",
 			"cats": [ 12 ],
-			"script": "\/yui\/|yui\\.yahooapis\\.com",
+			"script": "(\/yui\/|yui\\.yahooapis\\.com)",
 			"env": "^YAHOO$"
 		},
 		"Zen Cart": {
diff --git a/share/images/icons/chartbeat.png b/share/images/icons/Chartbeat.png
similarity index 100%
rename from share/images/icons/chartbeat.png
rename to share/images/icons/Chartbeat.png
diff --git a/share/images/icons/cufon.png b/share/images/icons/Cufon.png
similarity index 100%
rename from share/images/icons/cufon.png
rename to share/images/icons/Cufon.png
diff --git a/share/images/icons/Ecodoo.png b/share/images/icons/Ecodoo.png
deleted file mode 100644
index 0a25dd711..000000000
Binary files a/share/images/icons/Ecodoo.png and /dev/null differ
diff --git a/share/images/icons/Posterous.png b/share/images/icons/Posterous.png
new file mode 100644
index 000000000..3150f4f93
Binary files /dev/null and b/share/images/icons/Posterous.png differ
diff --git a/share/images/icons/Sap.png b/share/images/icons/SAP.png
similarity index 100%
rename from share/images/icons/Sap.png
rename to share/images/icons/SAP.png
diff --git a/share/images/icons/wink.png b/share/images/icons/Wink.png
similarity index 100%
rename from share/images/icons/wink.png
rename to share/images/icons/Wink.png
diff --git a/share/images/icons/xajax.png b/share/images/icons/Xajax.png
similarity index 100%
rename from share/images/icons/xajax.png
rename to share/images/icons/Xajax.png
diff --git a/share/images/icons/posterous.png b/share/images/icons/posterous.png
deleted file mode 100644
index 3730d31aa..000000000
Binary files a/share/images/icons/posterous.png and /dev/null differ
diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js
index 6257ac81e..7a4913cee 100644
--- a/share/js/wappalyzer.js
+++ b/share/js/wappalyzer.js
@@ -172,15 +172,9 @@ var wappalyzer = (function() {
 
 		config: {
 			environment: 'dev', // dev | live
-
-			version: false,
-
 			websiteURL: 'http://wappalyzer.com/',
 			twitterURL: 'https://twitter.com/Wappalyzer',
 			githubURL:  'https://github.com/ElbertF/Wappalyzer',
-
-			firstRun: false,
-			upgraded: false
 		},
 
 		/**
@@ -214,19 +208,7 @@ var wappalyzer = (function() {
 			}
 
 			// Initialize driver
-			driver('init', function() {
-				if ( w.config.firstRun ) {
-					driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
-
-					w.config.firstRun = false;
-				}
-
-				if ( w.config.upgraded ) {
-					driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
-
-					w.config.upgraded = false;
-				}
-			});
+			driver('init');
 		},
 
 		/**