diff --git a/drivers/bookmarklet/images/icons/Nokia Maps.png b/drivers/bookmarklet/images/icons/Nokia Maps.png
new file mode 100644
index 000000000..3e12aa950
Binary files /dev/null and b/drivers/bookmarklet/images/icons/Nokia Maps.png differ
diff --git a/drivers/bookmarklet/images/icons/OpenLayers.png b/drivers/bookmarklet/images/icons/OpenLayers.png
index 519eb547b..a6da6084d 100644
Binary files a/drivers/bookmarklet/images/icons/OpenLayers.png and b/drivers/bookmarklet/images/icons/OpenLayers.png differ
diff --git a/drivers/bookmarklet/images/icons/SUSE.png b/drivers/bookmarklet/images/icons/SUSE.png
new file mode 100644
index 000000000..dc1f640cf
Binary files /dev/null and b/drivers/bookmarklet/images/icons/SUSE.png differ
diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index 4ad4503d2..cfb6a7c6e 100644
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -528,7 +528,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
+			"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -688,13 +688,13 @@
 			"env": "^WebFonts$"
 		},
 		"Google Maps": {
-			"cats": [ 5 ],
+			"cats": [ 35 ],
 			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
 		},
-               "Google PageSpeed": {
-                      "cats": [ 23, 33 ],
-                      "headers": { "X-Mod-Pagespeed": ".*" }
-               },
+		"Google PageSpeed": {
+			"cats": [ 23, 33 ],
+			"headers": { "X-Mod-Pagespeed": ".*" }
+		},
 		"Google Sites": {
 			"cats": [ 1 ],
 			"url": "sites.google.com"
@@ -1194,6 +1194,9 @@
 		"node.js": {
 			"cats": [ 27 ]
 		},
+		"Nokia Maps": {
+			"cats": [ 35 ]
+		},
 		"NOIX": {
 			"cats": [ 19 ],
 			"html": "<[^>]+(src|href)=[^>]*(/media/noix)|<!-- NOIX"
@@ -1232,7 +1235,7 @@
 			"implies": [ "Java" ]
 		},
 		"OpenLayers": {
-			"cats": [ 5 ],
+			"cats": [ 35 ],
 			"script": "openlayers",
 			"env": "^OpenLayers$"
 		},
@@ -1734,7 +1737,7 @@
 		"Twitter Bootstrap": {
 			"cats": [ 18 ],
 			"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
-			"html": "<link[^>]+bootstrap[^>"]+css",
+			"html": "<link[^>]+bootstrap[^>\"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index 4ad4503d2..cfb6a7c6e 100644
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -528,7 +528,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
+			"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -688,13 +688,13 @@
 			"env": "^WebFonts$"
 		},
 		"Google Maps": {
-			"cats": [ 5 ],
+			"cats": [ 35 ],
 			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
 		},
-               "Google PageSpeed": {
-                      "cats": [ 23, 33 ],
-                      "headers": { "X-Mod-Pagespeed": ".*" }
-               },
+		"Google PageSpeed": {
+			"cats": [ 23, 33 ],
+			"headers": { "X-Mod-Pagespeed": ".*" }
+		},
 		"Google Sites": {
 			"cats": [ 1 ],
 			"url": "sites.google.com"
@@ -1194,6 +1194,9 @@
 		"node.js": {
 			"cats": [ 27 ]
 		},
+		"Nokia Maps": {
+			"cats": [ 35 ]
+		},
 		"NOIX": {
 			"cats": [ 19 ],
 			"html": "<[^>]+(src|href)=[^>]*(/media/noix)|<!-- NOIX"
@@ -1232,7 +1235,7 @@
 			"implies": [ "Java" ]
 		},
 		"OpenLayers": {
-			"cats": [ 5 ],
+			"cats": [ 35 ],
 			"script": "openlayers",
 			"env": "^OpenLayers$"
 		},
@@ -1734,7 +1737,7 @@
 		"Twitter Bootstrap": {
 			"cats": [ 18 ],
 			"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
-			"html": "<link[^>]+bootstrap[^>"]+css",
+			"html": "<link[^>]+bootstrap[^>\"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {
diff --git a/drivers/chrome/images/icons/Nokia Maps.png b/drivers/chrome/images/icons/Nokia Maps.png
new file mode 100644
index 000000000..3e12aa950
Binary files /dev/null and b/drivers/chrome/images/icons/Nokia Maps.png differ
diff --git a/drivers/chrome/images/icons/OpenLayers.png b/drivers/chrome/images/icons/OpenLayers.png
index 519eb547b..a6da6084d 100644
Binary files a/drivers/chrome/images/icons/OpenLayers.png and b/drivers/chrome/images/icons/OpenLayers.png differ
diff --git a/drivers/chrome/images/icons/SUSE.png b/drivers/chrome/images/icons/SUSE.png
new file mode 100644
index 000000000..dc1f640cf
Binary files /dev/null and b/drivers/chrome/images/icons/SUSE.png differ
diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index 4ad4503d2..cfb6a7c6e 100644
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -528,7 +528,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
+			"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -688,13 +688,13 @@
 			"env": "^WebFonts$"
 		},
 		"Google Maps": {
-			"cats": [ 5 ],
+			"cats": [ 35 ],
 			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
 		},
