diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js
index 4646fc80c..4397e2d49 100644
--- a/chrome/content/overlay.js
+++ b/chrome/content/overlay.js
@@ -70,7 +70,7 @@ wappalyzer =
 		'Tumblr':                { html: /<iframe src=("|')http:\/\/www\.tumblr\.com/i, url: /^(www.)?.+\.tumblr\.com/i, headers: { 'X-Tumblr-Usec': /.*/ } },
 		'Google Friend Connect': { html: /<script[^>]* src=("|')[^>]*google.com\/friendconnect/i },
 		'MyBlogLog':             { html: /<script[^>]* src=("|')[^>]*pub\.mybloglog\.com/i },
-		'Google Maps':           { html: /<script[^>]* src=("|')[^>]*maps\.google\.com\/maps\?file=api/i },
+		'Google Maps':           { html: /(<script[^>]* src=("|')[^>]*maps\.google\.com\/maps\?file=api|maps\.google\.com\/maps\/api\/staticmap)/i },
 		'AWStats':               { html: /<meta name=("|')generator("|') [^>]+AWStats/i },
 		'phpMyAdmin':            { html: /(var pma_absolute_uri = '|PMA_sendHeaderLocation\(|<title>phpMyAdmin<\/title>)/i },
 		'phpDocumentor':         { html: /<!-- Generated by phpDocumentor/ },
@@ -87,7 +87,7 @@ wappalyzer =
 		'xtCommerce':            { html: /(<meta name=("|')generator("|') [^>]+xt:Commerce|<div class=("|')copyright("|')>.+<a[^>]+>xt:Commerce)/i },
 		'BIGACE':                { html: /(<meta name=("|')generator("|') [^>]+BIGACE|Powered by <a href=("|')[^>]+BIGACE|<!--\s+Site is running BIGACE)/i },
 		'Ubercart':              { html: /<script[^>]* src=("|')[^>]*uc_cart\/uc_cart_block\.js/i },
-		'TYPOlight':             { html: /(<!--\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)/i },
+		'Contao':                { html: /(<!--\s+This website is powered by (TYPOlight|Contao)|<link[^>]+(typolight|contao).css)/i },
 		'posterous':             { html: /<div class=("|')posterous/i },
 		'papaya CMS':            { html: /<link[^>]*\/papaya-themes\//i },
 		'eZ Publish':            { html: /<meta name=("|')generator("|') [^>]+eZ Publish/i },
@@ -170,7 +170,15 @@ wappalyzer =
 		'comScore':              { html: /<iframe[^>]* (id=("|')comscore("|')|scr=[^>]+comscore)/ },
 		'Google Font API':       { html: /<link[^>]* href=("|')http:\/\/fonts\.googleapis\.com/ },
 		'CO2Stats':              { html: /src=("|')http:\/\/www\.co2stats\.com\/propres\.php/ },
-		'Woopra':                { html: /<script[^>]* src=("|')[^>]*static\.woopra\.com/i }
+		'Woopra':                { html: /<script[^>]* src=("|')[^>]*static\.woopra\.com/i },
+		'Webtrekk':              { html: /var webtrekk = new Object/ },
+		'Reinvigorate':          { html: /reinvigorate\.track\("/ },
+		'Quick.Cart':            { html: /<a href="[^>]+opensolution\.org\/">Powered by/i },
+		'VirtueMart':            { html: /<div id=("|')vmMainPage/ },
+		'Cotonti':               { html: /<meta name=("|')generator("|') [^>]+Cotonti/i },
+		'Mambo':                 { html: /<meta name=("|')generator("|') [^>]+Mambo/i },
+		'Concrete5':             { html: /<meta name=("|')generator("|') [^>]+concrete5/i },
+		'Webtrends':             { html: /<img[^>]+id=("|')DCSIMG("|')[^>]+webtrends/i }
 		},
 
 	init: function()
@@ -293,7 +301,7 @@ wappalyzer =
 
 		if ( !wappalyzer.isBookmarklet )
 		{
-			if ( doc.location.href == gBrowser.selectedBrowser.contentDocument.location.href )
+			if ( doc.location && doc.location.href == gBrowser.selectedBrowser.contentDocument.location.href )
 			{
 				wappalyzer.currentTab = true;
 
diff --git a/chrome/skin/app_icons/Concrete5.ico b/chrome/skin/app_icons/Concrete5.ico
new file mode 100644
index 000000000..73f49a361
Binary files /dev/null and b/chrome/skin/app_icons/Concrete5.ico differ
diff --git a/chrome/skin/app_icons/Contao.ico b/chrome/skin/app_icons/Contao.ico
new file mode 100644
index 000000000..776c0b789
Binary files /dev/null and b/chrome/skin/app_icons/Contao.ico differ
diff --git a/chrome/skin/app_icons/Cotonti.ico b/chrome/skin/app_icons/Cotonti.ico
new file mode 100644
index 000000000..c29411334
Binary files /dev/null and b/chrome/skin/app_icons/Cotonti.ico differ
diff --git a/chrome/skin/app_icons/Mambo.ico b/chrome/skin/app_icons/Mambo.ico
new file mode 100644
index 000000000..cd2370fd9
Binary files /dev/null and b/chrome/skin/app_icons/Mambo.ico differ
diff --git a/chrome/skin/app_icons/Quick.Cart.ico b/chrome/skin/app_icons/Quick.Cart.ico
new file mode 100644
index 000000000..e9417d0b9
Binary files /dev/null and b/chrome/skin/app_icons/Quick.Cart.ico differ
diff --git a/chrome/skin/app_icons/Reinvigorate.ico b/chrome/skin/app_icons/Reinvigorate.ico
new file mode 100644
index 000000000..65d204982
Binary files /dev/null and b/chrome/skin/app_icons/Reinvigorate.ico differ
diff --git a/chrome/skin/app_icons/VirtueMart.ico b/chrome/skin/app_icons/VirtueMart.ico
new file mode 100644
index 000000000..e14e4efe9
Binary files /dev/null and b/chrome/skin/app_icons/VirtueMart.ico differ
diff --git a/chrome/skin/app_icons/Webtrekk.ico b/chrome/skin/app_icons/Webtrekk.ico
new file mode 100644
index 000000000..98da3b5e6
Binary files /dev/null and b/chrome/skin/app_icons/Webtrekk.ico differ
diff --git a/chrome/skin/app_icons/Webtrends.ico b/chrome/skin/app_icons/Webtrends.ico
new file mode 100644
index 000000000..1e4b1ee7e
Binary files /dev/null and b/chrome/skin/app_icons/Webtrends.ico differ
diff --git a/install.rdf b/install.rdf
index 62c900e72..970a3d36a 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,14 +5,14 @@
 <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>1.9.3a1</em:version>
+    <em:version>1.9.4</em:version>
     <em:type>2</em:type>
 
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>3.0</em:minVersion>
-        <em:maxVersion>4.0b1</em:maxVersion>
+        <em:maxVersion>4.0b7pre</em:maxVersion>
       </Description>
     </em:targetApplication>