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 1/4] 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


From 307d16560844ff56790c2974e6c1d6755adf4bb1 Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sun, 27 Jan 2013 10:41:06 +1100
Subject: [PATCH 2/4] Added icons, fixed JSON bug

---
 drivers/bookmarklet/images/icons/Nokia Maps.png   | Bin 0 -> 636 bytes
 drivers/bookmarklet/images/icons/SUSE.png         | Bin 0 -> 573 bytes
 drivers/bookmarklet/json                          |   2 +-
 drivers/chrome/apps.json                          |   2 +-
 drivers/chrome/images/icons/Nokia Maps.png        | Bin 0 -> 636 bytes
 drivers/chrome/images/icons/SUSE.png              | Bin 0 -> 573 bytes
 drivers/firefox-jetpack/data/apps.json            |   2 +-
 .../firefox-jetpack/images/icons/Nokia Maps.png   | Bin 0 -> 636 bytes
 drivers/firefox-jetpack/images/icons/SUSE.png     | Bin 0 -> 573 bytes
 drivers/firefox/content/apps.json                 |   2 +-
 drivers/firefox/skin/images/icons/Nokia Maps.png  | Bin 0 -> 636 bytes
 drivers/firefox/skin/images/icons/SUSE.png        | Bin 0 -> 573 bytes
 drivers/html/apps.json                            |   2 +-
 drivers/html/images/icons/Nokia Maps.png          | Bin 0 -> 636 bytes
 drivers/html/images/icons/SUSE.png                | Bin 0 -> 573 bytes
 drivers/php/apps.json                             |   2 +-
 share/apps.json                                   |   2 +-
 share/images/icons/Nokia Maps.png                 | Bin 0 -> 636 bytes
 share/images/icons/SUSE.png                       | Bin 0 -> 573 bytes
 19 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 drivers/bookmarklet/images/icons/Nokia Maps.png
 create mode 100644 drivers/bookmarklet/images/icons/SUSE.png
 create mode 100644 drivers/chrome/images/icons/Nokia Maps.png
 create mode 100644 drivers/chrome/images/icons/SUSE.png
 create mode 100644 drivers/firefox-jetpack/images/icons/Nokia Maps.png
 create mode 100644 drivers/firefox-jetpack/images/icons/SUSE.png
 create mode 100644 drivers/firefox/skin/images/icons/Nokia Maps.png
 create mode 100644 drivers/firefox/skin/images/icons/SUSE.png
 create mode 100644 drivers/html/images/icons/Nokia Maps.png
 create mode 100644 drivers/html/images/icons/SUSE.png
 create mode 100644 share/images/icons/Nokia Maps.png
 create mode 100644 share/images/icons/SUSE.png

