diff --git a/src/fellchensammlung/static/fellchensammlung/map/styles/colorful.json b/src/fellchensammlung/static/fellchensammlung/map/styles/colorful/style.json
similarity index 75%
rename from src/fellchensammlung/static/fellchensammlung/map/styles/colorful.json
rename to src/fellchensammlung/static/fellchensammlung/map/styles/colorful/style.json
index e8205d0..870d9b2 100644
--- a/src/fellchensammlung/static/fellchensammlung/map/styles/colorful.json
+++ b/src/fellchensammlung/static/fellchensammlung/map/styles/colorful/style.json
@@ -2,329 +2,26 @@
 	"version": 8,
 	"name": "versatiles-colorful",
 	"metadata": {
-		"maputnik:renderer": "mbgljs",
 		"license": "https://creativecommons.org/publicdomain/zero/1.0/"
 	},
-	"glyphs": "https://tiles.hyteck.de/assets/fonts/{fontstack}/{range}.pbf",
-	"sprite": "https://tiles.hyteck.de/assets/sprites/sprites",
+	"glyphs": "https://tiles.hyteck.de/assets/glyphs/{fontstack}/{range}.pbf",
+	"sprite": [
+		{
+			"id": "basics",
+			"url": "https://tiles.hyteck.de/assets/sprites/basics/sprites"
+		}
+	],
 	"sources": {
 		"versatiles-shortbread": {
-			"tilejson": "3.0.0",
 			"attribution": "© <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors",
 			"tiles": [
 				"https://tiles.hyteck.de/tiles/osm/{z}/{x}/{y}"
 			],
 			"type": "vector",
 			"scheme": "xyz",
-			"format": "pbf",
 			"bounds": [ -180, -85.0511287798066, 180, 85.0511287798066 ],
 			"minzoom": 0,
-			"maxzoom": 14,
-			"vector_layers": [
-				{
-					"id": "place_labels",
-					"fields": {
-						"kind": "String",
-						"name": "String",
-						"name_de": "String",
-						"name_en": "String",
-						"population": "Number"
-					},
-					"minzoom": 3,
-					"maxzoom": 14
-				},
-				{
-					"id": "boundaries",
-					"fields": {
-						"admin_level": "Number",
-						"coastline": "Boolean",
-						"disputed": "Boolean",
-						"maritime": "Boolean"
-					},
-					"minzoom": 0,
-					"maxzoom": 14
-				},
-				{
-					"id": "boundary_labels",
-					"fields": {
-						"admin_level": "Number",
-						"land_area": "Number",
-						"name": "String",
-						"name_de": "String",
-						"name_en": "String",
-						"name_single": "String",
-						"way_area": "Number"
-					},
-					"minzoom": 2,
-					"maxzoom": 14
-				},
-				{
-					"id": "addresses",
-					"fields": {
-						"housename": "String",
-						"housenumber": "String"
-					},
-					"minzoom": 14,
-					"maxzoom": 14
-				},
-				{
-					"id": "water_lines",
-					"fields": {
-						"bridge": "Boolean",
-						"kind": "String",
-						"tunnel": "Boolean"
-					},
-					"minzoom": 4,
-					"maxzoom": 14
-				},
-				{
-					"id": "water_lines_labels",
-					"fields": {
-						"bridge": "Boolean",
-						"kind": "String",
-						"name": "String",
-						"name_de": "String",
-						"name_en": "String",
-						"tunnel": "Boolean"
-					},
-					"minzoom": 4,
-					"maxzoom": 14
-				},
-				{
-					"id": "dam_lines",
-					"fields": {
-						"kind": "String"
-					},
-					"minzoom": 12,
-					"maxzoom": 14
-				},
-				{
-					"id": "dam_polygons",
-					"fields": {
-						"kind": "String"
-					},
-					"minzoom": 12,
-					"maxzoom": 14
-				},
-				{
-					"id": "pier_lines",
-					"fields": {
-						"kind": "String"
-					},
-					"minzoom": 12,
-					"maxzoom": 14
-				},
-				{
-					"id": "pier_polygons",
-					"fields": {
-						"kind": "String"
-					},
-					"minzoom": 12,
-					"maxzoom": 14
-				},
-				{
-					"id": "bridges",
-					"fields": {
-						"kind": "String"
-					},
-					"minzoom": 12,
-					"maxzoom": 14
-				},
-				{
-					"id": "street_polygons",
-					"fields": {
-						"bridge": "Boolean",
-						"kind": "String",
-						"rail": "Boolean",
-						"service": "String",
-						"surface": "String",
-						"tunnel": "Boolean"
-					},
-					"minzoom": 11,
-					"maxzoom": 14
-				},
-				{
-					"id": "streets_polygons_labels",
-					"fields": {
-						"kind": "String",
-						"name": "String",
-						"name_de": "String",
-						"name_en": "String"
-					},
-					"minzoom": 14,
-					"maxzoom": 14
-				},
-				{
-					"id": "ferries",
-					"fields": {
-						"kind": "String",
-						"name": "String",
-						"name_de": "String",
-						"name_en": "String"
-					},
-					"minzoom": 8,
-					"maxzoom": 14
-				},
-				{
-					"id": "streets",
-					"fields": {
-						"bicycle": "String",
-						"bridge": "Boolean",
-						"horse": "String",
-						"kind": "String",
-						"link": "Boolean",
-						"oneway": "Boolean",
-						"oneway_reverse": "Boolean",
-						"rail": "Boolean",
-						"service": "String",
-						"surface": "String",
-						"tracktype": "String",
-						"tunnel": "Boolean"
-					},
-					"minzoom": 5,
-					"maxzoom": 14
-				},
-				{
-					"id": "street_labels",
-					"fields": {
-						"kind": "String",
-						"name": "String",
-						"name_de": "String",
-						"name_en": "String",
-						"ref": "String",
-						"ref_cols": "Number",
-						"ref_rows": "Number",
-						"tunnel": "Boolean"
-					},
-					"minzoom": 10,
-					"maxzoom": 14
-				},
-				{
-					"id": "street_labels_points",
-					"fields": {
-						"kind": "String",
-						"name": "String",
-						"name_de": "String",
-						"name_en": "String",
-						"ref": "String"
-					},
-					"minzoom": 12,
-					"maxzoom": 14
-				},
-				{
-					"id": "aerialways",
-					"fields": {
-						"kind": "String"
-					},
-					"minzoom": 12,
-					"maxzoom": 14
-				},
-				{
-					"id": "public_transport",
-					"fields": {
-						"iata": "String",
-						"kind": "String",
-						"name": "String",
-						"name_de": "String",
-						"name_en": "String",
-						"station": "String"
-					},
-					"minzoom": 11,
-					"maxzoom": 14
-				},
-				{
-					"id": "buildings",
-					"fields": {
-						"amenity": "String",
-						"dummy": "Number",
-						"name": "String",
-						"name_de": "String",
-						"name_en": "String"
-					},
-					"minzoom": 14,
-					"maxzoom": 14
-				},
-				{
-					"id": "water_polygons",
-					"fields": {
-						"kind": "String",
-						"way_area": "Number"
-					},
-					"minzoom": 4,
-					"maxzoom": 14
-				},
-				{
-					"id": "ocean",
-					"fields": {
-						"x": "Number",
-						"y": "Number"
-					},
-					"minzoom": 0,
-					"maxzoom": 14
-				},
-				{
-					"id": "water_polygons_labels",
-					"fields": {
-						"kind": "String",
-						"name": "String",
-						"name_de": "String",
-						"name_en": "String",
-						"way_area": "Number"
-					},
-					"minzoom": 14,
-					"maxzoom": 14
-				},
-				{
-					"id": "land",
-					"fields": {
-						"kind": "String"
-					},
-					"minzoom": 7,
-					"maxzoom": 14
-				},
-				{
-					"id": "sites",
-					"fields": {
-						"amenity": "String",
-						"kind": "String",
-						"name": "String",
-						"name_de": "String",
-						"name_en": "String"
-					},
-					"minzoom": 14,
-					"maxzoom": 14
-				},
-				{
-					"id": "pois",
-					"fields": {
-						"amenity": "String",
-						"atm": "Boolean",
-						"cuisine": "String",
-						"denomination": "String",
-						"emergency": "String",
-						"highway": "String",
-						"historic": "String",
-						"information": "String",
-						"leisure": "String",
-						"man_made": "String",
-						"name": "String",
-						"name_de": "String",
-						"name_en": "String",
-						"recycling:clothes": "Boolean",
-						"recycling:glass_bottles": "Boolean",
-						"recycling:paper": "Boolean",
-						"recycling:scrap_metal": "Boolean",
-						"religion": "String",
-						"shop": "String",
-						"sport": "String",
-						"tourism": "String",
-						"tower:type": "String",
-						"vending": "String"
-					},
-					"minzoom": 14,
-					"maxzoom": 14
-				}
-			]
+			"maxzoom": 14
 		}
 	},
 	"layers": [
@@ -332,7 +29,7 @@
 			"id": "background",
 			"type": "background",
 			"paint": {
-				"background-color": "#f9f4ee"
+				"background-color": "rgb(249,244,238)"
 			}
 		},
 		{
@@ -341,7 +38,7 @@
 			"type": "fill",
 			"source-layer": "ocean",
 			"paint": {
-				"fill-color": "#beddf3"
+				"fill-color": "rgb(190,221,243)"
 			}
 		},
 		{
@@ -351,7 +48,7 @@
 			"source-layer": "water_polygons",
 			"filter": [ "all", [ "==", "kind", "glacier" ] ],
 			"paint": {
-				"fill-color": "#ffffff"
+				"fill-color": "rgb(255,255,255)"
 			}
 		},
 		{
@@ -361,7 +58,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "commercial", "retail" ] ],
 			"paint": {
-				"fill-color": "rgba(247, 222, 237, 0.25098039215686274)",
+				"fill-color": "rgba(247,222,237,0.251)",
 				"fill-opacity": { "stops": [ [ 10, 0 ], [ 11, 1 ] ] }
 			}
 		},
@@ -372,7 +69,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "industrial", "quarry", "railway" ] ],
 			"paint": {
-				"fill-color": "rgba(255, 244, 194, 0.3333333333333333)",
+				"fill-color": "rgba(255,244,194,0.333)",
 				"fill-opacity": { "stops": [ [ 10, 0 ], [ 11, 1 ] ] }
 			}
 		},
@@ -383,7 +80,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "garages", "residential" ] ],
 			"paint": {
-				"fill-color": "rgba(234, 230, 225, 0.2)",
+				"fill-color": "rgba(234,230,225,0.2)",
 				"fill-opacity": { "stops": [ [ 10, 0 ], [ 11, 1 ] ] }
 			}
 		},
@@ -394,7 +91,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "brownfield", "farmland", "farmyard", "greenfield", "greenhouse_horticulture", "orchard", "plant_nursery", "vineyard" ] ],
 			"paint": {
-				"fill-color": "#f0e7d1",
+				"fill-color": "rgb(240,231,209)",
 				"fill-opacity": { "stops": [ [ 10, 0 ], [ 11, 1 ] ] }
 			}
 		},
@@ -405,7 +102,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "landfill" ] ],
 			"paint": {
-				"fill-color": "#dbd6bd",
+				"fill-color": "rgb(219,214,189)",
 				"fill-opacity": { "stops": [ [ 10, 0 ], [ 11, 1 ] ] }
 			}
 		},
@@ -416,7 +113,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "park", "village_green", "recreation_ground" ] ],
 			"paint": {
-				"fill-color": "#d9d9a5",
+				"fill-color": "rgb(217,217,165)",
 				"fill-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
 			}
 		},
@@ -427,7 +124,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "allotments", "garden" ] ],
 			"paint": {
-				"fill-color": "#d9d9a5",
+				"fill-color": "rgb(217,217,165)",
 				"fill-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
 			}
 		},
@@ -438,7 +135,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "cemetery", "grave_yard" ] ],
 			"paint": {
-				"fill-color": "#dddbca",
+				"fill-color": "rgb(221,219,202)",
 				"fill-opacity": { "stops": [ [ 13, 0 ], [ 14, 1 ] ] }
 			}
 		},
@@ -449,7 +146,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "miniature_golf", "playground", "golf_course" ] ],
 			"paint": {
-				"fill-color": "#e7edde"
+				"fill-color": "rgb(231,237,222)"
 			}
 		},
 		{
@@ -459,7 +156,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "bare_rock", "scree", "shingle" ] ],
 			"paint": {
-				"fill-color": "#e0e4e5"
+				"fill-color": "rgb(224,228,229)"
 			}
 		},
 		{
@@ -469,7 +166,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "forest" ] ],
 			"paint": {
-				"fill-color": "#66aa44",
+				"fill-color": "rgb(102,170,68)",
 				"fill-opacity": { "stops": [ [ 7, 0 ], [ 8, 0.1 ] ] }
 			}
 		},
@@ -480,7 +177,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "grass", "grassland", "meadow", "wet_meadow" ] ],
 			"paint": {
-				"fill-color": "#d8e8c8",
+				"fill-color": "rgb(216,232,200)",
 				"fill-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
 			}
 		},
@@ -491,7 +188,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "heath", "scrub" ] ],
 			"paint": {
-				"fill-color": "#d9d9a5",
+				"fill-color": "rgb(217,217,165)",
 				"fill-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
 			}
 		},
