diff --git a/drivers/bookmarklet/js/wappalyzer.js b/drivers/bookmarklet/js/wappalyzer.js
index 2b6db1236..92a829f4a 100644
--- a/drivers/bookmarklet/js/wappalyzer.js
+++ b/drivers/bookmarklet/js/wappalyzer.js
@@ -6,7 +6,7 @@
  * License: GPLv3 http://www.gnu.org/licenses/gpl-3.0.txt
  */
 
-var wappalyzer = wappalyzer || (function() {
+var wappalyzer = (function() {
 	//'use strict';
 
 	/**
@@ -317,3 +317,9 @@ var wappalyzer = wappalyzer || (function() {
 
 	return w;
 })();
+
+// CommonJS package
+// See http://wiki.commonjs.org/wiki/CommonJS
+if ( typeof exports === 'object' ) {
+	exports.wappalyzer = wappalyzer;
+}
diff --git a/drivers/chrome/js/wappalyzer.js b/drivers/chrome/js/wappalyzer.js
index 2b6db1236..92a829f4a 100644
--- a/drivers/chrome/js/wappalyzer.js
+++ b/drivers/chrome/js/wappalyzer.js
@@ -6,7 +6,7 @@
  * License: GPLv3 http://www.gnu.org/licenses/gpl-3.0.txt
  */
 
-var wappalyzer = wappalyzer || (function() {
+var wappalyzer = (function() {
 	//'use strict';
 
 	/**
@@ -317,3 +317,9 @@ var wappalyzer = wappalyzer || (function() {
 
 	return w;
 })();
+
+// CommonJS package
+// See http://wiki.commonjs.org/wiki/CommonJS
+if ( typeof exports === 'object' ) {
+	exports.wappalyzer = wappalyzer;
+}
diff --git a/drivers/chrome/manifest.json b/drivers/chrome/manifest.json
index 1385c724d..939f68dde 100644
--- a/drivers/chrome/manifest.json
+++ b/drivers/chrome/manifest.json
@@ -1,7 +1,7 @@
 { "name": "Wappalyzer",
 	"homepage_url": "http://wappalyzer.com?utm_source=chrome&utm_medium=extension&utm_campaign=extensions",
 	"description": "Identifies software on the web",
-	"version": "2.13",
+	"version": "2.14",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
diff --git a/drivers/firefox-jetpack/lib/driver.js b/drivers/firefox-jetpack/lib/driver.js
index e8b867036..02acb325a 100644
--- a/drivers/firefox-jetpack/lib/driver.js
+++ b/drivers/firefox-jetpack/lib/driver.js
@@ -3,10 +3,14 @@
  */
 
 (function() {
-	//'use strict';
+	'use strict';
+
 	var
-		main = require('wappalyzer'),
-		w    = main.wappalyzer
+		{ Cc, Ci } = require('chrome'),
+		tabs       = require('tabs'),
+		self       = require('self'),
+		main       = require('wappalyzer'),
+		w          = main.wappalyzer
 		;
 
 	w.driver = {
diff --git a/drivers/firefox-jetpack/lib/wappalyzer.js b/drivers/firefox-jetpack/lib/wappalyzer.js
index 2b6db1236..92a829f4a 100644
--- a/drivers/firefox-jetpack/lib/wappalyzer.js
+++ b/drivers/firefox-jetpack/lib/wappalyzer.js
@@ -6,7 +6,7 @@
  * License: GPLv3 http://www.gnu.org/licenses/gpl-3.0.txt
  */
 
-var wappalyzer = wappalyzer || (function() {
+var wappalyzer = (function() {
 	//'use strict';
 
 	/**
@@ -317,3 +317,9 @@ var wappalyzer = wappalyzer || (function() {
 
 	return w;
 })();
+
+// CommonJS package
+// See http://wiki.commonjs.org/wiki/CommonJS
+if ( typeof exports === 'object' ) {
+	exports.wappalyzer = wappalyzer;
+}
diff --git a/drivers/firefox/content/js/wappalyzer.js b/drivers/firefox/content/js/wappalyzer.js
index 2b6db1236..92a829f4a 100644
--- a/drivers/firefox/content/js/wappalyzer.js
+++ b/drivers/firefox/content/js/wappalyzer.js
@@ -6,7 +6,7 @@
  * License: GPLv3 http://www.gnu.org/licenses/gpl-3.0.txt
  */
 
-var wappalyzer = wappalyzer || (function() {
+var wappalyzer = (function() {
 	//'use strict';
 
 	/**
@@ -317,3 +317,9 @@ var wappalyzer = wappalyzer || (function() {
 
 	return w;
 })();
+
+// CommonJS package
+// See http://wiki.commonjs.org/wiki/CommonJS
+if ( typeof exports === 'object' ) {
+	exports.wappalyzer = wappalyzer;
+}
diff --git a/drivers/firefox/install.rdf b/drivers/firefox/install.rdf
index ae53c3f58..d55b87760 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.4.3</em:version>
+		<em:version>2.5.0</em:version>
 		<em:type>2</em:type>
 		<em:unpack>true</em:unpack>
 
diff --git a/drivers/html/js/wappalyzer.js b/drivers/html/js/wappalyzer.js
index 2b6db1236..92a829f4a 100644
--- a/drivers/html/js/wappalyzer.js
+++ b/drivers/html/js/wappalyzer.js
@@ -6,7 +6,7 @@
  * License: GPLv3 http://www.gnu.org/licenses/gpl-3.0.txt
  */
 
-var wappalyzer = wappalyzer || (function() {
+var wappalyzer = (function() {
 	//'use strict';
 
 	/**
@@ -317,3 +317,9 @@ var wappalyzer = wappalyzer || (function() {
 
 	return w;
 })();
+
+// CommonJS package
+// See http://wiki.commonjs.org/wiki/CommonJS
+if ( typeof exports === 'object' ) {
+	exports.wappalyzer = wappalyzer;
+}
diff --git a/drivers/php/js/wappalyzer.js b/drivers/php/js/wappalyzer.js
index 2b6db1236..92a829f4a 100644
--- a/drivers/php/js/wappalyzer.js
+++ b/drivers/php/js/wappalyzer.js
@@ -6,7 +6,7 @@
  * License: GPLv3 http://www.gnu.org/licenses/gpl-3.0.txt
  */
 
-var wappalyzer = wappalyzer || (function() {
+var wappalyzer = (function() {
 	//'use strict';
 
 	/**
@@ -317,3 +317,9 @@ var wappalyzer = wappalyzer || (function() {
 
 	return w;
 })();
+
+// CommonJS package
+// See http://wiki.commonjs.org/wiki/CommonJS
+if ( typeof exports === 'object' ) {
+	exports.wappalyzer = wappalyzer;
+}
diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js
index 2b6db1236..92a829f4a 100644
--- a/share/js/wappalyzer.js
+++ b/share/js/wappalyzer.js
@@ -6,7 +6,7 @@
  * License: GPLv3 http://www.gnu.org/licenses/gpl-3.0.txt
  */
 
-var wappalyzer = wappalyzer || (function() {
+var wappalyzer = (function() {
 	//'use strict';
 
 	/**
@@ -317,3 +317,9 @@ var wappalyzer = wappalyzer || (function() {
 
 	return w;
 })();
+
+// CommonJS package
+// See http://wiki.commonjs.org/wiki/CommonJS
+if ( typeof exports === 'object' ) {
+	exports.wappalyzer = wappalyzer;
+}