-               "Google PageSpeed": {
-                      "cats": [ 23, 33 ],
-                      "headers": { "X-Mod-Pagespeed": ".*" }
-               },
+		"Google PageSpeed": {
+			"cats": [ 23, 33 ],
+			"headers": { "X-Mod-Pagespeed": ".*" }
+		},
 		"Google Sites": {
 			"cats": [ 1 ],
 			"url": "sites.google.com"
@@ -1194,6 +1194,9 @@
 		"node.js": {
 			"cats": [ 27 ]
 		},
+		"Nokia Maps": {
+			"cats": [ 35 ]
+		},
 		"NOIX": {
 			"cats": [ 19 ],
 			"html": "<[^>]+(src|href)=[^>]*(/media/noix)|<!-- NOIX"
@@ -1232,7 +1235,7 @@
 			"implies": [ "Java" ]
 		},
 		"OpenLayers": {
-			"cats": [ 5 ],
+			"cats": [ 35 ],
 			"script": "openlayers",
 			"env": "^OpenLayers$"
 		},
@@ -1734,7 +1737,7 @@
 		"Twitter Bootstrap": {
 			"cats": [ 18 ],
 			"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
-			"html": "<link[^>]+bootstrap[^>"]+css",
+			"html": "<link[^>]+bootstrap[^>\"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {
diff --git a/drivers/firefox-jetpack/images/icons/Nokia Maps.png b/drivers/firefox-jetpack/images/icons/Nokia Maps.png
new file mode 100644
index 000000000..3e12aa950
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/Nokia Maps.png differ
diff --git a/drivers/firefox-jetpack/images/icons/OpenLayers.png b/drivers/firefox-jetpack/images/icons/OpenLayers.png
index 519eb547b..a6da6084d 100644
Binary files a/drivers/firefox-jetpack/images/icons/OpenLayers.png and b/drivers/firefox-jetpack/images/icons/OpenLayers.png differ
diff --git a/drivers/firefox-jetpack/images/icons/SUSE.png b/drivers/firefox-jetpack/images/icons/SUSE.png
new file mode 100644
index 000000000..dc1f640cf
Binary files /dev/null and b/drivers/firefox-jetpack/images/icons/SUSE.png differ
diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index 4ad4503d2..cfb6a7c6e 100644
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -528,7 +528,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
+			"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -688,13 +688,13 @@
 			"env": "^WebFonts$"
 		},
 		"Google Maps": {
-			"cats": [ 5 ],
+			"cats": [ 35 ],
 			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
 		},