@@ -502,7 +199,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "beach", "sand" ] ],
 			"paint": {
-				"fill-color": "#fafaed"
+				"fill-color": "rgb(250,250,237)"
 			}
 		},
 		{
@@ -512,7 +209,7 @@
 			"source-layer": "land",
 			"filter": [ "all", [ "in", "kind", "bog", "marsh", "string_bog", "swamp" ] ],
 			"paint": {
-				"fill-color": "#d3e6db"
+				"fill-color": "rgb(211,230,219)"
 			}
 		},
 		{
@@ -522,7 +219,7 @@
 			"source-layer": "water_lines",
 			"filter": [ "all", [ "in", "kind", "river" ], [ "!=", "tunnel", true ], [ "!=", "bridge", true ] ],
 			"paint": {
-				"line-color": "#beddf3",
+				"line-color": "rgb(190,221,243)",
 				"line-width": { "stops": [ [ 9, 0 ], [ 10, 3 ], [ 15, 5 ], [ 17, 9 ], [ 18, 20 ], [ 20, 60 ] ] }
 			},
 			"layout": {
@@ -537,7 +234,7 @@
 			"source-layer": "water_lines",
 			"filter": [ "all", [ "in", "kind", "canal" ], [ "!=", "tunnel", true ], [ "!=", "bridge", true ] ],
 			"paint": {
-				"line-color": "#beddf3",
+				"line-color": "rgb(190,221,243)",
 				"line-width": { "stops": [ [ 9, 0 ], [ 10, 2 ], [ 15, 4 ], [ 17, 8 ], [ 18, 17 ], [ 20, 50 ] ] }
 			},
 			"layout": {
@@ -552,7 +249,7 @@
 			"source-layer": "water_lines",
 			"filter": [ "all", [ "in", "kind", "stream" ], [ "!=", "tunnel", true ], [ "!=", "bridge", true ] ],
 			"paint": {
-				"line-color": "#beddf3",
+				"line-color": "rgb(190,221,243)",
 				"line-width": { "stops": [ [ 13, 0 ], [ 14, 1 ], [ 15, 2 ], [ 17, 6 ], [ 18, 12 ], [ 20, 30 ] ] }
 			},
 			"layout": {
@@ -567,7 +264,7 @@
 			"source-layer": "water_lines",
 			"filter": [ "all", [ "in", "kind", "ditch" ], [ "!=", "tunnel", true ], [ "!=", "bridge", true ] ],
 			"paint": {
-				"line-color": "#beddf3",
+				"line-color": "rgb(190,221,243)",
 				"line-width": { "stops": [ [ 14, 0 ], [ 15, 1 ], [ 17, 4 ], [ 18, 8 ], [ 20, 20 ] ] }
 			},
 			"layout": {
@@ -582,7 +279,7 @@
 			"source-layer": "water_polygons",
 			"filter": [ "==", "kind", "water" ],
 			"paint": {
-				"fill-color": "#beddf3",
+				"fill-color": "rgb(190,221,243)",
 				"fill-opacity": { "stops": [ [ 4, 0 ], [ 6, 1 ] ] }
 			}
 		},
@@ -593,7 +290,7 @@
 			"source-layer": "water_polygons",
 			"filter": [ "==", "kind", "river" ],
 			"paint": {
-				"fill-color": "#beddf3",
+				"fill-color": "rgb(190,221,243)",
 				"fill-opacity": { "stops": [ [ 4, 0 ], [ 6, 1 ] ] }
 			}
 		},
@@ -604,7 +301,7 @@
 			"source-layer": "water_polygons",
 			"filter": [ "in", "kind", "reservoir", "basin", "dock" ],
 			"paint": {
-				"fill-color": "#beddf3",
+				"fill-color": "rgb(190,221,243)",
 				"fill-opacity": { "stops": [ [ 4, 0 ], [ 6, 1 ] ] }
 			}
 		},
@@ -615,7 +312,7 @@
 			"source-layer": "dam_polygons",
 			"filter": [ "==", "kind", "dam" ],
 			"paint": {
-				"fill-color": "#f9f4ee",
+				"fill-color": "rgb(249,244,238)",
 				"fill-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			}
 		},
@@ -626,7 +323,7 @@
 			"source-layer": "dam_lines",
 			"filter": [ "==", "kind", "dam" ],
 			"paint": {
-				"line-color": "#beddf3"
+				"line-color": "rgb(190,221,243)"
 			},
 			"layout": {
 				"line-cap": "round",
@@ -640,7 +337,7 @@
 			"source-layer": "pier_polygons",
 			"filter": [ "in", "kind", "pier", "breakwater", "groyne" ],
 			"paint": {
-				"fill-color": "#f9f4ee",
+				"fill-color": "rgb(249,244,238)",
 				"fill-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			}
 		},
@@ -651,7 +348,7 @@
 			"source-layer": "pier_lines",
 			"filter": [ "in", "kind", "pier", "breakwater", "groyne" ],
 			"paint": {
-				"line-color": "#beddf3"
+				"line-color": "rgb(249,244,238)"
 			},
 			"layout": {
 				"line-cap": "round",
@@ -665,10 +362,10 @@
 			"source-layer": "sites",
 			"filter": [ "in", "kind", "danger_area" ],
 			"paint": {
-				"fill-color": "#ff0000",
-				"fill-outline-color": "#ff0000",
+				"fill-color": "rgb(255,0,0)",
+				"fill-outline-color": "rgb(255,0,0)",
 				"fill-opacity": 0.3,
-				"fill-pattern": "pattern-warning"
+				"fill-pattern": "basics:pattern-warning"
 			}
 		},
 		{
@@ -678,7 +375,7 @@
 			"source-layer": "sites",
 			"filter": [ "in", "kind", "university" ],
 			"paint": {
-				"fill-color": "#ffff80",
+				"fill-color": "rgb(255,255,128)",
 				"fill-opacity": 0.1
 			}
 		},
@@ -689,7 +386,7 @@
 			"source-layer": "sites",
 			"filter": [ "in", "kind", "college" ],
 			"paint": {
-				"fill-color": "#ffff80",
+				"fill-color": "rgb(255,255,128)",
 				"fill-opacity": 0.1
 			}
 		},
@@ -700,7 +397,7 @@
 			"source-layer": "sites",
 			"filter": [ "in", "kind", "school" ],
 			"paint": {
-				"fill-color": "#ffff80",
+				"fill-color": "rgb(255,255,128)",
 				"fill-opacity": 0.1
 			}
 		},
@@ -711,7 +408,7 @@
 			"source-layer": "sites",
 			"filter": [ "in", "kind", "hospital" ],
 			"paint": {
-				"fill-color": "#ff6666",
+				"fill-color": "rgb(255,102,102)",
 				"fill-opacity": 0.1
 			}
 		},
@@ -722,8 +419,8 @@
 			"source-layer": "sites",
 			"filter": [ "in", "kind", "prison" ],
 			"paint": {
-				"fill-color": "#fdf2fc",
-				"fill-pattern": "pattern-striped",
+				"fill-color": "rgb(253,242,252)",
+				"fill-pattern": "basics:pattern-striped",
 				"fill-opacity": 0.1
 			}
 		},
@@ -734,7 +431,7 @@
 			"source-layer": "sites",
 			"filter": [ "in", "kind", "parking" ],
 			"paint": {
-				"fill-color": "#ebe8e6"
+				"fill-color": "rgb(235,232,230)"
 			}
 		},
 		{
@@ -744,7 +441,7 @@
 			"source-layer": "sites",
 			"filter": [ "in", "kind", "bicycle_parking" ],
 			"paint": {
-				"fill-color": "#ebe8e6"
+				"fill-color": "rgb(235,232,230)"
 			}
 		},
 		{
@@ -754,8 +451,8 @@
 			"source-layer": "sites",
 			"filter": [ "in", "kind", "construction" ],
 			"paint": {
-				"fill-color": "#a9a9a9",
-				"fill-pattern": "pattern-hatched_thin",
+				"fill-color": "rgb(169,169,169)",
+				"fill-pattern": "basics:pattern-hatched_thin",
 				"fill-opacity": 0.1
 			}
 		},
@@ -766,7 +463,7 @@
 			"source-layer": "street_polygons",
 			"filter": [ "in", "kind", "runway", "taxiway" ],
 			"paint": {
-				"fill-color": "#ffffff",
+				"fill-color": "rgb(255,255,255)",
 				"fill-opacity": 0.5
 			}
 		},
@@ -777,7 +474,7 @@
 			"source-layer": "streets",
 			"filter": [ "==", "kind", "taxiway" ],
 			"paint": {
-				"line-color": "#cfcdca",
+				"line-color": "rgb(207,205,202)",
 				"line-width": { "stops": [ [ 13, 0 ], [ 14, 2 ], [ 15, 10 ], [ 16, 14 ], [ 18, 20 ], [ 20, 40 ] ] }
 			},
 			"layout": {
@@ -791,7 +488,7 @@
 			"source-layer": "streets",
 			"filter": [ "==", "kind", "runway" ],
 			"paint": {
-				"line-color": "#cfcdca",
+				"line-color": "rgb(207,205,202)",
 				"line-width": { "stops": [ [ 11, 0 ], [ 12, 6 ], [ 13, 9 ], [ 14, 16 ], [ 15, 24 ], [ 16, 40 ], [ 17, 100 ], [ 18, 160 ], [ 20, 300 ] ] }
 			},
 			"layout": {
@@ -805,7 +502,7 @@
 			"source-layer": "streets",
 			"filter": [ "==", "kind", "taxiway" ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 13, 0 ], [ 14, 1 ], [ 15, 8 ], [ 16, 12 ], [ 18, 18 ], [ 20, 36 ] ] },
 				"line-opacity": { "stops": [ [ 13, 0 ], [ 14, 1 ] ] }
 			},
@@ -820,7 +517,7 @@
 			"source-layer": "streets",
 			"filter": [ "==", "kind", "runway" ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 11, 0 ], [ 12, 5 ], [ 13, 8 ], [ 14, 14 ], [ 15, 22 ], [ 16, 38 ], [ 17, 98 ], [ 18, 158 ], [ 20, 298 ] ] },
 				"line-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
 			},
@@ -834,7 +531,7 @@
 			"type": "fill",
 			"source-layer": "buildings",
 			"paint": {
-				"fill-color": "#dfdbd7",
+				"fill-color": "rgb(223,219,215)",
 				"fill-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
 			}
 		},
@@ -844,7 +541,7 @@
 			"type": "fill",
 			"source-layer": "buildings",
 			"paint": {
-				"fill-color": "#f2eae2",
+				"fill-color": "rgb(242,234,226)",
 				"fill-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] },
 				"fill-translate": [ -2, -2 ]
 			}
@@ -856,7 +553,7 @@
 			"source-layer": "street_polygons",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "==", "kind", "pedestrian" ] ],
 			"paint": {
-				"fill-color": "#f7f7f7",
+				"fill-color": "rgb(247,247,247)",
 				"fill-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			}
 		},
@@ -871,7 +568,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 19, 12 ], [ 20, 22 ] ] },
-				"line-color": "#e7cbee"
+				"line-color": "hsl(288,13%,86%)"
 			},
 			"minzoom": 15
 		},
@@ -886,7 +583,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 19, 12 ], [ 20, 22 ] ] },
-				"line-color": "#e7cbee"
+				"line-color": "hsl(288,13%,86%)"
 			},
 			"minzoom": 15
 		},
@@ -901,7 +598,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 19, 12 ], [ 20, 22 ] ] },
-				"line-color": "#e7cbee"
+				"line-color": "hsl(288,13%,86%)"
 			},
 			"minzoom": 15
 		},
@@ -916,7 +613,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 19, 12 ], [ 20, 22 ] ] },
-				"line-color": "#cee2ef"
+				"line-color": "hsl(203,11%,87%)"
 			},
 			"minzoom": 15
 		},
@@ -927,7 +624,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "track" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#dedede",
+				"line-color": "rgb(222,222,222)",
 				"line-width": { "stops": [ [ 14, 2 ], [ 16, 4 ], [ 18, 18 ], [ 19, 48 ], [ 20, 96 ] ] },
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
 			},
@@ -943,7 +640,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "pedestrian" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#dedede",
+				"line-color": "rgb(222,222,222)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -957,11 +654,11 @@
 			"id": "tunnel-street-service:outline",
 			"type": "line",
 			"source-layer": "streets",
-			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "tunnel", true ], [ "!=", "service", "driveway" ] ],
+			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#dedede",
-				"line-width": { "stops": [ [ 14, 2 ], [ 16, 4 ], [ 18, 18 ], [ 19, 48 ], [ 20, 96 ] ] },
-				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
+				"line-color": "rgb(221,220,218)",
+				"line-width": { "stops": [ [ 14, 1 ], [ 16, 3 ], [ 18, 12 ], [ 19, 32 ], [ 20, 48 ] ] },
+				"line-opacity": { "stops": [ [ 15, 0 ], [ 16, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
@@ -975,7 +672,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "living_street" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#dedede",
+				"line-color": "rgb(222,222,222)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -991,7 +688,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "residential" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#dedede",
+				"line-color": "rgb(222,222,222)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1007,7 +704,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "unclassified" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#dedede",
+				"line-color": "rgb(222,222,222)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1023,7 +720,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "tertiary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#dedede",
+				"line-color": "rgb(222,222,222)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1039,7 +736,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "secondary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ebb586",
+				"line-color": "rgb(234,176,126)",
 				"line-dasharray": [ 1, 0.3 ],
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 7 ], [ 18, 14 ], [ 20, 40 ] ] }
 			},
@@ -1056,7 +753,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "primary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ebb586",
+				"line-color": "rgb(234,176,126)",
 				"line-dasharray": [ 1, 0.3 ],
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 7 ], [ 18, 14 ], [ 20, 40 ] ] }
 			},
@@ -1073,7 +770,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "trunk" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ebb586",
+				"line-color": "rgb(234,176,126)",
 				"line-dasharray": [ 1, 0.3 ],
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 7 ], [ 18, 14 ], [ 20, 40 ] ] }
 			},
@@ -1090,7 +787,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "motorway" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ebb586",
+				"line-color": "rgb(234,176,126)",
 				"line-dasharray": [ 1, 0.3 ],
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 7 ], [ 18, 14 ], [ 20, 40 ] ] }
 			},
@@ -1107,7 +804,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "tertiary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#dedede",
+				"line-color": "rgb(222,222,222)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1123,7 +820,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "secondary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ebb586",
+				"line-color": "rgb(234,176,126)",
 				"line-dasharray": [ 1, 0.3 ],
 				"line-width": { "stops": [ [ 11, 2 ], [ 14, 5 ], [ 16, 8 ], [ 18, 30 ], [ 19, 68 ], [ 20, 138 ] ] },
 				"line-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
@@ -1140,7 +837,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "primary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ebb586",
+				"line-color": "rgb(234,176,126)",
 				"line-dasharray": [ 1, 0.3 ],
 				"line-width": { "stops": [ [ 8, 0 ], [ 9, 1 ], [ 10, 4 ], [ 14, 6 ], [ 16, 12 ], [ 18, 36 ], [ 19, 74 ], [ 20, 144 ] ] }
 			},
@@ -1156,7 +853,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "trunk" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ebb586",
+				"line-color": "rgb(234,176,126)",
 				"line-dasharray": [ 1, 0.3 ],
 				"line-width": { "stops": [ [ 7, 0 ], [ 8, 2 ], [ 10, 4 ], [ 14, 6 ], [ 16, 12 ], [ 18, 36 ], [ 19, 74 ], [ 20, 144 ] ] }
 			},
@@ -1172,7 +869,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "motorway" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ebb586",
+				"line-color": "rgb(234,176,126)",
 				"line-dasharray": [ 1, 0.3 ],
 				"line-width": { "stops": [ [ 5, 0 ], [ 6, 2 ], [ 10, 5 ], [ 14, 5 ], [ 16, 14 ], [ 18, 38 ], [ 19, 84 ], [ 20, 168 ] ] }
 			},
@@ -1192,7 +889,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 4 ], [ 18, 6 ], [ 19, 10 ], [ 20, 20 ] ] },
-				"line-color": "#f5e9f8",
+				"line-color": "hsl(288,33%,94%)",
 				"line-dasharray": [ 1, 0.2 ]
 			},
 			"minzoom": 15