diff --git a/drivers/bookmarklet/images/icons/Nokia Maps.png b/drivers/bookmarklet/images/icons/Nokia Maps.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e12aa9501820918f1d6a10a4eef7fa303602a21
GIT binary patch
literal 636
zcmV-?0)zdDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oaGAPti2*6;uT0trb(
zK~y-)os-W_6JZob&rD{f(0|ifXge)Z+5$5JR3(J&WFfIEj0@k$2jCHW3l|#WPK_ai
z3WRD$t<Yji6Bo9{f}O(Dm4yP5;7#u4%gy=D?<Q9OBwg2MMNyQvLG>Kxq-a?MbX~ve
zI8N_>+AxfH>F>`^SD&%<=_}^c1c5*t>st*o9b<0kK0kh)5DzFknDP%;h@vR<wbwor
zc>QjJM)Qzxw8Q)S7mkiQ_%d1Q%`PMEs}uHLr_<v!58D`%34)<0$G>gTi3ky&OvED-
z@yXW%qR|w|q>QF%EasM(TIv#06;=$jKfF<CQ*YS}DI&|$>L6gp+UL!Bk&fLZmbIxi
zY{H&F?e7hn&03pOXy~$mp3>;pUCeYGO;recWMZl^=qrHcR|ubr(+4c(mWgF;G*#iz
zOrSrIue7N)Z4_B#?d2;<<vI&<DOQZfgMfOgOSNee^$sqp+OWx2+ay9RcB~4UAIo^%
zS44=b3So~#{DQV535?%z5%VkDGZXkc!^}*^F9UKHw!QzegCq&Oeg1-CsmA>51PApJ
z<?<e5Vc|01d>yoGwrWR=1r<K;*2x$4@Og(Rm3CR*E;1SlUJr1|BFPaKQNO}MCW+tY
zCZpdb5_A|11z5OaoB?{h-swfaL;WmHPJi;xi*y|4Q~)H?G&6!A+~}Mg$2qkuYx@tO
WC*1`Z;R>k$0000<MNUMnLSTYr8W(Z^

literal 0
HcmV?d00001

diff --git a/drivers/bookmarklet/images/icons/SUSE.png b/drivers/bookmarklet/images/icons/SUSE.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc1f640cf12bf5bdb293022308000c8c4cd1c6fc
GIT binary patch
literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oaG8VV^PohkqT0m?~4
zK~y-)rIS5q6j2bzfA8(y?(Ll(5iuqzrnIoI6s$xP3q@-Y(+GlKAX)_xD+w3{B?Lc8
zxzZwF6N>{u@B<NIr8x@)(fEOvkYvB!+kN{i;)Rpsh?;?^X685l8D@mFmW`NXgC_P5
zQF}RV7Xc1m785#VCezFa%e&`y?U!`{$FA{K#WYR9tDfzgZU=OP%r&zr<#oD5<Ha4@
zSQBuj&YLX80Vq{4ok5)-3Wd}OQpJSPJoTry?Zh8|bCXPWlV>ubsKrnwN#f50UX8JE
zj%H)jUihmewmx!6xZLt2_iFuINe#obUJf2OFLtgAFbWb&R2Zr%;#ssnlBXno1zYZ6
zuq(hq2#_0e;Il27r)e!G0Ro@hR#4Qoa%cr$)N;4B#|wn5ADqfF<|>;Rbp-WqO^&*f
z@#+?CcmdWc)7J*Lt1io--_03I;bQs|*DrH+*IsV^)?0{zk;RBlD*&A#RxO~!fK)v6
zt2{C(kHseL&rY*6u#a99GF*1p0UTLV0e}}^H53w#I}Rt%(6<MrQjn6?_YYj}IzlG|
zKtqvhzFNckG~&tBRXf?4=jvp61m9=m!JwV`=Wi?&vgA?!pJIStRMNxDZkT)U00000
LNkvXXu0mjfW_9q<

literal 0
HcmV?d00001

diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index c8c791e3c..cfb6a7c6e 100644
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -1737,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 c8c791e3c..cfb6a7c6e 100644
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -1737,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 0000000000000000000000000000000000000000..3e12aa9501820918f1d6a10a4eef7fa303602a21
GIT binary patch
literal 636
zcmV-?0)zdDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oaGAPti2*6;uT0trb(
zK~y-)os-W_6JZob&rD{f(0|ifXge)Z+5$5JR3(J&WFfIEj0@k$2jCHW3l|#WPK_ai
z3WRD$t<Yji6Bo9{f}O(Dm4yP5;7#u4%gy=D?<Q9OBwg2MMNyQvLG>Kxq-a?MbX~ve
zI8N_>+AxfH>F>`^SD&%<=_}^c1c5*t>st*o9b<0kK0kh)5DzFknDP%;h@vR<wbwor
zc>QjJM)Qzxw8Q)S7mkiQ_%d1Q%`PMEs}uHLr_<v!58D`%34)<0$G>gTi3ky&OvED-
z@yXW%qR|w|q>QF%EasM(TIv#06;=$jKfF<CQ*YS}DI&|$>L6gp+UL!Bk&fLZmbIxi
zY{H&F?e7hn&03pOXy~$mp3>;pUCeYGO;recWMZl^=qrHcR|ubr(+4c(mWgF;G*#iz
zOrSrIue7N)Z4_B#?d2;<<vI&<DOQZfgMfOgOSNee^$sqp+OWx2+ay9RcB~4UAIo^%
zS44=b3So~#{DQV535?%z5%VkDGZXkc!^}*^F9UKHw!QzegCq&Oeg1-CsmA>51PApJ
z<?<e5Vc|01d>yoGwrWR=1r<K;*2x$4@Og(Rm3CR*E;1SlUJr1|BFPaKQNO}MCW+tY
zCZpdb5_A|11z5OaoB?{h-swfaL;WmHPJi;xi*y|4Q~)H?G&6!A+~}Mg$2qkuYx@tO
WC*1`Z;R>k$0000<MNUMnLSTYr8W(Z^

literal 0
HcmV?d00001

diff --git a/drivers/chrome/images/icons/SUSE.png b/drivers/chrome/images/icons/SUSE.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc1f640cf12bf5bdb293022308000c8c4cd1c6fc
GIT binary patch
literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oaG8VV^PohkqT0m?~4
zK~y-)rIS5q6j2bzfA8(y?(Ll(5iuqzrnIoI6s$xP3q@-Y(+GlKAX)_xD+w3{B?Lc8
zxzZwF6N>{u@B<NIr8x@)(fEOvkYvB!+kN{i;)Rpsh?;?^X685l8D@mFmW`NXgC_P5
zQF}RV7Xc1m785#VCezFa%e&`y?U!`{$FA{K#WYR9tDfzgZU=OP%r&zr<#oD5<Ha4@
zSQBuj&YLX80Vq{4ok5)-3Wd}OQpJSPJoTry?Zh8|bCXPWlV>ubsKrnwN#f50UX8JE
zj%H)jUihmewmx!6xZLt2_iFuINe#obUJf2OFLtgAFbWb&R2Zr%;#ssnlBXno1zYZ6
zuq(hq2#_0e;Il27r)e!G0Ro@hR#4Qoa%cr$)N;4B#|wn5ADqfF<|>;Rbp-WqO^&*f
z@#+?CcmdWc)7J*Lt1io--_03I;bQs|*DrH+*IsV^)?0{zk;RBlD*&A#RxO~!fK)v6
zt2{C(kHseL&rY*6u#a99GF*1p0UTLV0e}}^H53w#I}Rt%(6<MrQjn6?_YYj}IzlG|
zKtqvhzFNckG~&tBRXf?4=jvp61m9=m!JwV`=Wi?&vgA?!pJIStRMNxDZkT)U00000
LNkvXXu0mjfW_9q<

literal 0
HcmV?d00001

diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index c8c791e3c..cfb6a7c6e 100644
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -1737,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 0000000000000000000000000000000000000000..3e12aa9501820918f1d6a10a4eef7fa303602a21
GIT binary patch
literal 636
zcmV-?0)zdDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oaGAPti2*6;uT0trb(
zK~y-)os-W_6JZob&rD{f(0|ifXge)Z+5$5JR3(J&WFfIEj0@k$2jCHW3l|#WPK_ai
z3WRD$t<Yji6Bo9{f}O(Dm4yP5;7#u4%gy=D?<Q9OBwg2MMNyQvLG>Kxq-a?MbX~ve
zI8N_>+AxfH>F>`^SD&%<=_}^c1c5*t>st*o9b<0kK0kh)5DzFknDP%;h@vR<wbwor
zc>QjJM)Qzxw8Q)S7mkiQ_%d1Q%`PMEs}uHLr_<v!58D`%34)<0$G>gTi3ky&OvED-
z@yXW%qR|w|q>QF%EasM(TIv#06;=$jKfF<CQ*YS}DI&|$>L6gp+UL!Bk&fLZmbIxi
zY{H&F?e7hn&03pOXy~$mp3>;pUCeYGO;recWMZl^=qrHcR|ubr(+4c(mWgF;G*#iz
zOrSrIue7N)Z4_B#?d2;<<vI&<DOQZfgMfOgOSNee^$sqp+OWx2+ay9RcB~4UAIo^%
zS44=b3So~#{DQV535?%z5%VkDGZXkc!^}*^F9UKHw!QzegCq&Oeg1-CsmA>51PApJ
z<?<e5Vc|01d>yoGwrWR=1r<K;*2x$4@Og(Rm3CR*E;1SlUJr1|BFPaKQNO}MCW+tY
zCZpdb5_A|11z5OaoB?{h-swfaL;WmHPJi;xi*y|4Q~)H?G&6!A+~}Mg$2qkuYx@tO
WC*1`Z;R>k$0000<MNUMnLSTYr8W(Z^

literal 0
HcmV?d00001

diff --git a/drivers/firefox-jetpack/images/icons/SUSE.png b/drivers/firefox-jetpack/images/icons/SUSE.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc1f640cf12bf5bdb293022308000c8c4cd1c6fc
GIT binary patch
literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oaG8VV^PohkqT0m?~4
zK~y-)rIS5q6j2bzfA8(y?(Ll(5iuqzrnIoI6s$xP3q@-Y(+GlKAX)_xD+w3{B?Lc8
zxzZwF6N>{u@B<NIr8x@)(fEOvkYvB!+kN{i;)Rpsh?;?^X685l8D@mFmW`NXgC_P5
zQF}RV7Xc1m785#VCezFa%e&`y?U!`{$FA{K#WYR9tDfzgZU=OP%r&zr<#oD5<Ha4@
zSQBuj&YLX80Vq{4ok5)-3Wd}OQpJSPJoTry?Zh8|bCXPWlV>ubsKrnwN#f50UX8JE
zj%H)jUihmewmx!6xZLt2_iFuINe#obUJf2OFLtgAFbWb&R2Zr%;#ssnlBXno1zYZ6
zuq(hq2#_0e;Il27r)e!G0Ro@hR#4Qoa%cr$)N;4B#|wn5ADqfF<|>;Rbp-WqO^&*f
z@#+?CcmdWc)7J*Lt1io--_03I;bQs|*DrH+*IsV^)?0{zk;RBlD*&A#RxO~!fK)v6
zt2{C(kHseL&rY*6u#a99GF*1p0UTLV0e}}^H53w#I}Rt%(6<MrQjn6?_YYj}IzlG|
zKtqvhzFNckG~&tBRXf?4=jvp61m9=m!JwV`=Wi?&vgA?!pJIStRMNxDZkT)U00000
LNkvXXu0mjfW_9q<

literal 0
HcmV?d00001

diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index c8c791e3c..cfb6a7c6e 100644
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -1737,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/skin/images/icons/Nokia Maps.png b/drivers/firefox/skin/images/icons/Nokia Maps.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e12aa9501820918f1d6a10a4eef7fa303602a21
GIT binary patch
literal 636
zcmV-?0)zdDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oaGAPti2*6;uT0trb(
zK~y-)os-W_6JZob&rD{f(0|ifXge)Z+5$5JR3(J&WFfIEj0@k$2jCHW3l|#WPK_ai
z3WRD$t<Yji6Bo9{f}O(Dm4yP5;7#u4%gy=D?<Q9OBwg2MMNyQvLG>Kxq-a?MbX~ve
zI8N_>+AxfH>F>`^SD&%<=_}^c1c5*t>st*o9b<0kK0kh)5DzFknDP%;h@vR<wbwor
zc>QjJM)Qzxw8Q)S7mkiQ_%d1Q%`PMEs}uHLr_<v!58D`%34)<0$G>gTi3ky&OvED-
z@yXW%qR|w|q>QF%EasM(TIv#06;=$jKfF<CQ*YS}DI&|$>L6gp+UL!Bk&fLZmbIxi
zY{H&F?e7hn&03pOXy~$mp3>;pUCeYGO;recWMZl^=qrHcR|ubr(+4c(mWgF;G*#iz
zOrSrIue7N)Z4_B#?d2;<<vI&<DOQZfgMfOgOSNee^$sqp+OWx2+ay9RcB~4UAIo^%
zS44=b3So~#{DQV535?%z5%VkDGZXkc!^}*^F9UKHw!QzegCq&Oeg1-CsmA>51PApJ
z<?<e5Vc|01d>yoGwrWR=1r<K;*2x$4@Og(Rm3CR*E;1SlUJr1|BFPaKQNO}MCW+tY
zCZpdb5_A|11z5OaoB?{h-swfaL;WmHPJi;xi*y|4Q~)H?G&6!A+~}Mg$2qkuYx@tO
WC*1`Z;R>k$0000<MNUMnLSTYr8W(Z^

literal 0
HcmV?d00001

diff --git a/drivers/firefox/skin/images/icons/SUSE.png b/drivers/firefox/skin/images/icons/SUSE.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc1f640cf12bf5bdb293022308000c8c4cd1c6fc
GIT binary patch
literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oaG8VV^PohkqT0m?~4
zK~y-)rIS5q6j2bzfA8(y?(Ll(5iuqzrnIoI6s$xP3q@-Y(+GlKAX)_xD+w3{B?Lc8
zxzZwF6N>{u@B<NIr8x@)(fEOvkYvB!+kN{i;)Rpsh?;?^X685l8D@mFmW`NXgC_P5
zQF}RV7Xc1m785#VCezFa%e&`y?U!`{$FA{K#WYR9tDfzgZU=OP%r&zr<#oD5<Ha4@
zSQBuj&YLX80Vq{4ok5)-3Wd}OQpJSPJoTry?Zh8|bCXPWlV>ubsKrnwN#f50UX8JE
zj%H)jUihmewmx!6xZLt2_iFuINe#obUJf2OFLtgAFbWb&R2Zr%;#ssnlBXno1zYZ6
zuq(hq2#_0e;Il27r)e!G0Ro@hR#4Qoa%cr$)N;4B#|wn5ADqfF<|>;Rbp-WqO^&*f
z@#+?CcmdWc)7J*Lt1io--_03I;bQs|*DrH+*IsV^)?0{zk;RBlD*&A#RxO~!fK)v6
zt2{C(kHseL&rY*6u#a99GF*1p0UTLV0e}}^H53w#I}Rt%(6<MrQjn6?_YYj}IzlG|
zKtqvhzFNckG~&tBRXf?4=jvp61m9=m!JwV`=Wi?&vgA?!pJIStRMNxDZkT)U00000
LNkvXXu0mjfW_9q<

literal 0
HcmV?d00001

diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index c8c791e3c..cfb6a7c6e 100644
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -1737,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 0000000000000000000000000000000000000000..3e12aa9501820918f1d6a10a4eef7fa303602a21
GIT binary patch
literal 636
zcmV-?0)zdDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oaGAPti2*6;uT0trb(
zK~y-)os-W_6JZob&rD{f(0|ifXge)Z+5$5JR3(J&WFfIEj0@k$2jCHW3l|#WPK_ai
z3WRD$t<Yji6Bo9{f}O(Dm4yP5;7#u4%gy=D?<Q9OBwg2MMNyQvLG>Kxq-a?MbX~ve
zI8N_>+AxfH>F>`^SD&%<=_}^c1c5*t>st*o9b<0kK0kh)5DzFknDP%;h@vR<wbwor
zc>QjJM)Qzxw8Q)S7mkiQ_%d1Q%`PMEs}uHLr_<v!58D`%34)<0$G>gTi3ky&OvED-
z@yXW%qR|w|q>QF%EasM(TIv#06;=$jKfF<CQ*YS}DI&|$>L6gp+UL!Bk&fLZmbIxi
zY{H&F?e7hn&03pOXy~$mp3>;pUCeYGO;recWMZl^=qrHcR|ubr(+4c(mWgF;G*#iz
zOrSrIue7N)Z4_B#?d2;<<vI&<DOQZfgMfOgOSNee^$sqp+OWx2+ay9RcB~4UAIo^%
zS44=b3So~#{DQV535?%z5%VkDGZXkc!^}*^F9UKHw!QzegCq&Oeg1-CsmA>51PApJ
z<?<e5Vc|01d>yoGwrWR=1r<K;*2x$4@Og(Rm3CR*E;1SlUJr1|BFPaKQNO}MCW+tY
zCZpdb5_A|11z5OaoB?{h-swfaL;WmHPJi;xi*y|4Q~)H?G&6!A+~}Mg$2qkuYx@tO
WC*1`Z;R>k$0000<MNUMnLSTYr8W(Z^

literal 0
HcmV?d00001

diff --git a/drivers/html/images/icons/SUSE.png b/drivers/html/images/icons/SUSE.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc1f640cf12bf5bdb293022308000c8c4cd1c6fc
GIT binary patch
literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oaG8VV^PohkqT0m?~4
zK~y-)rIS5q6j2bzfA8(y?(Ll(5iuqzrnIoI6s$xP3q@-Y(+GlKAX)_xD+w3{B?Lc8
zxzZwF6N>{u@B<NIr8x@)(fEOvkYvB!+kN{i;)Rpsh?;?^X685l8D@mFmW`NXgC_P5
zQF}RV7Xc1m785#VCezFa%e&`y?U!`{$FA{K#WYR9tDfzgZU=OP%r&zr<#oD5<Ha4@
zSQBuj&YLX80Vq{4ok5)-3Wd}OQpJSPJoTry?Zh8|bCXPWlV>ubsKrnwN#f50UX8JE
zj%H)jUihmewmx!6xZLt2_iFuINe#obUJf2OFLtgAFbWb&R2Zr%;#ssnlBXno1zYZ6
zuq(hq2#_0e;Il27r)e!G0Ro@hR#4Qoa%cr$)N;4B#|wn5ADqfF<|>;Rbp-WqO^&*f
z@#+?CcmdWc)7J*Lt1io--_03I;bQs|*DrH+*IsV^)?0{zk;RBlD*&A#RxO~!fK)v6
zt2{C(kHseL&rY*6u#a99GF*1p0UTLV0e}}^H53w#I}Rt%(6<MrQjn6?_YYj}IzlG|
zKtqvhzFNckG~&tBRXf?4=jvp61m9=m!JwV`=Wi?&vgA?!pJIStRMNxDZkT)U00000
LNkvXXu0mjfW_9q<

literal 0
HcmV?d00001

diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index c8c791e3c..cfb6a7c6e 100644
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -1737,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 c8c791e3c..cfb6a7c6e 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -1737,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/images/icons/Nokia Maps.png b/share/images/icons/Nokia Maps.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e12aa9501820918f1d6a10a4eef7fa303602a21
GIT binary patch
literal 636
zcmV-?0)zdDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oaGAPti2*6;uT0trb(
zK~y-)os-W_6JZob&rD{f(0|ifXge)Z+5$5JR3(J&WFfIEj0@k$2jCHW3l|#WPK_ai
z3WRD$t<Yji6Bo9{f}O(Dm4yP5;7#u4%gy=D?<Q9OBwg2MMNyQvLG>Kxq-a?MbX~ve
zI8N_>+AxfH>F>`^SD&%<=_}^c1c5*t>st*o9b<0kK0kh)5DzFknDP%;h@vR<wbwor
zc>QjJM)Qzxw8Q)S7mkiQ_%d1Q%`PMEs}uHLr_<v!58D`%34)<0$G>gTi3ky&OvED-
z@yXW%qR|w|q>QF%EasM(TIv#06;=$jKfF<CQ*YS}DI&|$>L6gp+UL!Bk&fLZmbIxi
zY{H&F?e7hn&03pOXy~$mp3>;pUCeYGO;recWMZl^=qrHcR|ubr(+4c(mWgF;G*#iz
zOrSrIue7N)Z4_B#?d2;<<vI&<DOQZfgMfOgOSNee^$sqp+OWx2+ay9RcB~4UAIo^%
zS44=b3So~#{DQV535?%z5%VkDGZXkc!^}*^F9UKHw!QzegCq&Oeg1-CsmA>51PApJ
z<?<e5Vc|01d>yoGwrWR=1r<K;*2x$4@Og(Rm3CR*E;1SlUJr1|BFPaKQNO}MCW+tY
zCZpdb5_A|11z5OaoB?{h-swfaL;WmHPJi;xi*y|4Q~)H?G&6!A+~}Mg$2qkuYx@tO
WC*1`Z;R>k$0000<MNUMnLSTYr8W(Z^

literal 0
HcmV?d00001

diff --git a/share/images/icons/SUSE.png b/share/images/icons/SUSE.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc1f640cf12bf5bdb293022308000c8c4cd1c6fc
GIT binary patch
literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-2oaG8VV^PohkqT0m?~4
zK~y-)rIS5q6j2bzfA8(y?(Ll(5iuqzrnIoI6s$xP3q@-Y(+GlKAX)_xD+w3{B?Lc8
zxzZwF6N>{u@B<NIr8x@)(fEOvkYvB!+kN{i;)Rpsh?;?^X685l8D@mFmW`NXgC_P5
zQF}RV7Xc1m785#VCezFa%e&`y?U!`{$FA{K#WYR9tDfzgZU=OP%r&zr<#oD5<Ha4@
zSQBuj&YLX80Vq{4ok5)-3Wd}OQpJSPJoTry?Zh8|bCXPWlV>ubsKrnwN#f50UX8JE
zj%H)jUihmewmx!6xZLt2_iFuINe#obUJf2OFLtgAFbWb&R2Zr%;#ssnlBXno1zYZ6
zuq(hq2#_0e;Il27r)e!G0Ro@hR#4Qoa%cr$)N;4B#|wn5ADqfF<|>;Rbp-WqO^&*f
z@#+?CcmdWc)7J*Lt1io--_03I;bQs|*DrH+*IsV^)?0{zk;RBlD*&A#RxO~!fK)v6
zt2{C(kHseL&rY*6u#a99GF*1p0UTLV0e}}^H53w#I}Rt%(6<MrQjn6?_YYj}IzlG|
zKtqvhzFNckG~&tBRXf?4=jvp61m9=m!JwV`=Wi?&vgA?!pJIStRMNxDZkT)U00000
LNkvXXu0mjfW_9q<

literal 0
HcmV?d00001


From 30165fb3a3123de9094d75a27ed3c2fb2fa0fa2d Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sun, 27 Jan 2013 10:43:52 +1100
Subject: [PATCH 3/4] Fixed Firefox preferences and locales

---
 drivers/firefox/content/xul/preferences.xul      | 2 ++
 drivers/firefox/defaults/preferences/defaults.js | 2 ++
 drivers/firefox/locale/de-DE/wappalyzer.dtd      | 8 ++++----
 drivers/firefox/locale/en-UK/wappalyzer.dtd      | 8 ++++----
 drivers/firefox/locale/en-US/wappalyzer.dtd      | 8 ++++----
 drivers/firefox/locale/fr-FR/wappalyzer.dtd      | 8 ++++----
 drivers/firefox/locale/nl-NL/wappalyzer.dtd      | 8 ++++----
 7 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/drivers/firefox/content/xul/preferences.xul b/drivers/firefox/content/xul/preferences.xul
index 3eb7087d8..154bf8e48 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-cat34" name="extensions.wappalyzer.cat35" type="bool"/>
+			<preference id="wappalyzer-cat34" name="extensions.wappalyzer.cat36" type="bool"/>
 
 			<preference id="wappalyzer-tracking" name="extensions.wappalyzer.tracking" type="bool"/>
 		</preferences>
diff --git a/drivers/firefox/defaults/preferences/defaults.js b/drivers/firefox/defaults/preferences/defaults.js
index 35340ac02..c6d284034 100644
--- a/drivers/firefox/defaults/preferences/defaults.js
+++ b/drivers/firefox/defaults/preferences/defaults.js
@@ -40,3 +40,5 @@ 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);
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">

From 11a93999ad3e9ec8d086897a4ae915dd10e3cd5b Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sun, 27 Jan 2013 10:46:29 +1100
Subject: [PATCH 4/4] Fixed Firefox preferences and locales

---
 drivers/firefox/content/xul/preferences.xul      | 6 +++---
 drivers/firefox/defaults/preferences/defaults.js | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/firefox/content/xul/preferences.xul b/drivers/firefox/content/xul/preferences.xul
index 154bf8e48..6d05b92d5 100755
--- a/drivers/firefox/content/xul/preferences.xul
+++ b/drivers/firefox/content/xul/preferences.xul
@@ -49,8 +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-cat34" name="extensions.wappalyzer.cat35" type="bool"/>
-			<preference id="wappalyzer-cat34" name="extensions.wappalyzer.cat36" 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>
@@ -98,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 c6d284034..b170d4ec1 100644
--- a/drivers/firefox/defaults/preferences/defaults.js
+++ b/drivers/firefox/defaults/preferences/defaults.js
@@ -42,3 +42,4 @@ 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);