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/json b/drivers/bookmarklet/json
index 4ad4503d2..c8c791e3c 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$"
 		},
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index 4ad4503d2..c8c791e3c 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$"
 		},
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/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index 4ad4503d2..c8c791e3c 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$"
 		},
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/content/apps.json b/drivers/firefox/content/apps.json
index 4ad4503d2..c8c791e3c 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$"
 		},
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/html/apps.json b/drivers/html/apps.json
index 4ad4503d2..c8c791e3c 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$"
 		},
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/php/apps.json b/drivers/php/apps.json
index 4ad4503d2..c8c791e3c 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$"
 		},
diff --git a/share/apps.json b/share/apps.json
index 4ad4503d2..c8c791e3c 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$"
 		},
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