@@ -1208,7 +905,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 4 ], [ 18, 6 ], [ 19, 10 ], [ 20, 20 ] ] },
-				"line-color": "#f5e9f8",
+				"line-color": "hsl(288,33%,94%)",
 				"line-dasharray": [ 1, 0.2 ]
 			},
 			"minzoom": 15
@@ -1224,7 +921,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 4 ], [ 18, 6 ], [ 19, 10 ], [ 20, 20 ] ] },
-				"line-color": "#f5e9f8",
+				"line-color": "hsl(288,33%,94%)",
 				"line-dasharray": [ 1, 0.2 ]
 			},
 			"minzoom": 15
@@ -1240,7 +937,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 4 ], [ 18, 6 ], [ 19, 10 ], [ 20, 20 ] ] },
-				"line-color": "#ecf4f9",
+				"line-color": "hsl(203,30%,95%)",
 				"line-dasharray": [ 1, 0.2 ]
 			},
 			"minzoom": 15
@@ -1252,7 +949,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "track" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#f7f7f7",
+				"line-color": "rgb(247,247,247)",
 				"line-width": { "stops": [ [ 14, 1 ], [ 16, 3 ], [ 18, 16 ], [ 19, 44 ], [ 20, 88 ] ] },
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
 			},
@@ -1268,7 +965,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "pedestrian" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#f7f7f7",
+				"line-color": "rgb(247,247,247)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1282,11 +979,11 @@
 			"id": "tunnel-street-service",
 			"type": "line",
 			"source-layer": "streets",
-			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "tunnel", true ], [ "!=", "service", "driveway" ] ],
+			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#f7f7f7",
-				"line-width": { "stops": [ [ 14, 1 ], [ 16, 3 ], [ 18, 16 ], [ 19, 44 ], [ 20, 88 ] ] },
-				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
+				"line-color": "rgb(247,247,247)",
+				"line-width": { "stops": [ [ 14, 1 ], [ 16, 2 ], [ 18, 10 ], [ 19, 28 ], [ 20, 40 ] ] },
+				"line-opacity": { "stops": [ [ 15, 0 ], [ 16, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
@@ -1300,7 +997,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "living_street" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#f7f7f7",
+				"line-color": "rgb(247,247,247)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1316,7 +1013,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "residential" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#f7f7f7",
+				"line-color": "rgb(247,247,247)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1332,7 +1029,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "unclassified" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#f7f7f7",
+				"line-color": "rgb(247,247,247)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1348,7 +1045,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "track" ], [ "==", "bicycle", "designated" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#f7f7f7"
+				"line-color": "rgb(247,247,247)"
 			},
 			"layout": {
 				"line-join": "round",
@@ -1362,13 +1059,13 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "pedestrian" ], [ "==", "bicycle", "designated" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#eff9ff",
+				"line-color": "rgb(239,249,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
-				"line-cap": "butt"
+				"line-cap": "round"
 			}
 		},
 		{
@@ -1376,9 +1073,9 @@
 			"id": "tunnel-street-service-bicycle",
 			"type": "line",
 			"source-layer": "streets",
-			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "bicycle", "designated" ], [ "==", "tunnel", true ], [ "!=", "service", "driveway" ] ],
+			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "bicycle", "designated" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#f7f7f7"
+				"line-color": "rgb(247,247,247)"
 			},
 			"layout": {
 				"line-join": "round",
@@ -1392,13 +1089,13 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "living_street" ], [ "==", "bicycle", "designated" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#eff9ff",
+				"line-color": "rgb(239,249,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
-				"line-cap": "butt"
+				"line-cap": "round"
 			}
 		},
 		{
@@ -1408,13 +1105,13 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "residential" ], [ "==", "bicycle", "designated" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#eff9ff",
+				"line-color": "rgb(239,249,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
-				"line-cap": "butt"
+				"line-cap": "round"
 			}
 		},
 		{
@@ -1424,13 +1121,13 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "unclassified" ], [ "==", "bicycle", "designated" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#eff9ff",
+				"line-color": "rgb(239,249,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
-				"line-cap": "butt"
+				"line-cap": "round"
 			}
 		},
 		{
@@ -1440,7 +1137,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "tertiary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#f7f7f7",
+				"line-color": "rgb(247,247,247)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1456,7 +1153,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "secondary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#fff6d4",
+				"line-color": "rgb(255,240,179)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 12 ], [ 20, 38 ] ] }
 			},
 			"layout": {
@@ -1472,7 +1169,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "primary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#fff6d4",
+				"line-color": "rgb(255,240,179)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 12 ], [ 20, 38 ] ] }
 			},
 			"layout": {
@@ -1488,7 +1185,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "trunk" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#fff6d4",
+				"line-color": "rgb(255,240,179)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 12 ], [ 20, 38 ] ] }
 			},
 			"layout": {
@@ -1504,7 +1201,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "motorway" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ffddaf",
+				"line-color": "rgb(255,209,148)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 12 ], [ 20, 38 ] ] }
 			},
 			"layout": {
@@ -1520,7 +1217,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "tertiary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#f7f7f7",
+				"line-color": "rgb(247,247,247)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1536,7 +1233,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "secondary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#fff6d4",
+				"line-color": "rgb(255,240,179)",
 				"line-width": { "stops": [ [ 11, 1 ], [ 14, 4 ], [ 16, 6 ], [ 18, 28 ], [ 19, 64 ], [ 20, 130 ] ] },
 				"line-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
 			},
@@ -1552,7 +1249,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "primary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#fff6d4",
+				"line-color": "rgb(255,240,179)",
 				"line-width": { "stops": [ [ 8, 0 ], [ 9, 2 ], [ 10, 3 ], [ 14, 5 ], [ 16, 10 ], [ 18, 34 ], [ 19, 70 ], [ 20, 140 ] ] },
 				"line-opacity": { "stops": [ [ 8, 0 ], [ 9, 1 ] ] }
 			},
@@ -1568,7 +1265,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "trunk" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#fff6d4",
+				"line-color": "rgb(255,240,179)",
 				"line-width": { "stops": [ [ 7, 0 ], [ 8, 1 ], [ 10, 3 ], [ 14, 5 ], [ 16, 10 ], [ 18, 34 ], [ 19, 70 ], [ 20, 140 ] ] },
 				"line-opacity": { "stops": [ [ 7, 0 ], [ 8, 1 ] ] }
 			},
@@ -1584,7 +1281,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "tunnel", true ], [ "in", "kind", "motorway" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ffddaf",
+				"line-color": "rgb(255,209,148)",
 				"line-width": { "stops": [ [ 5, 0 ], [ 6, 1 ], [ 10, 4 ], [ 14, 4 ], [ 16, 12 ], [ 18, 36 ], [ 19, 80 ], [ 20, 160 ] ] },
 				"line-opacity": { "stops": [ [ 5, 0 ], [ 6, 1 ] ] }
 			},
@@ -1593,32 +1290,6 @@
 				"line-cap": "butt"
 			}
 		},
-		{
-			"source": "versatiles-shortbread",
-			"id": "tunnel-transport-monorail:outline",
-			"type": "line",
-			"source-layer": "streets",
-			"filter": [ "all", [ "in", "kind", "monorail" ], [ "!has", "service" ], [ "==", "tunnel", true ] ],
-			"minzoom": 15,
-			"paint": {
-				"line-color": "#b1bbc4",
-				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
-				"line-dasharray": [ 0.1, 0.5 ]
-			}
-		},
-		{
-			"source": "versatiles-shortbread",
-			"id": "tunnel-transport-funicular:outline",
-			"type": "line",
-			"source-layer": "streets",
-			"filter": [ "all", [ "in", "kind", "funicular" ], [ "!has", "service" ], [ "==", "tunnel", true ] ],
-			"minzoom": 15,
-			"paint": {
-				"line-color": "#b1bbc4",
-				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
-				"line-dasharray": [ 0.1, 0.5 ]
-			}
-		},
 		{
 			"source": "versatiles-shortbread",
 			"id": "tunnel-transport-tram:outline",
@@ -1627,7 +1298,7 @@
 			"filter": [ "all", [ "in", "kind", "tram" ], [ "!has", "service" ], [ "==", "tunnel", true ] ],
 			"minzoom": 15,
 			"paint": {
-				"line-color": "#b1bbc4",
+				"line-color": "rgb(177,187,196)",
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
 				"line-dasharray": [ 0.1, 0.5 ]
 			}
@@ -1640,7 +1311,7 @@
 			"filter": [ "all", [ "in", "kind", "narrow_gauge" ], [ "!has", "service" ], [ "==", "tunnel", true ] ],
 			"minzoom": 15,
 			"paint": {
-				"line-color": "#b1bbc4",
+				"line-color": "rgb(177,187,196)",
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
 				"line-dasharray": [ 0.1, 0.5 ]
 			}
@@ -1652,7 +1323,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "subway" ], [ "!has", "service" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#a6b8c7",
+				"line-color": "rgb(166,184,199)",
 				"line-width": { "stops": [ [ 11, 0 ], [ 12, 1 ], [ 15, 3 ], [ 16, 3 ], [ 18, 6 ], [ 19, 8 ], [ 20, 10 ] ] },
 				"line-opacity": { "stops": [ [ 11, 0 ], [ 12, 0.5 ] ] }
 			}
@@ -1664,10 +1335,23 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "light_rail" ], [ "!has", "service" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#b1bbc4",
-				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 3 ], [ 16, 4 ], [ 18, 8 ], [ 19, 11 ], [ 20, 14 ] ] },
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 1 ], [ 20, 14 ] ] },
 				"line-opacity": { "stops": [ [ 11, 0 ], [ 12, 0.5 ] ] }
-			}
+			},
+			"minzoom": 8
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "tunnel-transport-lightrail-service:outline",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "light_rail" ], [ "has", "service" ], [ "==", "tunnel", true ] ],
+			"paint": {
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 14, 0 ], [ 15, 1 ], [ 16, 1 ], [ 20, 14 ] ] }
+			},
+			"minzoom": 14
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -1676,33 +1360,48 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "rail" ], [ "!has", "service" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#b1bbc4",
-				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 3 ], [ 16, 4 ], [ 18, 8 ], [ 19, 11 ], [ 20, 14 ] ] },
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 1 ], [ 20, 14 ] ] },
 				"line-opacity": { "stops": [ [ 8, 0 ], [ 9, 0.3 ] ] }
+			},
+			"minzoom": 8
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "tunnel-transport-rail-service:outline",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "rail" ], [ "has", "service" ], [ "==", "tunnel", true ] ],
+			"paint": {
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 14, 0 ], [ 15, 1 ], [ 16, 1 ], [ 20, 14 ] ] }
+			},
+			"minzoom": 14
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "tunnel-transport-monorail:outline",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "monorail" ], [ "==", "tunnel", true ] ],
+			"minzoom": 15,
+			"paint": {
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
+				"line-dasharray": [ 0.1, 0.5 ]
 			}
 		},
 		{
 			"source": "versatiles-shortbread",
-			"id": "tunnel-transport-monorail",
+			"id": "tunnel-transport-funicular:outline",
 			"type": "line",
 			"source-layer": "streets",
-			"filter": [ "all", [ "in", "kind", "monorail" ], [ "!has", "service" ], [ "==", "tunnel", true ] ],
-			"minzoom": 13,
+			"filter": [ "all", [ "in", "kind", "funicular" ], [ "==", "tunnel", true ] ],
+			"minzoom": 15,
 			"paint": {
-				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
-				"line-color": "#b1bbc4"
-			}
-		},
-		{
-			"source": "versatiles-shortbread",
-			"id": "tunnel-transport-funicular",
-			"type": "line",
-			"source-layer": "streets",
-			"filter": [ "all", [ "in", "kind", "funicular" ], [ "!has", "service" ], [ "==", "tunnel", true ] ],
-			"minzoom": 13,
-			"paint": {
-				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
-				"line-color": "#b1bbc4"
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
+				"line-dasharray": [ 0.1, 0.5 ]
 			}
 		},
 		{
@@ -1714,7 +1413,7 @@
 			"minzoom": 13,
 			"paint": {
 				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
-				"line-color": "#b1bbc4"
+				"line-color": "rgb(177,187,196)"
 			}
 		},
 		{
@@ -1726,7 +1425,7 @@
 			"minzoom": 13,
 			"paint": {
 				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
-				"line-color": "#b1bbc4"
+				"line-color": "rgb(177,187,196)"
 			}
 		},
 		{
@@ -1736,7 +1435,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "subway" ], [ "!has", "service" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#dee5ea",
+				"line-color": "rgb(188,202,213)",
 				"line-width": { "stops": [ [ 11, 0 ], [ 12, 1 ], [ 15, 2 ], [ 16, 2 ], [ 18, 5 ], [ 19, 6 ], [ 20, 8 ] ] },
 				"line-dasharray": [ 2, 2 ],
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
@@ -1749,11 +1448,25 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "light_rail" ], [ "!has", "service" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#e6e9ec",
-				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 2 ], [ 16, 3 ], [ 18, 6 ], [ 19, 8 ], [ 20, 10 ] ] },
+				"line-color": "rgb(197,204,211)",
+				"line-width": { "stops": [ [ 14, 0 ], [ 15, 1 ], [ 20, 10 ] ] },
 				"line-dasharray": [ 2, 2 ],
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
-			}
+			},
+			"minzoom": 14
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "tunnel-transport-lightrail-service",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "light_rail" ], [ "has", "service" ], [ "==", "tunnel", true ] ],
+			"paint": {
+				"line-color": "rgb(197,204,211)",
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 1 ], [ 20, 10 ] ] },
+				"line-dasharray": [ 2, 2 ]
+			},
+			"minzoom": 15
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -1762,10 +1475,59 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "rail" ], [ "!has", "service" ], [ "==", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#e6e9ec",
-				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 2 ], [ 16, 3 ], [ 18, 6 ], [ 19, 8 ], [ 20, 10 ] ] },
+				"line-color": "rgb(197,204,211)",
+				"line-width": { "stops": [ [ 14, 0 ], [ 15, 1 ], [ 20, 10 ] ] },
 				"line-dasharray": [ 2, 2 ],
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 0.3 ] ] }
+			},
+			"minzoom": 14
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "tunnel-transport-rail-service",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "rail" ], [ "has", "service" ], [ "==", "tunnel", true ] ],
+			"paint": {
+				"line-color": "rgb(197,204,211)",
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 1 ], [ 20, 10 ] ] },
+				"line-dasharray": [ 2, 2 ]
+			},
+			"minzoom": 15
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "tunnel-transport-monorail",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "monorail" ], [ "==", "tunnel", true ] ],
+			"minzoom": 13,
+			"paint": {
+				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
+				"line-color": "rgb(177,187,196)"
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "tunnel-transport-funicular",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "funicular" ], [ "==", "tunnel", true ] ],
+			"minzoom": 13,
+			"paint": {
+				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
+				"line-color": "rgb(177,187,196)"
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge",
+			"type": "fill",
+			"source-layer": "bridges",
+			"paint": {
+				"fill-color": "rgb(244,239,233)",
+				"fill-antialias": true,
+				"fill-opacity": 0.8
 			}
 		},
 		{
@@ -1775,7 +1537,7 @@
 			"source-layer": "street_polygons",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "==", "kind", "pedestrian" ] ],
 			"paint": {
-				"fill-color": "hsla(288, 100%, 98%, 0.25)",
+				"fill-color": "rgba(251,235,255,0.25)",
 				"fill-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ], [ 14, 0 ], [ 15, 1 ] ] }
 			}
 		},
