diff --git a/drivers/firefox/content/js/content.js b/drivers/firefox/content/js/content.js
index 093298a81..57b315d01 100644
--- a/drivers/firefox/content/js/content.js
+++ b/drivers/firefox/content/js/content.js
@@ -4,13 +4,6 @@
 	function onLoad() {
 		if ( content.document.contentType != 'text/html' ) return;
 
-		// Environment variables
-		var env = new Array;
-
-		for ( i in content.wrappedJSObject ) {
-			if ( typeof i === "string" ) env.push(i);
-		}
-
 		// HTML
 		var html = content.document.documentElement.innerHTML
 
@@ -19,7 +12,7 @@
 		sendAsyncMessage('wappalyzer', {
 			hostname: content.location.hostname,
 			html:     html,
-			env:      env,
+			env:      Object.keys(content.wrappedJSObject),
 			url:      content.location.href
 			});
 	}
diff --git a/drivers/firefox/install.rdf b/drivers/firefox/install.rdf
index 7af1a0354..344c89014 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.0.5</em:version>
+		<em:version>2.0.7</em:version>
 		<em:type>2</em:type>
 		<em:unpack>true</em:unpack>
 
@@ -12,7 +12,7 @@
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>4.0</em:minVersion>
-				<em:maxVersion>9.*</em:maxVersion>
+				<em:maxVersion>12.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 
diff --git a/share/js/apps.js b/share/js/apps.js
index d05e92957..86643e58f 100644
--- a/share/js/apps.js
+++ b/share/js/apps.js
@@ -132,7 +132,7 @@
 		'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/, env: /^\$jit$/ },
-		'Jo':                    { cats: { 1: 26, 2: 12 }, script: /[^a-z]?jo(\.[^>]+)?\.js/i },
+		'Jo':                    { cats: { 1: 26, 2: 12 }, env: /^jo(Cache|DOM|Event)$/ },
 		'Joomla':                { cats: { 1:  1 }, meta: { 'generator': /Joomla/i }, html: /(<!\-\- JoomlaWorks "K2"|<[^>]+(feed|components)\/com_)/i, headers: { 'X-Content-Encoded-By': /Joomla/ }, env: /^(jcomments)$/i },
 		'jqPlot':                { cats: { 1: 25 }, script: /jqplot.*\.js/, env: /^jQuery.jqplot$/ },
 		'jQTouch':               { cats: { 1: 26 }, script: /jqtouch.*\.js/i, env:/^jQT$/ },
@@ -214,7 +214,7 @@
 		'Red Hat':               { cats: { 1: 28 }, headers: { 'Server': /Red Hat/i, 'X-Powered-By': /Red Hat/i } },
 		'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/, env: /^Recaptcha$/ },
-		'Reddit':                { cats: { 1:  2 }, html: /(<script[^>]+>var reddit = {|<a[^>]+Powered by Reddit|powered by <a[^>]+>reddit<)/i, url: /^(www.)?reddit\.com/ },
+		'Reddit':                { cats: { 1:  2 }, html: /(<script[^>]+>var reddit = {|<a[^>]+Powered by Reddit|powered by <a[^>]+>reddit<)/i, url: /^(www\.)?reddit\.com/, env: /^reddit$/ },
 		'Redmine':               { cats: { 1: 13 }, meta: { 'description': /Redmine/i }, html: /Powered by <a href=("|')[^>]+Redmine/i },
 		'Reinvigorate':          { cats: { 1: 10 }, html: /reinvigorate\.track\("/ },
 		'RequireJS':             { cats: { 1: 12 }, script: /require.*\.js/ , env: /^requirejs$/},
@@ -241,7 +241,7 @@
 		'StatCounter':           { cats: { 1: 10 }, script: /statcounter\.com\/counter\/counter/ },
 		'SWFObject':             { cats: { 1: 19 }, script: /swfobject.*\.js/i, env: /^SWFObject$/ },
 		'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/ } },
+		'Swiftlet':              { cats: { 1: 18 }, meta: { 'generator': /Swiftlet/i }, html: /Powered by <a href=("|')[^>]+Swiftlet/i, headers: { 'X-Swiftlet-Cache': /.*/, 'X-Powered-By': /Swiftlet/, 'X-Generator': /Swiftlet/ } },
 		'Textpattern CMS':       { cats: { 1:  1 }, meta: { 'generator': /Textpattern/i } },
 		'Timeplot':              { cats: { 1: 25 }, script: /timeplot.*\.js/, env: /^Timeplot$/ },
 		'TinyMCE':               { cats: { 1: 24 }, env: /^tinyMCE$/ },