diff --git a/drivers/bookmarklet/js/wappalyzer.js b/drivers/bookmarklet/js/wappalyzer.js
index 5b9ff7918..8298ca544 100644
--- a/drivers/bookmarklet/js/wappalyzer.js
+++ b/drivers/bookmarklet/js/wappalyzer.js
@@ -66,20 +66,20 @@ var wappalyzer = (function() {
 			// Checks
 			if ( w.driver == null ) {
 				w.log('no driver, exiting');
-G
+
 				return;
 			}
 
 			// Initialize driver
 			driver('init', function() {
 				if ( w.config.firstRun ) {
-					driver('goToURL', { url: w.config.websiteURL + 'installed' });
+					driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
 
 					w.config.firstRun = false;
 				}
 
 				if ( w.config.upgraded ) {
-					driver('goToURL', { url: w.config.websiteURL + 'upgraded'  });
+					driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
 
 					w.config.upgraded = false;
 				}
diff --git a/drivers/chrome/js/driver.js b/drivers/chrome/js/driver.js
index d7611ee02..711ff4732 100644
--- a/drivers/chrome/js/driver.js
+++ b/drivers/chrome/js/driver.js
@@ -116,7 +116,9 @@
 		},
 
 		goToURL: function(args) {
-			window.open(args.url + '?utm_source=chrome&utm_medium=extension&utm_campaign=extensions');
+			var url = args.url + ( typeof args.medium === 'undefined' ? '' :  '?utm_source=chrome&utm_medium=' + args.medium + '&utm_campaign=extensions');
+
+			window.open(url);
 		},
 
 		/**
diff --git a/drivers/chrome/js/options.js b/drivers/chrome/js/options.js
index 36164c60b..212f21f3b 100644
--- a/drivers/chrome/js/options.js
+++ b/drivers/chrome/js/options.js
@@ -9,7 +9,7 @@ document.addEventListener('DOMContentLoaded', function() {
 
 			d.getElementById('github'    ).addEventListener('click', function() { window.open(wappalyzer.config.githubURL);  });
 			d.getElementById('twitter'   ).addEventListener('click', function() { window.open(wappalyzer.config.twitterURL); });
-			d.getElementById('wappalyzer').addEventListener('click', function() { window.open(wappalyzer.config.websiteURL + '?utm_source=chrome&utm_medium=extension&utm_campaign=extensions'); });
+			d.getElementById('wappalyzer').addEventListener('click', function() { window.open(wappalyzer.config.websiteURL + '?utm_source=chrome&utm_medium=options&utm_campaign=extensions'); });
 
 			d.getElementById('options-save').addEventListener('click', options.save);
 		},
diff --git a/drivers/chrome/js/popup.js b/drivers/chrome/js/popup.js
index 9f83e6cb0..a2c6441b4 100644
--- a/drivers/chrome/js/popup.js
+++ b/drivers/chrome/js/popup.js
@@ -10,7 +10,7 @@ document.addEventListener('DOMContentLoaded', function() {
 
 		init: function() {
 			d.getElementById('options').addEventListener('click', function() {
-				open(chrome.extension.getURL('options.html'));
+				window.open(chrome.extension.getURL('options.html'));
 			});
 
 			analyzeHeaders.innerHTML = chrome.i18n.getMessage('analyzeHeaders');
@@ -58,14 +58,14 @@ document.addEventListener('DOMContentLoaded', function() {
 						response.tabCache.appsDetected.map(function(appName) {
 							html =
 								'<div class="detected-app">' +
-									'<a target="_blank" href="http://wappalyzer.com/applications/' + appName.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, '') + '?utm_source=chrome&utm_medium=extension&utm_campaign=extensions">' +
+									'<a target="_blank" href="http://wappalyzer.com/applications/' + appName.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, '') + '?utm_source=chrome&utm_medium=popup&utm_campaign=extensions">' +
 										'<img src="images/icons/' + appName + '.png"/>' +
 										'<span class="label">' + appName + '</span>' +
 									'</a>';
 
 							response.apps[appName].cats.map(function(cat) {
 								html +=
-									'<a target="_blank" href="http://wappalyzer.com/categories/' + response.categories[cat] + '?utm_source=chrome&utm_medium=extension&utm_campaign=extensions">' +
+									'<a target="_blank" href="http://wappalyzer.com/categories/' + response.categories[cat] + '?utm_source=chrome&utm_medium=popup&utm_campaign=extensions">' +
 										'<span class="category">' + chrome.i18n.getMessage('categoryName' + cat) + '</span>' +
 									'</a>';
 							});
diff --git a/drivers/chrome/js/wappalyzer.js b/drivers/chrome/js/wappalyzer.js
index 5b9ff7918..8298ca544 100644
--- a/drivers/chrome/js/wappalyzer.js
+++ b/drivers/chrome/js/wappalyzer.js
@@ -66,20 +66,20 @@ var wappalyzer = (function() {
 			// Checks
 			if ( w.driver == null ) {
 				w.log('no driver, exiting');
-G
+
 				return;
 			}
 
 			// Initialize driver
 			driver('init', function() {
 				if ( w.config.firstRun ) {
-					driver('goToURL', { url: w.config.websiteURL + 'installed' });
+					driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
 
 					w.config.firstRun = false;
 				}
 
 				if ( w.config.upgraded ) {
-					driver('goToURL', { url: w.config.websiteURL + 'upgraded'  });
+					driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
 
 					w.config.upgraded = false;
 				}
diff --git a/drivers/chrome/manifest.json b/drivers/chrome/manifest.json
index a0e8e522c..493eef862 100644
--- a/drivers/chrome/manifest.json
+++ b/drivers/chrome/manifest.json
@@ -1,5 +1,5 @@
 { "name": "Wappalyzer",
-	"homepage_url": "http://wappalyzer.com?utm_source=chrome&utm_medium=extension&utm_campaign=extensions",
+	"homepage_url": "http://wappalyzer.com?utm_source=chrome&utm_medium=context&utm_campaign=extensions",
 	"description": "Identifies software on the web",
 	"version": "2.17",
 	"default_locale": "en",
diff --git a/drivers/firefox-jetpack/lib/wappalyzer.js b/drivers/firefox-jetpack/lib/wappalyzer.js
index 5b9ff7918..8298ca544 100644
--- a/drivers/firefox-jetpack/lib/wappalyzer.js
+++ b/drivers/firefox-jetpack/lib/wappalyzer.js
@@ -66,20 +66,20 @@ var wappalyzer = (function() {
 			// Checks
 			if ( w.driver == null ) {
 				w.log('no driver, exiting');
-G
+
 				return;
 			}
 
 			// Initialize driver
 			driver('init', function() {
 				if ( w.config.firstRun ) {
-					driver('goToURL', { url: w.config.websiteURL + 'installed' });
+					driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
 
 					w.config.firstRun = false;
 				}
 
 				if ( w.config.upgraded ) {
-					driver('goToURL', { url: w.config.websiteURL + 'upgraded'  });
+					driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
 
 					w.config.upgraded = false;
 				}
diff --git a/drivers/firefox/content/js/driver.js b/drivers/firefox/content/js/driver.js
index b729490f3..9dafab763 100644
--- a/drivers/firefox/content/js/driver.js
+++ b/drivers/firefox/content/js/driver.js
@@ -193,7 +193,7 @@
 							menuItem.setAttribute('name',  app);
 
 							menuItem.addEventListener('command', function() {
-								w.driver.goToURL({ url: w.config.websiteURL + 'applications/' + app.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, '') });
+								w.driver.goToURL({ url: w.config.websiteURL + 'applications/' + app.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, ''), medium: 'menu' });
 							});
 
 							menu.appendChild(menuSeparator);
@@ -210,7 +210,7 @@
 								menuItem.setAttribute('label', strings.getString('wappalyzer.cat' + cat));
 
 								menuItem.addEventListener('command', function() {
-									w.driver.goToURL({ url: w.config.websiteURL + 'categories/' + w.categories[cat] });
+									w.driver.goToURL({ url: w.config.websiteURL + 'categories/' + w.categories[cat], medium: 'menu' });
 								});
 
 								menu.appendChild(menuItem);
@@ -257,7 +257,9 @@
 		 * Go to URL
 		 */
 		goToURL: function(args) {
-			gBrowser.selectedTab = gBrowser.addTab(args.url + '?utm_source=firefox&utm_medium=extension&utm_campaign=extensions');
+			var url = args.url + ( typeof args.medium === 'undefined' ? '' :  '?utm_source=firefox&utm_medium=' + args.medium + '&utm_campaign=extensions');
+
+			gBrowser.selectedTab = gBrowser.addTab(url);
 		},
 
 		/**
@@ -333,19 +335,19 @@
 		};
 
 		d.getElementById(prefix + 'feedback').onclick = function() {
-			w.driver.goToURL({ url: w.config.websiteURL + 'contact' })
+			w.driver.goToURL({ url: w.config.websiteURL + 'contact', medium: 'menu' })
 		};
 
 		d.getElementById(prefix + 'website').onclick = function() {
-			w.driver.goToURL({ url: w.config.websiteURL })
+			w.driver.goToURL({ url: w.config.websiteURL, medium: 'menu' })
 		};
 
 		d.getElementById(prefix + 'github').onclick = function() {
-			w.driver.goToURL({ url: w.config.githubURL })
+			w.driver.goToURL({ url: w.config.githubURL, medium: 'menu' })
 		};
 
 		d.getElementById(prefix + 'twitter').onclick = function() {
-			w.driver.goToURL({ url: w.config.twitterURL })
+			w.driver.goToURL({ url: w.config.twitterURL, medium: 'menu' })
 		};
 	}
 
diff --git a/drivers/firefox/content/js/wappalyzer.js b/drivers/firefox/content/js/wappalyzer.js
index 5b9ff7918..8298ca544 100644
--- a/drivers/firefox/content/js/wappalyzer.js
+++ b/drivers/firefox/content/js/wappalyzer.js
@@ -66,20 +66,20 @@ var wappalyzer = (function() {
 			// Checks
 			if ( w.driver == null ) {
 				w.log('no driver, exiting');
-G
+
 				return;
 			}
 
 			// Initialize driver
 			driver('init', function() {
 				if ( w.config.firstRun ) {
-					driver('goToURL', { url: w.config.websiteURL + 'installed' });
+					driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
 
 					w.config.firstRun = false;
 				}
 
 				if ( w.config.upgraded ) {
-					driver('goToURL', { url: w.config.websiteURL + 'upgraded'  });
+					driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
 
 					w.config.upgraded = false;
 				}
diff --git a/drivers/firefox/install.rdf b/drivers/firefox/install.rdf
index 1cbba8a37..4d965fa75 100644
--- a/drivers/firefox/install.rdf
+++ b/drivers/firefox/install.rdf
@@ -3,7 +3,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>2.6.1</em:version>
+		<em:version>2.6.2</em:version>
 		<em:type>2</em:type>
 		<em:unpack>true</em:unpack>
 
@@ -21,8 +21,8 @@
 
 		<em:name>Wappalyzer</em:name>
 		<em:description>Identifies software on the web.</em:description>
-		<em:iconURL>chrome://wappalyzer/skin/images/icon128x128.png</em:iconURL>
-		<em:icon64URL>chrome://wappalyzer/skin/images/icon64x64.png</em:icon64URL>
+		<em:iconURL>chrome://wappalyzer/skin/images/icon32.png</em:iconURL>
+		<em:icon64URL>chrome://wappalyzer/skin/images/icon64.png</em:icon64URL>
 		<em:creator>Elbert Alias</em:creator>
 		<em:homepageURL>http://wappalyzer.com</em:homepageURL>
 	</Description>
diff --git a/drivers/firefox/skin/images/icon128x128.png b/drivers/firefox/skin/images/icon128x128.png
deleted file mode 100644
index a72b1c8af..000000000
Binary files a/drivers/firefox/skin/images/icon128x128.png and /dev/null differ
diff --git a/drivers/firefox/skin/images/icon64x64.png b/drivers/firefox/skin/images/icon64x64.png
deleted file mode 100644
index 58d6a0edc..000000000
Binary files a/drivers/firefox/skin/images/icon64x64.png and /dev/null differ
diff --git a/drivers/html/js/wappalyzer.js b/drivers/html/js/wappalyzer.js
index 5b9ff7918..8298ca544 100644
--- a/drivers/html/js/wappalyzer.js
+++ b/drivers/html/js/wappalyzer.js
@@ -66,20 +66,20 @@ var wappalyzer = (function() {
 			// Checks
 			if ( w.driver == null ) {
 				w.log('no driver, exiting');
-G
+
 				return;
 			}
 
 			// Initialize driver
 			driver('init', function() {
 				if ( w.config.firstRun ) {
-					driver('goToURL', { url: w.config.websiteURL + 'installed' });
+					driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
 
 					w.config.firstRun = false;
 				}
 
 				if ( w.config.upgraded ) {
-					driver('goToURL', { url: w.config.websiteURL + 'upgraded'  });
+					driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
 
 					w.config.upgraded = false;
 				}
diff --git a/drivers/php/js/wappalyzer.js b/drivers/php/js/wappalyzer.js
index 5b9ff7918..8298ca544 100644
--- a/drivers/php/js/wappalyzer.js
+++ b/drivers/php/js/wappalyzer.js
@@ -66,20 +66,20 @@ var wappalyzer = (function() {
 			// Checks
 			if ( w.driver == null ) {
 				w.log('no driver, exiting');
-G
+
 				return;
 			}
 
 			// Initialize driver
 			driver('init', function() {
 				if ( w.config.firstRun ) {
-					driver('goToURL', { url: w.config.websiteURL + 'installed' });
+					driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
 
 					w.config.firstRun = false;
 				}
 
 				if ( w.config.upgraded ) {
-					driver('goToURL', { url: w.config.websiteURL + 'upgraded'  });
+					driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
 
 					w.config.upgraded = false;
 				}
diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js
index 5b9ff7918..8298ca544 100644
--- a/share/js/wappalyzer.js
+++ b/share/js/wappalyzer.js
@@ -66,20 +66,20 @@ var wappalyzer = (function() {
 			// Checks
 			if ( w.driver == null ) {
 				w.log('no driver, exiting');
-G
+
 				return;
 			}
 
 			// Initialize driver
 			driver('init', function() {
 				if ( w.config.firstRun ) {
-					driver('goToURL', { url: w.config.websiteURL + 'installed' });
+					driver('goToURL', { url: w.config.websiteURL + 'installed', medium: 'install' });
 
 					w.config.firstRun = false;
 				}
 
 				if ( w.config.upgraded ) {
-					driver('goToURL', { url: w.config.websiteURL + 'upgraded'  });
+					driver('goToURL', { url: w.config.websiteURL + 'upgraded', medium: 'upgrade' });
 
 					w.config.upgraded = false;
 				}