@@ -1790,7 +1552,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 19, 12 ], [ 20, 22 ] ] },
-				"line-color": "#f1baff"
+				"line-color": "rgb(226,212,230)"
 			},
 			"minzoom": 15
 		},
@@ -1805,7 +1567,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 19, 12 ], [ 20, 22 ] ] },
-				"line-color": "#f1baff"
+				"line-color": "rgb(226,212,230)"
 			},
 			"minzoom": 15
 		},
@@ -1820,7 +1582,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 19, 12 ], [ 20, 22 ] ] },
-				"line-color": "#f1baff"
+				"line-color": "rgb(226,212,230)"
 			},
 			"minzoom": 15
 		},
@@ -1835,7 +1597,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 19, 12 ], [ 20, 22 ] ] },
-				"line-color": "#bee6ff"
+				"line-color": "rgb(215,224,230)"
 			},
 			"minzoom": 15
 		},
@@ -1846,7 +1608,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "track" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#cfcdca",
+				"line-color": "rgb(207,205,202)",
 				"line-width": { "stops": [ [ 14, 2 ], [ 16, 4 ], [ 18, 18 ], [ 19, 48 ], [ 20, 96 ] ] },
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
 			},
@@ -1862,7 +1624,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "pedestrian" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#cfcdca",
+				"line-color": "rgb(207,205,202)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1876,11 +1638,11 @@
 			"id": "street-service:outline",
 			"type": "line",
 			"source-layer": "streets",
-			"filter": [ "all", [ "==", "kind", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "!=", "service", "driveway" ] ],
+			"filter": [ "all", [ "==", "kind", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#cfcdca",
-				"line-width": { "stops": [ [ 14, 2 ], [ 16, 4 ], [ 18, 18 ], [ 19, 48 ], [ 20, 96 ] ] },
-				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
+				"line-color": "rgb(221,220,218)",
+				"line-width": { "stops": [ [ 14, 1 ], [ 16, 3 ], [ 18, 12 ], [ 19, 32 ], [ 20, 48 ] ] },
+				"line-opacity": { "stops": [ [ 15, 0 ], [ 16, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
@@ -1894,7 +1656,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "living_street" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#cfcdca",
+				"line-color": "rgb(207,205,202)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1910,7 +1672,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "residential" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#cfcdca",
+				"line-color": "rgb(207,205,202)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1926,7 +1688,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "unclassified" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#cfcdca",
+				"line-color": "rgb(207,205,202)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1942,7 +1704,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "tertiary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#cfcdca",
+				"line-color": "rgb(207,205,202)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -1958,7 +1720,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "secondary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 7 ], [ 18, 14 ], [ 20, 40 ] ] }
 			},
 			"layout": {
@@ -1974,7 +1736,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "primary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 7 ], [ 18, 14 ], [ 20, 40 ] ] }
 			},
 			"layout": {
@@ -1990,7 +1752,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "trunk" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 7 ], [ 18, 14 ], [ 20, 40 ] ] }
 			},
 			"layout": {
@@ -2006,7 +1768,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "motorway" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 7 ], [ 18, 14 ], [ 20, 40 ] ] }
 			},
 			"layout": {
@@ -2022,7 +1784,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "tertiary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#cfcdca",
+				"line-color": "rgb(207,205,202)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -2038,7 +1800,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "secondary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 11, 2 ], [ 14, 5 ], [ 16, 8 ], [ 18, 30 ], [ 19, 68 ], [ 20, 138 ] ] },
 				"line-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
 			},
@@ -2054,7 +1816,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "primary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 8, 0 ], [ 9, 1 ], [ 10, 4 ], [ 14, 6 ], [ 16, 12 ], [ 18, 36 ], [ 19, 74 ], [ 20, 144 ] ] }
 			},
 			"layout": {
@@ -2069,7 +1831,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "trunk" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 7, 0 ], [ 8, 2 ], [ 10, 4 ], [ 14, 6 ], [ 16, 12 ], [ 18, 36 ], [ 19, 74 ], [ 20, 144 ] ] }
 			},
 			"layout": {
@@ -2084,7 +1846,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "motorway" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 5, 0 ], [ 6, 2 ], [ 10, 5 ], [ 14, 5 ], [ 16, 14 ], [ 18, 38 ], [ 19, 84 ], [ 20, 168 ] ] }
 			},
 			"layout": {
@@ -2103,7 +1865,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 4 ], [ 18, 6 ], [ 19, 10 ], [ 20, 20 ] ] },
-				"line-color": "#fdf5ff"
+				"line-color": "rgb(251,235,255)"
 			},
 			"minzoom": 15
 		},
@@ -2118,7 +1880,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 4 ], [ 18, 6 ], [ 19, 10 ], [ 20, 20 ] ] },
-				"line-color": "#fdf5ff"
+				"line-color": "rgb(251,235,255)"
 			},
 			"minzoom": 15
 		},
@@ -2133,7 +1895,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 4 ], [ 18, 6 ], [ 19, 10 ], [ 20, 20 ] ] },
-				"line-color": "#fdf5ff"
+				"line-color": "rgb(251,235,255)"
 			},
 			"minzoom": 15
 		},
@@ -2148,7 +1910,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 4 ], [ 18, 6 ], [ 19, 10 ], [ 20, 20 ] ] },
-				"line-color": "#eff9ff"
+				"line-color": "rgb(239,249,255)"
 			},
 			"minzoom": 15
 		},
@@ -2159,7 +1921,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "track" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 14, 1 ], [ 16, 3 ], [ 18, 16 ], [ 19, 44 ], [ 20, 88 ] ] },
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
 			},
@@ -2175,7 +1937,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "pedestrian" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#fbebff",
+				"line-color": "rgb(251,235,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 0 ], [ 14, 1 ] ] }
 			},
@@ -2189,11 +1951,11 @@
 			"id": "street-service",
 			"type": "line",
 			"source-layer": "streets",
-			"filter": [ "all", [ "==", "kind", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "!=", "service", "driveway" ] ],
+			"filter": [ "all", [ "==", "kind", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
-				"line-width": { "stops": [ [ 14, 1 ], [ 16, 3 ], [ 18, 16 ], [ 19, 44 ], [ 20, 88 ] ] },
-				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
+				"line-color": "rgb(247,247,247)",
+				"line-width": { "stops": [ [ 14, 1 ], [ 16, 2 ], [ 18, 10 ], [ 19, 28 ], [ 20, 40 ] ] },
+				"line-opacity": { "stops": [ [ 15, 0 ], [ 16, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
@@ -2207,7 +1969,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "living_street" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -2223,7 +1985,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "residential" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -2239,7 +2001,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "unclassified" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -2255,7 +2017,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "track" ], [ "==", "bicycle", "designated" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#ffffff"
+				"line-color": "rgb(255,255,255)"
 			},
 			"layout": {
 				"line-join": "round",
@@ -2269,13 +2031,13 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "pedestrian" ], [ "==", "bicycle", "designated" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#eff9ff",
+				"line-color": "rgb(239,249,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
-				"line-cap": "butt"
+				"line-cap": "round"
 			}
 		},
 		{
@@ -2283,9 +2045,9 @@
 			"id": "street-service-bicycle",
 			"type": "line",
 			"source-layer": "streets",
-			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "bicycle", "designated" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "!=", "service", "driveway" ] ],
+			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "bicycle", "designated" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#ffffff"
+				"line-color": "rgb(255,255,255)"
 			},
 			"layout": {
 				"line-join": "round",
@@ -2299,13 +2061,13 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "living_street" ], [ "==", "bicycle", "designated" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#eff9ff",
+				"line-color": "rgb(239,249,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
-				"line-cap": "butt"
+				"line-cap": "round"
 			}
 		},
 		{
@@ -2315,13 +2077,13 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "residential" ], [ "==", "bicycle", "designated" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#eff9ff",
+				"line-color": "rgb(239,249,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
-				"line-cap": "butt"
+				"line-cap": "round"
 			}
 		},
 		{
@@ -2331,13 +2093,13 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "unclassified" ], [ "==", "bicycle", "designated" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#eff9ff",
+				"line-color": "rgb(239,249,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
-				"line-cap": "butt"
+				"line-cap": "round"
 			}
 		},
 		{
@@ -2347,7 +2109,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "tertiary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -2363,7 +2125,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "secondary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ffeeaa",
+				"line-color": "rgb(255,238,170)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 12 ], [ 20, 38 ] ] }
 			},
 			"layout": {
@@ -2379,7 +2141,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "primary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ffeeaa",
+				"line-color": "rgb(255,238,170)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 12 ], [ 20, 38 ] ] }
 			},
 			"layout": {
@@ -2395,7 +2157,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "trunk" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ffeeaa",
+				"line-color": "rgb(255,238,170)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 12 ], [ 20, 38 ] ] }
 			},
 			"layout": {
@@ -2411,7 +2173,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "motorway" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ffcc88",
+				"line-color": "rgb(255,204,136)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 12 ], [ 20, 38 ] ] }
 			},
 			"layout": {
@@ -2427,7 +2189,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "tertiary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -2443,7 +2205,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "secondary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ffeeaa",
+				"line-color": "rgb(255,238,170)",
 				"line-width": { "stops": [ [ 11, 1 ], [ 14, 4 ], [ 16, 6 ], [ 18, 28 ], [ 19, 64 ], [ 20, 130 ] ] },
 				"line-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
 			},
@@ -2459,7 +2221,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "primary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ffeeaa",
+				"line-color": "rgb(255,238,170)",
 				"line-width": { "stops": [ [ 8, 0 ], [ 9, 2 ], [ 10, 3 ], [ 14, 5 ], [ 16, 10 ], [ 18, 34 ], [ 19, 70 ], [ 20, 140 ] ] },
 				"line-opacity": { "stops": [ [ 8, 0 ], [ 9, 1 ] ] }
 			},
@@ -2475,7 +2237,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "trunk" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ffeeaa",
+				"line-color": "rgb(255,238,170)",
 				"line-width": { "stops": [ [ 7, 0 ], [ 8, 1 ], [ 10, 3 ], [ 14, 5 ], [ 16, 10 ], [ 18, 34 ], [ 19, 70 ], [ 20, 140 ] ] },
 				"line-opacity": { "stops": [ [ 7, 0 ], [ 8, 1 ] ] }
 			},
@@ -2491,7 +2253,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "!=", "bridge", true ], [ "!=", "tunnel", true ], [ "in", "kind", "motorway" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ffcc88",
+				"line-color": "rgb(255,204,136)",
 				"line-width": { "stops": [ [ 5, 0 ], [ 6, 1 ], [ 10, 4 ], [ 14, 4 ], [ 16, 12 ], [ 18, 36 ], [ 19, 80 ], [ 20, 160 ] ] },
 				"line-opacity": { "stops": [ [ 5, 0 ], [ 6, 1 ] ] }
 			},
@@ -2500,32 +2262,6 @@
 				"line-cap": "round"
 			}
 		},
-		{
-			"source": "versatiles-shortbread",
-			"id": "transport-monorail:outline",
-			"type": "line",
-			"source-layer": "streets",
-			"filter": [ "all", [ "in", "kind", "monorail" ], [ "!has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
-			"minzoom": 15,
-			"paint": {
-				"line-color": "#b1bbc4",
-				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
-				"line-dasharray": [ 0.1, 0.5 ]
-			}
-		},
-		{
-			"source": "versatiles-shortbread",
-			"id": "transport-funicular:outline",
-			"type": "line",
-			"source-layer": "streets",
-			"filter": [ "all", [ "in", "kind", "funicular" ], [ "!has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
-			"minzoom": 15,
-			"paint": {
-				"line-color": "#b1bbc4",
-				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
-				"line-dasharray": [ 0.1, 0.5 ]
-			}
-		},
 		{
 			"source": "versatiles-shortbread",
 			"id": "transport-tram:outline",
@@ -2534,7 +2270,7 @@
 			"filter": [ "all", [ "in", "kind", "tram" ], [ "!has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"minzoom": 15,
 			"paint": {
-				"line-color": "#b1bbc4",
+				"line-color": "rgb(177,187,196)",
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
 				"line-dasharray": [ 0.1, 0.5 ]
 			}
@@ -2547,7 +2283,7 @@
 			"filter": [ "all", [ "in", "kind", "narrow_gauge" ], [ "!has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"minzoom": 15,
 			"paint": {
-				"line-color": "#b1bbc4",
+				"line-color": "rgb(177,187,196)",
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
 				"line-dasharray": [ 0.1, 0.5 ]
 			}
@@ -2559,7 +2295,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "subway" ], [ "!has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#a6b8c7",
+				"line-color": "rgb(166,184,199)",
 				"line-width": { "stops": [ [ 11, 0 ], [ 12, 1 ], [ 15, 3 ], [ 16, 3 ], [ 18, 6 ], [ 19, 8 ], [ 20, 10 ] ] },
 				"line-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
 			}
@@ -2571,10 +2307,23 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "light_rail" ], [ "!has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#b1bbc4",
-				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 3 ], [ 16, 4 ], [ 18, 8 ], [ 19, 11 ], [ 20, 14 ] ] },
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 1 ], [ 20, 14 ] ] },
 				"line-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
-			}
+			},
+			"minzoom": 8
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "transport-lightrail-service:outline",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "light_rail" ], [ "has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
+			"paint": {
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 14, 0 ], [ 15, 1 ], [ 16, 1 ], [ 20, 14 ] ] }
+			},
+			"minzoom": 14
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -2583,33 +2332,48 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "rail" ], [ "!has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#b1bbc4",
-				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 3 ], [ 16, 4 ], [ 18, 8 ], [ 19, 11 ], [ 20, 14 ] ] },
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 1 ], [ 20, 14 ] ] },
 				"line-opacity": { "stops": [ [ 8, 0 ], [ 9, 1 ] ] }