-               "Google PageSpeed": {
-                      "cats": [ 23, 33 ],
-                      "headers": { "X-Mod-Pagespeed": ".*" }
-               },
+		"Google PageSpeed": {
+			"cats": [ 23, 33 ],
+			"headers": { "X-Mod-Pagespeed": ".*" }
+		},
 		"Google Sites": {
 			"cats": [ 1 ],
 			"url": "sites.google.com"
@@ -1194,6 +1194,9 @@
 		"node.js": {
 			"cats": [ 27 ]
 		},
+		"Nokia Maps": {
+			"cats": [ 35 ]
+		},
 		"NOIX": {
 			"cats": [ 19 ],
 			"html": "<[^>]+(src|href)=[^>]*(/media/noix)|<!-- NOIX"
@@ -1232,7 +1235,7 @@
 			"implies": [ "Java" ]
 		},
 		"OpenLayers": {
-			"cats": [ 5 ],
+			"cats": [ 35 ],
 			"script": "openlayers",
 			"env": "^OpenLayers$"
 		},
@@ -1734,7 +1737,7 @@
 		"Twitter Bootstrap": {
 			"cats": [ 18 ],
 			"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
-			"html": "<link[^>]+bootstrap[^>"]+css",
+			"html": "<link[^>]+bootstrap[^>\"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {
diff --git a/drivers/firefox/content/xul/preferences.xul b/drivers/firefox/content/xul/preferences.xul
index 3eb7087d8..6d05b92d5 100755
--- a/drivers/firefox/content/xul/preferences.xul
+++ b/drivers/firefox/content/xul/preferences.xul
@@ -49,6 +49,8 @@
 			<preference id="wappalyzer-cat32" name="extensions.wappalyzer.cat32" type="bool"/>
 			<preference id="wappalyzer-cat33" name="extensions.wappalyzer.cat33" type="bool"/>
 			<preference id="wappalyzer-cat34" name="extensions.wappalyzer.cat34" type="bool"/>
+			<preference id="wappalyzer-cat35" name="extensions.wappalyzer.cat35" type="bool"/>
+			<preference id="wappalyzer-cat36" name="extensions.wappalyzer.cat36" type="bool"/>
 
 			<preference id="wappalyzer-tracking" name="extensions.wappalyzer.tracking" type="bool"/>
 		</preferences>
@@ -96,7 +98,7 @@
 					</columns>
 					<rows>
 						<row>
-							<checkbox preference="wappalyzer-cat31" label="&wappalyzer.cat36;"/><!-- Advertising networks-->
+							<checkbox preference="wappalyzer-cat36" label="&wappalyzer.cat36;"/><!-- Advertising networks-->
 							<checkbox preference="wappalyzer-cat10" label="&wappalyzer.cat10;"/><!-- Analytics -->
 							<checkbox preference="wappalyzer-cat11" label="&wappalyzer.cat11;"/><!-- Blogs -->
 							<checkbox preference="wappalyzer-cat23" label="&wappalyzer.cat23;"/><!-- Cache tools -->
diff --git a/drivers/firefox/defaults/preferences/defaults.js b/drivers/firefox/defaults/preferences/defaults.js
index 35340ac02..b170d4ec1 100644
--- a/drivers/firefox/defaults/preferences/defaults.js
+++ b/drivers/firefox/defaults/preferences/defaults.js
@@ -40,3 +40,6 @@ pref('extensions.wappalyzer.cat30',             true);
 pref('extensions.wappalyzer.cat31',             true);
 pref('extensions.wappalyzer.cat32',             true);
 pref('extensions.wappalyzer.cat33',             true);
+pref('extensions.wappalyzer.cat34',             true);
+pref('extensions.wappalyzer.cat35',             true);
+pref('extensions.wappalyzer.cat36',             true);
diff --git a/drivers/firefox/locale/de-DE/wappalyzer.dtd b/drivers/firefox/locale/de-DE/wappalyzer.dtd
index c1df0cfe4..67866f5a7 100755
--- a/drivers/firefox/locale/de-DE/wappalyzer.dtd
+++ b/drivers/firefox/locale/de-DE/wappalyzer.dtd
@@ -50,7 +50,7 @@
 <!ENTITY wappalyzer.cat30             "Web mail">
 <!ENTITY wappalyzer.cat31             "CDN">
 <!ENTITY wappalyzer.cat32             "Marketing Automation">
-<!ENTITY wappalyzer.cat33             "Web Server Extension">
-<!ENTITY wappalyzer.cat34             "Database">
-<!ENTITY wappalyzer.cat35             "Map">
-<!ENTITY wappalyzer.cat36             "Advertizing Network">
+<!ENTITY wappalyzer.cat33             "Web Server Extensions">
+<!ENTITY wappalyzer.cat34             "Databases">
+<!ENTITY wappalyzer.cat35             "Maps">
+<!ENTITY wappalyzer.cat36             "Advertizing Networks">
diff --git a/drivers/firefox/locale/en-UK/wappalyzer.dtd b/drivers/firefox/locale/en-UK/wappalyzer.dtd
index 09aa3de29..6d111238f 100755
--- a/drivers/firefox/locale/en-UK/wappalyzer.dtd
+++ b/drivers/firefox/locale/en-UK/wappalyzer.dtd
@@ -50,7 +50,7 @@
 <!ENTITY wappalyzer.cat30             "Web Mail">
 <!ENTITY wappalyzer.cat31             "CDN">
 <!ENTITY wappalyzer.cat32             "Marketing Automation">
-<!ENTITY wappalyzer.cat33             "Web Server Extension">
-<!ENTITY wappalyzer.cat34             "Database">
-<!ENTITY wappalyzer.cat35             "Map">
-<!ENTITY wappalyzer.cat36             "Advertising Network">
+<!ENTITY wappalyzer.cat33             "Web Server Extensions">
+<!ENTITY wappalyzer.cat34             "Databases">
+<!ENTITY wappalyzer.cat35             "Maps">
+<!ENTITY wappalyzer.cat36             "Advertising Networks">
diff --git a/drivers/firefox/locale/en-US/wappalyzer.dtd b/drivers/firefox/locale/en-US/wappalyzer.dtd
index 6f8ef8982..e477b6488 100755
--- a/drivers/firefox/locale/en-US/wappalyzer.dtd
+++ b/drivers/firefox/locale/en-US/wappalyzer.dtd
@@ -50,7 +50,7 @@
 <!ENTITY wappalyzer.cat30             "Web Mail">
 <!ENTITY wappalyzer.cat31             "CDN">
 <!ENTITY wappalyzer.cat32             "Marketing Automation">
-<!ENTITY wappalyzer.cat33             "Web Server Extension">
-<!ENTITY wappalyzer.cat34             "Database">
-<!ENTITY wappalyzer.cat35             "Map">
-<!ENTITY wappalyzer.cat36             "Advertizing Network">
+<!ENTITY wappalyzer.cat33             "Web Server Extensions">
+<!ENTITY wappalyzer.cat34             "Databases">
+<!ENTITY wappalyzer.cat35             "Maps">
+<!ENTITY wappalyzer.cat36             "Advertizing Networks">
diff --git a/drivers/firefox/locale/fr-FR/wappalyzer.dtd b/drivers/firefox/locale/fr-FR/wappalyzer.dtd
index 33c2ffe26..33e0cf596 100644
--- a/drivers/firefox/locale/fr-FR/wappalyzer.dtd
+++ b/drivers/firefox/locale/fr-FR/wappalyzer.dtd
@@ -50,7 +50,7 @@
 <!ENTITY wappalyzer.cat30             "Web Mail">
 <!ENTITY wappalyzer.cat31             "CDN">
 <!ENTITY wappalyzer.cat32             "Logiciel de marketing">
-<!ENTITY wappalyzer.cat33             "Web Server Extension">
-<!ENTITY wappalyzer.cat34             "Database">
-<!ENTITY wappalyzer.cat35             "Map">
-<!ENTITY wappalyzer.cat36             "Advertizing Network">
+<!ENTITY wappalyzer.cat33             "Web Server Extensions">
+<!ENTITY wappalyzer.cat34             "Databases">
+<!ENTITY wappalyzer.cat35             "Maps">
+<!ENTITY wappalyzer.cat36             "Advertizing Networks">
diff --git a/drivers/firefox/locale/nl-NL/wappalyzer.dtd b/drivers/firefox/locale/nl-NL/wappalyzer.dtd
index 230edc0ed..1d444d5a8 100755
--- a/drivers/firefox/locale/nl-NL/wappalyzer.dtd
+++ b/drivers/firefox/locale/nl-NL/wappalyzer.dtd
@@ -49,7 +49,7 @@
 <!ENTITY wappalyzer.cat30             "Web Mail">
 <!ENTITY wappalyzer.cat31             "CDN">
 <!ENTITY wappalyzer.cat32             "Marketing Automatisering">
-<!ENTITY wappalyzer.cat33             "Web Server Extentie">
-<!ENTITY wappalyzer.cat34             "Database">
-<!ENTITY wappalyzer.cat35             "Map">
-<!ENTITY wappalyzer.cat36             "Advertizing Network">
+<!ENTITY wappalyzer.cat33             "Web Server Extenties">
+<!ENTITY wappalyzer.cat34             "Databases">
+<!ENTITY wappalyzer.cat35             "Landkaarten">
+<!ENTITY wappalyzer.cat36             "Advertentie Netwerken">
diff --git a/drivers/firefox/skin/images/icons/Nokia Maps.png b/drivers/firefox/skin/images/icons/Nokia Maps.png
new file mode 100644
index 000000000..3e12aa950
Binary files /dev/null and b/drivers/firefox/skin/images/icons/Nokia Maps.png differ
diff --git a/drivers/firefox/skin/images/icons/OpenLayers.png b/drivers/firefox/skin/images/icons/OpenLayers.png
index 519eb547b..a6da6084d 100644
Binary files a/drivers/firefox/skin/images/icons/OpenLayers.png and b/drivers/firefox/skin/images/icons/OpenLayers.png differ
diff --git a/drivers/firefox/skin/images/icons/SUSE.png b/drivers/firefox/skin/images/icons/SUSE.png
new file mode 100644
index 000000000..dc1f640cf
Binary files /dev/null and b/drivers/firefox/skin/images/icons/SUSE.png differ
diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index 4ad4503d2..cfb6a7c6e 100644
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -528,7 +528,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
+			"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -688,13 +688,13 @@
 			"env": "^WebFonts$"
 		},
 		"Google Maps": {
-			"cats": [ 5 ],
+			"cats": [ 35 ],
 			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
 		},
