From 2f0d4bc4658662179e489c57442a3e29bf952411 Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sun, 27 Jan 2013 10:39:13 +1100
Subject: [PATCH] Added Nokia Maps

---
 .../bookmarklet/images/icons/OpenLayers.png    | Bin 866 -> 671 bytes
 drivers/bookmarklet/json                       |  17 ++++++++++-------
 drivers/chrome/apps.json                       |  17 ++++++++++-------
 drivers/chrome/images/icons/OpenLayers.png     | Bin 866 -> 671 bytes
 drivers/firefox-jetpack/data/apps.json         |  17 ++++++++++-------
 .../images/icons/OpenLayers.png                | Bin 866 -> 671 bytes
 drivers/firefox/content/apps.json              |  17 ++++++++++-------
 .../firefox/skin/images/icons/OpenLayers.png   | Bin 866 -> 671 bytes
 drivers/html/apps.json                         |  17 ++++++++++-------
 drivers/html/images/icons/OpenLayers.png       | Bin 866 -> 671 bytes
 drivers/php/apps.json                          |  17 ++++++++++-------
 share/apps.json                                |  17 ++++++++++-------
 share/images/icons/OpenLayers.png              | Bin 866 -> 671 bytes
 13 files changed, 70 insertions(+), 49 deletions(-)