+			},
+			"minzoom": 8
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "transport-rail-service:outline",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "rail" ], [ "has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
+			"paint": {
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 14, 0 ], [ 15, 1 ], [ 16, 1 ], [ 20, 14 ] ] }
+			},
+			"minzoom": 14
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "transport-monorail:outline",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "monorail" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
+			"minzoom": 15,
+			"paint": {
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
+				"line-dasharray": [ 0.1, 0.5 ]
 			}
 		},
 		{
 			"source": "versatiles-shortbread",
-			"id": "transport-monorail",
+			"id": "transport-funicular:outline",
 			"type": "line",
 			"source-layer": "streets",
-			"filter": [ "all", [ "in", "kind", "monorail" ], [ "!has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
-			"minzoom": 13,
+			"filter": [ "all", [ "in", "kind", "funicular" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
+			"minzoom": 15,
 			"paint": {
-				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
-				"line-color": "#b1bbc4"
-			}
-		},
-		{
-			"source": "versatiles-shortbread",
-			"id": "transport-funicular",
-			"type": "line",
-			"source-layer": "streets",
-			"filter": [ "all", [ "in", "kind", "funicular" ], [ "!has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
-			"minzoom": 13,
-			"paint": {
-				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
-				"line-color": "#b1bbc4"
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
+				"line-dasharray": [ 0.1, 0.5 ]
 			}
 		},
 		{
@@ -2621,7 +2385,7 @@
 			"minzoom": 13,
 			"paint": {
 				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
-				"line-color": "#b1bbc4"
+				"line-color": "rgb(177,187,196)"
 			}
 		},
 		{
@@ -2633,7 +2397,7 @@
 			"minzoom": 13,
 			"paint": {
 				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
-				"line-color": "#b1bbc4"
+				"line-color": "rgb(177,187,196)"
 			}
 		},
 		{
@@ -2643,7 +2407,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "subway" ], [ "!has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#dee5ea",
+				"line-color": "rgb(188,202,213)",
 				"line-width": { "stops": [ [ 11, 0 ], [ 12, 1 ], [ 15, 2 ], [ 16, 2 ], [ 18, 5 ], [ 19, 6 ], [ 20, 8 ] ] },
 				"line-dasharray": [ 2, 2 ],
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
@@ -2656,11 +2420,25 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "light_rail" ], [ "!has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#e6e9ec",
-				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 2 ], [ 16, 3 ], [ 18, 6 ], [ 19, 8 ], [ 20, 10 ] ] },
+				"line-color": "rgb(197,204,211)",
+				"line-width": { "stops": [ [ 14, 0 ], [ 15, 1 ], [ 20, 10 ] ] },
 				"line-dasharray": [ 2, 2 ],
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
-			}
+			},
+			"minzoom": 14
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "transport-lightrail-service",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "light_rail" ], [ "has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
+			"paint": {
+				"line-color": "rgb(197,204,211)",
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 1 ], [ 20, 10 ] ] },
+				"line-dasharray": [ 2, 2 ]
+			},
+			"minzoom": 15
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -2669,10 +2447,48 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "rail" ], [ "!has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
 			"paint": {
-				"line-color": "#e6e9ec",
-				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 2 ], [ 16, 3 ], [ 18, 6 ], [ 19, 8 ], [ 20, 10 ] ] },
+				"line-color": "rgb(197,204,211)",
+				"line-width": { "stops": [ [ 14, 0 ], [ 15, 1 ], [ 20, 10 ] ] },
 				"line-dasharray": [ 2, 2 ],
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
+			},
+			"minzoom": 14
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "transport-rail-service",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "rail" ], [ "has", "service" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
+			"paint": {
+				"line-color": "rgb(197,204,211)",
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 1 ], [ 20, 10 ] ] },
+				"line-dasharray": [ 2, 2 ]
+			},
+			"minzoom": 15
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "transport-monorail",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "monorail" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
+			"minzoom": 13,
+			"paint": {
+				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
+				"line-color": "rgb(177,187,196)"
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "transport-funicular",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "funicular" ], [ "!=", "bridge", true ], [ "!=", "tunnel", true ] ],
+			"minzoom": 13,
+			"paint": {
+				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
+				"line-color": "rgb(177,187,196)"
 			}
 		},
 		{
@@ -2682,7 +2498,7 @@
 			"source-layer": "ferries",
 			"minzoom": 10,
 			"paint": {
-				"line-color": "#99caec",
+				"line-color": "rgb(171,199,219)",
 				"line-width": { "stops": [ [ 10, 1 ], [ 13, 2 ], [ 14, 3 ], [ 16, 4 ], [ 17, 6 ] ] },
 				"line-opacity": { "stops": [ [ 10, 0 ], [ 11, 1 ] ] },
 				"line-dasharray": [ 1, 1 ]
@@ -2690,13 +2506,330 @@
 		},
 		{
 			"source": "versatiles-shortbread",
-			"id": "bridge",
-			"type": "fill",
-			"source-layer": "bridges",
+			"id": "bridge-way-footway:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "footway" ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
 			"paint": {
-				"fill-color": "#f6efe7",
-				"fill-antialias": true,
-				"fill-opacity": 0.8
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": 0.5,
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 7 ], [ 18, 10 ], [ 19, 17 ], [ 20, 31 ] ] }
+			},
+			"minzoom": 15
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-way-steps:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "steps" ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": 0.5,
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 7 ], [ 18, 10 ], [ 19, 17 ], [ 20, 31 ] ] }
+			},
+			"minzoom": 15
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-way-path:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "path" ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": 0.5,
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 7 ], [ 18, 10 ], [ 19, 17 ], [ 20, 31 ] ] }
+			},
+			"minzoom": 15
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-way-cycleway:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "cycleway" ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": 0.5,
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 7 ], [ 18, 10 ], [ 19, 17 ], [ 20, 31 ] ] }
+			},
+			"minzoom": 15
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-track:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "kind", "track" ], [ "==", "bridge", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] },
+				"line-width": { "stops": [ [ 14, 3 ], [ 16, 6 ], [ 18, 25 ], [ 19, 67 ], [ 20, 134 ] ] }
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-pedestrian:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "kind", "pedestrian" ], [ "==", "bridge", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] },
+				"line-width": { "stops": [ [ 12, 3 ], [ 14, 4 ], [ 16, 8 ], [ 18, 36 ], [ 19, 90 ], [ 20, 179 ] ] }
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-service:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "bridge", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] },
+				"line-width": { "stops": [ [ 14, 3 ], [ 16, 6 ], [ 18, 25 ], [ 19, 67 ], [ 20, 134 ] ] }
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-livingstreet:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "kind", "living_street" ], [ "==", "bridge", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] },
+				"line-width": { "stops": [ [ 12, 3 ], [ 14, 4 ], [ 16, 8 ], [ 18, 36 ], [ 19, 90 ], [ 20, 179 ] ] }
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-residential:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "kind", "residential" ], [ "==", "bridge", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] },
+				"line-width": { "stops": [ [ 12, 3 ], [ 14, 4 ], [ 16, 8 ], [ 18, 36 ], [ 19, 90 ], [ 20, 179 ] ] }
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-unclassified:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "kind", "unclassified" ], [ "==", "bridge", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] },
+				"line-width": { "stops": [ [ 12, 3 ], [ 14, 4 ], [ 16, 8 ], [ 18, 36 ], [ 19, 90 ], [ 20, 179 ] ] }
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-tertiary-link:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "tertiary" ], [ "==", "link", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] },
+				"line-width": { "stops": [ [ 12, 3 ], [ 14, 4 ], [ 16, 8 ], [ 18, 36 ], [ 19, 90 ], [ 20, 179 ] ] }
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-secondary-link:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "secondary" ], [ "==", "link", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": 0.5,
+				"line-width": { "stops": [ [ 12, 3 ], [ 14, 4 ], [ 16, 10 ], [ 18, 20 ], [ 20, 56 ] ] }
+			},
+			"minzoom": 13
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-primary-link:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "primary" ], [ "==", "link", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": 0.5,
+				"line-width": { "stops": [ [ 12, 3 ], [ 14, 4 ], [ 16, 10 ], [ 18, 20 ], [ 20, 56 ] ] }
+			},
+			"minzoom": 13
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-trunk-link:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "trunk" ], [ "==", "link", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": 0.5,
+				"line-width": { "stops": [ [ 12, 3 ], [ 14, 4 ], [ 16, 10 ], [ 18, 20 ], [ 20, 56 ] ] }
+			},
+			"minzoom": 13
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-motorway-link:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "motorway" ], [ "==", "link", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": 0.5,
+				"line-width": { "stops": [ [ 12, 3 ], [ 14, 4 ], [ 16, 10 ], [ 18, 20 ], [ 20, 56 ] ] }
+			},
+			"minzoom": 12
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-tertiary:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "tertiary" ], [ "!=", "link", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] },
+				"line-width": { "stops": [ [ 12, 3 ], [ 14, 4 ], [ 16, 8 ], [ 18, 36 ], [ 19, 90 ], [ 20, 179 ] ] }
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-secondary:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "secondary" ], [ "!=", "link", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] },
+				"line-width": { "stops": [ [ 11, 3 ], [ 14, 7 ], [ 16, 11 ], [ 18, 42 ], [ 19, 95 ], [ 20, 193 ] ] }
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-primary:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "primary" ], [ "!=", "link", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": 0.5,
+				"line-width": { "stops": [ [ 8, 0 ], [ 9, 1 ], [ 10, 6 ], [ 14, 8 ], [ 16, 17 ], [ 18, 50 ], [ 19, 104 ], [ 20, 202 ] ] }
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-trunk:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "trunk" ], [ "!=", "link", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": 0.5,
+				"line-width": { "stops": [ [ 7, 0 ], [ 8, 3 ], [ 10, 6 ], [ 14, 8 ], [ 16, 17 ], [ 18, 50 ], [ 19, 104 ], [ 20, 202 ] ] }
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-street-motorway:bridge",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "motorway" ], [ "!=", "link", true ] ],
+			"layout": {
+				"line-cap": "butt",
+				"line-join": "round"
+			},
+			"paint": {
+				"line-color": "rgb(244,239,233)",
+				"line-opacity": 0.5,
+				"line-width": { "stops": [ [ 5, 0 ], [ 6, 3 ], [ 10, 7 ], [ 14, 7 ], [ 16, 20 ], [ 18, 53 ], [ 19, 118 ], [ 20, 235 ] ] }
 			}
 		},
 		{
@@ -2706,7 +2839,7 @@
 			"source-layer": "street_polygons",
 			"filter": [ "all", [ "==", "bridge", true ], [ "==", "kind", "pedestrian" ] ],
 			"paint": {
-				"fill-color": "#ffffff",
+				"fill-color": "rgb(255,255,255)",
 				"fill-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			}
 		},
@@ -2721,7 +2854,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 19, 12 ], [ 20, 22 ] ] },
-				"line-color": "#f1baff"
+				"line-color": "rgb(226,212,230)"
 			},
 			"minzoom": 15
 		},
@@ -2736,7 +2869,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 19, 12 ], [ 20, 22 ] ] },
-				"line-color": "#f1baff"
+				"line-color": "rgb(226,212,230)"
 			},
 			"minzoom": 15
 		},
@@ -2751,7 +2884,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 19, 12 ], [ 20, 22 ] ] },
-				"line-color": "#f1baff"
+				"line-color": "rgb(226,212,230)"
 			},
 			"minzoom": 15
 		},
@@ -2766,7 +2899,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 19, 12 ], [ 20, 22 ] ] },
-				"line-color": "#bee6ff"
+				"line-color": "rgb(215,224,230)"
 			},
 			"minzoom": 15
 		},
@@ -2777,7 +2910,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "track" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#d9d9d9",
+				"line-color": "rgb(217,217,217)",
 				"line-width": { "stops": [ [ 14, 2 ], [ 16, 4 ], [ 18, 18 ], [ 19, 48 ], [ 20, 96 ] ] },
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
 			},
@@ -2793,7 +2926,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "pedestrian" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#d9d9d9",
+				"line-color": "rgb(217,217,217)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -2807,11 +2940,11 @@
 			"id": "bridge-street-service:outline",
 			"type": "line",
 			"source-layer": "streets",
-			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "bridge", true ], [ "!=", "service", "driveway" ] ],
+			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#d9d9d9",
-				"line-width": { "stops": [ [ 14, 2 ], [ 16, 4 ], [ 18, 18 ], [ 19, 48 ], [ 20, 96 ] ] },
-				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
+				"line-color": "rgb(221,220,218)",
+				"line-width": { "stops": [ [ 14, 1 ], [ 16, 3 ], [ 18, 12 ], [ 19, 32 ], [ 20, 48 ] ] },
+				"line-opacity": { "stops": [ [ 15, 0 ], [ 16, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
@@ -2825,7 +2958,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "living_street" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#d9d9d9",
+				"line-color": "rgb(217,217,217)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -2841,7 +2974,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "residential" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#d9d9d9",
+				"line-color": "rgb(217,217,217)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -2857,7 +2990,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "unclassified" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#d9d9d9",
+				"line-color": "rgb(217,217,217)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -2873,7 +3006,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "tertiary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#d9d9d9",
+				"line-color": "rgb(217,217,217)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -2889,7 +3022,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "secondary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 7 ], [ 18, 14 ], [ 20, 40 ] ] }
 			},
 			"layout": {
@@ -2905,7 +3038,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "primary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 7 ], [ 18, 14 ], [ 20, 40 ] ] }
 			},
 			"layout": {
@@ -2921,7 +3054,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "trunk" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 7 ], [ 18, 14 ], [ 20, 40 ] ] }
 			},
 			"layout": {
@@ -2937,7 +3070,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "motorway" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 7 ], [ 18, 14 ], [ 20, 40 ] ] }
 			},
 			"layout": {
@@ -2953,7 +3086,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "tertiary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#d9d9d9",
+				"line-color": "rgb(217,217,217)",
 				"line-width": { "stops": [ [ 12, 2 ], [ 14, 3 ], [ 16, 6 ], [ 18, 26 ], [ 19, 64 ], [ 20, 128 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -2969,7 +3102,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "secondary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 11, 2 ], [ 14, 5 ], [ 16, 8 ], [ 18, 30 ], [ 19, 68 ], [ 20, 138 ] ] },
 				"line-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
 			},
@@ -2985,7 +3118,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "primary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 8, 0 ], [ 9, 1 ], [ 10, 4 ], [ 14, 6 ], [ 16, 12 ], [ 18, 36 ], [ 19, 74 ], [ 20, 144 ] ] }
 			},
 			"layout": {
@@ -3000,7 +3133,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "trunk" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 7, 0 ], [ 8, 2 ], [ 10, 4 ], [ 14, 6 ], [ 16, 12 ], [ 18, 36 ], [ 19, 74 ], [ 20, 144 ] ] }
 			},
 			"layout": {
@@ -3015,7 +3148,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "motorway" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#e9ac77",
+				"line-color": "rgb(233,172,119)",
 				"line-width": { "stops": [ [ 5, 0 ], [ 6, 2 ], [ 10, 5 ], [ 14, 5 ], [ 16, 14 ], [ 18, 38 ], [ 19, 84 ], [ 20, 168 ] ] }
 			},
 			"layout": {
@@ -3034,7 +3167,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 4 ], [ 18, 6 ], [ 19, 10 ], [ 20, 20 ] ] },
-				"line-color": "#fdf5ff"
+				"line-color": "rgb(251,235,255)"
 			},
 			"minzoom": 15
 		},