-               "Google PageSpeed": {
-                      "cats": [ 23, 33 ],
-                      "headers": { "X-Mod-Pagespeed": ".*" }
-               },
+		"Google PageSpeed": {
+			"cats": [ 23, 33 ],
+			"headers": { "X-Mod-Pagespeed": ".*" }
+		},
 		"Google Sites": {
 			"cats": [ 1 ],
 			"url": "sites.google.com"
@@ -1194,6 +1194,9 @@
 		"node.js": {
 			"cats": [ 27 ]
 		},
+		"Nokia Maps": {
+			"cats": [ 35 ]
+		},
 		"NOIX": {
 			"cats": [ 19 ],
 			"html": "<[^>]+(src|href)=[^>]*(/media/noix)|<!-- NOIX"
@@ -1232,7 +1235,7 @@
 			"implies": [ "Java" ]
 		},
 		"OpenLayers": {
-			"cats": [ 5 ],
+			"cats": [ 35 ],
 			"script": "openlayers",
 			"env": "^OpenLayers$"
 		},
@@ -1734,7 +1737,7 @@
 		"Twitter Bootstrap": {
 			"cats": [ 18 ],
 			"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
-			"html": "<link[^>]+bootstrap[^>"]+css",
+			"html": "<link[^>]+bootstrap[^>\"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {
diff --git a/drivers/html/images/icons/Nokia Maps.png b/drivers/html/images/icons/Nokia Maps.png
new file mode 100644
index 000000000..3e12aa950
Binary files /dev/null and b/drivers/html/images/icons/Nokia Maps.png differ
diff --git a/drivers/html/images/icons/OpenLayers.png b/drivers/html/images/icons/OpenLayers.png
index 519eb547b..a6da6084d 100644
Binary files a/drivers/html/images/icons/OpenLayers.png and b/drivers/html/images/icons/OpenLayers.png differ
diff --git a/drivers/html/images/icons/SUSE.png b/drivers/html/images/icons/SUSE.png
new file mode 100644
index 000000000..dc1f640cf
Binary files /dev/null and b/drivers/html/images/icons/SUSE.png differ
diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index 4ad4503d2..cfb6a7c6e 100644
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -528,7 +528,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
+			"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -688,13 +688,13 @@
 			"env": "^WebFonts$"
 		},
 		"Google Maps": {
-			"cats": [ 5 ],
+			"cats": [ 35 ],
 			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
 		},