diff --git a/drivers/bookmarklet/images/icons/OpenLayers.png b/drivers/bookmarklet/images/icons/OpenLayers.png
index 519eb547b8caa26d0c69a95cb2e46e1e7dfe2ca4..a6da6084da92f49e1a50878b16fe373712a1b283 100644
GIT binary patch
delta 648
zcmV;30(br52A>6xBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2oaGBq+Uv$Fl$c0xU^HK~y-)rBh94l5re<{;ywC=f_@s{U|auSTJf8
zu2&6mP^|^UF0n1}7F}X=+Agg_bcjJKf=&@sJ6E?_8_b&KHh&0G!$~GoMsDgWnYpp%
z$MoN=kje@DuD{>&{Jx%tP)hMX!8A(}LPXmUkbg};+=Kn-@?68_S_YBXF&YnkY>9x_
z9VQ$)bsY!$y-?|70D#r^D+oWIq%ZE@X-Ytjogcx0lcU(Z-}XnVN{J#eGmT~67>)T8
z4Ftq-#(^%+1b@0u^g$wPzVvD$gV58Pn4h{$DWwF*FHFF7_9FDVG%cTgs{(|kXAt#`
zil8+s(axTR(WY$ucOsy&sX-zAi2<V=fY_`<Bmfk$+k@BhK=>t4tZMPSXcD_+D{8K`
z$OK_UA)NtoUx3cT03nS)N`b^{padwyZLp;MMX4kkV}IBVwrW*@df62A{fGfn4MYOK
zxAbqY@EHir155|@mOsGTo<NU*kt!4lgGjAWM{PE{)oe0$8p#^jQBEOSQ=zm`2fikO
zY!WCF=(dXJ!!mkwHS9EU;5aUx&*z{0(!t=+@Fm{qyetTUxl*koATWq(ct~m$bZ>-l
z#6Zy|m4Couu@pj~H}|F<KDbILEjI{>=bd{zy}h^edTv0-2_&^np_CG6#dX;1Hk!?3
zXP1^1$6p2fZ<~5yX!zU+&pWROf?$@*<zQJhxv&tt@#OKNyDgi^<#OAPdOVY*QmNpZ
in;VbE-{t;R_Y=B^<Vvr>Mc)7b002ovPDHLkU;%<hjw_u2

delta 844
zcmV-S1GD^}1>y#fBYy)aNkl<ZILnR6%WqUw0KnnjJ?GrlJbF7bwbPc?R$IVC14<W0
zH$X%ZUAT5ZqKhuvvelh`hlvScrD-%MF+fO~C{ZzK(@HEML9~<>`k2lPbLT$KIc{|C
zxBZ+!e)z_t!QCqr8Lc<v%+*TJx|izbZyu(*7w;c#oU6ID`+p~!r<Nmc@>XUBX9n5f
zd$}FF{bKFRq7c$LT5JC3-uOK!d#~AELC|Va8t5c_hDA(yU<mCD6|X_AbK<f~t6^Du
z`P^c~jaG%Vmbz^JU<{b7BpLJ(XcUH{EzR+Xvm9SI$+5W?n3!%c)t+JRC}3-Q`z-(g
z;8Od`R~6*g2!Bp$$jgMhmoeKqO?@OlNJ-#^MAZmY0k2}&{Cj6fYmEXZMEtI=Do6^P
zz-23b!o$Zg=TFaKwU5z|q#lLI>83fV=3q+k`p)j|3FSCAaj}2aP*CPMNz$ilazZ;!
zl6nXn1cI#8#Hqz0!f|_eRY{U&V=B|h^f2!=q?G91kbklcV`Ymiost#?FYJKG=*JDp
z(#5Y0kxqyxLOnWCe<V!q9GJp+l;%UUDF~c^id!cL$GNj|lQ=CXZ9=8K%SdB~DD;_+
z<|#VGb<g*Q0x%{C?&3Hg9LiFl$|ixTvGU#5tlnA2S_xPJS1~FZtZi&E)~H^!#-M^A
z$U+%y4u5oqRC%}^%dH#VLU*6J`5I53{mi|!0nL#X)^+Ij4pG7dulkDT`_~jeJsO?O
z@+sVE%s0!o`R(Q=S{OdLyu|#1Pq!S<?`+fQ9FbNH)2$giC)x;nKU2mSXD@$xq0oJ<
zeYwIfH`c+04?jA~u{lBPv=|Fvd?w;Stm%~lx_`xfuicnjky4`K^!Y@0xOeRO7eDgr
z?KM;&`S|ktygE6FttlOP9XUvvxc&jX-T)~j4LQD1tyKE}${LJ)9DbfWdHh+LXXT}(
z4|ZlJ7gk+0^}RR<AH?S1e5pDY^2EFpB@+)TqH*^``_xxL2n*npWy!O>y{VsWU-`73
zk467^@xnXH?RI-xDW&;Wnx=l9=RptziRXDafRqvd$6AZlns_*@xvpDyuABXr|HnV9
W-->iIbj|Ak0000<MNUMnLSTZhU!`{d

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 519eb547b8caa26d0c69a95cb2e46e1e7dfe2ca4..a6da6084da92f49e1a50878b16fe373712a1b283 100644
GIT binary patch
delta 648
zcmV;30(br52A>6xBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2oaGBq+Uv$Fl$c0xU^HK~y-)rBh94l5re<{;ywC=f_@s{U|auSTJf8
zu2&6mP^|^UF0n1}7F}X=+Agg_bcjJKf=&@sJ6E?_8_b&KHh&0G!$~GoMsDgWnYpp%
z$MoN=kje@DuD{>&{Jx%tP)hMX!8A(}LPXmUkbg};+=Kn-@?68_S_YBXF&YnkY>9x_
z9VQ$)bsY!$y-?|70D#r^D+oWIq%ZE@X-Ytjogcx0lcU(Z-}XnVN{J#eGmT~67>)T8
z4Ftq-#(^%+1b@0u^g$wPzVvD$gV58Pn4h{$DWwF*FHFF7_9FDVG%cTgs{(|kXAt#`
zil8+s(axTR(WY$ucOsy&sX-zAi2<V=fY_`<Bmfk$+k@BhK=>t4tZMPSXcD_+D{8K`
z$OK_UA)NtoUx3cT03nS)N`b^{padwyZLp;MMX4kkV}IBVwrW*@df62A{fGfn4MYOK
zxAbqY@EHir155|@mOsGTo<NU*kt!4lgGjAWM{PE{)oe0$8p#^jQBEOSQ=zm`2fikO
zY!WCF=(dXJ!!mkwHS9EU;5aUx&*z{0(!t=+@Fm{qyetTUxl*koATWq(ct~m$bZ>-l
z#6Zy|m4Couu@pj~H}|F<KDbILEjI{>=bd{zy}h^edTv0-2_&^np_CG6#dX;1Hk!?3
zXP1^1$6p2fZ<~5yX!zU+&pWROf?$@*<zQJhxv&tt@#OKNyDgi^<#OAPdOVY*QmNpZ
in;VbE-{t;R_Y=B^<Vvr>Mc)7b002ovPDHLkU;%<hjw_u2

delta 844
zcmV-S1GD^}1>y#fBYy)aNkl<ZILnR6%WqUw0KnnjJ?GrlJbF7bwbPc?R$IVC14<W0
zH$X%ZUAT5ZqKhuvvelh`hlvScrD-%MF+fO~C{ZzK(@HEML9~<>`k2lPbLT$KIc{|C
zxBZ+!e)z_t!QCqr8Lc<v%+*TJx|izbZyu(*7w;c#oU6ID`+p~!r<Nmc@>XUBX9n5f
zd$}FF{bKFRq7c$LT5JC3-uOK!d#~AELC|Va8t5c_hDA(yU<mCD6|X_AbK<f~t6^Du
z`P^c~jaG%Vmbz^JU<{b7BpLJ(XcUH{EzR+Xvm9SI$+5W?n3!%c)t+JRC}3-Q`z-(g
z;8Od`R~6*g2!Bp$$jgMhmoeKqO?@OlNJ-#^MAZmY0k2}&{Cj6fYmEXZMEtI=Do6^P
zz-23b!o$Zg=TFaKwU5z|q#lLI>83fV=3q+k`p)j|3FSCAaj}2aP*CPMNz$ilazZ;!
zl6nXn1cI#8#Hqz0!f|_eRY{U&V=B|h^f2!=q?G91kbklcV`Ymiost#?FYJKG=*JDp
z(#5Y0kxqyxLOnWCe<V!q9GJp+l;%UUDF~c^id!cL$GNj|lQ=CXZ9=8K%SdB~DD;_+
z<|#VGb<g*Q0x%{C?&3Hg9LiFl$|ixTvGU#5tlnA2S_xPJS1~FZtZi&E)~H^!#-M^A
z$U+%y4u5oqRC%}^%dH#VLU*6J`5I53{mi|!0nL#X)^+Ij4pG7dulkDT`_~jeJsO?O
z@+sVE%s0!o`R(Q=S{OdLyu|#1Pq!S<?`+fQ9FbNH)2$giC)x;nKU2mSXD@$xq0oJ<
zeYwIfH`c+04?jA~u{lBPv=|Fvd?w;Stm%~lx_`xfuicnjky4`K^!Y@0xOeRO7eDgr
z?KM;&`S|ktygE6FttlOP9XUvvxc&jX-T)~j4LQD1tyKE}${LJ)9DbfWdHh+LXXT}(
z4|ZlJ7gk+0^}RR<AH?S1e5pDY^2EFpB@+)TqH*^``_xxL2n*npWy!O>y{VsWU-`73
zk467^@xnXH?RI-xDW&;Wnx=l9=RptziRXDafRqvd$6AZlns_*@xvpDyuABXr|HnV9
W-->iIbj|Ak0000<MNUMnLSTZhU!`{d

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 519eb547b8caa26d0c69a95cb2e46e1e7dfe2ca4..a6da6084da92f49e1a50878b16fe373712a1b283 100644
GIT binary patch
delta 648
zcmV;30(br52A>6xBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2oaGBq+Uv$Fl$c0xU^HK~y-)rBh94l5re<{;ywC=f_@s{U|auSTJf8
zu2&6mP^|^UF0n1}7F}X=+Agg_bcjJKf=&@sJ6E?_8_b&KHh&0G!$~GoMsDgWnYpp%
z$MoN=kje@DuD{>&{Jx%tP)hMX!8A(}LPXmUkbg};+=Kn-@?68_S_YBXF&YnkY>9x_
z9VQ$)bsY!$y-?|70D#r^D+oWIq%ZE@X-Ytjogcx0lcU(Z-}XnVN{J#eGmT~67>)T8
z4Ftq-#(^%+1b@0u^g$wPzVvD$gV58Pn4h{$DWwF*FHFF7_9FDVG%cTgs{(|kXAt#`
zil8+s(axTR(WY$ucOsy&sX-zAi2<V=fY_`<Bmfk$+k@BhK=>t4tZMPSXcD_+D{8K`
z$OK_UA)NtoUx3cT03nS)N`b^{padwyZLp;MMX4kkV}IBVwrW*@df62A{fGfn4MYOK
zxAbqY@EHir155|@mOsGTo<NU*kt!4lgGjAWM{PE{)oe0$8p#^jQBEOSQ=zm`2fikO
zY!WCF=(dXJ!!mkwHS9EU;5aUx&*z{0(!t=+@Fm{qyetTUxl*koATWq(ct~m$bZ>-l
z#6Zy|m4Couu@pj~H}|F<KDbILEjI{>=bd{zy}h^edTv0-2_&^np_CG6#dX;1Hk!?3
zXP1^1$6p2fZ<~5yX!zU+&pWROf?$@*<zQJhxv&tt@#OKNyDgi^<#OAPdOVY*QmNpZ
in;VbE-{t;R_Y=B^<Vvr>Mc)7b002ovPDHLkU;%<hjw_u2

delta 844
zcmV-S1GD^}1>y#fBYy)aNkl<ZILnR6%WqUw0KnnjJ?GrlJbF7bwbPc?R$IVC14<W0
zH$X%ZUAT5ZqKhuvvelh`hlvScrD-%MF+fO~C{ZzK(@HEML9~<>`k2lPbLT$KIc{|C
zxBZ+!e)z_t!QCqr8Lc<v%+*TJx|izbZyu(*7w;c#oU6ID`+p~!r<Nmc@>XUBX9n5f
zd$}FF{bKFRq7c$LT5JC3-uOK!d#~AELC|Va8t5c_hDA(yU<mCD6|X_AbK<f~t6^Du
z`P^c~jaG%Vmbz^JU<{b7BpLJ(XcUH{EzR+Xvm9SI$+5W?n3!%c)t+JRC}3-Q`z-(g
z;8Od`R~6*g2!Bp$$jgMhmoeKqO?@OlNJ-#^MAZmY0k2}&{Cj6fYmEXZMEtI=Do6^P
zz-23b!o$Zg=TFaKwU5z|q#lLI>83fV=3q+k`p)j|3FSCAaj}2aP*CPMNz$ilazZ;!
zl6nXn1cI#8#Hqz0!f|_eRY{U&V=B|h^f2!=q?G91kbklcV`Ymiost#?FYJKG=*JDp
z(#5Y0kxqyxLOnWCe<V!q9GJp+l;%UUDF~c^id!cL$GNj|lQ=CXZ9=8K%SdB~DD;_+
z<|#VGb<g*Q0x%{C?&3Hg9LiFl$|ixTvGU#5tlnA2S_xPJS1~FZtZi&E)~H^!#-M^A
z$U+%y4u5oqRC%}^%dH#VLU*6J`5I53{mi|!0nL#X)^+Ij4pG7dulkDT`_~jeJsO?O
z@+sVE%s0!o`R(Q=S{OdLyu|#1Pq!S<?`+fQ9FbNH)2$giC)x;nKU2mSXD@$xq0oJ<
zeYwIfH`c+04?jA~u{lBPv=|Fvd?w;Stm%~lx_`xfuicnjky4`K^!Y@0xOeRO7eDgr
z?KM;&`S|ktygE6FttlOP9XUvvxc&jX-T)~j4LQD1tyKE}${LJ)9DbfWdHh+LXXT}(
z4|ZlJ7gk+0^}RR<AH?S1e5pDY^2EFpB@+)TqH*^``_xxL2n*npWy!O>y{VsWU-`73
zk467^@xnXH?RI-xDW&;Wnx=l9=RptziRXDafRqvd$6AZlns_*@xvpDyuABXr|HnV9
W-->iIbj|Ak0000<MNUMnLSTZhU!`{d

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 519eb547b8caa26d0c69a95cb2e46e1e7dfe2ca4..a6da6084da92f49e1a50878b16fe373712a1b283 100644
GIT binary patch
delta 648
zcmV;30(br52A>6xBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2oaGBq+Uv$Fl$c0xU^HK~y-)rBh94l5re<{;ywC=f_@s{U|auSTJf8
zu2&6mP^|^UF0n1}7F}X=+Agg_bcjJKf=&@sJ6E?_8_b&KHh&0G!$~GoMsDgWnYpp%
z$MoN=kje@DuD{>&{Jx%tP)hMX!8A(}LPXmUkbg};+=Kn-@?68_S_YBXF&YnkY>9x_
z9VQ$)bsY!$y-?|70D#r^D+oWIq%ZE@X-Ytjogcx0lcU(Z-}XnVN{J#eGmT~67>)T8
z4Ftq-#(^%+1b@0u^g$wPzVvD$gV58Pn4h{$DWwF*FHFF7_9FDVG%cTgs{(|kXAt#`
zil8+s(axTR(WY$ucOsy&sX-zAi2<V=fY_`<Bmfk$+k@BhK=>t4tZMPSXcD_+D{8K`
z$OK_UA)NtoUx3cT03nS)N`b^{padwyZLp;MMX4kkV}IBVwrW*@df62A{fGfn4MYOK
zxAbqY@EHir155|@mOsGTo<NU*kt!4lgGjAWM{PE{)oe0$8p#^jQBEOSQ=zm`2fikO
zY!WCF=(dXJ!!mkwHS9EU;5aUx&*z{0(!t=+@Fm{qyetTUxl*koATWq(ct~m$bZ>-l
z#6Zy|m4Couu@pj~H}|F<KDbILEjI{>=bd{zy}h^edTv0-2_&^np_CG6#dX;1Hk!?3
zXP1^1$6p2fZ<~5yX!zU+&pWROf?$@*<zQJhxv&tt@#OKNyDgi^<#OAPdOVY*QmNpZ
in;VbE-{t;R_Y=B^<Vvr>Mc)7b002ovPDHLkU;%<hjw_u2

delta 844
zcmV-S1GD^}1>y#fBYy)aNkl<ZILnR6%WqUw0KnnjJ?GrlJbF7bwbPc?R$IVC14<W0
zH$X%ZUAT5ZqKhuvvelh`hlvScrD-%MF+fO~C{ZzK(@HEML9~<>`k2lPbLT$KIc{|C
zxBZ+!e)z_t!QCqr8Lc<v%+*TJx|izbZyu(*7w;c#oU6ID`+p~!r<Nmc@>XUBX9n5f
zd$}FF{bKFRq7c$LT5JC3-uOK!d#~AELC|Va8t5c_hDA(yU<mCD6|X_AbK<f~t6^Du
z`P^c~jaG%Vmbz^JU<{b7BpLJ(XcUH{EzR+Xvm9SI$+5W?n3!%c)t+JRC}3-Q`z-(g
z;8Od`R~6*g2!Bp$$jgMhmoeKqO?@OlNJ-#^MAZmY0k2}&{Cj6fYmEXZMEtI=Do6^P
zz-23b!o$Zg=TFaKwU5z|q#lLI>83fV=3q+k`p)j|3FSCAaj}2aP*CPMNz$ilazZ;!
zl6nXn1cI#8#Hqz0!f|_eRY{U&V=B|h^f2!=q?G91kbklcV`Ymiost#?FYJKG=*JDp
z(#5Y0kxqyxLOnWCe<V!q9GJp+l;%UUDF~c^id!cL$GNj|lQ=CXZ9=8K%SdB~DD;_+
z<|#VGb<g*Q0x%{C?&3Hg9LiFl$|ixTvGU#5tlnA2S_xPJS1~FZtZi&E)~H^!#-M^A
z$U+%y4u5oqRC%}^%dH#VLU*6J`5I53{mi|!0nL#X)^+Ij4pG7dulkDT`_~jeJsO?O
z@+sVE%s0!o`R(Q=S{OdLyu|#1Pq!S<?`+fQ9FbNH)2$giC)x;nKU2mSXD@$xq0oJ<
zeYwIfH`c+04?jA~u{lBPv=|Fvd?w;Stm%~lx_`xfuicnjky4`K^!Y@0xOeRO7eDgr
z?KM;&`S|ktygE6FttlOP9XUvvxc&jX-T)~j4LQD1tyKE}${LJ)9DbfWdHh+LXXT}(
z4|ZlJ7gk+0^}RR<AH?S1e5pDY^2EFpB@+)TqH*^``_xxL2n*npWy!O>y{VsWU-`73
zk467^@xnXH?RI-xDW&;Wnx=l9=RptziRXDafRqvd$6AZlns_*@xvpDyuABXr|HnV9
W-->iIbj|Ak0000<MNUMnLSTZhU!`{d

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 519eb547b8caa26d0c69a95cb2e46e1e7dfe2ca4..a6da6084da92f49e1a50878b16fe373712a1b283 100644
GIT binary patch
delta 648
zcmV;30(br52A>6xBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2oaGBq+Uv$Fl$c0xU^HK~y-)rBh94l5re<{;ywC=f_@s{U|auSTJf8
zu2&6mP^|^UF0n1}7F}X=+Agg_bcjJKf=&@sJ6E?_8_b&KHh&0G!$~GoMsDgWnYpp%
z$MoN=kje@DuD{>&{Jx%tP)hMX!8A(}LPXmUkbg};+=Kn-@?68_S_YBXF&YnkY>9x_
z9VQ$)bsY!$y-?|70D#r^D+oWIq%ZE@X-Ytjogcx0lcU(Z-}XnVN{J#eGmT~67>)T8
z4Ftq-#(^%+1b@0u^g$wPzVvD$gV58Pn4h{$DWwF*FHFF7_9FDVG%cTgs{(|kXAt#`
zil8+s(axTR(WY$ucOsy&sX-zAi2<V=fY_`<Bmfk$+k@BhK=>t4tZMPSXcD_+D{8K`
z$OK_UA)NtoUx3cT03nS)N`b^{padwyZLp;MMX4kkV}IBVwrW*@df62A{fGfn4MYOK
zxAbqY@EHir155|@mOsGTo<NU*kt!4lgGjAWM{PE{)oe0$8p#^jQBEOSQ=zm`2fikO
zY!WCF=(dXJ!!mkwHS9EU;5aUx&*z{0(!t=+@Fm{qyetTUxl*koATWq(ct~m$bZ>-l
z#6Zy|m4Couu@pj~H}|F<KDbILEjI{>=bd{zy}h^edTv0-2_&^np_CG6#dX;1Hk!?3
zXP1^1$6p2fZ<~5yX!zU+&pWROf?$@*<zQJhxv&tt@#OKNyDgi^<#OAPdOVY*QmNpZ
in;VbE-{t;R_Y=B^<Vvr>Mc)7b002ovPDHLkU;%<hjw_u2

delta 844
zcmV-S1GD^}1>y#fBYy)aNkl<ZILnR6%WqUw0KnnjJ?GrlJbF7bwbPc?R$IVC14<W0
zH$X%ZUAT5ZqKhuvvelh`hlvScrD-%MF+fO~C{ZzK(@HEML9~<>`k2lPbLT$KIc{|C
zxBZ+!e)z_t!QCqr8Lc<v%+*TJx|izbZyu(*7w;c#oU6ID`+p~!r<Nmc@>XUBX9n5f
zd$}FF{bKFRq7c$LT5JC3-uOK!d#~AELC|Va8t5c_hDA(yU<mCD6|X_AbK<f~t6^Du
z`P^c~jaG%Vmbz^JU<{b7BpLJ(XcUH{EzR+Xvm9SI$+5W?n3!%c)t+JRC}3-Q`z-(g
z;8Od`R~6*g2!Bp$$jgMhmoeKqO?@OlNJ-#^MAZmY0k2}&{Cj6fYmEXZMEtI=Do6^P
zz-23b!o$Zg=TFaKwU5z|q#lLI>83fV=3q+k`p)j|3FSCAaj}2aP*CPMNz$ilazZ;!
zl6nXn1cI#8#Hqz0!f|_eRY{U&V=B|h^f2!=q?G91kbklcV`Ymiost#?FYJKG=*JDp
z(#5Y0kxqyxLOnWCe<V!q9GJp+l;%UUDF~c^id!cL$GNj|lQ=CXZ9=8K%SdB~DD;_+
z<|#VGb<g*Q0x%{C?&3Hg9LiFl$|ixTvGU#5tlnA2S_xPJS1~FZtZi&E)~H^!#-M^A
z$U+%y4u5oqRC%}^%dH#VLU*6J`5I53{mi|!0nL#X)^+Ij4pG7dulkDT`_~jeJsO?O
z@+sVE%s0!o`R(Q=S{OdLyu|#1Pq!S<?`+fQ9FbNH)2$giC)x;nKU2mSXD@$xq0oJ<
zeYwIfH`c+04?jA~u{lBPv=|Fvd?w;Stm%~lx_`xfuicnjky4`K^!Y@0xOeRO7eDgr
z?KM;&`S|ktygE6FttlOP9XUvvxc&jX-T)~j4LQD1tyKE}${LJ)9DbfWdHh+LXXT}(
z4|ZlJ7gk+0^}RR<AH?S1e5pDY^2EFpB@+)TqH*^``_xxL2n*npWy!O>y{VsWU-`73
zk467^@xnXH?RI-xDW&;Wnx=l9=RptziRXDafRqvd$6AZlns_*@xvpDyuABXr|HnV9
W-->iIbj|Ak0000<MNUMnLSTZhU!`{d

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 519eb547b8caa26d0c69a95cb2e46e1e7dfe2ca4..a6da6084da92f49e1a50878b16fe373712a1b283 100644
GIT binary patch
delta 648
zcmV;30(br52A>6xBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_
z000McNliru-2oaGBq+Uv$Fl$c0xU^HK~y-)rBh94l5re<{;ywC=f_@s{U|auSTJf8
zu2&6mP^|^UF0n1}7F}X=+Agg_bcjJKf=&@sJ6E?_8_b&KHh&0G!$~GoMsDgWnYpp%
z$MoN=kje@DuD{>&{Jx%tP)hMX!8A(}LPXmUkbg};+=Kn-@?68_S_YBXF&YnkY>9x_
z9VQ$)bsY!$y-?|70D#r^D+oWIq%ZE@X-Ytjogcx0lcU(Z-}XnVN{J#eGmT~67>)T8
z4Ftq-#(^%+1b@0u^g$wPzVvD$gV58Pn4h{$DWwF*FHFF7_9FDVG%cTgs{(|kXAt#`
zil8+s(axTR(WY$ucOsy&sX-zAi2<V=fY_`<Bmfk$+k@BhK=>t4tZMPSXcD_+D{8K`
z$OK_UA)NtoUx3cT03nS)N`b^{padwyZLp;MMX4kkV}IBVwrW*@df62A{fGfn4MYOK
zxAbqY@EHir155|@mOsGTo<NU*kt!4lgGjAWM{PE{)oe0$8p#^jQBEOSQ=zm`2fikO
zY!WCF=(dXJ!!mkwHS9EU;5aUx&*z{0(!t=+@Fm{qyetTUxl*koATWq(ct~m$bZ>-l
z#6Zy|m4Couu@pj~H}|F<KDbILEjI{>=bd{zy}h^edTv0-2_&^np_CG6#dX;1Hk!?3
zXP1^1$6p2fZ<~5yX!zU+&pWROf?$@*<zQJhxv&tt@#OKNyDgi^<#OAPdOVY*QmNpZ
in;VbE-{t;R_Y=B^<Vvr>Mc)7b002ovPDHLkU;%<hjw_u2

delta 844
zcmV-S1GD^}1>y#fBYy)aNkl<ZILnR6%WqUw0KnnjJ?GrlJbF7bwbPc?R$IVC14<W0
zH$X%ZUAT5ZqKhuvvelh`hlvScrD-%MF+fO~C{ZzK(@HEML9~<>`k2lPbLT$KIc{|C
zxBZ+!e)z_t!QCqr8Lc<v%+*TJx|izbZyu(*7w;c#oU6ID`+p~!r<Nmc@>XUBX9n5f
zd$}FF{bKFRq7c$LT5JC3-uOK!d#~AELC|Va8t5c_hDA(yU<mCD6|X_AbK<f~t6^Du
z`P^c~jaG%Vmbz^JU<{b7BpLJ(XcUH{EzR+Xvm9SI$+5W?n3!%c)t+JRC}3-Q`z-(g
z;8Od`R~6*g2!Bp$$jgMhmoeKqO?@OlNJ-#^MAZmY0k2}&{Cj6fYmEXZMEtI=Do6^P
zz-23b!o$Zg=TFaKwU5z|q#lLI>83fV=3q+k`p)j|3FSCAaj}2aP*CPMNz$ilazZ;!
zl6nXn1cI#8#Hqz0!f|_eRY{U&V=B|h^f2!=q?G91kbklcV`Ymiost#?FYJKG=*JDp
z(#5Y0kxqyxLOnWCe<V!q9GJp+l;%UUDF~c^id!cL$GNj|lQ=CXZ9=8K%SdB~DD;_+
z<|#VGb<g*Q0x%{C?&3Hg9LiFl$|ixTvGU#5tlnA2S_xPJS1~FZtZi&E)~H^!#-M^A
z$U+%y4u5oqRC%}^%dH#VLU*6J`5I53{mi|!0nL#X)^+Ij4pG7dulkDT`_~jeJsO?O
z@+sVE%s0!o`R(Q=S{OdLyu|#1Pq!S<?`+fQ9FbNH)2$giC)x;nKU2mSXD@$xq0oJ<
zeYwIfH`c+04?jA~u{lBPv=|Fvd?w;Stm%~lx_`xfuicnjky4`K^!Y@0xOeRO7eDgr
z?KM;&`S|ktygE6FttlOP9XUvvxc&jX-T)~j4LQD1tyKE}${LJ)9DbfWdHh+LXXT}(
z4|ZlJ7gk+0^}RR<AH?S1e5pDY^2EFpB@+)TqH*^``_xxL2n*npWy!O>y{VsWU-`73
zk467^@xnXH?RI-xDW&;Wnx=l9=RptziRXDafRqvd$6AZlns_*@xvpDyuABXr|HnV9
W-->iIbj|Ak0000<MNUMnLSTZhU!`{d