@@ -3049,7 +3182,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 4 ], [ 18, 6 ], [ 19, 10 ], [ 20, 20 ] ] },
-				"line-color": "#fdf5ff"
+				"line-color": "rgb(251,235,255)"
 			},
 			"minzoom": 15
 		},
@@ -3064,7 +3197,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 4 ], [ 18, 6 ], [ 19, 10 ], [ 20, 20 ] ] },
-				"line-color": "#fdf5ff"
+				"line-color": "rgb(251,235,255)"
 			},
 			"minzoom": 15
 		},
@@ -3079,7 +3212,7 @@
 			},
 			"paint": {
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 4 ], [ 18, 6 ], [ 19, 10 ], [ 20, 20 ] ] },
-				"line-color": "#eff9ff"
+				"line-color": "rgb(239,249,255)"
 			},
 			"minzoom": 15
 		},
@@ -3090,7 +3223,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "track" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 14, 1 ], [ 16, 3 ], [ 18, 16 ], [ 19, 44 ], [ 20, 88 ] ] },
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
 			},
@@ -3106,7 +3239,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "pedestrian" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -3120,11 +3253,11 @@
 			"id": "bridge-street-service",
 			"type": "line",
 			"source-layer": "streets",
-			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "bridge", true ], [ "!=", "service", "driveway" ] ],
+			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
-				"line-width": { "stops": [ [ 14, 1 ], [ 16, 3 ], [ 18, 16 ], [ 19, 44 ], [ 20, 88 ] ] },
-				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
+				"line-color": "rgb(247,247,247)",
+				"line-width": { "stops": [ [ 14, 1 ], [ 16, 2 ], [ 18, 10 ], [ 19, 28 ], [ 20, 40 ] ] },
+				"line-opacity": { "stops": [ [ 15, 0 ], [ 16, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
@@ -3138,7 +3271,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "living_street" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -3154,7 +3287,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "residential" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -3170,7 +3303,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "unclassified" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -3186,7 +3319,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "track" ], [ "==", "bicycle", "designated" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#ffffff"
+				"line-color": "rgb(255,255,255)"
 			},
 			"layout": {
 				"line-join": "round",
@@ -3200,13 +3333,13 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "pedestrian" ], [ "==", "bicycle", "designated" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#eff9ff",
+				"line-color": "rgb(239,249,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
-				"line-cap": "butt"
+				"line-cap": "round"
 			}
 		},
 		{
@@ -3214,9 +3347,9 @@
 			"id": "bridge-street-service-bicycle",
 			"type": "line",
 			"source-layer": "streets",
-			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "bicycle", "designated" ], [ "==", "bridge", true ], [ "!=", "service", "driveway" ] ],
+			"filter": [ "all", [ "==", "kind", "service" ], [ "==", "bicycle", "designated" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#ffffff"
+				"line-color": "rgb(255,255,255)"
 			},
 			"layout": {
 				"line-join": "round",
@@ -3230,13 +3363,13 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "living_street" ], [ "==", "bicycle", "designated" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#eff9ff",
+				"line-color": "rgb(239,249,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
-				"line-cap": "butt"
+				"line-cap": "round"
 			}
 		},
 		{
@@ -3246,13 +3379,13 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "residential" ], [ "==", "bicycle", "designated" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#eff9ff",
+				"line-color": "rgb(239,249,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
-				"line-cap": "butt"
+				"line-cap": "round"
 			}
 		},
 		{
@@ -3262,13 +3395,13 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "kind", "unclassified" ], [ "==", "bicycle", "designated" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#eff9ff",
+				"line-color": "rgb(239,249,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
 			"layout": {
 				"line-join": "round",
-				"line-cap": "butt"
+				"line-cap": "round"
 			}
 		},
 		{
@@ -3278,7 +3411,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "tertiary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -3294,7 +3427,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "secondary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ffeeaa",
+				"line-color": "rgb(255,238,170)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 12 ], [ 20, 38 ] ] }
 			},
 			"layout": {
@@ -3310,7 +3443,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "primary" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ffeeaa",
+				"line-color": "rgb(255,238,170)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 12 ], [ 20, 38 ] ] }
 			},
 			"layout": {
@@ -3326,7 +3459,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "trunk" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ffeeaa",
+				"line-color": "rgb(255,238,170)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 12 ], [ 20, 38 ] ] }
 			},
 			"layout": {
@@ -3342,7 +3475,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "motorway" ], [ "==", "link", true ] ],
 			"paint": {
-				"line-color": "#ffcc88",
+				"line-color": "rgb(255,204,136)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 12 ], [ 20, 38 ] ] }
 			},
 			"layout": {
@@ -3358,7 +3491,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "tertiary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(255,255,255)",
 				"line-width": { "stops": [ [ 12, 1 ], [ 14, 2 ], [ 16, 5 ], [ 18, 24 ], [ 19, 60 ], [ 20, 120 ] ] },
 				"line-opacity": { "stops": [ [ 12, 0 ], [ 13, 1 ] ] }
 			},
@@ -3374,7 +3507,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "secondary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ffeeaa",
+				"line-color": "rgb(255,238,170)",
 				"line-width": { "stops": [ [ 11, 1 ], [ 14, 4 ], [ 16, 6 ], [ 18, 28 ], [ 19, 64 ], [ 20, 130 ] ] },
 				"line-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
 			},
@@ -3390,7 +3523,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "primary" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ffeeaa",
+				"line-color": "rgb(255,238,170)",
 				"line-width": { "stops": [ [ 8, 0 ], [ 9, 2 ], [ 10, 3 ], [ 14, 5 ], [ 16, 10 ], [ 18, 34 ], [ 19, 70 ], [ 20, 140 ] ] },
 				"line-opacity": { "stops": [ [ 8, 0 ], [ 9, 1 ] ] }
 			},
@@ -3406,7 +3539,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "trunk" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ffeeaa",
+				"line-color": "rgb(255,238,170)",
 				"line-width": { "stops": [ [ 7, 0 ], [ 8, 1 ], [ 10, 3 ], [ 14, 5 ], [ 16, 10 ], [ 18, 34 ], [ 19, 70 ], [ 20, 140 ] ] },
 				"line-opacity": { "stops": [ [ 7, 0 ], [ 8, 1 ] ] }
 			},
@@ -3422,7 +3555,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "==", "bridge", true ], [ "in", "kind", "motorway" ], [ "!=", "link", true ] ],
 			"paint": {
-				"line-color": "#ffcc88",
+				"line-color": "rgb(255,204,136)",
 				"line-width": { "stops": [ [ 5, 0 ], [ 6, 1 ], [ 10, 4 ], [ 14, 4 ], [ 16, 12 ], [ 18, 36 ], [ 19, 80 ], [ 20, 160 ] ] },
 				"line-opacity": { "stops": [ [ 5, 0 ], [ 6, 1 ] ] }
 			},
@@ -3431,32 +3564,6 @@
 				"line-cap": "butt"
 			}
 		},
-		{
-			"source": "versatiles-shortbread",
-			"id": "bridge-transport-monorail:outline",
-			"type": "line",
-			"source-layer": "streets",
-			"filter": [ "all", [ "in", "kind", "monorail" ], [ "!has", "service" ], [ "==", "bridge", true ] ],
-			"minzoom": 15,
-			"paint": {
-				"line-color": "#b1bbc4",
-				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
-				"line-dasharray": [ 0.1, 0.5 ]
-			}
-		},
-		{
-			"source": "versatiles-shortbread",
-			"id": "bridge-transport-funicular:outline",
-			"type": "line",
-			"source-layer": "streets",
-			"filter": [ "all", [ "in", "kind", "funicular" ], [ "!has", "service" ], [ "==", "bridge", true ] ],
-			"minzoom": 15,
-			"paint": {
-				"line-color": "#b1bbc4",
-				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
-				"line-dasharray": [ 0.1, 0.5 ]
-			}
-		},
 		{
 			"source": "versatiles-shortbread",
 			"id": "bridge-transport-tram:outline",
@@ -3465,7 +3572,7 @@
 			"filter": [ "all", [ "in", "kind", "tram" ], [ "!has", "service" ], [ "==", "bridge", true ] ],
 			"minzoom": 15,
 			"paint": {
-				"line-color": "#b1bbc4",
+				"line-color": "rgb(177,187,196)",
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
 				"line-dasharray": [ 0.1, 0.5 ]
 			}
@@ -3478,7 +3585,7 @@
 			"filter": [ "all", [ "in", "kind", "narrow_gauge" ], [ "!has", "service" ], [ "==", "bridge", true ] ],
 			"minzoom": 15,
 			"paint": {
-				"line-color": "#b1bbc4",
+				"line-color": "rgb(177,187,196)",
 				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
 				"line-dasharray": [ 0.1, 0.5 ]
 			}
@@ -3490,7 +3597,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "subway" ], [ "!has", "service" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#a6b8c7",
+				"line-color": "rgb(166,184,199)",
 				"line-width": { "stops": [ [ 11, 0 ], [ 12, 1 ], [ 15, 3 ], [ 16, 3 ], [ 18, 6 ], [ 19, 8 ], [ 20, 10 ] ] },
 				"line-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
 			}
@@ -3502,10 +3609,23 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "light_rail" ], [ "!has", "service" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#b1bbc4",
-				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 3 ], [ 16, 4 ], [ 18, 8 ], [ 19, 11 ], [ 20, 14 ] ] },
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 1 ], [ 20, 14 ] ] },
 				"line-opacity": { "stops": [ [ 11, 0 ], [ 12, 1 ] ] }
-			}
+			},
+			"minzoom": 8
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-transport-lightrail-service:outline",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "light_rail" ], [ "has", "service" ], [ "==", "bridge", true ] ],
+			"paint": {
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 14, 0 ], [ 15, 1 ], [ 16, 1 ], [ 20, 14 ] ] }
+			},
+			"minzoom": 14
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -3514,33 +3634,48 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "rail" ], [ "!has", "service" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#b1bbc4",
-				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 3 ], [ 16, 4 ], [ 18, 8 ], [ 19, 11 ], [ 20, 14 ] ] },
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 1 ], [ 20, 14 ] ] },
 				"line-opacity": { "stops": [ [ 8, 0 ], [ 9, 1 ] ] }