-               "Google PageSpeed": {
-                      "cats": [ 23, 33 ],
-                      "headers": { "X-Mod-Pagespeed": ".*" }
-               },
+		"Google PageSpeed": {
+			"cats": [ 23, 33 ],
+			"headers": { "X-Mod-Pagespeed": ".*" }
+		},
 		"Google Sites": {
 			"cats": [ 1 ],
 			"url": "sites.google.com"
@@ -1194,6 +1194,9 @@
 		"node.js": {
 			"cats": [ 27 ]
 		},
+		"Nokia Maps": {
+			"cats": [ 35 ]
+		},
 		"NOIX": {
 			"cats": [ 19 ],
 			"html": "<[^>]+(src|href)=[^>]*(/media/noix)|<!-- NOIX"
@@ -1232,7 +1235,7 @@
 			"implies": [ "Java" ]
 		},
 		"OpenLayers": {
-			"cats": [ 5 ],
+			"cats": [ 35 ],
 			"script": "openlayers",
 			"env": "^OpenLayers$"
 		},
@@ -1734,7 +1737,7 @@
 		"Twitter Bootstrap": {
 			"cats": [ 18 ],
 			"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
-			"html": "<link[^>]+bootstrap[^>"]+css",
+			"html": "<link[^>]+bootstrap[^>\"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {
diff --git a/share/apps.json b/share/apps.json
index e0a9f1b70..7ca107ee8 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -528,7 +528,7 @@
 		"Drupal": {
 			"cats": [ 1 ],
 			"script": "drupal\\.js",
-			"html": "Drupal(\\.extend)?.+settings|<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
+			"html": "<(link|style)[^>]+sites/(default|all)/(themes|modules)/",
 			"headers": { "X-Drupal-Cache": ".*", "X-Generator": "Drupal(\\s([\\d\\.]+))?\\;version:\\2", "Expires": "19 Nov 1978" },
 			"env": "^Drupal$",
 			"implies": [ "PHP" ]
@@ -688,13 +688,13 @@
 			"env": "^WebFonts$"
 		},
 		"Google Maps": {
-			"cats": [ 5 ],
+			"cats": [ 35 ],
 			"script": "(maps\\.google\\.com/maps\\?file=api(&v=([\\d\\.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\3"
 		},
-               "Google PageSpeed": {
-                      "cats": [ 23, 33 ],
-                      "headers": { "X-Mod-Pagespeed": ".*" }
-               },
+		"Google PageSpeed": {
+			"cats": [ 23, 33 ],
+			"headers": { "X-Mod-Pagespeed": ".*" }
+		},
 		"Google Sites": {
 			"cats": [ 1 ],
 			"url": "sites.google.com"
@@ -1194,6 +1194,9 @@
 		"node.js": {
 			"cats": [ 27 ]
 		},
+		"Nokia Maps": {
+			"cats": [ 35 ]
+		},
 		"NOIX": {
 			"cats": [ 19 ],
 			"html": "<[^>]+(src|href)=[^>]*(/media/noix)|<!-- NOIX"
@@ -1232,7 +1235,7 @@
 			"implies": [ "Java" ]
 		},
 		"OpenLayers": {
-			"cats": [ 5 ],
+			"cats": [ 35 ],
 			"script": "openlayers",
 			"env": "^OpenLayers$"
 		},
@@ -1742,7 +1745,7 @@
 		"Twitter Bootstrap": {
 			"cats": [ 18 ],
 			"script": "(twitter\\.github\\.com/bootstrap|bootstrap(\\.js|\\.min\\.js))",
-			"html": "<link[^>]+bootstrap[^>"]+css",
+			"html": "<link[^>]+bootstrap[^>\"]+css",
 			"env": "^Twipsy$\\;confidence:50"
 		},
 		"Typekit": {
diff --git a/share/images/icons/Nokia Maps.png b/share/images/icons/Nokia Maps.png
new file mode 100644
index 000000000..3e12aa950
Binary files /dev/null and b/share/images/icons/Nokia Maps.png differ
diff --git a/share/images/icons/OpenLayers.png b/share/images/icons/OpenLayers.png
index 519eb547b..a6da6084d 100644
Binary files a/share/images/icons/OpenLayers.png and b/share/images/icons/OpenLayers.png differ
diff --git a/share/images/icons/SUSE.png b/share/images/icons/SUSE.png
new file mode 100644
index 000000000..dc1f640cf
Binary files /dev/null and b/share/images/icons/SUSE.png differ