+			},
+			"minzoom": 8
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-transport-rail-service:outline",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "rail" ], [ "has", "service" ], [ "==", "bridge", true ] ],
+			"paint": {
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 14, 0 ], [ 15, 1 ], [ 16, 1 ], [ 20, 14 ] ] }
+			},
+			"minzoom": 14
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-transport-monorail:outline",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "monorail" ], [ "==", "bridge", true ] ],
+			"minzoom": 15,
+			"paint": {
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
+				"line-dasharray": [ 0.1, 0.5 ]
 			}
 		},
 		{
 			"source": "versatiles-shortbread",
-			"id": "bridge-transport-monorail",
+			"id": "bridge-transport-funicular:outline",
 			"type": "line",
 			"source-layer": "streets",
-			"filter": [ "all", [ "in", "kind", "monorail" ], [ "!has", "service" ], [ "==", "bridge", true ] ],
-			"minzoom": 13,
+			"filter": [ "all", [ "in", "kind", "funicular" ], [ "==", "bridge", true ] ],
+			"minzoom": 15,
 			"paint": {
-				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
-				"line-color": "#b1bbc4"
-			}
-		},
-		{
-			"source": "versatiles-shortbread",
-			"id": "bridge-transport-funicular",
-			"type": "line",
-			"source-layer": "streets",
-			"filter": [ "all", [ "in", "kind", "funicular" ], [ "!has", "service" ], [ "==", "bridge", true ] ],
-			"minzoom": 13,
-			"paint": {
-				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
-				"line-color": "#b1bbc4"
+				"line-color": "rgb(177,187,196)",
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 5 ], [ 18, 7 ], [ 20, 20 ] ] },
+				"line-dasharray": [ 0.1, 0.5 ]
 			}
 		},
 		{
@@ -3552,7 +3687,7 @@
 			"minzoom": 13,
 			"paint": {
 				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
-				"line-color": "#b1bbc4"
+				"line-color": "rgb(177,187,196)"
 			}
 		},
 		{
@@ -3564,7 +3699,7 @@
 			"minzoom": 13,
 			"paint": {
 				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
-				"line-color": "#b1bbc4"
+				"line-color": "rgb(177,187,196)"
 			}
 		},
 		{
@@ -3574,7 +3709,7 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "subway" ], [ "!has", "service" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#dee5ea",
+				"line-color": "rgb(188,202,213)",
 				"line-width": { "stops": [ [ 11, 0 ], [ 12, 1 ], [ 15, 2 ], [ 16, 2 ], [ 18, 5 ], [ 19, 6 ], [ 20, 8 ] ] },
 				"line-dasharray": [ 2, 2 ],
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
@@ -3587,11 +3722,25 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "light_rail" ], [ "!has", "service" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#e6e9ec",
-				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 2 ], [ 16, 3 ], [ 18, 6 ], [ 19, 8 ], [ 20, 10 ] ] },
+				"line-color": "rgb(197,204,211)",
+				"line-width": { "stops": [ [ 14, 0 ], [ 15, 1 ], [ 20, 10 ] ] },
 				"line-dasharray": [ 2, 2 ],
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
-			}
+			},
+			"minzoom": 14
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-transport-lightrail-service",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "light_rail" ], [ "has", "service" ], [ "==", "bridge", true ] ],
+			"paint": {
+				"line-color": "rgb(197,204,211)",
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 1 ], [ 20, 10 ] ] },
+				"line-dasharray": [ 2, 2 ]
+			},
+			"minzoom": 15
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -3600,10 +3749,48 @@
 			"source-layer": "streets",
 			"filter": [ "all", [ "in", "kind", "rail" ], [ "!has", "service" ], [ "==", "bridge", true ] ],
 			"paint": {
-				"line-color": "#e6e9ec",
-				"line-width": { "stops": [ [ 8, 1 ], [ 13, 1 ], [ 15, 2 ], [ 16, 3 ], [ 18, 6 ], [ 19, 8 ], [ 20, 10 ] ] },
+				"line-color": "rgb(197,204,211)",
+				"line-width": { "stops": [ [ 14, 0 ], [ 15, 1 ], [ 20, 10 ] ] },
 				"line-dasharray": [ 2, 2 ],
 				"line-opacity": { "stops": [ [ 14, 0 ], [ 15, 1 ] ] }
+			},
+			"minzoom": 14
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-transport-rail-service",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "rail" ], [ "has", "service" ], [ "==", "bridge", true ] ],
+			"paint": {
+				"line-color": "rgb(197,204,211)",
+				"line-width": { "stops": [ [ 15, 0 ], [ 16, 1 ], [ 20, 10 ] ] },
+				"line-dasharray": [ 2, 2 ]
+			},
+			"minzoom": 15
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-transport-monorail",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "monorail" ], [ "==", "bridge", true ] ],
+			"minzoom": 13,
+			"paint": {
+				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
+				"line-color": "rgb(177,187,196)"
+			}
+		},
+		{
+			"source": "versatiles-shortbread",
+			"id": "bridge-transport-funicular",
+			"type": "line",
+			"source-layer": "streets",
+			"filter": [ "all", [ "in", "kind", "funicular" ], [ "==", "bridge", true ] ],
+			"minzoom": 13,
+			"paint": {
+				"line-width": { "stops": [ [ 13, 0 ], [ 16, 1 ], [ 17, 2 ], [ 18, 3 ], [ 20, 5 ] ] },
+				"line-color": "rgb(177,187,196)"
 			}
 		},
 		{
@@ -3618,13 +3805,13 @@
 				"symbol-placement": "point",
 				"icon-optional": true,
 				"text-font": [ "noto_sans_regular" ],
-				"icon-image": [ "match", [ "get", "amenity" ], "arts_centre", "icon-art_gallery", "atm", "icon-atm", "bank", "icon-bank", "bar", "icon-bar", "bench", "icon-bench", "bicycle_rental", "icon-bicycle_share", "biergarten", "icon-beergarden", "cafe", "icon-cafe", "car_rental", "icon-car_rental", "car_sharing", "icon-car_rental", "car_wash", "icon-car_wash", "cinema", "icon-cinema", "college", "icon-college", "community_centre", "icon-community", "dentist", "icon-dentist", "doctors", "icon-doctor", "dog_park", "icon-dog_park", "drinking_water", "icon-drinking_water", "embassy", "icon-embassy", "fast_food", "icon-fast_food", "fire_station", "icon-fire_station", "fountain", "icon-fountain", "grave_yard", "icon-cemetery", "hospital", "icon-hospital", "hunting_stand", "icon-huntingstand", "library", "icon-library", "marketplace", "icon-marketplace", "nightclub", "icon-nightclub", "nursing_home", "icon-nursinghome", "pharmacy", "icon-pharmacy", "place_of_worship", "icon-place_of_worship", "playground", "icon-playground", "police", "icon-police", "post_box", "icon-postbox", "post_office", "icon-post", "prison", "icon-prison", "pub", "icon-beer", "recycling", "icon-recycling", "restaurant", "icon-restaurant", "school", "icon-school", "shelter", "icon-shelter", "telephone", "icon-telephone", "theatre", "icon-theatre", "toilets", "icon-toilet", "townhall", "icon-town_hall", "vending_machine", "icon-vendingmachine", "veterinary", "icon-veterinary", "waste_basket", "icon-waste_basket", "unknown" ]
+				"icon-image": [ "match", [ "get", "amenity" ], "arts_centre", "basics:icon-art_gallery", "atm", "basics:icon-atm", "bank", "basics:icon-bank", "bar", "basics:icon-bar", "bench", "basics:icon-bench", "bicycle_rental", "basics:icon-bicycle_share", "biergarten", "basics:icon-beergarden", "cafe", "basics:icon-cafe", "car_rental", "basics:icon-car_rental", "car_sharing", "basics:icon-car_rental", "car_wash", "basics:icon-car_wash", "cinema", "basics:icon-cinema", "college", "basics:icon-college", "community_centre", "basics:icon-community", "dentist", "basics:icon-dentist", "doctors", "basics:icon-doctor", "dog_park", "basics:icon-dog_park", "drinking_water", "basics:icon-drinking_water", "embassy", "basics:icon-embassy", "fast_food", "basics:icon-fast_food", "fire_station", "basics:icon-fire_station", "fountain", "basics:icon-fountain", "grave_yard", "basics:icon-cemetery", "hospital", "basics:icon-hospital", "hunting_stand", "basics:icon-huntingstand", "library", "basics:icon-library", "marketplace", "basics:icon-marketplace", "nightclub", "basics:icon-nightclub", "nursing_home", "basics:icon-nursinghome", "pharmacy", "basics:icon-pharmacy", "place_of_worship", "basics:icon-place_of_worship", "playground", "basics:icon-playground", "police", "basics:icon-police", "post_box", "basics:icon-postbox", "post_office", "basics:icon-post", "prison", "basics:icon-prison", "pub", "basics:icon-beer", "recycling", "basics:icon-recycling", "restaurant", "basics:icon-restaurant", "school", "basics:icon-school", "shelter", "basics:icon-shelter", "telephone", "basics:icon-telephone", "theatre", "basics:icon-theatre", "toilets", "basics:icon-toilet", "townhall", "basics:icon-town_hall", "vending_machine", "basics:icon-vendingmachine", "veterinary", "basics:icon-veterinary", "waste_basket", "basics:icon-waste_basket", "" ]
 			},
 			"paint": {
 				"icon-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
 				"text-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
-				"icon-color": "#555555",
-				"text-color": "#555555"
+				"icon-color": "rgb(85,85,85)",
+				"text-color": "rgb(85,85,85)"
 			}
 		},
 		{
@@ -3639,13 +3826,13 @@
 				"symbol-placement": "point",
 				"icon-optional": true,
 				"text-font": [ "noto_sans_regular" ],
-				"icon-image": [ "match", [ "get", "leisure" ], "golf_course", "icon-golf", "ice_rink", "icon-icerink", "pitch", "icon-pitch", "stadium", "icon-stadium", "swimming_pool", "icon-swimming", "water_park", "icon-waterpark", "icon-sports" ]
+				"icon-image": [ "match", [ "get", "leisure" ], "golf_course", "basics:icon-golf", "ice_rink", "basics:icon-icerink", "pitch", "basics:icon-pitch", "stadium", "basics:icon-stadium", "swimming_pool", "basics:icon-swimming", "water_park", "basics:icon-waterpark", "basics:icon-sports" ]
 			},
 			"paint": {
 				"icon-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
 				"text-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
-				"icon-color": "#555555",
-				"text-color": "#555555"
+				"icon-color": "rgb(85,85,85)",
+				"text-color": "rgb(85,85,85)"
 			}
 		},
 		{
@@ -3660,13 +3847,13 @@
 				"symbol-placement": "point",
 				"icon-optional": true,
 				"text-font": [ "noto_sans_regular" ],
-				"icon-image": [ "match", [ "get", "tourism" ], "chalet", "icon-chalet", "information", "transport-information", "picnic_site", "icon-picnic_site", "viewpoint", "icon-viewpoint", "zoo", "icon-zoo", "unknown" ]
+				"icon-image": [ "match", [ "get", "tourism" ], "chalet", "basics:icon-chalet", "information", "basics:transport-information", "picnic_site", "basics:icon-picnic_site", "viewpoint", "basics:icon-viewpoint", "zoo", "basics:icon-zoo", "" ]
 			},
 			"paint": {
 				"icon-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
 				"text-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
-				"icon-color": "#555555",
-				"text-color": "#555555"
+				"icon-color": "rgb(85,85,85)",
+				"text-color": "rgb(85,85,85)"
 			}
 		},
 		{
@@ -3681,13 +3868,13 @@
 				"symbol-placement": "point",
 				"icon-optional": true,
 				"text-font": [ "noto_sans_regular" ],
-				"icon-image": [ "match", [ "get", "shop" ], "alcohol", "icon-alcohol_shop", "bakery", "icon-bakery", "beauty", "icon-beauty", "beverages", "icon-beverages", "books", "icon-books", "butcher", "icon-butcher", "chemist", "icon-chemist", "clothes", "icon-clothes", "doityourself", "icon-doityourself", "dry_cleaning", "icon-drycleaning", "florist", "icon-florist", "furniture", "icon-furniture", "garden_centre", "icon-garden_centre", "general", "icon-shop", "gift", "icon-gift", "greengrocer", "icon-greengrocer", "hairdresser", "icon-hairdresser", "hardware", "icon-hardware", "jewelry", "icon-jewelry_store", "kiosk", "icon-kiosk", "laundry", "icon-laundry", "newsagent", "icon-newsagent", "optican", "icon-optician", "outdoor", "icon-outdoor", "shoes", "icon-shoes", "sports", "icon-sports", "stationery", "icon-stationery", "toys", "icon-toys", "travel_agency", "icon-travel_agent", "video", "icon-video", "icon-shop" ]
+				"icon-image": [ "match", [ "get", "shop" ], "alcohol", "basics:icon-alcohol_shop", "bakery", "basics:icon-bakery", "beauty", "basics:icon-beauty", "beverages", "basics:icon-beverages", "books", "basics:icon-books", "butcher", "basics:icon-butcher", "chemist", "basics:icon-chemist", "clothes", "basics:icon-clothes", "doityourself", "basics:icon-doityourself", "dry_cleaning", "basics:icon-drycleaning", "florist", "basics:icon-florist", "furniture", "basics:icon-furniture", "garden_centre", "basics:icon-garden_centre", "general", "basics:icon-shop", "gift", "basics:icon-gift", "greengrocer", "basics:icon-greengrocer", "hairdresser", "basics:icon-hairdresser", "hardware", "basics:icon-hardware", "jewelry", "basics:icon-jewelry_store", "kiosk", "basics:icon-kiosk", "laundry", "basics:icon-laundry", "newsagent", "basics:icon-newsagent", "optican", "basics:icon-optician", "outdoor", "basics:icon-outdoor", "shoes", "basics:icon-shoes", "sports", "basics:icon-sports", "stationery", "basics:icon-stationery", "toys", "basics:icon-toys", "travel_agency", "basics:icon-travel_agent", "video", "basics:icon-video", "basics:icon-shop" ]
 			},
 			"paint": {
 				"icon-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
 				"text-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
-				"icon-color": "#555555",
-				"text-color": "#555555"
+				"icon-color": "rgb(85,85,85)",
+				"text-color": "rgb(85,85,85)"
 			}
 		},
 		{
@@ -3702,13 +3889,13 @@
 				"symbol-placement": "point",
 				"icon-optional": true,
 				"text-font": [ "noto_sans_regular" ],
-				"icon-image": [ "match", [ "get", "man_made" ], "lighthouse", "icon-lighthouse", "surveillance", "icon-surveillance", "tower", "icon-observation_tower", "watermill", "icon-watermill", "windmill", "icon-windmill", "unknown" ]
+				"icon-image": [ "match", [ "get", "man_made" ], "lighthouse", "basics:icon-lighthouse", "surveillance", "basics:icon-surveillance", "tower", "basics:icon-observation_tower", "watermill", "basics:icon-watermill", "windmill", "basics:icon-windmill", "" ]
 			},
 			"paint": {
 				"icon-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
 				"text-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
-				"icon-color": "#555555",
-				"text-color": "#555555"
+				"icon-color": "rgb(85,85,85)",
+				"text-color": "rgb(85,85,85)"
 			}
 		},
 		{
@@ -3723,13 +3910,13 @@
 				"symbol-placement": "point",
 				"icon-optional": true,
 				"text-font": [ "noto_sans_regular" ],
-				"icon-image": [ "match", [ "get", "historic" ], "artwork", "icon-artwork", "castle", "icon-castle", "monument", "icon-monument", "wayside_shrine", "icon-shrine", "icon-historic" ]
+				"icon-image": [ "match", [ "get", "historic" ], "artwork", "basics:icon-artwork", "castle", "basics:icon-castle", "monument", "basics:icon-monument", "wayside_shrine", "basics:icon-shrine", "basics:icon-historic" ]
 			},
 			"paint": {
 				"icon-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
 				"text-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
-				"icon-color": "#555555",
-				"text-color": "#555555"
+				"icon-color": "rgb(85,85,85)",
+				"text-color": "rgb(85,85,85)"
 			}
 		},
 		{
@@ -3744,13 +3931,13 @@
 				"symbol-placement": "point",
 				"icon-optional": true,
 				"text-font": [ "noto_sans_regular" ],
-				"icon-image": [ "match", [ "get", "emergency" ], "defibrillator", "icon-defibrillator", "fire_hydrant", "icon-hydrant", "phone", "icon-emergency_phone", "unknown" ]
+				"icon-image": [ "match", [ "get", "emergency" ], "defibrillator", "basics:icon-defibrillator", "fire_hydrant", "basics:icon-hydrant", "phone", "basics:icon-emergency_phone", "" ]
 			},
 			"paint": {
 				"icon-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
 				"text-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
-				"icon-color": "#555555",
-				"text-color": "#555555"
+				"icon-color": "rgb(85,85,85)",
+				"text-color": "rgb(85,85,85)"
 			}
 		},
 		{
@@ -3769,8 +3956,8 @@
 			"paint": {
 				"icon-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
 				"text-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
-				"icon-color": "#555555",
-				"text-color": "#555555"
+				"icon-color": "rgb(85,85,85)",
+				"text-color": "rgb(85,85,85)"
 			}
 		},
 		{
@@ -3789,8 +3976,8 @@
 			"paint": {
 				"icon-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
 				"text-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ] ] },
-				"icon-color": "#555555",
-				"text-color": "#555555"
+				"icon-color": "rgb(85,85,85)",
+				"text-color": "rgb(85,85,85)"
 			}
 		},
 		{
@@ -3800,7 +3987,7 @@
 			"source-layer": "boundaries",
 			"filter": [ "all", [ "==", "admin_level", 2 ], [ "!=", "maritime", true ], [ "!=", "disputed", true ], [ "!=", "coastline", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(249,245,239)",
 				"line-blur": 1,
 				"line-width": { "stops": [ [ 2, 0 ], [ 3, 2 ], [ 10, 8 ] ] },
 				"line-opacity": 0.75
@@ -3819,7 +4006,7 @@
 			"paint": {
 				"line-width": { "stops": [ [ 2, 0 ], [ 3, 2 ], [ 10, 8 ] ] },
 				"line-opacity": 0.75,
-				"line-color": "#ffffff"
+				"line-color": "rgb(249,245,239)"
 			}
 		},
 		{
@@ -3829,7 +4016,7 @@
 			"source-layer": "boundaries",
 			"filter": [ "all", [ "==", "admin_level", 4 ], [ "!=", "maritime", true ], [ "!=", "disputed", true ], [ "!=", "coastline", true ] ],
 			"paint": {
-				"line-color": "#ffffff",
+				"line-color": "rgb(250,245,240)",
 				"line-blur": 1,
 				"line-width": { "stops": [ [ 7, 0 ], [ 8, 2 ], [ 10, 4 ] ] },
 				"line-opacity": 0.75
@@ -3846,7 +4033,7 @@
 			"source-layer": "boundaries",
 			"filter": [ "all", [ "==", "admin_level", 2 ], [ "!=", "maritime", true ], [ "!=", "disputed", true ], [ "!=", "coastline", true ] ],
 			"paint": {
-				"line-color": "#a6a6c8",
+				"line-color": "rgb(166,166,200)",
 				"line-width": { "stops": [ [ 2, 0 ], [ 3, 1 ], [ 10, 4 ] ] }
 			},
 			"layout": {
@@ -3862,7 +4049,7 @@
 			"filter": [ "all", [ "==", "admin_level", 2 ], [ "==", "disputed", true ], [ "!=", "maritime", true ], [ "!=", "coastline", true ] ],
 			"paint": {
 				"line-width": { "stops": [ [ 2, 0 ], [ 3, 1 ], [ 10, 4 ] ] },
-				"line-color": "#bebccf",
+				"line-color": "rgb(190,188,207)",
 				"line-dasharray": [ 2, 1 ]
 			},
 			"layout": {
@@ -3876,7 +4063,7 @@
 			"source-layer": "boundaries",
 			"filter": [ "all", [ "==", "admin_level", 4 ], [ "!=", "maritime", true ], [ "!=", "disputed", true ], [ "!=", "coastline", true ] ],
 			"paint": {
-				"line-color": "#a6a6c8",
+				"line-color": "rgb(166,166,200)",
 				"line-width": { "stops": [ [ 7, 0 ], [ 8, 1 ], [ 10, 2 ] ] }
 			},
 			"layout": {
@@ -3898,11 +4085,11 @@
 				"text-size": { "stops": [ [ 17, 8 ], [ 19, 10 ] ] }
 			},
 			"paint": {
-				"text-halo-color": "#f9f6f2",
+				"text-halo-color": "rgb(243,235,227)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1,
-				"icon-color": "#c7a481",
-				"text-color": "#c7a481"
+				"icon-color": "rgb(169,164,158)",
+				"text-color": "rgb(169,164,158)"
 			},
 			"minzoom": 17
 		},
@@ -3920,9 +4107,9 @@
 				"text-size": { "stops": [ [ 14, 10 ], [ 18, 12 ], [ 20, 16 ] ] }
 			},
 			"paint": {
-				"icon-color": "#ffffff",
-				"text-color": "#ffffff",
-				"text-halo-color": "#ffcc88",
+				"icon-color": "rgb(255,255,255)",
+				"text-color": "rgb(255,255,255)",
+				"text-halo-color": "rgb(255,204,136)",
 				"text-halo-width": 0.1,
 				"text-halo-blur": 1
 			},
@@ -3942,9 +4129,9 @@
 				"text-size": { "stops": [ [ 12, 10 ], [ 15, 13 ] ] }
 			},
 			"paint": {
-				"icon-color": "#333344",
-				"text-color": "#333344",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(51,51,68)",
+				"text-color": "rgb(51,51,68)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -3964,9 +4151,9 @@
 				"text-size": { "stops": [ [ 12, 10 ], [ 15, 13 ] ] }
 			},
 			"paint": {
-				"icon-color": "#333344",
-				"text-color": "#333344",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(51,51,68)",
+				"text-color": "rgb(51,51,68)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -3986,9 +4173,9 @@
 				"text-size": { "stops": [ [ 12, 10 ], [ 15, 13 ] ] }
 			},
 			"paint": {
-				"icon-color": "#333344",
-				"text-color": "#333344",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(51,51,68)",
+				"text-color": "rgb(51,51,68)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4008,9 +4195,9 @@
 				"text-size": { "stops": [ [ 12, 10 ], [ 15, 13 ] ] }
 			},
 			"paint": {
-				"icon-color": "#333344",
-				"text-color": "#333344",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(51,51,68)",
+				"text-color": "rgb(51,51,68)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4030,9 +4217,9 @@
 				"text-size": { "stops": [ [ 12, 10 ], [ 15, 13 ] ] }
 			},
 			"paint": {
-				"icon-color": "#333344",
-				"text-color": "#333344",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(51,51,68)",
+				"text-color": "rgb(51,51,68)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4052,9 +4239,9 @@
 				"text-size": { "stops": [ [ 12, 10 ], [ 15, 13 ] ] }
 			},
 			"paint": {
-				"icon-color": "#333344",
-				"text-color": "#333344",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(51,51,68)",
+				"text-color": "rgb(51,51,68)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4074,9 +4261,9 @@
 				"text-size": { "stops": [ [ 12, 10 ], [ 15, 13 ] ] }
 			},
 			"paint": {
-				"icon-color": "#333344",
-				"text-color": "#333344",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(51,51,68)",
+				"text-color": "rgb(51,51,68)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4096,9 +4283,9 @@
 				"text-size": { "stops": [ [ 12, 10 ], [ 15, 13 ] ] }
 			},
 			"paint": {
-				"icon-color": "#333344",
-				"text-color": "#333344",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(51,51,68)",
+				"text-color": "rgb(51,51,68)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4117,13 +4304,13 @@
 				"text-transform": "uppercase"
 			},
 			"paint": {
-				"icon-color": "#284349",
-				"text-color": "#284349",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(40,67,73)",
+				"text-color": "rgb(40,67,73)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
-			"minzoom": 13
+			"minzoom": 14
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -4138,13 +4325,13 @@
 				"text-transform": "uppercase"
 			},
 			"paint": {
-				"icon-color": "#283e49",
-				"text-color": "#283e49",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(40,62,73)",
+				"text-color": "rgb(40,62,73)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
-			"minzoom": 12
+			"minzoom": 13
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -4159,13 +4346,13 @@
 				"text-transform": "uppercase"
 			},
 			"paint": {
-				"icon-color": "#283949",
-				"text-color": "#283949",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(40,57,73)",
+				"text-color": "rgb(40,57,73)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
-			"minzoom": 10
+			"minzoom": 11
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -4179,13 +4366,13 @@
 				"text-size": { "stops": [ [ 10, 11 ], [ 12, 14 ] ] }
 			},
 			"paint": {
-				"icon-color": "#283049",
-				"text-color": "#283049",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(40,48,73)",
+				"text-color": "rgb(40,48,73)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
-			"minzoom": 11
+			"minzoom": 13
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -4199,13 +4386,13 @@
 				"text-size": { "stops": [ [ 9, 11 ], [ 12, 14 ] ] }
 			},
 			"paint": {
-				"icon-color": "#283049",
-				"text-color": "#283049",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(40,48,73)",
+				"text-color": "rgb(40,48,73)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
-			"minzoom": 9
+			"minzoom": 11
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -4219,13 +4406,13 @@
 				"text-size": { "stops": [ [ 8, 11 ], [ 12, 14 ] ] }
 			},
 			"paint": {
-				"icon-color": "#283049",
-				"text-color": "#283049",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(40,48,73)",
+				"text-color": "rgb(40,48,73)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
-			"minzoom": 8
+			"minzoom": 9
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -4244,13 +4431,13 @@
 				"text-size": { "stops": [ [ 5, 8 ], [ 8, 12 ] ] }
 			},
 			"paint": {
-				"icon-color": "#363647",
-				"text-color": "#363647",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(61,61,77)",
+				"text-color": "rgb(61,61,77)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
-			"minzoom": 4
+			"minzoom": 5
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -4264,13 +4451,13 @@
 				"text-size": { "stops": [ [ 7, 11 ], [ 10, 14 ] ] }
 			},
 			"paint": {
-				"icon-color": "#283049",
-				"text-color": "#283049",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(40,48,73)",
+				"text-color": "rgb(40,48,73)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
-			"minzoom": 6
+			"minzoom": 7
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -4284,9 +4471,9 @@
 				"text-size": { "stops": [ [ 6, 11 ], [ 10, 15 ] ] }
 			},
 			"paint": {
-				"icon-color": "#283049",
-				"text-color": "#283049",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(40,48,73)",
+				"text-color": "rgb(40,48,73)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4304,9 +4491,9 @@
 				"text-size": { "stops": [ [ 5, 12 ], [ 10, 16 ] ] }
 			},
 			"paint": {
-				"icon-color": "#283049",
-				"text-color": "#283049",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(40,48,73)",
+				"text-color": "rgb(40,48,73)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4329,13 +4516,13 @@
 				"text-size": { "stops": [ [ 4, 8 ], [ 5, 11 ] ] }
 			},
 			"paint": {
-				"icon-color": "#333344",
-				"text-color": "#333344",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(51,51,68)",
+				"text-color": "rgb(51,51,68)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
-			"minzoom": 3
+			"minzoom": 4
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -4354,13 +4541,13 @@
 				"text-size": { "stops": [ [ 3, 8 ], [ 5, 12 ] ] }
 			},
 			"paint": {
-				"icon-color": "#333344",
-				"text-color": "#333344",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(51,51,68)",
+				"text-color": "rgb(51,51,68)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
-			"minzoom": 2
+			"minzoom": 3
 		},
 		{
 			"source": "versatiles-shortbread",
@@ -4379,9 +4566,9 @@
 				"text-size": { "stops": [ [ 2, 8 ], [ 5, 13 ] ] }
 			},
 			"paint": {
-				"icon-color": "#333344",
-				"text-color": "#333344",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(51,51,68)",
+				"text-color": "rgb(51,51,68)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4400,13 +4587,13 @@
 				"icon-rotation-alignment": "map",
 				"icon-padding": 5,
 				"symbol-avoid-edges": true,
-				"icon-image": "marking-arrow",
+				"icon-image": "basics:marking-arrow",
 				"text-font": [ "noto_sans_regular" ]
 			},
 			"minzoom": 16,
 			"paint": {
-				"icon-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.7 ] ] },
-				"text-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.7 ] ] }
+				"icon-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ], [ 20, 0.4 ] ] },
+				"text-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ], [ 20, 0.4 ] ] }
 			}
 		},
 		{
@@ -4422,13 +4609,13 @@
 				"icon-rotation-alignment": "map",
 				"icon-padding": 5,
 				"symbol-avoid-edges": true,
-				"icon-image": "marking-arrow",
+				"icon-image": "basics:marking-arrow",
 				"text-font": [ "noto_sans_regular" ]
 			},
 			"minzoom": 16,
 			"paint": {
-				"icon-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.7 ] ] },
-				"text-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.7 ] ] }
+				"icon-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ], [ 20, 0.4 ] ] },
+				"text-opacity": { "stops": [ [ 16, 0 ], [ 17, 0.4 ], [ 20, 0.4 ] ] }
 			}
 		},
 		{
@@ -4446,13 +4633,13 @@
 				"text-size": 10,
 				"icon-anchor": "bottom",
 				"text-anchor": "top",
-				"icon-image": "icon-bus"
+				"icon-image": "basics:icon-bus"
 			},
 			"paint": {
 				"icon-opacity": 0.7,
-				"icon-color": "#66626a",
-				"text-color": "#66626a",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(102,98,106)",
+				"text-color": "rgb(102,98,106)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4473,13 +4660,13 @@
 				"text-size": 10,
 				"icon-anchor": "bottom",
 				"text-anchor": "top",
-				"icon-image": "transport-tram"
+				"icon-image": "basics:transport-tram"
 			},
 			"paint": {
 				"icon-opacity": 0.7,
-				"icon-color": "#66626a",
-				"text-color": "#66626a",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(102,98,106)",
+				"text-color": "rgb(102,98,106)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4500,13 +4687,13 @@
 				"text-size": 10,
 				"icon-anchor": "bottom",
 				"text-anchor": "top",
-				"icon-image": "icon-rail_metro"
+				"icon-image": "basics:icon-rail_metro"
 			},
 			"paint": {
 				"icon-opacity": 0.7,
-				"icon-color": "#66626a",
-				"text-color": "#66626a",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(102,98,106)",
+				"text-color": "rgb(102,98,106)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4527,13 +4714,13 @@
 				"text-size": 10,
 				"icon-anchor": "bottom",
 				"text-anchor": "top",
-				"icon-image": "icon-rail_light"
+				"icon-image": "basics:icon-rail_light"
 			},
 			"paint": {
 				"icon-opacity": 0.7,
-				"icon-color": "#66626a",
-				"text-color": "#66626a",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(102,98,106)",
+				"text-color": "rgb(102,98,106)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4554,13 +4741,13 @@
 				"text-size": 10,
 				"icon-anchor": "bottom",
 				"text-anchor": "top",
-				"icon-image": "icon-rail"
+				"icon-image": "basics:icon-rail"
 			},
 			"paint": {
 				"icon-opacity": 0.7,
-				"icon-color": "#66626a",
-				"text-color": "#66626a",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(102,98,106)",
+				"text-color": "rgb(102,98,106)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4581,13 +4768,13 @@
 				"text-size": 10,
 				"icon-anchor": "bottom",
 				"text-anchor": "top",
-				"icon-image": "icon-airfield"
+				"icon-image": "basics:icon-airfield"
 			},
 			"paint": {
 				"icon-opacity": 0.7,
-				"icon-color": "#66626a",
-				"text-color": "#66626a",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(102,98,106)",
+				"text-color": "rgb(102,98,106)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
@@ -4608,13 +4795,13 @@
 				"text-size": 10,
 				"icon-anchor": "bottom",
 				"text-anchor": "top",
-				"icon-image": "icon-airport"
+				"icon-image": "basics:icon-airport"
 			},
 			"paint": {
 				"icon-opacity": 0.7,
-				"icon-color": "#66626a",
-				"text-color": "#66626a",
-				"text-halo-color": "rgba(255, 255, 255, 0.8)",
+				"icon-color": "rgb(102,98,106)",
+				"text-color": "rgb(102,98,106)",
+				"text-halo-color": "rgba(255,255,255,0.8)",
 				"text-halo-width": 2,
 				"text-halo-blur": 1
 			},
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/partial-map.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-map.html
index 8971de7..6b55ff7 100644
--- a/src/fellchensammlung/templates/fellchensammlung/partials/partial-map.html
+++ b/src/fellchensammlung/templates/fellchensammlung/partials/partial-map.html
@@ -29,7 +29,7 @@
 
     let map = new maplibregl.Map({
         container: 'map',
-        style: '{% static "fellchensammlung/map/styles/colorful.json" %}',
+        style: '{% static "fellchensammlung/map/styles/colorful/style.json" %}',
         center: map_center,
         zoom: zoom_level
     }).addControl(new maplibregl.NavigationControl());