diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index acafe31..6ef7a91 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,148 +1,148 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission
             android:name="android.permission.POST_NOTIFICATIONS"/>
     <!-- this is to REMOVE the permission from MQTT service -->
     <!--<uses-permission
             android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"
             tools:node="remove"/>
             -->
 
     <queries>
         <intent>
             <action android:name="android.intent.action.VIEW"/>
             <data android:scheme="http"/>
         </intent>
         <intent>
             <action android:name="android.intent.action.VIEW"/>
             <data android:scheme="geo"/>
         </intent>
         <intent>
             <action android:name="android.intent.action.VIEW"/>
             <data android:scheme="https"/>
         </intent>
         <intent>
             <action android:name="com.google.zxing.client.android.SCAN"/>
         </intent>
         <intent>
             <action android:name="com.google.zxing.client.android.ENCODE"/>
         </intent>
     </queries>
 
     <application
             android:name=".BustoApp"
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
             android:networkSecurityConfig="@xml/networks_security_config"
             android:roundIcon="@mipmap/ic_launcher_round"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppThemeDayNight.NoActionBar">
         <activity
                 android:name=".ActivityBackup"
                 android:label="@string/backup_restore"
                 android:parentActivityName=".ActivityPrincipal"
                 android:theme="@style/BackupTheme"
                 android:exported="false"/>
         <activity
                 android:name=".ActivityIntro"
                 android:exported="false"
-                android:theme="@style/AppTheme.NoActionBar.Light"
+                android:theme="@style/AppThemeDayNight.NoActionBar"
         />
         <activity
                 android:name=".ActivityExperiments"
                 android:label="@string/experiments"
                 android:theme="@style/MapTheme">
         </activity>
         <activity
                 android:name=".ActivityPrincipal"
                 android:exported="true"
                 android:label="@string/app_name"
                 android:screenOrientation="portrait"
                 android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
                 <data
                         android:host="www.gtt.to.it"
                         android:pathPrefix="/cms/percorari/arrivi"
                         android:scheme="http"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
                 <data
                         android:host="gtt.to.it"
                         android:pathPrefix="/cms/percorari/arrivi"
                         android:scheme="http"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
                 <data
                         android:host="m.gtt.to.it"
                         android:pathPrefix="/m/it/arrivi.jsp"
                         android:scheme="http"/>
             </intent-filter>
         </activity>
         <activity
                 android:name=".ActivityAbout"
                 android:label="@string/about_activity"
                 android:parentActivityName=".ActivityPrincipal"
                 android:theme="@style/AboutTheme">
 
             <!-- API < 16: -->
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value=".ActivityPrincipal"/>
         </activity>
 
         <provider
                 android:name=".data.AppDataProvider"
                 android:authorities="it.reyboz.bustorino.provider"
                 android:enabled="true"
                 android:exported="false">
         </provider> <!-- Don't show the additional frame on samsung phones -->
         <meta-data
                 android:name="com.samsung.android.icon_container.has_icon_container"
                 android:value="true"/>
 
         <activity
                 android:name=".ActivitySettings"
                 android:label="@string/title_activity_settings"
                 android:parentActivityName=".ActivityPrincipal"
-                android:theme="@style/AppTheme.NoActionBar">
+                android:theme="@style/AppThemeDayNight.NoActionBar">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="it.reyboz.bustorino.ActivityPrincipal"/>
         </activity>
 
         <service tools:node="replace" android:name="info.mqtt.android.service.MqttService"
                  android:exported="false"
         />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/assets/versatiles_eclipse_modif.json b/app/src/main/assets/versatiles_eclipse_modif.json
new file mode 100644
index 0000000..9aab152
--- /dev/null
+++ b/app/src/main/assets/versatiles_eclipse_modif.json
@@ -0,0 +1,6266 @@
+{
+  "version": 8,
+  "name": "versatiles-eclipse",
+  "metadata": {
+    "license": "https://creativecommons.org/publicdomain/zero/1.0/",
+    "maputnik:renderer": "mlgljs"
+  },
+  "sources": {
+    "versatiles-shortbread": {
+      "attribution": "© <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors",
+      "tiles": ["https://tiles.versatiles.org/tiles/osm/{z}/{x}/{y}"],
+      "type": "vector",
+      "scheme": "xyz",
+      "bounds": [-180, -85.0511287798066, 180, 85.0511287798066],
+      "minzoom": 0,
+      "maxzoom": 14
+    }
+  },
+  "sprite": [
+    {
+      "id": "basics",
+      "url": "https://tiles.versatiles.org/assets/sprites/basics/sprites"
+    }
+  ],
+  "glyphs": "https://tiles.versatiles.org/assets/glyphs/{fontstack}/{range}.pbf",
+  "layers": [
+    {
+      "id": "background",
+      "type": "background",
+      "paint": {"background-color": "hsl(33,48%,5%)"}
+    },
+    {
+      "id": "water-ocean",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "ocean",
+      "paint": {"fill-color": "hsl(205,69%,15%)"}
+    },
+    {
+      "id": "land-glacier",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "water_polygons",
+      "filter": ["all", ["==", "kind", "glacier"]],
+      "paint": {"fill-color": "hsl(0,0%,0%)"}
+    },
+    {
+      "id": "land-commercial",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": ["all", ["in", "kind", "commercial", "retail"]],
+      "paint": {
+        "fill-color": "hsla(324,61%,8%,0.251)",
+        "fill-opacity": {"stops": [[10, 0], [11, 1]]}
+      }
+    },
+    {
+      "id": "land-industrial",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": ["all", ["in", "kind", "industrial", "quarry", "railway"]],
+      "paint": {
+        "fill-color": "hsla(49,100%,12%,0.333)",
+        "fill-opacity": {"stops": [[10, 0], [11, 1]]}
+      }
+    },
+    {
+      "id": "land-residential",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": ["all", ["in", "kind", "garages", "residential"]],
+      "paint": {
+        "fill-color": "hsla(33,18%,10%,0.2)",
+        "fill-opacity": {"stops": [[10, 0], [11, 1]]}
+      }
+    },
+    {
+      "id": "land-agriculture",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": [
+        "all",
+        [
+          "in",
+          "kind",
+          "brownfield",
+          "farmland",
+          "farmyard",
+          "greenfield",
+          "greenhouse_horticulture",
+          "orchard",
+          "plant_nursery",
+          "vineyard"
+        ]
+      ],
+      "paint": {
+        "fill-color": "hsl(43,51%,12%)",
+        "fill-opacity": {"stops": [[10, 0], [11, 1]]}
+      }
+    },
+    {
+      "id": "land-waste",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": ["all", ["in", "kind", "landfill"]],
+      "paint": {
+        "fill-color": "hsl(50,29%,20%)",
+        "fill-opacity": {"stops": [[10, 0], [11, 1]]}
+      }
+    },
+    {
+      "id": "land-park",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": [
+        "all",
+        ["in", "kind", "park", "village_green", "recreation_ground"]
+      ],
+      "paint": {
+        "fill-color": "hsl(60,41%,25%)",
+        "fill-opacity": {"stops": [[11, 0], [12, 1]]}
+      }
+    },
+    {
+      "id": "land-garden",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": ["all", ["in", "kind", "allotments", "garden"]],
+      "paint": {
+        "fill-color": "hsl(60,41%,25%)",
+        "fill-opacity": {"stops": [[11, 0], [12, 1]]}
+      }
+    },
+    {
+      "id": "land-burial",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": ["all", ["in", "kind", "cemetery", "grave_yard"]],
+      "paint": {
+        "fill-color": "hsl(54,22%,17%)",
+        "fill-opacity": {"stops": [[13, 0], [14, 1]]}
+      }
+    },
+    {
+      "id": "land-leisure",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": [
+        "all",
+        ["in", "kind", "miniature_golf", "playground", "golf_course"]
+      ],
+      "paint": {"fill-color": "hsl(84,29%,10%)"}
+    },
+    {
+      "id": "land-rock",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": ["all", ["in", "kind", "bare_rock", "scree", "shingle"]],
+      "paint": {"fill-color": "hsl(192,9%,11%)"}
+    },
+    {
+      "id": "land-forest",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": ["all", ["in", "kind", "forest"]],
+      "paint": {
+        "fill-color": "hsl(100,43%,53%)",
+        "fill-opacity": {"stops": [[7, 0], [8, 0.1]]}
+      }
+    },
+    {
+      "id": "land-grass",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": [
+        "all",
+        ["in", "kind", "grass", "grassland", "meadow", "wet_meadow"]
+      ],
+      "paint": {
+        "fill-color": "hsl(90,41%,15%)",
+        "fill-opacity": {"stops": [[11, 0], [12, 1]]}
+      }
+    },
+    {
+      "id": "land-vegetation",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": ["all", ["in", "kind", "heath", "scrub"]],
+      "paint": {
+        "fill-color": "hsl(60,41%,25%)",
+        "fill-opacity": {"stops": [[11, 0], [12, 1]]}
+      }
+    },
+    {
+      "id": "land-sand",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": ["all", ["in", "kind", "beach", "sand"]],
+      "paint": {"fill-color": "hsl(60,57%,5%)"}
+    },
+    {
+      "id": "land-wetland",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "land",
+      "filter": ["all", ["in", "kind", "bog", "marsh", "string_bog", "swamp"]],
+      "paint": {"fill-color": "hsl(145,28%,14%)"}
+    },
+    {
+      "id": "water-river",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "water_lines",
+      "filter": [
+        "all",
+        ["in", "kind", "river"],
+        ["!=", "tunnel", true],
+        ["!=", "bridge", true]
+      ],
+      "layout": {"line-cap": "round", "line-join": "round"},
+      "paint": {
+        "line-color": "hsl(205,69%,15%)",
+        "line-width": {
+          "stops": [[9, 0], [10, 3], [15, 5], [17, 9], [18, 20], [20, 60]]
+        }
+      }
+    },
+    {
+      "id": "water-canal",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "water_lines",
+      "filter": [
+        "all",
+        ["in", "kind", "canal"],
+        ["!=", "tunnel", true],
+        ["!=", "bridge", true]
+      ],
+      "layout": {"line-cap": "round", "line-join": "round"},
+      "paint": {
+        "line-color": "hsl(205,69%,15%)",
+        "line-width": {
+          "stops": [[9, 0], [10, 2], [15, 4], [17, 8], [18, 17], [20, 50]]
+        }
+      }
+    },
+    {
+      "id": "water-stream",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "water_lines",
+      "filter": [
+        "all",
+        ["in", "kind", "stream"],
+        ["!=", "tunnel", true],
+        ["!=", "bridge", true]
+      ],
+      "layout": {"line-cap": "round", "line-join": "round"},
+      "paint": {
+        "line-color": "hsl(205,69%,15%)",
+        "line-width": {
+          "stops": [[13, 0], [14, 1], [15, 2], [17, 6], [18, 12], [20, 30]]
+        }
+      }
+    },
+    {
+      "id": "water-ditch",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "water_lines",
+      "filter": [
+        "all",
+        ["in", "kind", "ditch"],
+        ["!=", "tunnel", true],
+        ["!=", "bridge", true]
+      ],
+      "layout": {"line-cap": "round", "line-join": "round"},
+      "paint": {
+        "line-color": "hsl(205,69%,15%)",
+        "line-width": {"stops": [[14, 0], [15, 1], [17, 4], [18, 8], [20, 20]]}
+      }
+    },
+    {
+      "id": "water-area",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "water_polygons",
+      "filter": ["==", "kind", "water"],
+      "paint": {
+        "fill-color": "hsl(205,69%,15%)",
+        "fill-opacity": {"stops": [[4, 0], [6, 1]]}
+      }
+    },
+    {
+      "id": "water-area-river",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "water_polygons",
+      "filter": ["==", "kind", "river"],
+      "paint": {
+        "fill-color": "hsl(205,69%,15%)",
+        "fill-opacity": {"stops": [[4, 0], [6, 1]]}
+      }
+    },
+    {
+      "id": "water-area-small",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "water_polygons",
+      "filter": ["in", "kind", "reservoir", "basin", "dock"],
+      "paint": {
+        "fill-color": "hsl(205,69%,15%)",
+        "fill-opacity": {"stops": [[4, 0], [6, 1]]}
+      }
+    },
+    {
+      "id": "water-dam-area",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "dam_polygons",
+      "filter": ["==", "kind", "dam"],
+      "paint": {
+        "fill-color": "hsl(33,48%,5%)",
+        "fill-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "water-dam",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "dam_lines",
+      "filter": ["==", "kind", "dam"],
+      "layout": {"line-cap": "round", "line-join": "round"},
+      "paint": {"line-color": "hsl(205,69%,15%)"}
+    },
+    {
+      "id": "water-pier-area",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "pier_polygons",
+      "filter": ["in", "kind", "pier", "breakwater", "groyne"],
+      "paint": {
+        "fill-color": "hsl(33,48%,5%)",
+        "fill-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "water-pier",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "pier_lines",
+      "filter": ["in", "kind", "pier", "breakwater", "groyne"],
+      "layout": {"line-cap": "round", "line-join": "round"},
+      "paint": {"line-color": "hsl(33,48%,5%)"}
+    },
+    {
+      "id": "site-dangerarea",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "sites",
+      "filter": ["in", "kind", "danger_area"],
+      "paint": {
+        "fill-color": "hsl(0,100%,50%)",
+        "fill-outline-color": "hsl(0,100%,50%)",
+        "fill-opacity": 0.3,
+        "fill-pattern": "basics:pattern-warning"
+      }
+    },
+    {
+      "id": "site-university",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "sites",
+      "filter": ["in", "kind", "university"],
+      "paint": {"fill-color": "hsl(60,100%,25%)", "fill-opacity": 0.1}
+    },
+    {
+      "id": "site-college",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "sites",
+      "filter": ["in", "kind", "college"],
+      "paint": {"fill-color": "hsl(60,100%,25%)", "fill-opacity": 0.1}
+    },
+    {
+      "id": "site-school",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "sites",
+      "filter": ["in", "kind", "school"],
+      "paint": {"fill-color": "hsl(60,100%,25%)", "fill-opacity": 0.1}
+    },
+    {
+      "id": "site-hospital",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "sites",
+      "filter": ["in", "kind", "hospital"],
+      "paint": {"fill-color": "hsl(0,100%,30%)", "fill-opacity": 0.1}
+    },
+    {
+      "id": "site-prison",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "sites",
+      "filter": ["in", "kind", "prison"],
+      "paint": {
+        "fill-color": "hsl(305,73%,3%)",
+        "fill-pattern": "basics:pattern-striped",
+        "fill-opacity": 0.1
+      }
+    },
+    {
+      "id": "site-parking",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "sites",
+      "filter": ["in", "kind", "parking"],
+      "paint": {"fill-color": "hsl(24,11%,9%)"}
+    },
+    {
+      "id": "site-bicycleparking",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "sites",
+      "filter": ["in", "kind", "bicycle_parking"],
+      "paint": {"fill-color": "hsl(24,11%,9%)"}
+    },
+    {
+      "id": "site-construction",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "sites",
+      "filter": ["in", "kind", "construction"],
+      "paint": {
+        "fill-color": "hsl(0,0%,34%)",
+        "fill-pattern": "basics:pattern-hatched_thin",
+        "fill-opacity": 0.1
+      }
+    },
+    {
+      "id": "airport-area",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "street_polygons",
+      "filter": ["in", "kind", "runway", "taxiway"],
+      "paint": {"fill-color": "hsl(0,0%,0%)", "fill-opacity": 0.5}
+    },
+    {
+      "id": "airport-taxiway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["==", "kind", "taxiway"],
+      "layout": {"line-join": "round"},
+      "paint": {
+        "line-color": "hsl(36,5%,20%)",
+        "line-width": {
+          "stops": [[13, 0], [14, 2], [15, 10], [16, 14], [18, 20], [20, 40]]
+        }
+      }
+    },
+    {
+      "id": "airport-runway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["==", "kind", "runway"],
+      "layout": {"line-join": "round"},
+      "paint": {
+        "line-color": "hsl(36,5%,20%)",
+        "line-width": {
+          "stops": [
+            [11, 0],
+            [12, 6],
+            [13, 9],
+            [14, 16],
+            [15, 24],
+            [16, 40],
+            [17, 100],
+            [18, 160],
+            [20, 300]
+          ]
+        }
+      }
+    },
+    {
+      "id": "airport-taxiway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["==", "kind", "taxiway"],
+      "layout": {"line-join": "round"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "line-width": {
+          "stops": [[13, 0], [14, 1], [15, 8], [16, 12], [18, 18], [20, 36]]
+        },
+        "line-opacity": {"stops": [[13, 0], [14, 1]]}
+      }
+    },
+    {
+      "id": "airport-runway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["==", "kind", "runway"],
+      "layout": {"line-join": "round"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "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]]}
+      }
+    },
+    {
+      "id": "building:outline",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "buildings",
+      "paint": {
+        "fill-color": "hsl(30,11%,14%)",
+        "fill-opacity": {"stops": [[14, 0], [15, 1]]}
+      }
+    },
+    {
+      "id": "building",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "buildings",
+      "paint": {
+        "fill-color": "hsl(30,38%,8%)",
+        "fill-opacity": {"stops": [[14, 0], [15, 1]]},
+        "fill-translate": [-2, -2]
+      }
+    },
+    {
+      "id": "tunnel-street-pedestrian-zone",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "street_polygons",
+      "filter": ["all", ["==", "tunnel", true], ["==", "kind", "pedestrian"]],
+      "paint": {
+        "fill-color": "rgb(8,8,8)",
+        "fill-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-way-footway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "tunnel", true], ["in", "kind", "footway"]],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 5], [18, 7], [19, 12], [20, 22]]
+        },
+        "line-color": "hsl(288,13%,14%)"
+      }
+    },
+    {
+      "id": "tunnel-way-steps:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "tunnel", true], ["in", "kind", "steps"]],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 5], [18, 7], [19, 12], [20, 22]]
+        },
+        "line-color": "hsl(288,13%,14%)"
+      }
+    },
+    {
+      "id": "tunnel-way-path:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "tunnel", true], ["in", "kind", "path"]],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 5], [18, 7], [19, 12], [20, 22]]
+        },
+        "line-color": "hsl(288,13%,14%)"
+      }
+    },
+    {
+      "id": "tunnel-way-cycleway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "tunnel", true], ["in", "kind", "cycleway"]],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 5], [18, 7], [19, 12], [20, 22]]
+        },
+        "line-color": "hsl(203,11%,13%)"
+      }
+    },
+    {
+      "id": "tunnel-street-track:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "track"], ["==", "tunnel", true]],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(33,33,33)",
+        "line-width": {
+          "stops": [[14, 2], [16, 4], [18, 18], [19, 48], [20, 96]]
+        },
+        "line-opacity": {"stops": [[14, 0], [15, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-pedestrian:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "pedestrian"], ["==", "tunnel", true]],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(33,33,33)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-service:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "service"], ["==", "tunnel", true]],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(37,36,34)",
+        "line-width": {
+          "stops": [[14, 1], [16, 3], [18, 12], [19, 32], [20, 48]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-livingstreet:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "living_street"],
+        ["==", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(33,33,33)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-residential:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "residential"], ["==", "tunnel", true]],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(33,33,33)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-unclassified:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "unclassified"], ["==", "tunnel", true]],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(33,33,33)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-busway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "busway"], ["==", "tunnel", true]],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(37,36,34)",
+        "line-width": {
+          "stops": [[14, 1], [16, 3], [18, 12], [19, 32], [20, 48]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-busguideway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "bus_guideway"], ["==", "tunnel", true]],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(37,36,34)",
+        "line-width": {
+          "stops": [[14, 1], [16, 3], [18, 12], [19, 32], [20, 48]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-tertiary-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "tertiary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(33,33,33)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-secondary-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "secondary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(129,71,21)",
+        "line-dasharray": [1, 0.3],
+        "line-width": {"stops": [[12, 2], [14, 3], [16, 7], [18, 14], [20, 40]]}
+      }
+    },
+    {
+      "id": "tunnel-street-primary-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "primary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(129,71,21)",
+        "line-dasharray": [1, 0.3],
+        "line-width": {"stops": [[12, 2], [14, 3], [16, 7], [18, 14], [20, 40]]}
+      }
+    },
+    {
+      "id": "tunnel-street-trunk-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "trunk"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(129,71,21)",
+        "line-dasharray": [1, 0.3],
+        "line-width": {"stops": [[12, 2], [14, 3], [16, 7], [18, 14], [20, 40]]}
+      }
+    },
+    {
+      "id": "tunnel-street-motorway-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 12,
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "motorway"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(129,71,21)",
+        "line-dasharray": [1, 0.3],
+        "line-width": {"stops": [[12, 2], [14, 3], [16, 7], [18, 14], [20, 40]]}
+      }
+    },
+    {
+      "id": "tunnel-street-tertiary:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "tertiary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(33,33,33)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-secondary:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "secondary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(129,71,21)",
+        "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]]}
+      }
+    },
+    {
+      "id": "tunnel-street-primary:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "primary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(129,71,21)",
+        "line-dasharray": [1, 0.3],
+        "line-width": {
+          "stops": [
+            [8, 0],
+            [9, 1],
+            [10, 4],
+            [14, 6],
+            [16, 12],
+            [18, 36],
+            [19, 74],
+            [20, 144]
+          ]
+        }
+      }
+    },
+    {
+      "id": "tunnel-street-trunk:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "trunk"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(129,71,21)",
+        "line-dasharray": [1, 0.3],
+        "line-width": {
+          "stops": [
+            [6, 0],
+            [7, 2],
+            [10, 4],
+            [14, 6],
+            [16, 12],
+            [18, 36],
+            [19, 74],
+            [20, 144]
+          ]
+        }
+      }
+    },
+    {
+      "id": "tunnel-street-motorway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "motorway"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(129,71,21)",
+        "line-dasharray": [1, 0.3],
+        "line-width": {
+          "stops": [
+            [5, 0],
+            [6, 2],
+            [10, 5],
+            [14, 5],
+            [16, 14],
+            [18, 38],
+            [19, 84],
+            [20, 168]
+          ]
+        }
+      }
+    },
+    {
+      "id": "tunnel-way-footway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "tunnel", true], ["in", "kind", "footway"]],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 4], [18, 6], [19, 10], [20, 20]]
+        },
+        "line-color": "hsl(288,33%,6%)",
+        "line-dasharray": [1, 0.2]
+      }
+    },
+    {
+      "id": "tunnel-way-steps",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "tunnel", true], ["in", "kind", "steps"]],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 4], [18, 6], [19, 10], [20, 20]]
+        },
+        "line-color": "hsl(288,33%,6%)",
+        "line-dasharray": [1, 0.2]
+      }
+    },
+    {
+      "id": "tunnel-way-path",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "tunnel", true], ["in", "kind", "path"]],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 4], [18, 6], [19, 10], [20, 20]]
+        },
+        "line-color": "hsl(288,33%,6%)",
+        "line-dasharray": [1, 0.2]
+      }
+    },
+    {
+      "id": "tunnel-way-cycleway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "tunnel", true], ["in", "kind", "cycleway"]],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 4], [18, 6], [19, 10], [20, 20]]
+        },
+        "line-color": "hsl(203,30%,5%)",
+        "line-dasharray": [1, 0.2]
+      }
+    },
+    {
+      "id": "tunnel-street-track",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "track"], ["==", "tunnel", true]],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[14, 1], [16, 3], [18, 16], [19, 44], [20, 88]]
+        },
+        "line-opacity": {"stops": [[14, 0], [15, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-pedestrian",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "pedestrian"], ["==", "tunnel", true]],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-service",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "service"], ["==", "tunnel", true]],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[14, 1], [16, 2], [18, 10], [19, 28], [20, 40]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-livingstreet",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "living_street"],
+        ["==", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-residential",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "residential"], ["==", "tunnel", true]],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-unclassified",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "unclassified"], ["==", "tunnel", true]],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-busway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "busway"], ["==", "tunnel", true]],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[14, 1], [16, 2], [18, 10], [19, 28], [20, 40]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-busguideway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "bus_guideway"], ["==", "tunnel", true]],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[14, 1], [16, 2], [18, 10], [19, 28], [20, 40]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-track-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "track"],
+        ["==", "bicycle", "designated"],
+        ["==", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {"line-color": "rgb(8,8,8)"}
+    },
+    {
+      "id": "tunnel-street-pedestrian-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "pedestrian"],
+        ["==", "bicycle", "designated"],
+        ["==", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(203,100%,3%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-service-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "service"],
+        ["==", "bicycle", "designated"],
+        ["==", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {"line-color": "rgb(8,8,8)"}
+    },
+    {
+      "id": "tunnel-street-livingstreet-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "living_street"],
+        ["==", "bicycle", "designated"],
+        ["==", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(203,100%,3%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-residential-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "residential"],
+        ["==", "bicycle", "designated"],
+        ["==", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(203,100%,3%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-unclassified-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "unclassified"],
+        ["==", "bicycle", "designated"],
+        ["==", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(203,100%,3%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-tertiary-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "tertiary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-secondary-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "secondary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(77,61,0)",
+        "line-width": {"stops": [[12, 1], [14, 2], [16, 5], [18, 12], [20, 38]]}
+      }
+    },
+    {
+      "id": "tunnel-street-primary-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "primary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(77,61,0)",
+        "line-width": {"stops": [[12, 1], [14, 2], [16, 5], [18, 12], [20, 38]]}
+      }
+    },
+    {
+      "id": "tunnel-street-trunk-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "trunk"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(77,61,0)",
+        "line-width": {"stops": [[12, 1], [14, 2], [16, 5], [18, 12], [20, 38]]}
+      }
+    },
+    {
+      "id": "tunnel-street-motorway-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 12,
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "motorway"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(107,61,0)",
+        "line-width": {"stops": [[12, 1], [14, 2], [16, 5], [18, 12], [20, 38]]}
+      }
+    },
+    {
+      "id": "tunnel-street-tertiary",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "tertiary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-secondary",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "secondary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(77,61,0)",
+        "line-width": {
+          "stops": [[11, 1], [14, 4], [16, 6], [18, 28], [19, 64], [20, 130]]
+        },
+        "line-opacity": {"stops": [[11, 0], [12, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-primary",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "primary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(77,61,0)",
+        "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]]}
+      }
+    },
+    {
+      "id": "tunnel-street-trunk",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "trunk"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(77,61,0)",
+        "line-width": {
+          "stops": [
+            [6, 0],
+            [7, 1],
+            [10, 3],
+            [14, 5],
+            [16, 10],
+            [18, 34],
+            [19, 70],
+            [20, 140]
+          ]
+        },
+        "line-opacity": {"stops": [[6, 0], [7, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-street-motorway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "tunnel", true],
+        ["in", "kind", "motorway"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(107,61,0)",
+        "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]]}
+      }
+    },
+    {
+      "id": "tunnel-transport-tram:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["in", "kind", "tram"],
+        ["!has", "service"],
+        ["==", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[15, 0], [16, 5], [18, 7], [20, 20]]},
+        "line-dasharray": [0.1, 0.5]
+      }
+    },
+    {
+      "id": "tunnel-transport-narrowgauge:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["in", "kind", "narrow_gauge"],
+        ["!has", "service"],
+        ["==", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[15, 0], [16, 5], [18, 7], [20, 20]]},
+        "line-dasharray": [0.1, 0.5]
+      }
+    },
+    {
+      "id": "tunnel-transport-subway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["in", "kind", "subway"],
+        ["!has", "service"],
+        ["==", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(207,23%,28%)",
+        "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]]}
+      }
+    },
+    {
+      "id": "tunnel-transport-lightrail:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 8,
+      "filter": [
+        "all",
+        ["in", "kind", "light_rail"],
+        ["!has", "service"],
+        ["==", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[8, 1], [13, 1], [15, 1], [20, 14]]},
+        "line-opacity": {"stops": [[11, 0], [12, 0.5]]}
+      }
+    },
+    {
+      "id": "tunnel-transport-lightrail-service:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 14,
+      "filter": [
+        "all",
+        ["in", "kind", "light_rail"],
+        ["has", "service"],
+        ["==", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[14, 0], [15, 1], [16, 1], [20, 14]]}
+      }
+    },
+    {
+      "id": "tunnel-transport-rail:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 8,
+      "filter": [
+        "all",
+        ["in", "kind", "rail"],
+        ["!has", "service"],
+        ["==", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[8, 1], [13, 1], [15, 1], [20, 14]]},
+        "line-opacity": {"stops": [[8, 0], [9, 0.3]]}
+      }
+    },
+    {
+      "id": "tunnel-transport-rail-service:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 14,
+      "filter": [
+        "all",
+        ["in", "kind", "rail"],
+        ["has", "service"],
+        ["==", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[14, 0], [15, 1], [16, 1], [20, 14]]}
+      }
+    },
+    {
+      "id": "tunnel-transport-monorail:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["in", "kind", "monorail"], ["==", "tunnel", true]],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[15, 0], [16, 5], [18, 7], [20, 20]]},
+        "line-dasharray": [0.1, 0.5]
+      }
+    },
+    {
+      "id": "tunnel-transport-funicular:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["in", "kind", "funicular"], ["==", "tunnel", true]],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[15, 0], [16, 5], [18, 7], [20, 20]]},
+        "line-dasharray": [0.1, 0.5]
+      }
+    },
+    {
+      "id": "tunnel-transport-tram",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["in", "kind", "tram"],
+        ["!has", "service"],
+        ["==", "tunnel", true]
+      ],
+      "paint": {
+        "line-width": {"stops": [[13, 0], [16, 1], [17, 2], [18, 3], [20, 5]]},
+        "line-color": "hsl(208,14%,27%)"
+      }
+    },
+    {
+      "id": "tunnel-transport-narrowgauge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["in", "kind", "narrow_gauge"],
+        ["!has", "service"],
+        ["==", "tunnel", true]
+      ],
+      "paint": {
+        "line-width": {"stops": [[13, 0], [16, 1], [17, 2], [18, 3], [20, 5]]},
+        "line-color": "hsl(208,14%,27%)"
+      }
+    },
+    {
+      "id": "tunnel-transport-subway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["in", "kind", "subway"],
+        ["!has", "service"],
+        ["==", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "rgb(42,55,67)",
+        "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]]}
+      }
+    },
+    {
+      "id": "tunnel-transport-lightrail",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 14,
+      "filter": [
+        "all",
+        ["in", "kind", "light_rail"],
+        ["!has", "service"],
+        ["==", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "rgb(44,52,59)",
+        "line-width": {"stops": [[14, 0], [15, 1], [20, 10]]},
+        "line-dasharray": [2, 2],
+        "line-opacity": {"stops": [[14, 0], [15, 1]]}
+      }
+    },
+    {
+      "id": "tunnel-transport-lightrail-service",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["in", "kind", "light_rail"],
+        ["has", "service"],
+        ["==", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "rgb(44,52,59)",
+        "line-width": {"stops": [[15, 0], [16, 1], [20, 10]]},
+        "line-dasharray": [2, 2]
+      }
+    },
+    {
+      "id": "tunnel-transport-rail",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 14,
+      "filter": [
+        "all",
+        ["in", "kind", "rail"],
+        ["!has", "service"],
+        ["==", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "rgb(44,52,59)",
+        "line-width": {"stops": [[14, 0], [15, 1], [20, 10]]},
+        "line-dasharray": [2, 2],
+        "line-opacity": {"stops": [[14, 0], [15, 0.3]]}
+      }
+    },
+    {
+      "id": "tunnel-transport-rail-service",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["in", "kind", "rail"],
+        ["has", "service"],
+        ["==", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "rgb(44,52,59)",
+        "line-width": {"stops": [[15, 0], [16, 1], [20, 10]]},
+        "line-dasharray": [2, 2]
+      }
+    },
+    {
+      "id": "tunnel-transport-monorail",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": ["all", ["in", "kind", "monorail"], ["==", "tunnel", true]],
+      "paint": {
+        "line-width": {"stops": [[13, 0], [16, 1], [17, 2], [18, 3], [20, 5]]},
+        "line-color": "hsl(208,14%,27%)"
+      }
+    },
+    {
+      "id": "tunnel-transport-funicular",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": ["all", ["in", "kind", "funicular"], ["==", "tunnel", true]],
+      "paint": {
+        "line-width": {"stops": [[13, 0], [16, 1], [17, 2], [18, 3], [20, 5]]},
+        "line-color": "hsl(208,14%,27%)"
+      }
+    },
+    {
+      "id": "bridge",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "bridges",
+      "paint": {
+        "fill-color": "rgb(22,17,11)",
+        "fill-antialias": true,
+        "fill-opacity": 0.8
+      }
+    },
+    {
+      "id": "street-pedestrian-zone",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "street_polygons",
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["==", "kind", "pedestrian"]
+      ],
+      "paint": {
+        "fill-color": "rgba(16,0,20,0.25)",
+        "fill-opacity": {"stops": [[12, 0], [13, 1], [14, 0], [15, 1]]}
+      }
+    },
+    {
+      "id": "way-footway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "footway"]
+      ],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 5], [18, 7], [19, 12], [20, 22]]
+        },
+        "line-color": "rgb(40,26,44)"
+      }
+    },
+    {
+      "id": "way-steps:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "steps"]
+      ],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 5], [18, 7], [19, 12], [20, 22]]
+        },
+        "line-color": "rgb(40,26,44)"
+      }
+    },
+    {
+      "id": "way-path:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "path"]
+      ],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 5], [18, 7], [19, 12], [20, 22]]
+        },
+        "line-color": "rgb(40,26,44)"
+      }
+    },
+    {
+      "id": "way-cycleway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "cycleway"]
+      ],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 5], [18, 7], [19, 12], [20, 22]]
+        },
+        "line-color": "rgb(26,34,40)"
+      }
+    },
+    {
+      "id": "street-track:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "track"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(36,5%,20%)",
+        "line-width": {
+          "stops": [[14, 2], [16, 4], [18, 18], [19, 48], [20, 96]]
+        },
+        "line-opacity": {"stops": [[14, 0], [15, 1]]}
+      }
+    },
+    {
+      "id": "street-pedestrian:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "pedestrian"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(36,5%,20%)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-service:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(37,36,34)",
+        "line-width": {
+          "stops": [[14, 1], [16, 3], [18, 12], [19, 32], [20, 48]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "street-livingstreet:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "living_street"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(36,5%,20%)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-residential:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "residential"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(36,5%,20%)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-unclassified:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "unclassified"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(36,5%,20%)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-busway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "busway"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(37,36,34)",
+        "line-width": {
+          "stops": [[14, 1], [16, 3], [18, 12], [19, 32], [20, 48]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "street-busguideway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "bus_guideway"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(37,36,34)",
+        "line-width": {
+          "stops": [[14, 1], [16, 3], [18, 12], [19, 32], [20, 48]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "street-tertiary-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "tertiary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(36,5%,20%)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-secondary-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "secondary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {"stops": [[12, 2], [14, 3], [16, 7], [18, 14], [20, 40]]}
+      }
+    },
+    {
+      "id": "street-primary-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "primary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {"stops": [[12, 2], [14, 3], [16, 7], [18, 14], [20, 40]]}
+      }
+    },
+    {
+      "id": "street-trunk-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "trunk"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {"stops": [[12, 2], [14, 3], [16, 7], [18, 14], [20, 40]]}
+      }
+    },
+    {
+      "id": "street-motorway-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 12,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "motorway"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {"stops": [[12, 2], [14, 3], [16, 7], [18, 14], [20, 40]]}
+      }
+    },
+    {
+      "id": "street-tertiary:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "tertiary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(36,5%,20%)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-secondary:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "secondary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {
+          "stops": [[11, 2], [14, 5], [16, 8], [18, 30], [19, 68], [20, 138]]
+        },
+        "line-opacity": {"stops": [[11, 0], [12, 1]]}
+      }
+    },
+    {
+      "id": "street-primary:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "primary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {
+          "stops": [
+            [8, 0],
+            [9, 1],
+            [10, 4],
+            [14, 6],
+            [16, 12],
+            [18, 36],
+            [19, 74],
+            [20, 144]
+          ]
+        }
+      }
+    },
+    {
+      "id": "street-trunk:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "trunk"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {
+          "stops": [
+            [6, 0],
+            [7, 2],
+            [10, 4],
+            [14, 6],
+            [16, 12],
+            [18, 36],
+            [19, 74],
+            [20, 144]
+          ]
+        }
+      }
+    },
+    {
+      "id": "street-motorway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "motorway"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {
+          "stops": [
+            [5, 0],
+            [6, 2],
+            [10, 5],
+            [14, 5],
+            [16, 14],
+            [18, 38],
+            [19, 84],
+            [20, 168]
+          ]
+        }
+      }
+    },
+    {
+      "id": "way-footway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "footway"]
+      ],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 4], [18, 6], [19, 10], [20, 20]]
+        },
+        "line-color": "rgb(16,0,20)"
+      }
+    },
+    {
+      "id": "way-steps",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "steps"]
+      ],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 4], [18, 6], [19, 10], [20, 20]]
+        },
+        "line-color": "rgb(16,0,20)"
+      }
+    },
+    {
+      "id": "way-path",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "path"]
+      ],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 4], [18, 6], [19, 10], [20, 20]]
+        },
+        "line-color": "rgb(16,0,20)"
+      }
+    },
+    {
+      "id": "way-cycleway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "cycleway"]
+      ],
+      "layout": {"line-cap": "round"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 4], [18, 6], [19, 10], [20, 20]]
+        },
+        "line-color": "hsl(203,100%,3%)"
+      }
+    },
+    {
+      "id": "street-track",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "track"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "line-width": {
+          "stops": [[14, 1], [16, 3], [18, 16], [19, 44], [20, 88]]
+        },
+        "line-opacity": {"stops": [[14, 0], [15, 1]]}
+      }
+    },
+    {
+      "id": "street-pedestrian",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "pedestrian"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(288,100%,4%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 0], [14, 1]]}
+      }
+    },
+    {
+      "id": "street-service",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[14, 1], [16, 2], [18, 10], [19, 28], [20, 40]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "street-livingstreet",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "living_street"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-residential",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "residential"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-unclassified",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "unclassified"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-busway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "busway"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[14, 1], [16, 2], [18, 10], [19, 28], [20, 40]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "street-busguideway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "bus_guideway"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[14, 1], [16, 2], [18, 10], [19, 28], [20, 40]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "street-track-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "track"],
+        ["==", "bicycle", "designated"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {"line-color": "hsl(0,0%,0%)"}
+    },
+    {
+      "id": "street-pedestrian-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "pedestrian"],
+        ["==", "bicycle", "designated"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(203,100%,3%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-service-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "service"],
+        ["==", "bicycle", "designated"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {"line-color": "hsl(0,0%,0%)"}
+    },
+    {
+      "id": "street-livingstreet-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "living_street"],
+        ["==", "bicycle", "designated"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(203,100%,3%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-residential-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "residential"],
+        ["==", "bicycle", "designated"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(203,100%,3%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-unclassified-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "unclassified"],
+        ["==", "bicycle", "designated"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(203,100%,3%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-tertiary-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "tertiary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-secondary-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "secondary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(48,100%,17%)",
+        "line-width": {"stops": [[12, 1], [14, 2], [16, 5], [18, 12], [20, 38]]}
+      }
+    },
+    {
+      "id": "street-primary-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "primary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(48,100%,17%)",
+        "line-width": {"stops": [[12, 1], [14, 2], [16, 5], [18, 12], [20, 38]]}
+      }
+    },
+    {
+      "id": "street-trunk-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "trunk"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(48,100%,17%)",
+        "line-width": {"stops": [[12, 1], [14, 2], [16, 5], [18, 12], [20, 38]]}
+      }
+    },
+    {
+      "id": "street-motorway-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 12,
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "motorway"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(34,100%,23%)",
+        "line-width": {"stops": [[12, 1], [14, 2], [16, 5], [18, 12], [20, 38]]}
+      }
+    },
+    {
+      "id": "street-tertiary",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "tertiary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "street-secondary",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "secondary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(48,100%,17%)",
+        "line-width": {
+          "stops": [[11, 1], [14, 4], [16, 6], [18, 28], [19, 64], [20, 130]]
+        },
+        "line-opacity": {"stops": [[11, 0], [12, 1]]}
+      }
+    },
+    {
+      "id": "street-primary",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "primary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(48,100%,17%)",
+        "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]]}
+      }
+    },
+    {
+      "id": "street-trunk",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "trunk"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(48,100%,17%)",
+        "line-width": {
+          "stops": [
+            [6, 0],
+            [7, 1],
+            [10, 3],
+            [14, 5],
+            [16, 10],
+            [18, 34],
+            [19, 70],
+            [20, 140]
+          ]
+        },
+        "line-opacity": {"stops": [[6, 0], [7, 1]]}
+      }
+    },
+    {
+      "id": "street-motorway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true],
+        ["in", "kind", "motorway"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(34,100%,23%)",
+        "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]]}
+      }
+    },
+    {
+      "id": "transport-tram:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["in", "kind", "tram"],
+        ["!has", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[15, 0], [16, 5], [18, 7], [20, 20]]},
+        "line-dasharray": [0.1, 0.5]
+      }
+    },
+    {
+      "id": "transport-narrowgauge:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["in", "kind", "narrow_gauge"],
+        ["!has", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[15, 0], [16, 5], [18, 7], [20, 20]]},
+        "line-dasharray": [0.1, 0.5]
+      }
+    },
+    {
+      "id": "transport-subway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["in", "kind", "subway"],
+        ["!has", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(207,23%,28%)",
+        "line-width": {
+          "stops": [
+            [11, 0],
+            [12, 1],
+            [15, 3],
+            [16, 3],
+            [18, 6],
+            [19, 8],
+            [20, 10]
+          ]
+        },
+        "line-opacity": {"stops": [[11, 0], [12, 1]]}
+      }
+    },
+    {
+      "id": "transport-lightrail:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 8,
+      "filter": [
+        "all",
+        ["in", "kind", "light_rail"],
+        ["!has", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[8, 1], [13, 1], [15, 1], [20, 14]]},
+        "line-opacity": {"stops": [[11, 0], [12, 1]]}
+      }
+    },
+    {
+      "id": "transport-lightrail-service:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 14,
+      "filter": [
+        "all",
+        ["in", "kind", "light_rail"],
+        ["has", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[14, 0], [15, 1], [16, 1], [20, 14]]}
+      }
+    },
+    {
+      "id": "transport-rail:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 8,
+      "filter": [
+        "all",
+        ["in", "kind", "rail"],
+        ["!has", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[8, 1], [13, 1], [15, 1], [20, 14]]},
+        "line-opacity": {"stops": [[8, 0], [9, 1]]}
+      }
+    },
+    {
+      "id": "transport-rail-service:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 14,
+      "filter": [
+        "all",
+        ["in", "kind", "rail"],
+        ["has", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[14, 0], [15, 1], [16, 1], [20, 14]]}
+      }
+    },
+    {
+      "id": "transport-monorail:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["in", "kind", "monorail"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[15, 0], [16, 5], [18, 7], [20, 20]]},
+        "line-dasharray": [0.1, 0.5]
+      }
+    },
+    {
+      "id": "transport-funicular:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["in", "kind", "funicular"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[15, 0], [16, 5], [18, 7], [20, 20]]},
+        "line-dasharray": [0.1, 0.5]
+      }
+    },
+    {
+      "id": "transport-tram",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["in", "kind", "tram"],
+        ["!has", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-width": {"stops": [[13, 0], [16, 1], [17, 2], [18, 3], [20, 5]]},
+        "line-color": "hsl(208,14%,27%)"
+      }
+    },
+    {
+      "id": "transport-narrowgauge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["in", "kind", "narrow_gauge"],
+        ["!has", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-width": {"stops": [[13, 0], [16, 1], [17, 2], [18, 3], [20, 5]]},
+        "line-color": "hsl(208,14%,27%)"
+      }
+    },
+    {
+      "id": "transport-subway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["in", "kind", "subway"],
+        ["!has", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "rgb(42,55,67)",
+        "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]]}
+      }
+    },
+    {
+      "id": "transport-lightrail",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 14,
+      "filter": [
+        "all",
+        ["in", "kind", "light_rail"],
+        ["!has", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "rgb(44,52,59)",
+        "line-width": {"stops": [[14, 0], [15, 1], [20, 10]]},
+        "line-dasharray": [2, 2],
+        "line-opacity": {"stops": [[14, 0], [15, 1]]}
+      }
+    },
+    {
+      "id": "transport-lightrail-service",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["in", "kind", "light_rail"],
+        ["has", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "rgb(44,52,59)",
+        "line-width": {"stops": [[15, 0], [16, 1], [20, 10]]},
+        "line-dasharray": [2, 2]
+      }
+    },
+    {
+      "id": "transport-rail",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 14,
+      "filter": [
+        "all",
+        ["in", "kind", "rail"],
+        ["!has", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "rgb(44,52,59)",
+        "line-width": {"stops": [[14, 0], [15, 1], [20, 10]]},
+        "line-dasharray": [2, 2],
+        "line-opacity": {"stops": [[14, 0], [15, 1]]}
+      }
+    },
+    {
+      "id": "transport-rail-service",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["in", "kind", "rail"],
+        ["has", "service"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-color": "rgb(44,52,59)",
+        "line-width": {"stops": [[15, 0], [16, 1], [20, 10]]},
+        "line-dasharray": [2, 2]
+      }
+    },
+    {
+      "id": "transport-monorail",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["in", "kind", "monorail"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-width": {"stops": [[13, 0], [16, 1], [17, 2], [18, 3], [20, 5]]},
+        "line-color": "hsl(208,14%,27%)"
+      }
+    },
+    {
+      "id": "transport-funicular",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["in", "kind", "funicular"],
+        ["!=", "bridge", true],
+        ["!=", "tunnel", true]
+      ],
+      "paint": {
+        "line-width": {"stops": [[13, 0], [16, 1], [17, 2], [18, 3], [20, 5]]},
+        "line-color": "hsl(208,14%,27%)"
+      }
+    },
+    {
+      "id": "transport-ferry",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "ferries",
+      "minzoom": 10,
+      "paint": {
+        "line-color": "rgb(36,64,84)",
+        "line-width": {"stops": [[10, 1], [13, 2], [14, 3], [16, 4], [17, 6]]},
+        "line-opacity": {"stops": [[10, 0], [11, 1]]},
+        "line-dasharray": [1, 1]
+      }
+    },
+    {
+      "id": "bridge-way-footway:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "bridge", true], ["in", "kind", "footway"]],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": 0.5,
+        "line-width": {
+          "stops": [[15, 0], [16, 7], [18, 10], [19, 17], [20, 31]]
+        }
+      }
+    },
+    {
+      "id": "bridge-way-steps:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "bridge", true], ["in", "kind", "steps"]],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": 0.5,
+        "line-width": {
+          "stops": [[15, 0], [16, 7], [18, 10], [19, 17], [20, 31]]
+        }
+      }
+    },
+    {
+      "id": "bridge-way-path:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "bridge", true], ["in", "kind", "path"]],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": 0.5,
+        "line-width": {
+          "stops": [[15, 0], [16, 7], [18, 10], [19, 17], [20, 31]]
+        }
+      }
+    },
+    {
+      "id": "bridge-way-cycleway:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "bridge", true], ["in", "kind", "cycleway"]],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": 0.5,
+        "line-width": {
+          "stops": [[15, 0], [16, 7], [18, 10], [19, 17], [20, 31]]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-track:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "track"], ["==", "bridge", true]],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": {"stops": [[14, 0], [15, 1]]},
+        "line-width": {
+          "stops": [[14, 3], [16, 6], [18, 25], [19, 67], [20, 134]]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-pedestrian:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "pedestrian"], ["==", "bridge", true]],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": {"stops": [[12, 0], [13, 1]]},
+        "line-width": {
+          "stops": [[12, 3], [14, 4], [16, 8], [18, 36], [19, 90], [20, 179]]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-service:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "service"], ["==", "bridge", true]],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": {"stops": [[14, 0], [15, 1]]},
+        "line-width": {
+          "stops": [[14, 3], [16, 6], [18, 25], [19, 67], [20, 134]]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-livingstreet:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "living_street"],
+        ["==", "bridge", true]
+      ],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": {"stops": [[12, 0], [13, 1]]},
+        "line-width": {
+          "stops": [[12, 3], [14, 4], [16, 8], [18, 36], [19, 90], [20, 179]]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-residential:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "residential"], ["==", "bridge", true]],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": {"stops": [[12, 0], [13, 1]]},
+        "line-width": {
+          "stops": [[12, 3], [14, 4], [16, 8], [18, 36], [19, 90], [20, 179]]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-unclassified:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "unclassified"], ["==", "bridge", true]],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": {"stops": [[12, 0], [13, 1]]},
+        "line-width": {
+          "stops": [[12, 3], [14, 4], [16, 8], [18, 36], [19, 90], [20, 179]]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-busway:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "busway"], ["==", "bridge", true]],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {"line-color": "rgb(22,17,11)", "line-opacity": 0.5}
+    },
+    {
+      "id": "bridge-street-busguideway:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "bus_guideway"], ["==", "bridge", true]],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {"line-color": "rgb(22,17,11)", "line-opacity": 0.5}
+    },
+    {
+      "id": "bridge-street-tertiary-link:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "tertiary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": {"stops": [[12, 0], [13, 1]]},
+        "line-width": {
+          "stops": [[12, 3], [14, 4], [16, 8], [18, 36], [19, 90], [20, 179]]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-secondary-link:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "secondary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": 0.5,
+        "line-width": {
+          "stops": [[12, 3], [14, 4], [16, 10], [18, 20], [20, 56]]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-primary-link:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "primary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": 0.5,
+        "line-width": {
+          "stops": [[12, 3], [14, 4], [16, 10], [18, 20], [20, 56]]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-trunk-link:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "trunk"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": 0.5,
+        "line-width": {
+          "stops": [[12, 3], [14, 4], [16, 10], [18, 20], [20, 56]]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-motorway-link:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 12,
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "motorway"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": 0.5,
+        "line-width": {
+          "stops": [[12, 3], [14, 4], [16, 10], [18, 20], [20, 56]]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-tertiary:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "tertiary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": {"stops": [[12, 0], [13, 1]]},
+        "line-width": {
+          "stops": [[12, 3], [14, 4], [16, 8], [18, 36], [19, 90], [20, 179]]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-secondary:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "secondary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": {"stops": [[11, 0], [12, 1]]},
+        "line-width": {
+          "stops": [[11, 3], [14, 7], [16, 11], [18, 42], [19, 95], [20, 193]]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-primary:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "primary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": 0.5,
+        "line-width": {
+          "stops": [
+            [8, 0],
+            [9, 1],
+            [10, 6],
+            [14, 8],
+            [16, 17],
+            [18, 50],
+            [19, 104],
+            [20, 202]
+          ]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-trunk:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "trunk"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": 0.5,
+        "line-width": {
+          "stops": [
+            [7, 0],
+            [8, 3],
+            [10, 6],
+            [14, 8],
+            [16, 17],
+            [18, 50],
+            [19, 104],
+            [20, 202]
+          ]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-motorway:bridge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "motorway"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-cap": "butt", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(22,17,11)",
+        "line-opacity": 0.5,
+        "line-width": {
+          "stops": [
+            [5, 0],
+            [6, 3],
+            [10, 7],
+            [14, 7],
+            [16, 20],
+            [18, 53],
+            [19, 118],
+            [20, 235]
+          ]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-pedestrian-zone",
+      "type": "fill",
+      "source": "versatiles-shortbread",
+      "source-layer": "street_polygons",
+      "filter": ["all", ["==", "bridge", true], ["==", "kind", "pedestrian"]],
+      "paint": {
+        "fill-color": "hsl(0,0%,0%)",
+        "fill-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-way-footway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "bridge", true], ["in", "kind", "footway"]],
+      "layout": {"line-cap": "butt"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 5], [18, 7], [19, 12], [20, 22]]
+        },
+        "line-color": "rgb(40,26,44)"
+      }
+    },
+    {
+      "id": "bridge-way-steps:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "bridge", true], ["in", "kind", "steps"]],
+      "layout": {"line-cap": "butt"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 5], [18, 7], [19, 12], [20, 22]]
+        },
+        "line-color": "rgb(40,26,44)"
+      }
+    },
+    {
+      "id": "bridge-way-path:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "bridge", true], ["in", "kind", "path"]],
+      "layout": {"line-cap": "butt"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 5], [18, 7], [19, 12], [20, 22]]
+        },
+        "line-color": "rgb(40,26,44)"
+      }
+    },
+    {
+      "id": "bridge-way-cycleway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "bridge", true], ["in", "kind", "cycleway"]],
+      "layout": {"line-cap": "butt"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 5], [18, 7], [19, 12], [20, 22]]
+        },
+        "line-color": "rgb(26,34,40)"
+      }
+    },
+    {
+      "id": "bridge-street-track:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "track"], ["==", "bridge", true]],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(38,38,38)",
+        "line-width": {
+          "stops": [[14, 2], [16, 4], [18, 18], [19, 48], [20, 96]]
+        },
+        "line-opacity": {"stops": [[14, 0], [15, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-pedestrian:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "pedestrian"], ["==", "bridge", true]],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(38,38,38)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-service:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "service"], ["==", "bridge", true]],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(37,36,34)",
+        "line-width": {
+          "stops": [[14, 1], [16, 3], [18, 12], [19, 32], [20, 48]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-livingstreet:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "living_street"],
+        ["==", "bridge", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(38,38,38)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-residential:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "residential"], ["==", "bridge", true]],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(38,38,38)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-unclassified:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "unclassified"], ["==", "bridge", true]],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(38,38,38)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-busway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "busway"], ["==", "bridge", true]],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(37,36,34)",
+        "line-width": {
+          "stops": [[14, 1], [16, 3], [18, 12], [19, 32], [20, 48]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-busguideway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "bus_guideway"], ["==", "bridge", true]],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(37,36,34)",
+        "line-width": {
+          "stops": [[14, 1], [16, 3], [18, 12], [19, 32], [20, 48]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-tertiary-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "tertiary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(38,38,38)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-secondary-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "secondary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {"stops": [[12, 2], [14, 3], [16, 7], [18, 14], [20, 40]]}
+      }
+    },
+    {
+      "id": "bridge-street-primary-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "primary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {"stops": [[12, 2], [14, 3], [16, 7], [18, 14], [20, 40]]}
+      }
+    },
+    {
+      "id": "bridge-street-trunk-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "trunk"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {"stops": [[12, 2], [14, 3], [16, 7], [18, 14], [20, 40]]}
+      }
+    },
+    {
+      "id": "bridge-street-motorway-link:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 12,
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "motorway"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {"stops": [[12, 2], [14, 3], [16, 7], [18, 14], [20, 40]]}
+      }
+    },
+    {
+      "id": "bridge-street-tertiary:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "tertiary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(38,38,38)",
+        "line-width": {
+          "stops": [[12, 2], [14, 3], [16, 6], [18, 26], [19, 64], [20, 128]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-secondary:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "secondary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {
+          "stops": [[11, 2], [14, 5], [16, 8], [18, 30], [19, 68], [20, 138]]
+        },
+        "line-opacity": {"stops": [[11, 0], [12, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-primary:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "primary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {
+          "stops": [
+            [8, 0],
+            [9, 1],
+            [10, 4],
+            [14, 6],
+            [16, 12],
+            [18, 36],
+            [19, 74],
+            [20, 144]
+          ]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-trunk:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "trunk"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {
+          "stops": [
+            [6, 0],
+            [7, 2],
+            [10, 4],
+            [14, 6],
+            [16, 12],
+            [18, 36],
+            [19, 74],
+            [20, 144]
+          ]
+        }
+      }
+    },
+    {
+      "id": "bridge-street-motorway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "motorway"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(28,72%,31%)",
+        "line-width": {
+          "stops": [
+            [5, 0],
+            [6, 2],
+            [10, 5],
+            [14, 5],
+            [16, 14],
+            [18, 38],
+            [19, 84],
+            [20, 168]
+          ]
+        }
+      }
+    },
+    {
+      "id": "bridge-way-footway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "bridge", true], ["in", "kind", "footway"]],
+      "layout": {"line-cap": "butt"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 4], [18, 6], [19, 10], [20, 20]]
+        },
+        "line-color": "rgb(16,0,20)"
+      }
+    },
+    {
+      "id": "bridge-way-steps",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "bridge", true], ["in", "kind", "steps"]],
+      "layout": {"line-cap": "butt"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 4], [18, 6], [19, 10], [20, 20]]
+        },
+        "line-color": "rgb(16,0,20)"
+      }
+    },
+    {
+      "id": "bridge-way-path",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "bridge", true], ["in", "kind", "path"]],
+      "layout": {"line-cap": "butt"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 4], [18, 6], [19, 10], [20, 20]]
+        },
+        "line-color": "rgb(16,0,20)"
+      }
+    },
+    {
+      "id": "bridge-way-cycleway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["==", "bridge", true], ["in", "kind", "cycleway"]],
+      "layout": {"line-cap": "butt"},
+      "paint": {
+        "line-width": {
+          "stops": [[15, 0], [16, 4], [18, 6], [19, 10], [20, 20]]
+        },
+        "line-color": "hsl(203,100%,3%)"
+      }
+    },
+    {
+      "id": "bridge-street-track",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "track"], ["==", "bridge", true]],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "line-width": {
+          "stops": [[14, 1], [16, 3], [18, 16], [19, 44], [20, 88]]
+        },
+        "line-opacity": {"stops": [[14, 0], [15, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-pedestrian",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "pedestrian"], ["==", "bridge", true]],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-service",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "service"], ["==", "bridge", true]],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[14, 1], [16, 2], [18, 10], [19, 28], [20, 40]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-livingstreet",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "living_street"],
+        ["==", "bridge", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-residential",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "residential"], ["==", "bridge", true]],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-unclassified",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "unclassified"], ["==", "bridge", true]],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-busway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "busway"], ["==", "bridge", true]],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[14, 1], [16, 2], [18, 10], [19, 28], [20, 40]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-busguideway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": ["all", ["==", "kind", "bus_guideway"], ["==", "bridge", true]],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "rgb(8,8,8)",
+        "line-width": {
+          "stops": [[14, 1], [16, 2], [18, 10], [19, 28], [20, 40]]
+        },
+        "line-opacity": {"stops": [[15, 0], [16, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-track-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "track"],
+        ["==", "bicycle", "designated"],
+        ["==", "bridge", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {"line-color": "hsl(0,0%,0%)"}
+    },
+    {
+      "id": "bridge-street-pedestrian-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "pedestrian"],
+        ["==", "bicycle", "designated"],
+        ["==", "bridge", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(203,100%,3%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-service-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "service"],
+        ["==", "bicycle", "designated"],
+        ["==", "bridge", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {"line-color": "hsl(0,0%,0%)"}
+    },
+    {
+      "id": "bridge-street-livingstreet-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "living_street"],
+        ["==", "bicycle", "designated"],
+        ["==", "bridge", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(203,100%,3%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-residential-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "residential"],
+        ["==", "bicycle", "designated"],
+        ["==", "bridge", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(203,100%,3%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-unclassified-bicycle",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "kind", "unclassified"],
+        ["==", "bicycle", "designated"],
+        ["==", "bridge", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "round"},
+      "paint": {
+        "line-color": "hsl(203,100%,3%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-tertiary-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "tertiary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-secondary-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "secondary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(48,100%,17%)",
+        "line-width": {"stops": [[12, 1], [14, 2], [16, 5], [18, 12], [20, 38]]}
+      }
+    },
+    {
+      "id": "bridge-street-primary-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "primary"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(48,100%,17%)",
+        "line-width": {"stops": [[12, 1], [14, 2], [16, 5], [18, 12], [20, 38]]}
+      }
+    },
+    {
+      "id": "bridge-street-trunk-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "trunk"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(48,100%,17%)",
+        "line-width": {"stops": [[12, 1], [14, 2], [16, 5], [18, 12], [20, 38]]}
+      }
+    },
+    {
+      "id": "bridge-street-motorway-link",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 12,
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "motorway"],
+        ["==", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(34,100%,23%)",
+        "line-width": {"stops": [[12, 1], [14, 2], [16, 5], [18, 12], [20, 38]]}
+      }
+    },
+    {
+      "id": "bridge-street-tertiary",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "tertiary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(0,0%,0%)",
+        "line-width": {
+          "stops": [[12, 1], [14, 2], [16, 5], [18, 24], [19, 60], [20, 120]]
+        },
+        "line-opacity": {"stops": [[12, 0], [13, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-secondary",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "secondary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(48,100%,17%)",
+        "line-width": {
+          "stops": [[11, 1], [14, 4], [16, 6], [18, 28], [19, 64], [20, 130]]
+        },
+        "line-opacity": {"stops": [[11, 0], [12, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-primary",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "primary"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(48,100%,17%)",
+        "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]]}
+      }
+    },
+    {
+      "id": "bridge-street-trunk",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "trunk"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(48,100%,17%)",
+        "line-width": {
+          "stops": [
+            [6, 0],
+            [7, 1],
+            [10, 3],
+            [14, 5],
+            [16, 10],
+            [18, 34],
+            [19, 70],
+            [20, 140]
+          ]
+        },
+        "line-opacity": {"stops": [[6, 0], [7, 1]]}
+      }
+    },
+    {
+      "id": "bridge-street-motorway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["==", "bridge", true],
+        ["in", "kind", "motorway"],
+        ["!=", "link", true]
+      ],
+      "layout": {"line-join": "round", "line-cap": "butt"},
+      "paint": {
+        "line-color": "hsl(34,100%,23%)",
+        "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]]}
+      }
+    },
+    {
+      "id": "bridge-transport-tram:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["in", "kind", "tram"],
+        ["!has", "service"],
+        ["==", "bridge", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[15, 0], [16, 5], [18, 7], [20, 20]]},
+        "line-dasharray": [0.1, 0.5]
+      }
+    },
+    {
+      "id": "bridge-transport-narrowgauge:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["in", "kind", "narrow_gauge"],
+        ["!has", "service"],
+        ["==", "bridge", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[15, 0], [16, 5], [18, 7], [20, 20]]},
+        "line-dasharray": [0.1, 0.5]
+      }
+    },
+    {
+      "id": "bridge-transport-subway:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["in", "kind", "subway"],
+        ["!has", "service"],
+        ["==", "bridge", true]
+      ],
+      "paint": {
+        "line-color": "hsl(207,23%,28%)",
+        "line-width": {
+          "stops": [
+            [11, 0],
+            [12, 1],
+            [15, 3],
+            [16, 3],
+            [18, 6],
+            [19, 8],
+            [20, 10]
+          ]
+        },
+        "line-opacity": {"stops": [[11, 0], [12, 1]]}
+      }
+    },
+    {
+      "id": "bridge-transport-lightrail:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 8,
+      "filter": [
+        "all",
+        ["in", "kind", "light_rail"],
+        ["!has", "service"],
+        ["==", "bridge", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[8, 1], [13, 1], [15, 1], [20, 14]]},
+        "line-opacity": {"stops": [[11, 0], [12, 1]]}
+      }
+    },
+    {
+      "id": "bridge-transport-lightrail-service:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 14,
+      "filter": [
+        "all",
+        ["in", "kind", "light_rail"],
+        ["has", "service"],
+        ["==", "bridge", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[14, 0], [15, 1], [16, 1], [20, 14]]}
+      }
+    },
+    {
+      "id": "bridge-transport-rail:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 8,
+      "filter": [
+        "all",
+        ["in", "kind", "rail"],
+        ["!has", "service"],
+        ["==", "bridge", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[8, 1], [13, 1], [15, 1], [20, 14]]},
+        "line-opacity": {"stops": [[8, 0], [9, 1]]}
+      }
+    },
+    {
+      "id": "bridge-transport-rail-service:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 14,
+      "filter": [
+        "all",
+        ["in", "kind", "rail"],
+        ["has", "service"],
+        ["==", "bridge", true]
+      ],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[14, 0], [15, 1], [16, 1], [20, 14]]}
+      }
+    },
+    {
+      "id": "bridge-transport-monorail:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["in", "kind", "monorail"], ["==", "bridge", true]],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[15, 0], [16, 5], [18, 7], [20, 20]]},
+        "line-dasharray": [0.1, 0.5]
+      }
+    },
+    {
+      "id": "bridge-transport-funicular:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": ["all", ["in", "kind", "funicular"], ["==", "bridge", true]],
+      "paint": {
+        "line-color": "hsl(208,14%,27%)",
+        "line-width": {"stops": [[15, 0], [16, 5], [18, 7], [20, 20]]},
+        "line-dasharray": [0.1, 0.5]
+      }
+    },
+    {
+      "id": "bridge-transport-tram",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["in", "kind", "tram"],
+        ["!has", "service"],
+        ["==", "bridge", true]
+      ],
+      "paint": {
+        "line-width": {"stops": [[13, 0], [16, 1], [17, 2], [18, 3], [20, 5]]},
+        "line-color": "hsl(208,14%,27%)"
+      }
+    },
+    {
+      "id": "bridge-transport-narrowgauge",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["in", "kind", "narrow_gauge"],
+        ["!has", "service"],
+        ["==", "bridge", true]
+      ],
+      "paint": {
+        "line-width": {"stops": [[13, 0], [16, 1], [17, 2], [18, 3], [20, 5]]},
+        "line-color": "hsl(208,14%,27%)"
+      }
+    },
+    {
+      "id": "bridge-transport-subway",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "filter": [
+        "all",
+        ["in", "kind", "subway"],
+        ["!has", "service"],
+        ["==", "bridge", true]
+      ],
+      "paint": {
+        "line-color": "rgb(42,55,67)",
+        "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]]}
+      }
+    },
+    {
+      "id": "bridge-transport-lightrail",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 14,
+      "filter": [
+        "all",
+        ["in", "kind", "light_rail"],
+        ["!has", "service"],
+        ["==", "bridge", true]
+      ],
+      "paint": {
+        "line-color": "rgb(44,52,59)",
+        "line-width": {"stops": [[14, 0], [15, 1], [20, 10]]},
+        "line-dasharray": [2, 2],
+        "line-opacity": {"stops": [[14, 0], [15, 1]]}
+      }
+    },
+    {
+      "id": "bridge-transport-lightrail-service",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["in", "kind", "light_rail"],
+        ["has", "service"],
+        ["==", "bridge", true]
+      ],
+      "paint": {
+        "line-color": "rgb(44,52,59)",
+        "line-width": {"stops": [[15, 0], [16, 1], [20, 10]]},
+        "line-dasharray": [2, 2]
+      }
+    },
+    {
+      "id": "bridge-transport-rail",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 14,
+      "filter": [
+        "all",
+        ["in", "kind", "rail"],
+        ["!has", "service"],
+        ["==", "bridge", true]
+      ],
+      "paint": {
+        "line-color": "rgb(44,52,59)",
+        "line-width": {"stops": [[14, 0], [15, 1], [20, 10]]},
+        "line-dasharray": [2, 2],
+        "line-opacity": {"stops": [[14, 0], [15, 1]]}
+      }
+    },
+    {
+      "id": "bridge-transport-rail-service",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 15,
+      "filter": [
+        "all",
+        ["in", "kind", "rail"],
+        ["has", "service"],
+        ["==", "bridge", true]
+      ],
+      "paint": {
+        "line-color": "rgb(44,52,59)",
+        "line-width": {"stops": [[15, 0], [16, 1], [20, 10]]},
+        "line-dasharray": [2, 2]
+      }
+    },
+    {
+      "id": "bridge-transport-monorail",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": ["all", ["in", "kind", "monorail"], ["==", "bridge", true]],
+      "paint": {
+        "line-width": {"stops": [[13, 0], [16, 1], [17, 2], [18, 3], [20, 5]]},
+        "line-color": "hsl(208,14%,27%)"
+      }
+    },
+    {
+      "id": "bridge-transport-funicular",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 13,
+      "filter": ["all", ["in", "kind", "funicular"], ["==", "bridge", true]],
+      "paint": {
+        "line-width": {"stops": [[13, 0], [16, 1], [17, 2], [18, 3], [20, 5]]},
+        "line-color": "hsl(208,14%,27%)"
+      }
+    },
+    {
+      "id": "poi-amenity",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "pois",
+      "minzoom": 16,
+      "filter": ["to-boolean", ["get", "amenity"]],
+      "layout": {
+        "icon-size": {"stops": [[16, 0.5], [19, 0.5], [20, 1]]},
+        "symbol-placement": "point",
+        "icon-optional": true,
+        "text-font": ["noto_sans_regular"],
+        "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": "hsl(0,0%,67%)",
+        "text-color": "hsl(0,0%,67%)"
+      }
+    },
+    {
+      "id": "poi-leisure",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "pois",
+      "minzoom": 16,
+      "filter": ["to-boolean", ["get", "leisure"]],
+      "layout": {
+        "icon-size": {"stops": [[16, 0.5], [19, 0.5], [20, 1]]},
+        "symbol-placement": "point",
+        "icon-optional": true,
+        "text-font": ["noto_sans_regular"],
+        "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": "hsl(0,0%,67%)",
+        "text-color": "hsl(0,0%,67%)"
+      }
+    },
+    {
+      "id": "poi-tourism",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "pois",
+      "minzoom": 16,
+      "filter": ["to-boolean", ["get", "tourism"]],
+      "layout": {
+        "icon-size": {"stops": [[16, 0.5], [19, 0.5], [20, 1]]},
+        "symbol-placement": "point",
+        "icon-optional": true,
+        "text-font": ["noto_sans_regular"],
+        "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": "hsl(0,0%,67%)",
+        "text-color": "hsl(0,0%,67%)"
+      }
+    },
+    {
+      "id": "poi-shop",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "pois",
+      "minzoom": 16,
+      "filter": ["to-boolean", ["get", "shop"]],
+      "layout": {
+        "icon-size": {"stops": [[16, 0.5], [19, 0.5], [20, 1]]},
+        "symbol-placement": "point",
+        "icon-optional": true,
+        "text-font": ["noto_sans_regular"],
+        "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": "hsl(0,0%,67%)",
+        "text-color": "hsl(0,0%,67%)"
+      }
+    },
+    {
+      "id": "poi-man_made",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "pois",
+      "minzoom": 16,
+      "filter": ["to-boolean", ["get", "man_made"]],
+      "layout": {
+        "icon-size": {"stops": [[16, 0.5], [19, 0.5], [20, 1]]},
+        "symbol-placement": "point",
+        "icon-optional": true,
+        "text-font": ["noto_sans_regular"],
+        "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": "hsl(0,0%,67%)",
+        "text-color": "hsl(0,0%,67%)"
+      }
+    },
+    {
+      "id": "poi-historic",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "pois",
+      "minzoom": 16,
+      "filter": ["to-boolean", ["get", "historic"]],
+      "layout": {
+        "icon-size": {"stops": [[16, 0.5], [19, 0.5], [20, 1]]},
+        "symbol-placement": "point",
+        "icon-optional": true,
+        "text-font": ["noto_sans_regular"],
+        "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": "hsl(0,0%,67%)",
+        "text-color": "hsl(0,0%,67%)"
+      }
+    },
+    {
+      "id": "poi-emergency",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "pois",
+      "minzoom": 16,
+      "filter": ["to-boolean", ["get", "emergency"]],
+      "layout": {
+        "icon-size": {"stops": [[16, 0.5], [19, 0.5], [20, 1]]},
+        "symbol-placement": "point",
+        "icon-optional": true,
+        "text-font": ["noto_sans_regular"],
+        "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": "hsl(0,0%,67%)",
+        "text-color": "hsl(0,0%,67%)"
+      }
+    },
+    {
+      "id": "poi-highway",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "pois",
+      "minzoom": 16,
+      "filter": ["to-boolean", ["get", "highway"]],
+      "layout": {
+        "icon-size": {"stops": [[16, 0.5], [19, 0.5], [20, 1]]},
+        "symbol-placement": "point",
+        "icon-optional": true,
+        "text-font": ["noto_sans_regular"]
+      },
+      "paint": {
+        "icon-opacity": {"stops": [[16, 0], [17, 0.4]]},
+        "text-opacity": {"stops": [[16, 0], [17, 0.4]]},
+        "icon-color": "hsl(0,0%,67%)",
+        "text-color": "hsl(0,0%,67%)"
+      }
+    },
+    {
+      "id": "poi-office",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "pois",
+      "minzoom": 16,
+      "filter": ["to-boolean", ["get", "office"]],
+      "layout": {
+        "icon-size": {"stops": [[16, 0.5], [19, 0.5], [20, 1]]},
+        "symbol-placement": "point",
+        "icon-optional": true,
+        "text-font": ["noto_sans_regular"]
+      },
+      "paint": {
+        "icon-opacity": {"stops": [[16, 0], [17, 0.4]]},
+        "text-opacity": {"stops": [[16, 0], [17, 0.4]]},
+        "icon-color": "hsl(0,0%,67%)",
+        "text-color": "hsl(0,0%,67%)"
+      }
+    },
+    {
+      "id": "boundary-country:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "boundaries",
+      "filter": [
+        "all",
+        ["==", "admin_level", 2],
+        ["!=", "maritime", true],
+        ["!=", "disputed", true],
+        ["!=", "coastline", true]
+      ],
+      "layout": {"line-cap": "round", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(16,11,6)",
+        "line-blur": 1,
+        "line-width": {"stops": [[2, 0], [3, 2], [10, 8]]},
+        "line-opacity": 0.75
+      }
+    },
+    {
+      "id": "boundary-country-disputed:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "boundaries",
+      "filter": [
+        "all",
+        ["==", "admin_level", 2],
+        ["==", "disputed", true],
+        ["!=", "maritime", true],
+        ["!=", "coastline", true]
+      ],
+      "paint": {
+        "line-width": {"stops": [[2, 0], [3, 2], [10, 8]]},
+        "line-opacity": 0.75,
+        "line-color": "rgb(16,11,6)"
+      }
+    },
+    {
+      "id": "boundary-state:outline",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "boundaries",
+      "filter": [
+        "all",
+        ["==", "admin_level", 4],
+        ["!=", "maritime", true],
+        ["!=", "disputed", true],
+        ["!=", "coastline", true]
+      ],
+      "layout": {"line-cap": "round", "line-join": "round"},
+      "paint": {
+        "line-color": "rgb(15,11,5)",
+        "line-blur": 1,
+        "line-width": {"stops": [[7, 0], [8, 2], [10, 4]]},
+        "line-opacity": 0.75
+      }
+    },
+    {
+      "id": "boundary-country",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "boundaries",
+      "filter": [
+        "all",
+        ["==", "admin_level", 2],
+        ["!=", "maritime", true],
+        ["!=", "disputed", true],
+        ["!=", "coastline", true]
+      ],
+      "layout": {"line-cap": "round", "line-join": "round"},
+      "paint": {
+        "line-color": "hsl(240,24%,28%)",
+        "line-width": {"stops": [[2, 0], [3, 1], [10, 4]]}
+      }
+    },
+    {
+      "id": "boundary-country-disputed",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "boundaries",
+      "filter": [
+        "all",
+        ["==", "admin_level", 2],
+        ["==", "disputed", true],
+        ["!=", "maritime", true],
+        ["!=", "coastline", true]
+      ],
+      "layout": {"line-cap": "square"},
+      "paint": {
+        "line-width": {"stops": [[2, 0], [3, 1], [10, 4]]},
+        "line-color": "hsl(246,17%,23%)",
+        "line-dasharray": [2, 1]
+      }
+    },
+    {
+      "id": "boundary-state",
+      "type": "line",
+      "source": "versatiles-shortbread",
+      "source-layer": "boundaries",
+      "filter": [
+        "all",
+        ["==", "admin_level", 4],
+        ["!=", "maritime", true],
+        ["!=", "disputed", true],
+        ["!=", "coastline", true]
+      ],
+      "layout": {"line-cap": "round", "line-join": "round"},
+      "paint": {
+        "line-color": "hsl(240,24%,28%)",
+        "line-width": {"stops": [[7, 0], [8, 1], [10, 2]]}
+      }
+    },
+    {
+      "id": "label-address-housenumber",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "addresses",
+      "minzoom": 17,
+      "filter": ["has", "housenumber"],
+      "layout": {
+        "text-field": "{housenumber}",
+        "text-font": ["noto_sans_regular"],
+        "symbol-placement": "point",
+        "text-anchor": "center",
+        "text-size": {"stops": [[17, 8], [19, 10]]}
+      },
+      "paint": {
+        "icon-color": "rgb(95,88,81)",
+        "text-color": "rgb(95,88,81)",
+        "text-halo-color": "rgb(23,17,10)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-motorway-shield",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "street_labels",
+      "minzoom": 14,
+      "filter": ["==", "kind", "motorway"],
+      "layout": {
+        "text-field": "{ref}",
+        "text-font": ["noto_sans_bold"],
+        "symbol-placement": "line",
+        "text-anchor": "center",
+        "text-size": {"stops": [[14, 10], [18, 12], [20, 16]]}
+      },
+      "paint": {
+        "icon-color": "hsl(0,0%,0%)",
+        "text-color": "hsl(0,0%,0%)",
+        "text-halo-color": "hsl(34,100%,23%)",
+        "text-halo-width": 0.1,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-street-pedestrian",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "street_labels",
+      "minzoom": 12,
+      "filter": ["==", "kind", "pedestrian"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "text-font": ["noto_sans_regular"],
+        "symbol-placement": "line",
+        "text-anchor": "center",
+        "text-size": {"stops": [[12, 10], [15, 13]]}
+      },
+      "paint": {
+        "icon-color": "hsl(240,14%,77%)",
+        "text-color": "hsl(240,14%,77%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-street-livingstreet",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "street_labels",
+      "minzoom": 12,
+      "filter": ["==", "kind", "living_street"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "text-font": ["noto_sans_regular"],
+        "symbol-placement": "line",
+        "text-anchor": "center",
+        "text-size": {"stops": [[12, 10], [15, 13]]}
+      },
+      "paint": {
+        "icon-color": "hsl(240,14%,77%)",
+        "text-color": "hsl(240,14%,77%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-street-residential",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "street_labels",
+      "minzoom": 12,
+      "filter": ["==", "kind", "residential"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "text-font": ["noto_sans_regular"],
+        "symbol-placement": "line",
+        "text-anchor": "center",
+        "text-size": {"stops": [[12, 10], [15, 13]]}
+      },
+      "paint": {
+        "icon-color": "hsl(240,14%,77%)",
+        "text-color": "hsl(240,14%,77%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-street-unclassified",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "street_labels",
+      "minzoom": 12,
+      "filter": ["==", "kind", "unclassified"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "text-font": ["noto_sans_regular"],
+        "symbol-placement": "line",
+        "text-anchor": "center",
+        "text-size": {"stops": [[12, 10], [15, 13]]}
+      },
+      "paint": {
+        "icon-color": "hsl(240,14%,77%)",
+        "text-color": "hsl(240,14%,77%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-street-tertiary",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "street_labels",
+      "minzoom": 12,
+      "filter": ["==", "kind", "tertiary"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "text-font": ["noto_sans_regular"],
+        "symbol-placement": "line",
+        "text-anchor": "center",
+        "text-size": {"stops": [[12, 10], [15, 13]]}
+      },
+      "paint": {
+        "icon-color": "hsl(240,14%,77%)",
+        "text-color": "hsl(240,14%,77%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-street-secondary",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "street_labels",
+      "minzoom": 12,
+      "filter": ["==", "kind", "secondary"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "text-font": ["noto_sans_regular"],
+        "symbol-placement": "line",
+        "text-anchor": "center",
+        "text-size": {"stops": [[12, 10], [15, 13]]}
+      },
+      "paint": {
+        "icon-color": "hsl(240,14%,77%)",
+        "text-color": "hsl(240,14%,77%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-street-primary",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "street_labels",
+      "minzoom": 12,
+      "filter": ["==", "kind", "primary"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "text-font": ["noto_sans_regular"],
+        "symbol-placement": "line",
+        "text-anchor": "center",
+        "text-size": {"stops": [[12, 10], [15, 13]]}
+      },
+      "paint": {
+        "icon-color": "hsl(240,14%,77%)",
+        "text-color": "hsl(240,14%,77%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-street-trunk",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "street_labels",
+      "minzoom": 12,
+      "filter": ["==", "kind", "trunk"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "text-font": ["noto_sans_regular"],
+        "symbol-placement": "line",
+        "text-anchor": "center",
+        "text-size": {"stops": [[12, 10], [15, 13]]}
+      },
+      "paint": {
+        "icon-color": "hsl(240,14%,77%)",
+        "text-color": "hsl(240,14%,77%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-street-track",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "street_labels",
+      "minzoom": 12,
+      "filter": ["==", "kind", "track"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "text-font": ["noto_sans_regular"],
+        "symbol-placement": "line",
+        "text-anchor": "center",
+        "text-size": {"stops": [[12, 10], [15, 13]]}
+      },
+      "paint": {
+        "icon-color": "hsl(240,14%,77%)",
+        "text-color": "hsl(240,14%,77%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-place-neighbourhood",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "place_labels",
+      "minzoom": 14,
+      "filter": ["==", "kind", "neighbourhood"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "symbol-sort-key": ["-", ["to-number", ["get", "population"], 0]],
+        "text-font": ["noto_sans_regular"],
+        "text-size": {"stops": [[14, 12]]},
+        "text-transform": "uppercase"
+      },
+      "paint": {
+        "icon-color": "rgb(182,209,215)",
+        "text-color": "rgb(182,209,215)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-place-quarter",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "place_labels",
+      "minzoom": 13,
+      "filter": ["==", "kind", "quarter"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "symbol-sort-key": ["-", ["to-number", ["get", "population"], 0]],
+        "text-font": ["noto_sans_regular"],
+        "text-size": {"stops": [[13, 13]]},
+        "text-transform": "uppercase"
+      },
+      "paint": {
+        "icon-color": "rgb(182,204,215)",
+        "text-color": "rgb(182,204,215)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-place-suburb",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "place_labels",
+      "minzoom": 11,
+      "filter": ["==", "kind", "suburb"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "symbol-sort-key": ["-", ["to-number", ["get", "population"], 0]],
+        "text-font": ["noto_sans_regular"],
+        "text-size": {"stops": [[11, 11], [13, 14]]},
+        "text-transform": "uppercase"
+      },
+      "paint": {
+        "icon-color": "rgb(182,198,215)",
+        "text-color": "rgb(182,198,215)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-place-hamlet",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "place_labels",
+      "minzoom": 13,
+      "filter": ["==", "kind", "hamlet"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "symbol-sort-key": ["-", ["to-number", ["get", "population"], 0]],
+        "text-font": ["noto_sans_regular"],
+        "text-size": {"stops": [[10, 11], [12, 14]]}
+      },
+      "paint": {
+        "icon-color": "rgb(182,190,215)",
+        "text-color": "rgb(182,190,215)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-place-village",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "place_labels",
+      "minzoom": 11,
+      "filter": ["==", "kind", "village"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "symbol-sort-key": ["-", ["to-number", ["get", "population"], 0]],
+        "text-font": ["noto_sans_regular"],
+        "text-size": {"stops": [[9, 11], [12, 14]]}
+      },
+      "paint": {
+        "icon-color": "rgb(182,190,215)",
+        "text-color": "rgb(182,190,215)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-place-town",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "place_labels",
+      "minzoom": 9,
+      "filter": ["==", "kind", "town"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "symbol-sort-key": ["-", ["to-number", ["get", "population"], 0]],
+        "text-font": ["noto_sans_regular"],
+        "text-size": {"stops": [[8, 11], [12, 14]]}
+      },
+      "paint": {
+        "icon-color": "rgb(182,190,215)",
+        "text-color": "rgb(182,190,215)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-boundary-state",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "boundary_labels",
+      "minzoom": 5,
+      "filter": ["in", "admin_level", 4, "4"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "text-font": ["noto_sans_regular"],
+        "text-transform": "uppercase",
+        "text-anchor": "top",
+        "text-offset": [0, 0.2],
+        "text-padding": 0,
+        "text-optional": true,
+        "text-size": {"stops": [[5, 8], [8, 12]]}
+      },
+      "paint": {
+        "icon-color": "rgb(178,178,194)",
+        "text-color": "rgb(178,178,194)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-place-city",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "place_labels",
+      "minzoom": 7,
+      "filter": ["==", "kind", "city"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "symbol-sort-key": ["-", ["to-number", ["get", "population"], 0]],
+        "text-font": ["noto_sans_regular"],
+        "text-size": {"stops": [[7, 11], [10, 14]]}
+      },
+      "paint": {
+        "icon-color": "rgb(182,190,215)",
+        "text-color": "rgb(182,190,215)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-place-statecapital",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "place_labels",
+      "minzoom": 6,
+      "filter": ["==", "kind", "state_capital"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "symbol-sort-key": ["-", ["to-number", ["get", "population"], 0]],
+        "text-font": ["noto_sans_regular"],
+        "text-size": {"stops": [[6, 11], [10, 15]]}
+      },
+      "paint": {
+        "icon-color": "rgb(182,190,215)",
+        "text-color": "rgb(182,190,215)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-place-capital",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "place_labels",
+      "minzoom": 5,
+      "filter": ["==", "kind", "capital"],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "symbol-sort-key": ["-", ["to-number", ["get", "population"], 0]],
+        "text-font": ["noto_sans_regular"],
+        "text-size": {"stops": [[5, 12], [10, 16]]}
+      },
+      "paint": {
+        "icon-color": "rgb(182,190,215)",
+        "text-color": "rgb(182,190,215)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-boundary-country-small",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "boundary_labels",
+      "minzoom": 4,
+      "filter": [
+        "all",
+        ["in", "admin_level", 2, "2"],
+        ["<=", "way_area", 10000000]
+      ],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "text-font": ["noto_sans_regular"],
+        "text-transform": "uppercase",
+        "text-anchor": "top",
+        "text-offset": [0, 0.2],
+        "text-padding": 0,
+        "text-optional": true,
+        "text-size": {"stops": [[4, 8], [5, 11]]}
+      },
+      "paint": {
+        "icon-color": "hsl(240,14%,77%)",
+        "text-color": "hsl(240,14%,77%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-boundary-country-medium",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "boundary_labels",
+      "minzoom": 3,
+      "filter": [
+        "all",
+        ["in", "admin_level", 2, "2"],
+        ["<", "way_area", 90000000],
+        [">", "way_area", 10000000]
+      ],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "text-font": ["noto_sans_regular"],
+        "text-transform": "uppercase",
+        "text-anchor": "top",
+        "text-offset": [0, 0.2],
+        "text-padding": 0,
+        "text-optional": true,
+        "text-size": {"stops": [[3, 8], [5, 12]]}
+      },
+      "paint": {
+        "icon-color": "hsl(240,14%,77%)",
+        "text-color": "hsl(240,14%,77%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "label-boundary-country-large",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "boundary_labels",
+      "minzoom": 2,
+      "filter": [
+        "all",
+        ["in", "admin_level", 2, "2"],
+        [">=", "way_area", 90000000]
+      ],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "text-font": ["noto_sans_regular"],
+        "text-transform": "uppercase",
+        "text-anchor": "top",
+        "text-offset": [0, 0.2],
+        "text-padding": 0,
+        "text-optional": true,
+        "text-size": {"stops": [[2, 8], [5, 13]]}
+      },
+      "paint": {
+        "icon-color": "hsl(240,14%,77%)",
+        "text-color": "hsl(240,14%,77%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "marking-oneway",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 16,
+      "filter": [
+        "all",
+        ["==", "oneway", true],
+        [
+          "in",
+          "kind",
+          "trunk",
+          "primary",
+          "secondary",
+          "tertiary",
+          "unclassified",
+          "residential",
+          "living_street"
+        ]
+      ],
+      "layout": {
+        "symbol-placement": "line",
+        "symbol-spacing": 175,
+        "icon-rotate": 90,
+        "icon-rotation-alignment": "map",
+        "icon-padding": 5,
+        "symbol-avoid-edges": true,
+        "icon-image": "basics:marking-arrow",
+        "text-font": ["noto_sans_regular"]
+      },
+      "paint": {
+        "icon-opacity": {"stops": [[16, 0], [17, 0.4], [20, 0.4]]},
+        "text-opacity": {"stops": [[16, 0], [17, 0.4], [20, 0.4]]}
+      }
+    },
+    {
+      "id": "marking-oneway-reverse",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "streets",
+      "minzoom": 16,
+      "filter": [
+        "all",
+        ["==", "oneway_reverse", true],
+        [
+          "in",
+          "kind",
+          "trunk",
+          "primary",
+          "secondary",
+          "tertiary",
+          "unclassified",
+          "residential",
+          "living_street"
+        ]
+      ],
+      "layout": {
+        "symbol-placement": "line",
+        "symbol-spacing": 75,
+        "icon-rotate": -90,
+        "icon-rotation-alignment": "map",
+        "icon-padding": 5,
+        "symbol-avoid-edges": true,
+        "icon-image": "basics:marking-arrow",
+        "text-font": ["noto_sans_regular"]
+      },
+      "paint": {
+        "icon-opacity": {"stops": [[16, 0], [17, 0.4], [20, 0.4]]},
+        "text-opacity": {"stops": [[16, 0], [17, 0.4], [20, 0.4]]}
+      }
+    },
+    {
+      "id": "symbol-transit-station",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "public_transport",
+      "minzoom": 13,
+      "filter": [
+        "all",
+        ["in", "kind", "station", "halt"],
+        ["!in", "station", "light_rail", "subway"]
+      ],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "icon-size": {"stops": [[13, 0.5], [15, 1]]},
+        "symbol-placement": "point",
+        "icon-keep-upright": true,
+        "text-font": ["noto_sans_regular"],
+        "text-size": 10,
+        "icon-anchor": "bottom",
+        "text-anchor": "top",
+        "icon-image": "basics:icon-rail"
+      },
+      "paint": {
+        "icon-opacity": 0.7,
+        "icon-color": "hsl(270,4%,60%)",
+        "text-color": "hsl(270,4%,60%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "symbol-transit-airfield",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "public_transport",
+      "minzoom": 13,
+      "filter": ["all", ["==", "kind", "aerodrome"], ["!has", "iata"]],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "icon-size": {"stops": [[13, 0.5], [15, 1]]},
+        "symbol-placement": "point",
+        "icon-keep-upright": true,
+        "text-font": ["noto_sans_regular"],
+        "text-size": 10,
+        "icon-anchor": "bottom",
+        "text-anchor": "top",
+        "icon-image": "basics:icon-airfield"
+      },
+      "paint": {
+        "icon-opacity": 0.7,
+        "icon-color": "hsl(270,4%,60%)",
+        "text-color": "hsl(270,4%,60%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    },
+    {
+      "id": "symbol-transit-airport",
+      "type": "symbol",
+      "source": "versatiles-shortbread",
+      "source-layer": "public_transport",
+      "minzoom": 12,
+      "filter": ["all", ["==", "kind", "aerodrome"], ["has", "iata"]],
+      "layout": {
+        "text-field": [
+          "coalesce",
+          ["get", "name"],
+          ["get", "name_en"],
+          ["get", "name_de"]
+        ],
+        "icon-size": {"stops": [[12, 0.5], [14, 1]]},
+        "symbol-placement": "point",
+        "icon-keep-upright": true,
+        "text-font": ["noto_sans_regular"],
+        "text-size": 10,
+        "icon-anchor": "bottom",
+        "text-anchor": "top",
+        "icon-image": "basics:icon-airport"
+      },
+      "paint": {
+        "icon-opacity": 0.7,
+        "icon-color": "hsl(270,4%,60%)",
+        "text-color": "hsl(270,4%,60%)",
+        "text-halo-color": "hsla(0,0%,0%,0.8)",
+        "text-halo-width": 2,
+        "text-halo-blur": 1
+      }
+    }
+  ],
+  "id": "80klscq"
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityIntro.kt b/app/src/main/java/it/reyboz/bustorino/ActivityIntro.kt
index b65224f..032dc8f 100644
--- a/app/src/main/java/it/reyboz/bustorino/ActivityIntro.kt
+++ b/app/src/main/java/it/reyboz/bustorino/ActivityIntro.kt
@@ -1,143 +1,141 @@
 package it.reyboz.bustorino
 
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
 import android.widget.ImageButton
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import it.reyboz.bustorino.data.DBUpdateCheckWorker
 import it.reyboz.bustorino.data.PreferencesHolder
 import it.reyboz.bustorino.fragments.IntroFragment
 import it.reyboz.bustorino.middleware.GeneralActivity
 
 class ActivityIntro : GeneralActivity(), IntroFragment.IntroListener {
 
     private lateinit var viewPager : ViewPager2
     private lateinit var btnForward: ImageButton
     private lateinit var btnBackward: ImageButton
     private lateinit var closeBottomButton: ImageButton
 
     private var restartMain = true
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_intro)
-        //check default settings and apply them
-        checkApplyDefaultSettingsValues()
         viewPager = findViewById(R.id.viewPager)
         btnBackward = findViewById(R.id.btnPrevious)
         btnForward = findViewById(R.id.btnNext)
         closeBottomButton = findViewById(R.id.btnCompactClose)
 
         val extras = intent.extras
         if(extras!=null){
             restartMain = extras.getBoolean(RESTART_MAIN)
         }
 
 
         val adapter = IntroPagerAdapter(this)
         viewPager.adapter = adapter
 
         val tabLayout = findViewById<TabLayout>(R.id.tab_layout)
         val tabLayoutMediator = TabLayoutMediator(tabLayout, viewPager) { tab, pos ->
             Log.d(DEBUG_TAG, "tabview on position $pos")
 
         }
         tabLayoutMediator.attach()
 
 
         btnForward.setOnClickListener {
             viewPager.setCurrentItem(viewPager.currentItem+1,true)
         }
         btnBackward.setOnClickListener {
             viewPager.setCurrentItem(viewPager.currentItem-1, true)
         }
         /*closeBottomButton.setOnClickListener {
             closeIntroduction()
         }
 
          */
 
         viewPager.registerOnPageChangeCallback(object : OnPageChangeCallback() {
 
             override fun onPageSelected(position: Int) {
                 if(position == 0){
                     btnBackward.visibility = View.INVISIBLE
                 } else{
                     btnBackward.visibility = View.VISIBLE
                 }
                 if(position == NUM_ITEMS-1){
                     btnForward.visibility = View.INVISIBLE
                     closeBottomButton.visibility = View.VISIBLE
                 }else if(position == NUM_ITEMS-2){
                     if(closeBottomButton.visibility == View.VISIBLE) {
                         closeBottomButton.visibility = View.INVISIBLE
                         btnForward.visibility = View.VISIBLE
                     }
                     //btnForward.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.arrow_forward_white, null))
                     //btnForward.setBackgroundColor(ResourcesCompat.getColor(resources,R.attr.colorAccent, theme))
                     /*val
                     GET THE COLOR VALUE OF THE THEMER
                     colo = TypedValue()
                     theme.resolveAttribute(R.attr.colorAccent,colo, true)
                     btnForward.backgroundTintList  //(colo.data)
 
                      */
                 }
             }
 
 
         })
 
         closeBottomButton.setOnClickListener {
             closeIntroduction()
         }
         ViewCompat.setOnApplyWindowInsetsListener(
             findViewById<View>(R.id.theConstraintLayout),
             this.applyBottomAndBordersInsetsListener
         )
         // Start the DB Update now
         DBUpdateCheckWorker.schedulePeriodicCheck(this, true)
 
     }
 
 
 
     /**
      * A simple pager adapter that represents 5 ScreenSlidePageFragment objects, in
      * sequence.
      */
     private inner class IntroPagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
         override fun getItemCount(): Int = NUM_ITEMS
 
         override fun createFragment(position: Int): Fragment = IntroFragment.newInstance(position)
     }
 
     companion object{
         const private val DEBUG_TAG = "BusTO-IntroActivity"
         const val RESTART_MAIN = "restartMainActivity"
 
         val NUM_ITEMS = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) 8 else 7
     }
 
     override fun closeIntroduction() {
         if(restartMain) startActivity(Intent(this, ActivityPrincipal::class.java))
         val pref = PreferencesHolder.getMainSharedPreferences(this)
         val editor = pref.edit()
         editor.putBoolean(PreferencesHolder.PREF_INTRO_ACTIVITY_RUN, true)
         //use commit so we don't "lose" info
         editor.commit()
         finish()
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
index fb88b9a..517627b 100644
--- a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
+++ b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
@@ -1,917 +1,918 @@
 /*
 	BusTO - Arrival times for Turin public transport.
     Copyright (C) 2021 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino;
 
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.*;
 import android.widget.Toast;
 
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.graphics.Insets;
 import androidx.core.view.*;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.preference.PreferenceManager;
 import androidx.work.WorkInfo;
 
 import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.snackbar.Snackbar;
 
 import java.util.Arrays;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.function.Consumer;
 
 import it.reyboz.bustorino.backend.Stop;
 import it.reyboz.bustorino.data.DBUpdateCheckWorker;
 import it.reyboz.bustorino.data.DBUpdateWorker;
 import it.reyboz.bustorino.data.PreferencesHolder;
 import it.reyboz.bustorino.fragments.*;
 import it.reyboz.bustorino.middleware.GeneralActivity;
 import it.reyboz.bustorino.viewmodels.ServiceAlertsViewModel;
 
 import static it.reyboz.bustorino.backend.utils.getBusStopIDFromUri;
 import static it.reyboz.bustorino.backend.utils.openIceweasel;
 
 public class ActivityPrincipal extends GeneralActivity implements FragmentListenerMain {
     private DrawerLayout mDrawer;
     private NavigationView mNavView;
     private ActionBarDrawerToggle drawerToggle;
     private final static String DEBUG_TAG="BusTO Act Principal";
 
     private final static String TAG_FAVORITES="favorites_frag";
     private Snackbar snackbar;
 
+
     private ServiceAlertsViewModel  serviceAlertsViewModel;
     //private FragmentKind showingFragmentKind;
 
     private final Map<Integer, Runnable> menuActions = Map.of(
             R.id.drawer_action_settings, () -> {
                 Log.d("MAINBusTO", "Pressed button preferences");
                 startActivity(new Intent(this, ActivitySettings.class));
             },
 
             R.id.nav_favorites_item, () ->
                     checkAndShowFavoritesFragment(getSupportFragmentManager(), true),
 
             R.id.nav_home, this::showHomeMainFragmentFromClick,
 
             R.id.nav_map_item, () ->
                     requestMapFragment(true),
 
             R.id.nav_lines_item, () ->
                     showLinesFragment(getSupportFragmentManager(), true, null),
 
             R.id.drawer_action_info, () ->
                     startActivity(new Intent(this, ActivityAbout.class)),
             R.id.nav_nearby, this::openNearbyStopsFragment
     );
 
 
     private long lastClosingAttempt = -1L;
     private final OnBackPressedCallback backPressedCallback = new OnBackPressedCallback(false) {
         @Override
         public void handleOnBackPressed() {
             boolean isResolved = activityCustomBackPressed();
             Log.d(DEBUG_TAG, "backpress resolved: " + isResolved);
             if(!isResolved){
                 long currentTime = System.currentTimeMillis();
                 if(currentTime - lastClosingAttempt < 2000){
                     finish();
                 } else{
                     lastClosingAttempt = currentTime;
                     Toast.makeText(getApplicationContext(),R.string.back_again_to_close,Toast.LENGTH_SHORT).show();
                 }
             }
         }
     };
 
+
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Log.d(DEBUG_TAG, "onCreate, savedInstanceState is: "+savedInstanceState);
         setContentView(R.layout.activity_principal);
         serviceAlertsViewModel = new ViewModelProvider(this).get(ServiceAlertsViewModel.class);
         //Use LiveModel to sync fragment state
-        /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            getWindow().setNavigationBarContrastEnforced(false);
-        }
-         */
 
         //onBackPressed solution required from Android 16
         backPressedCallback.setEnabled(true);
         this.getOnBackPressedDispatcher().addCallback(backPressedCallback);
         boolean showingArrivalsFromIntent = false;
 
         final Toolbar mToolbar = findViewById(R.id.default_toolbar);
         setSupportActionBar(mToolbar);
         if (getSupportActionBar()!=null)
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         else Log.w(DEBUG_TAG, "NO ACTION BAR");
 
         mToolbar.setOnMenuItemClickListener(new ToolbarItemClickListener(this));
         mDrawer = findViewById(R.id.drawer_layout);
         drawerToggle = setupDrawerToggle(mToolbar);
 
         // Setup toggle to display hamburger icon with nice animation
         drawerToggle.setDrawerIndicatorEnabled(true);
 
         drawerToggle.syncState();
         mDrawer.addDrawerListener(drawerToggle);
 
         mDrawer.addDrawerListener(new DrawerLayout.DrawerListener() {
             @Override
             public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
 
             }
 
             @Override
             public void onDrawerOpened(@NonNull View drawerView) {
                 hideKeyboard();
             }
 
             @Override
             public void onDrawerClosed(@NonNull View drawerView) {
 
             }
 
             @Override
             public void onDrawerStateChanged(int newState) {
             }
         });
 
 
         mNavView = findViewById(R.id.nvView);
 
         setupDrawerContent(mNavView);
         /*View header = mNavView.getHeaderView(0);
 
         */
         //mNavView.getMenu().findItem(R.id.versionFooter).
 
         /// LEGACY CODE
         //---------------------------- START INTENT CHECK QUEUE ------------------------------------
 
         // Intercept calls from URL intent
         boolean tryedFromIntent = false;
 
         String busStopID = null;
         Uri data = getIntent().getData();
         if (data != null) {
 
             busStopID = getBusStopIDFromUri(data);
             Log.d(DEBUG_TAG, "Opening Intent: busStopID: "+busStopID);
             tryedFromIntent = true;
         }
 
         // Intercept calls from other activities
         if (!tryedFromIntent) {
             Bundle b = getIntent().getExtras();
             if (b != null) {
                 busStopID = b.getString("bus-stop-ID");
 
                 /*
                  * I'm not very sure if you are coming from an Intent.
                  * Some launchers work in strange ways.
                  */
                 tryedFromIntent = busStopID != null;
             }
         }
 
         //---------------------------- END INTENT CHECK QUEUE --------------------------------------
 
         if (busStopID == null) {
             // Show keyboard if can't start from intent
             // JUST DON'T
             // showKeyboard();
 
             // You haven't obtained anything... from an intent?
             if (tryedFromIntent) {
 
                 // This shows a luser warning
                 Toast.makeText(getApplicationContext(),
                         R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show();
             }
         } else {
             // If you are here an intent has worked successfully
             //setBusStopSearchByIDEditText(busStopID);
             //Log.d(DEBUG_TAG, "Requesting arrivals for stop "+busStopID+" from intent");
             requestArrivalsForStopID(busStopID); //this shows the fragment, too
             showingArrivalsFromIntent = true;
         }
         //database check
 
         //        DatabaseUpdate.requestDBUpdateWithWork(this, false, false);
         DBUpdateCheckWorker.Companion.schedulePeriodicCheck(this,false);
         /*
         Watch for database update
          */
         DBUpdateWorker.getWorkInfoLiveData(this)
                 .observe(this, workInfoList -> {
                     // If there are no matching work info, do nothing
                     if (workInfoList == null || workInfoList.isEmpty()) {
                         return;
                     }
                     Log.d(DEBUG_TAG, "WorkerInfo: "+workInfoList);
 
                     boolean showProgress = false;
                     for (WorkInfo workInfo : workInfoList) {
                         if (workInfo.getState() == WorkInfo.State.RUNNING) {
                             showProgress = true;
                             break;
                         }
                     }
                     if (showProgress) {
                         createDatabaseUpdateSnackbar();
                     } else {
                         if(snackbar!=null) {
                             snackbar.dismiss();
                             snackbar = null;
                         }
                     }
 
                 });
         // show the main fragment
         Fragment f = getSupportFragmentManager().findFragmentById(R.id.mainActContentFrame);
         Log.d(DEBUG_TAG, "OnCreate the fragment is "+f);
         String vl = PreferenceManager.getDefaultSharedPreferences(this).getString(SettingsFragment.PREF_KEY_STARTUP_SCREEN, "");
 
         Log.d(DEBUG_TAG, "The default screen to open is: "+vl);
         if (showingArrivalsFromIntent){
             //do nothing but exclude a case
         }else if (savedInstanceState==null) {
             var framan = getSupportFragmentManager();
             //we are not restarting the activity from nothing
             switch (vl){
                 case "map" -> {requestMapFragment(false);}
                 case "favorites" -> checkAndShowFavoritesFragment(framan, false);
                 case "lines" -> showLinesFragment(framan, false, null);
                 case "nearby" -> createShowMainFragment(framan, MainScreenFragment.makeArgsNearby(), false);
                 default -> createShowMainFragment(framan, MainScreenFragment.makeArgsButtonsScreen(), false);
             }
         }
         //boolean onCreateComplete = true;
 
-        //last but not least, set the good default values
-        checkApplyDefaultSettingsValues();
+        //default values are set in the BustoApp
+        //checkApplyDefaultSettingsValues();
         // handle the device "insets"
         /*
         ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.rootRelativeLayout), (v, windowInsets) -> {
             Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
             // Apply the insets as a margin to the view. This solution sets only the
             // bottom, left, and right dimensions, but you can apply whichever insets are
             // appropriate to your layout. You can also update the view padding if that's
             // more appropriate.
             ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
             mlp.leftMargin = insets.left;
             mlp.bottomMargin = insets.bottom;
             mlp.rightMargin = insets.right;
             v.setLayoutParams(mlp);
             //set for toolbar
             //mlp = (ViewGroup.MarginLayoutParams) mToolbar.getLayoutParams();
             //mlp.topMargin = insets.top;
             //mToolbar.setLayoutParams(mlp);
             mToolbar.setPadding(0, insets.top, 0, 0);
 
             // Return CONSUMED if you don't want the window insets to keep passing
             // down to descendant views.
             return WindowInsetsCompat.CONSUMED;
         });
 
 
         //to properly handle IME
         WindowInsetsControllerCompat insetsController =
                 WindowCompat.getInsetsController(getWindow(), getWindow().getDecorView());
 
         if (insetsController != null) {
             insetsController.setSystemBarsBehavior(
                     WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
             );
         }
 
          */
         // Toolbar: solo inset superiore (status bar)
         ViewCompat.setOnApplyWindowInsetsListener(mToolbar, (v, windowInsets) -> {
             Insets statusBar = windowInsets.getInsets(WindowInsetsCompat.Type.statusBars());
             v.setPadding(0, statusBar.top, 0, 0);
             return windowInsets; // NON consumare: passa gli insets ai figli
         });
 
         // Content frame: insets laterali e inferiori (navigation bar)
         // I fragment figli riceveranno gli insets e potranno gestirli a loro volta
         ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.mainActContentFrame), (v, windowInsets) -> {
             Insets systemBars = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
             // Solo left/right, bottom lo gestisce ogni fragment
             v.setPadding(systemBars.left, 0, systemBars.right, 0);
             return windowInsets; //WindowInsetsCompat.CONSUMED;  // NON consumare: passa ai fragment
         });
 
 
 
         //check if first run activity (IntroActivity) has been started once or not
         final SharedPreferences theShPr = getMainSharedPreferences();
         boolean hasIntroRun = theShPr.getBoolean(PreferencesHolder.PREF_INTRO_ACTIVITY_RUN,false);
         if(!hasIntroRun){
             startIntroductionActivity();
         }
         serviceAlertsViewModel.getLastTimeRunningDownload().observe(this, (timeRunning) -> {
             if (timeRunning != null) {
                 Log.d(DEBUG_TAG, "requested alerts download at time: "+timeRunning);
             }
         });
         serviceAlertsViewModel.launchAlertsPeriodCheck();
 
     }
     private ActionBarDrawerToggle setupDrawerToggle(Toolbar toolbar) {
         // NOTE: Make sure you pass in a valid toolbar reference.  ActionBarDrawToggle() does not require it
         // and will not render the hamburger icon without it.
         return new ActionBarDrawerToggle(this, mDrawer, toolbar, R.string.drawer_open,  R.string.drawer_close);
 
     }
 
 
 
     /**
      * Setup drawer actions
      * @param navigationView the navigation view on which to set the callbacks
      */
     private void setupDrawerContent(NavigationView navigationView) {
         navigationView.setNavigationItemSelectedListener(
                 menuItem -> {
                     int menuId = menuItem.getItemId();
                     if( menuActions.containsKey(menuId)){
                         closeDrawerIfOpen();
                         var runnable = menuActions.get(menuId);
                         if(runnable!=null) runnable.run();
                         return true;
                     } else{
                         return false;
                     }
                 });
 
     }
 
     private void closeDrawerIfOpen(){
         if (mDrawer.isDrawerOpen(GravityCompat.START))
             mDrawer.closeDrawer(GravityCompat.START);
     }
 
 
     // `onPostCreate` called when activity start-up is complete after `onStart()`
     // NOTE 1: Make sure to override the method with only a single `Bundle` argument
     // Note 2: Make sure you implement the correct `onPostCreate(Bundle savedInstanceState)` method.
     // There are 2 signatures and only `onPostCreate(Bundle state)` shows the hamburger icon.
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
         // Sync the toggle state after onRestoreInstanceState has occurred.
         drawerToggle.syncState();
     }
 
 
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         // Pass any configuration change to the drawer toggles
         drawerToggle.onConfigurationChanged(newConfig);
 
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.principal_menu, menu);
         MenuItem experimentsMenuItem = menu.findItem(R.id.action_experiments);
         SharedPreferences shPr = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         boolean exper_On = shPr.getBoolean(getString(R.string.pref_key_experimental), false);
         experimentsMenuItem.setVisible(exper_On);
         return super.onCreateOptionsMenu(menu);
     }
 
     //requesting permissions
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (requestCode==STORAGE_PERMISSION_REQ){
             final String storagePerm = Manifest.permission.WRITE_EXTERNAL_STORAGE;
             if (permissionDoneRunnables.containsKey(storagePerm)) {
                 Runnable toRun = permissionDoneRunnables.get(storagePerm);
                 if (toRun != null)
                     toRun.run();
                 permissionDoneRunnables.remove(storagePerm);
             }
 
             if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 Log.d(DEBUG_TAG, "Permissions check: " + Arrays.toString(permissions));
 
                 if (permissionDoneRunnables.containsKey(storagePerm)) {
                     Runnable toRun = permissionDoneRunnables.get(storagePerm);
                     if (toRun != null)
                         toRun.run();
                     permissionDoneRunnables.remove(storagePerm);
                 }
             } else {
                 //permission denied
                 showToastMessage(R.string.permission_storage_maps_msg, false);
             }
         }
     }
 
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 
         Log.d(DEBUG_TAG, "Item pressed");
         if (item.getItemId() == android.R.id.home) {
             mDrawer.openDrawer(GravityCompat.START);
             return true;
         }
 
         if (drawerToggle.onOptionsItemSelected(item)) {
 
             return true;
 
         }
         return super.onOptionsItemSelected(item);
 
     }
 
     /*@Override
     public void onBackPressed() {
         if (!activityCustomBackPressed())
             super.onBackPressed();
     }
 
      */
 
     private boolean activityCustomBackPressed(){
         var mainFragManager = getSupportFragmentManager();
         boolean resolved = mainFragManager.getBackStackEntryCount() > 0;
 
         Fragment shownFrag = mainFragManager.findFragmentById(R.id.mainActContentFrame);
         if (mDrawer.isDrawerOpen(GravityCompat.START)) {
             mDrawer.closeDrawer(GravityCompat.START);
             resolved = true;
         }
         else if (shownFrag instanceof MainScreenFragment mainFrag) { //the only case when we have to pop both stacks
             mainFrag.cancelReloadArrivalsIfNeeded();
 
             var chManager = mainFrag.getChildFragmentManager();
 
             if(chManager.getBackStackEntryCount() > 0){
                 chManager.popBackStack();
                 Log.d(DEBUG_TAG, "Child back stack popped");
                 resolved = true;
             } else{
                 Log.d(DEBUG_TAG, "No back stack on child fragment manager");
             }
             boolean haveToPopMainFromFragment = mainFrag.needToPopMainStackOnBack();
             //mainFrag.getChildFragmentManager().popBackStack();
             if(haveToPopMainFromFragment){ // pops the stack
                 mainFragManager.popBackStack();
             }
         }
         else if (getSupportFragmentManager().getBackStackEntryCount() > 0) {
             mainFragManager.popBackStack();
             var newFrag = mainFragManager.findFragmentById(R.id.mainActContentFrame);
             if(newFrag != null) {
                 int backStackCount = newFrag.getChildFragmentManager().getBackStackEntryCount();
                 Log.d(DEBUG_TAG, "new fragment is "+newFrag.getClass().getSimpleName() +", count of the backstack: "+backStackCount);
             }
             Log.d(DEBUG_TAG, "Popping main backstack");
         }
         else{
             resolved = false;
         }
        return resolved;
     }
 
     /**
      * Create and show the SnackBar with the message
      * The fragment shown points to which view to attach the snackbar
      */
     private void createDatabaseUpdateSnackbar() {
         View baseView = null;
         boolean showSnackbar = true;
         final Fragment frag = getSupportFragmentManager().findFragmentById(R.id.mainActContentFrame);
         if (frag instanceof ScreenBaseFragment){
             baseView = ((ScreenBaseFragment) frag).getBaseViewForSnackBar();
             showSnackbar = ((ScreenBaseFragment) frag).showSnackbarOnDBUpdate();
         }
         if (baseView == null) baseView = findViewById(R.id.mainActContentFrame);
         //if (baseView == null) Log.e(DEBUG_TAG, "baseView null for default snackbar, probably exploding now");
         if (baseView !=null && showSnackbar) {
             snackbar = Snackbar.make(baseView, R.string.database_update_msg_inapp, Snackbar.LENGTH_INDEFINITE);
             snackbar.setTextColor(getColor(android.R.color.white));
             snackbar.setBackgroundTint(getColor(R.color.grey_800));
             if (frag instanceof ScreenBaseFragment){
                 ((ScreenBaseFragment) frag).setSnackbarPropertiesBeforeShowing(snackbar);
             }
             snackbar.show();
 
         } else{
             Log.e(DEBUG_TAG, "Asked to show the snackbar but the baseView is null");
         }
     }
     /*
     private void updateShowingFragmentKindInternal(@NonNull FragmentKind newKind){
         if(BuildConfig.DEBUG)
             Log.d(DEBUG_TAG, "Updating fragment kind, new: "+newKind+", current: "+showingFragmentKind);
         boolean showingMainFragmentFromOther = false;
         if(showingFragmentKind == null){
             showingFragmentKind = newKind;
             showingMainFragmentFromOther = false;
         } else if(newKind != showingFragmentKind) {
             showingMainFragmentFromOther = (
                     FragmentKind.getSuperKind(newKind) != FragmentKind.getSuperKind(showingFragmentKind));
             showingFragmentKind = newKind;
         }
     }
 
      */
 
     /**
      * Show the actual fragment by adding it to the backstack
      * @param fraMan the fragmentManager
      * @param fragment the fragment
      */
     private static void showMainFragment(FragmentManager fraMan, MainScreenFragment fragment, boolean addToBackStack){
         FragmentTransaction ft  = fraMan.beginTransaction()
                 .replace(R.id.mainActContentFrame, fragment, MainScreenFragment.FRAGMENT_TAG)
                 .setReorderingAllowed(false)
                 /*.setCustomAnimations(
                         R.anim.slide_in,  // enter
                         R.anim.fade_out,  // exit
                         R.anim.fade_in,   // popEnter
                         R.anim.slide_out  // popExit
                 )*/
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
         if (addToBackStack)  {
             ft.addToBackStack(null);
         }
         ft.commit();
     }
     /**
      * Create a new MainFragment for the arguments provided and show it in the layout
      * @param fraMan the fragmentManager
      * @param arguments args for the fragment
      */
     private static void createShowMainFragment(FragmentManager fraMan,@Nullable Bundle arguments, boolean addToBackStack){
         FragmentTransaction ft  = fraMan.beginTransaction()
                 .replace(R.id.mainActContentFrame, MainScreenFragment.class, arguments, MainScreenFragment.FRAGMENT_TAG)
                 .setReorderingAllowed(false)
                 /*.setCustomAnimations(
                         R.anim.slide_in,  // enter
                         R.anim.fade_out,  // exit
                         R.anim.fade_in,   // popEnter
                         R.anim.slide_out  // popExit
                 )*/
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
         if (addToBackStack)  ft.addToBackStack(null);
         ft.commit();
     }
 
     private void showHomeMainFragmentFromClick(){
         FragmentManager fraMan = getSupportFragmentManager();
         var fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG);
         if(fragment instanceof MainScreenFragment mainFrag){
             var visible = mainFrag.isVisible();
             if(!mainFrag.isVisible()){
                 showMainFragment(fraMan, mainFrag, true);
             }
             mainFrag.showButtonsFragmentIfNotNearby(true);
         } else{
             createShowMainFragment(fraMan, MainScreenFragment.makeArgsButtonsScreen(), true);
         }
     }
 
     private void requestMapFragment(final boolean allowReturn){
         // starting from Android 11, we don't need to have the STORAGE permission anymore for the map cache
         FragmentManager fm = getSupportFragmentManager();
         Fragment fragment = fm.findFragmentById(R.id.mainActContentFrame);
         if(fragment instanceof MapLibreFragment){
             Log.d(DEBUG_TAG, "Requested map fragment, but it is already open");
         } else {
             fragment = fm.findFragmentByTag(MapLibreFragment.FRAGMENT_TAG);
             if(fragment != null){
                 Log.d(DEBUG_TAG, "Found map fragment, reopening it");
                 var ft = fm.beginTransaction();
                 ft.replace(R.id.mainActContentFrame,fragment, MapLibreFragment.FRAGMENT_TAG);
                 if(allowReturn) ft.addToBackStack(null);
                 ft.commit();
             } else {
                 //create from scratch
                 //The permissions are handled in the MapLibreFragment instead
                 createAndShowMapFragment(null, allowReturn);
             }
         }
     }
 
     private void checkAndShowFavoritesFragment(FragmentManager fragmentManager,  boolean addToBackStack){
         if(getSupportFragmentManager().findFragmentById(R.id.mainActContentFrame) instanceof FavoritesFragment){
             Log.d(DEBUG_TAG, "Requested favorites fragment, but it is already open");
             return;
         }
         FragmentTransaction ft = fragmentManager.beginTransaction();
         Fragment fragment = fragmentManager.findFragmentByTag(TAG_FAVORITES);
         if(fragment!=null){
             ft.replace(R.id.mainActContentFrame, fragment, TAG_FAVORITES);
         }else{
             //use new method
             ft.replace(R.id.mainActContentFrame,FavoritesFragment.class,null,TAG_FAVORITES);
         }
         if (addToBackStack)
             ft.addToBackStack("favorites_main");
         ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                 .setReorderingAllowed(false);
         ft.commit();
     }
 
     private void showLinesFragment(@NonNull FragmentManager fragmentManager,  boolean addToBackStack, @Nullable Bundle fragArgs){
         if(getSupportFragmentManager().findFragmentById(R.id.mainActContentFrame) instanceof LinesGridShowingFragment){
             Log.d(DEBUG_TAG, "Requested lines grid fragment, but it is already open");
             return;
         }
         FragmentTransaction ft = fragmentManager.beginTransaction();
         Fragment f = fragmentManager.findFragmentByTag(LinesGridShowingFragment.FRAGMENT_TAG);
         if(f!=null){
             ft.replace(R.id.mainActContentFrame, f, LinesGridShowingFragment.FRAGMENT_TAG);
         }else{
             //use new method
             ft.replace(R.id.mainActContentFrame,LinesGridShowingFragment.class,fragArgs,
                     LinesGridShowingFragment.FRAGMENT_TAG);
         }
         if (addToBackStack)
             ft.addToBackStack("linesGrid");
         ft.setReorderingAllowed(true)
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                 .commit();
     }
 
     @Nullable
     private MainScreenFragment getMainFragmentIfVisible(){
         FragmentManager fraMan = getSupportFragmentManager();
         Fragment fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG);
         if (fragment!= null && fragment.isVisible()) return (MainScreenFragment) fragment;
         else return null;
     }
 
 
     @Override
     public void showFloatingActionButton(boolean yes) {
         var frag =  getMainFragmentIfVisible();
         if(frag!=null){
             frag.showFloatingActionButton(yes);
         }
     }
 
     /*
     public void setDrawerSelectedItem(String fragmentTag){
         switch (fragmentTag){
             case MainScreenFragment.FRAGMENT_TAG:
                 mNavView.setCheckedItem(R.id.nav_arrivals);
                 break;
             case MapFragment.FRAGMENT_TAG:
 
                 break;
 
             case FavoritesFragment.FRAGMENT_TAG:
                 mNavView.setCheckedItem(R.id.nav_favorites_item);
                 break;
         }
     }*/
 
     @Override
     public void readyGUIfor(FragmentKind fragmentType) {
         //updateShowingFragmentKindInternal(fragmentType);
         if(BuildConfig.DEBUG) Log.d(DEBUG_TAG, "readyGUIfor fragment kind: " + fragmentType);
 
         Integer titleResId = null;
         switch (fragmentType){
             case MAP:
                 mNavView.setCheckedItem(R.id.nav_map_item);
                 titleResId = R.string.map;
                 break;
             case FAVORITES:
                 mNavView.setCheckedItem(R.id.nav_favorites_item);
                 titleResId = R.string.nav_favorites_text;
                 break;
             case ARRIVALS:
                 titleResId = R.string.nav_arrivals_text;
                 mNavView.setCheckedItem(R.id.nav_home);
                 //TODO: Figure out way to change title
                 //mNavView.getCheckedItem().setTitle(R.string.nav_arrivals_text);
                 break;
             case STOPS:
                 titleResId = R.string.stop_search_view_title;
                 mNavView.setCheckedItem(R.id.nav_home);
                 break;
             case MAIN_SCREEN_FRAGMENT:
             case HOME_BUTTONS:
                 titleResId=R.string.app_name_full;
                 mNavView.setCheckedItem(R.id.nav_home);
                 //mNavView.getCheckedItem().setTitle(R.string.nav_home_text);
                 break;
             case NEARBY_STOPS:
             case NEARBY_ARRIVALS:
                 titleResId=R.string.app_name_full;
                 mNavView.setCheckedItem(R.id.nav_nearby);
                 break;
             case LINES:
                 titleResId=R.string.lines;
                 mNavView.setCheckedItem(R.id.nav_lines_item);
                 break;
         }
         if(getSupportActionBar()!=null && titleResId!=null)
             getSupportActionBar().setTitle(titleResId);
         MainScreenFragment mainFragmentIfVisible = getMainFragmentIfVisible();
         if (mainFragmentIfVisible!=null){
             mainFragmentIfVisible.readyGUIfor(fragmentType);
         }
     }
 
     @Override
     public void requestArrivalsForStopID(String ID) {
         Consumer<MainScreenFragment> consumer = fragment -> {
             fragment.setSuppressArrivalsReload(true);
             fragment.requestArrivalsForStopID(ID);
         };
         boolean done = getMainFragmentAndDoStuff(consumer);
         if(!done){
             //create the fragment
             final Bundle args = MainScreenFragment.makeArgsArrivals(ID);
             createShowMainFragment(getSupportFragmentManager(), args ,true);
         }
     }
     @Override
     public void openLineFromStop(String routeGtfsId, @Nullable String stopIDFrom){
 
         FragmentTransaction tr = getSupportFragmentManager().beginTransaction();
         tr.replace(R.id.mainActContentFrame, LinesDetailFragment.class,
                 LinesDetailFragment.Companion.makeArgs(routeGtfsId, stopIDFrom));
         tr.addToBackStack("LineFromStop-"+routeGtfsId);
         tr.commit();
 
     }
 
     private boolean getMainFragmentAndDoStuff(Consumer<MainScreenFragment> consumer){
         FragmentManager fraMan = getSupportFragmentManager();
         var frag = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG);
         if( frag instanceof MainScreenFragment mainFrag){
             if(!mainFrag.isVisible()) {
                 showMainFragment(fraMan, mainFrag, true);
                 mainFrag.setMainFragmentManagerTransition(true);
             } else{
                 mainFrag.setMainFragmentManagerTransition(false);
             }
             consumer.accept(mainFrag);
             return true;
         } else{
             return false;
         }
     }
 
     @Override
     public void openLineFromVehicle(String routeGtfsId, @Nullable String optionalPatternId, @Nullable Bundle args) {
 
         FragmentTransaction tr = getSupportFragmentManager().beginTransaction();
         tr.replace(R.id.mainActContentFrame, LinesDetailFragment.class,
                 LinesDetailFragment.Companion.makeArgsPattern(routeGtfsId, optionalPatternId, args));
         tr.addToBackStack("LineFromOther-"+routeGtfsId);
         tr.commit();
     }
 
     @Override
     public void openNearbyStopsFragment() {
         boolean done = getMainFragmentAndDoStuff(MainScreenFragment::openNearbyStopsFragment);
         if(!done){
             createShowMainFragment(getSupportFragmentManager(), MainScreenFragment.makeArgsNearby(), true);
         }
     }
 
     @Override
     public void openLinesFragment() {
         showLinesFragment(getSupportFragmentManager(), true, null);
     }
 
     @Override
     public void openFavoritesFragment() {
         checkAndShowFavoritesFragment(getSupportFragmentManager(), true);
     }
 
     @Override
     public void toggleSpinner(boolean state) {
         MainScreenFragment probableFragment = getMainFragmentIfVisible();
         if (probableFragment!=null){
             probableFragment.toggleSpinner(state);
         }
     }
 
     @Override
     public void enableRefreshLayout(boolean yes) {
         MainScreenFragment probableFragment = getMainFragmentIfVisible();
         if (probableFragment!=null){
             probableFragment.enableRefreshLayout(yes);
         }
     }
 
 
     @Override
     public void showMapCenteredOnStop(@Nullable Stop stop) {
         createAndShowMapFragment(stop, true);
     }
 
 
 
     //Map Fragment stuff
     void createAndShowMapFragment(@Nullable Stop stop, boolean addToBackStack){
         final FragmentManager fm = getSupportFragmentManager();
         final FragmentTransaction ft = fm.beginTransaction();
         final MapLibreFragment fragment = MapLibreFragment.newInstance(stop);
         ft.replace(R.id.mainActContentFrame, fragment, MapLibreFragment.FRAGMENT_TAG);
         if (addToBackStack) ft.addToBackStack(null);
         ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
         ft.commit();
     }
 
     void startIntroductionActivity(){
         Intent intent = new Intent(ActivityPrincipal.this, ActivityIntro.class);
         intent.putExtra(ActivityIntro.RESTART_MAIN, false);
         startActivity(intent);
     }
 
     class ToolbarItemClickListener implements Toolbar.OnMenuItemClickListener{
         private final Context activityContext;
 
         public ToolbarItemClickListener(Context activityContext) {
             this.activityContext = activityContext;
         }
 
         @Override
         public boolean onMenuItemClick(MenuItem item) {
             final int id = item.getItemId();
             if(id == R.id.action_about){
                 startActivity(new Intent(ActivityPrincipal.this, ActivityAbout.class));
                 return true;
             } else if (id == R.id.action_hack) {
                 openIceweasel(getString(R.string.hack_url), activityContext);
                 return true;
             } else if (id == R.id.action_source){
                 openIceweasel("https://gitpull.it/source/libre-busto/", activityContext);
                 return true;
             } else if (id == R.id.action_licence){
                 openIceweasel("https://www.gnu.org/licenses/gpl-3.0.html", activityContext);
                 return true;
             } else if (id == R.id.action_experiments) {
                 startActivity(new Intent(ActivityPrincipal.this, ActivityExperiments.class));
                 return true;
             } else if (id == R.id.action_tutorial) {
                 startIntroductionActivity();
                 return true;
             }
 
             return false;
         }
     }
 
     @Override
     protected void onPause() {
         super.onPause();
         // stop updating the alerts
         serviceAlertsViewModel.setRunningDownloadRequests(false);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
         serviceAlertsViewModel.launchAlertsPeriodCheck();
     }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/BustoApp.java b/app/src/main/java/it/reyboz/bustorino/BustoApp.java
index d9e2916..ac9bb97 100644
--- a/app/src/main/java/it/reyboz/bustorino/BustoApp.java
+++ b/app/src/main/java/it/reyboz/bustorino/BustoApp.java
@@ -1,75 +1,139 @@
 /*
 	BusTO - Arrival times for Turin public transport.
     Copyright (C) 2021 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino;
 
 import android.content.Context;
 
+import android.content.SharedPreferences;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.multidex.MultiDexApplication;
+import androidx.preference.PreferenceManager;
+import it.reyboz.bustorino.backend.utils;
+import it.reyboz.bustorino.data.PreferencesHolder;
+import it.reyboz.bustorino.fragments.SettingsFragment;
 import org.acra.ACRA;
 import org.acra.BuildConfig;
 import org.acra.ReportField;
 import org.acra.config.CoreConfigurationBuilder;
 import org.acra.config.DialogConfigurationBuilder;
 import org.acra.config.MailSenderConfigurationBuilder;
 import org.acra.data.StringFormat;
 
 import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 import static org.acra.ReportField.*;
 
 
 public class BustoApp extends MultiDexApplication {
     private static final List<ReportField> REPORT_FIELDS = List.of(REPORT_ID, APP_VERSION_CODE, APP_VERSION_NAME,
             PACKAGE_NAME, PHONE_MODEL, BRAND, PRODUCT, ANDROID_VERSION, BUILD_CONFIG, CUSTOM_DATA,
             IS_SILENT, STACK_TRACE, INITIAL_CONFIGURATION, CRASH_CONFIGURATION, DISPLAY, USER_COMMENT,
             USER_APP_START_DATE, USER_CRASH_DATE, LOGCAT, SHARED_PREFERENCES);
 
+
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(base);
 
         CoreConfigurationBuilder builder = new CoreConfigurationBuilder();
         // mail stuff
         MailSenderConfigurationBuilder mailConfig = new MailSenderConfigurationBuilder();
         mailConfig.withMailTo("gtt@succhia.cz")
                 .withReportFileName(it.reyboz.bustorino.BuildConfig.VERSION_NAME +"_report.json")
                 .withBody(getString(R.string.acra_email_message))
                 .setEnabled(true);
         //dialog stuff
         DialogConfigurationBuilder dialogBuild = new DialogConfigurationBuilder();
         dialogBuild.withText(getString(R.string.message_crash))
                 .withResTheme(R.style.AppTheme).setEnabled(true);
         //Set options
         builder.withBuildConfigClass(BuildConfig.class)
                 .withReportFormat(StringFormat.JSON)
                 .withDeleteUnapprovedReportsOnApplicationStart(true);
         //Add plugins
         builder.withPluginConfigurations(
             mailConfig.build(), dialogBuild.build()
         );
 
 
         builder.setReportContent(REPORT_FIELDS);
         if (!it.reyboz.bustorino.BuildConfig.DEBUG)
             ACRA.init(this, builder);
 
     }
 
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        checkApplyDefaultSettingsValues();
+
+        var dayorNight = PreferencesHolder.getAppThemeDayNight(this);
+        AppCompatDelegate.setDefaultNightMode(dayorNight);
+        
+    }
+
+    /**
+     * Adjust setting to match the default ones
+     */
+    protected void checkApplyDefaultSettingsValues(){
+        SharedPreferences mainSharedPref = PreferenceManager.getDefaultSharedPreferences(this);
+        SharedPreferences.Editor editor = mainSharedPref.edit();
+        boolean edit = false;
+
+        //Day or night theme
+        var str = mainSharedPref.getString(PreferencesHolder.PREF_THEME_DAY_NIGHT, "");
+        if(str.isEmpty()){
+            editor.putString(PreferencesHolder.PREF_THEME_DAY_NIGHT, "system");
+            edit = true;
+        }
+
+        //Main fragment to show
+        String screen = mainSharedPref.getString(SettingsFragment.PREF_KEY_STARTUP_SCREEN, "");
+        if (screen.isEmpty()){
+            editor.putString(SettingsFragment.PREF_KEY_STARTUP_SCREEN, "arrivals");
+            edit=true;
+        }
+        //Fetchers
+        final Set<String> setSelected = mainSharedPref.getStringSet(SettingsFragment.KEY_ARRIVALS_FETCHERS_USE, new HashSet<>());
+        if (setSelected.isEmpty()){
+            String[] defaultVals = getResources().getStringArray(R.array.arrivals_sources_values_default);
+            editor.putStringSet(SettingsFragment.KEY_ARRIVALS_FETCHERS_USE, utils.convertArrayToSet(defaultVals));
+            edit=true;
+        }
+        //Live bus positions
+        final String keySourcePositions=getString(R.string.pref_positions_source);
+        final String positionsSource = mainSharedPref.getString(keySourcePositions, "");
+        if(positionsSource.isEmpty()){
+            String[] defaultVals = getResources().getStringArray(R.array.positions_source_values);
+            editor.putString(keySourcePositions, defaultVals[0]);
+            edit=true;
+        }
+        //Map style
+        final String mapStylePref = mainSharedPref.getString(SettingsFragment.LIBREMAP_STYLE_PREF_KEY, "");
+        if(mapStylePref.isEmpty()){
+            final String[] defaultVals = getResources().getStringArray(R.array.map_style_pref_values);
+            editor.putString(SettingsFragment.LIBREMAP_STYLE_PREF_KEY, defaultVals[0]);
+            edit=true;
+        }
+        if (edit){
+            editor.apply();
+        }
+
+    }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/adapters/ArrivalsStopAdapter.java b/app/src/main/java/it/reyboz/bustorino/adapters/ArrivalsStopAdapter.java
index 35ee280..d51329a 100644
--- a/app/src/main/java/it/reyboz/bustorino/adapters/ArrivalsStopAdapter.java
+++ b/app/src/main/java/it/reyboz/bustorino/adapters/ArrivalsStopAdapter.java
@@ -1,305 +1,304 @@
 /*
 	BusTO  - UI components
     Copyright (C) 2017 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.adapters;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.location.Location;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.util.Pair;
 import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.*;
 import it.reyboz.bustorino.fragments.FragmentListenerMain;
 
 import java.util.*;
 
 public class ArrivalsStopAdapter extends RecyclerView.Adapter<ArrivalsStopAdapter.ViewHolder> implements SharedPreferences.OnSharedPreferenceChangeListener {
-    private final static int layoutRes = R.layout.arrivals_nearby_card;
+    private final static int layoutRes = R.layout.item_arrivals_nearby_card;
     //private List<Stop> stops;
     private @NonNull GPSPoint userPosition;
     private FragmentListenerMain listener;
     private List< RouteWithStop > routesPairList;
     private final Context context;
     //Maximum number of stops to keep
     private final int MAX_STOPS = 20; //TODO: make it programmable
     private final String KEY_CAPITALIZE;
     private NameCapitalize capit;
 
 
-    public ArrivalsStopAdapter(@Nullable List< RouteWithStop > routesPairList, FragmentListenerMain fragmentListener, Context con, @NonNull GPSPoint pos) {
+    public ArrivalsStopAdapter(@Nullable List< RouteWithStop > routesPairList,@NonNull FragmentListenerMain fragmentListener, @NonNull Context con, @NonNull GPSPoint pos) {
         listener  = fragmentListener;
         userPosition = pos;
         this.routesPairList = routesPairList;
         context = con.getApplicationContext();
         resetListAndPosition();
         // if(paline!=null)
         //resetRoutesPairList(paline);
         KEY_CAPITALIZE = context.getString(R.string.pref_arrival_times_capit);
         SharedPreferences defSharPref = PreferenceManager.getDefaultSharedPreferences(context);
         defSharPref.registerOnSharedPreferenceChangeListener(this);
         String capitalizeKey = defSharPref.getString(KEY_CAPITALIZE, "");
         this.capit = NameCapitalize.getCapitalize(capitalizeKey);
     }
 
 
 
     @NonNull
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         final View view = LayoutInflater.from(parent.getContext()).inflate(layoutRes, parent, false);
 
         return new ViewHolder(view);
     }
 
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
             //DO THE ACTUAL WORK TO PUT THE DATA
         if(routesPairList==null || routesPairList.size() == 0) return; //NO STOPS
         final var stopRoutePair = routesPairList.get(position);
         if(stopRoutePair != null){
             final Stop stop = stopRoutePair.getStop();
             final Route r = stopRoutePair.getRoute();
             final Double distance = stop.getDistanceFromLocation(userPosition.getLatitude(), userPosition.longitude);
             if(distance!=Double.POSITIVE_INFINITY){
                 holder.distancetextView.setText(distance.intValue()+" m");
             } else {
                 holder.distancetextView.setVisibility(View.GONE);
             }
             final String stopText = String.format(context.getResources().getString(R.string.two_strings_format),stop.getStopDisplayName(),stop.ID);
             holder.stopNameView.setText(stopText);
             //final String routeName = String.format(context.getResources().getString(R.string.two_strings_format),r.getNameForDisplay(),r.destinazione);
             if (r!=null) {
                 holder.lineNameTextView.setText(r.getDisplayCode());
                 holder.lineDirectionTextView.setText(NameCapitalize.capitalizePass(r.destinazione, capit));
                 holder.arrivalsTextView.setText(r.getPassaggiToString(0,2,true));
             } else {
                 holder.lineNameTextView.setVisibility(View.INVISIBLE);
                 holder.lineDirectionTextView.setVisibility(View.INVISIBLE);
                 //holder.arrivalsTextView.setVisibility(View.INVISIBLE);
             }
             /* EXPERIMENTS
             if(r.destinazione==null || r.destinazione.trim().isEmpty()){
                 holder.lineDirectionTextView.setVisibility(View.GONE);
                 RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) holder.arrivalsDescriptionTextView.getLayoutParams();
                 params.addRule(RelativeLayout.RIGHT_OF,holder.lineNameTextView.getId());
                 holder.arrivalsDescriptionTextView.setLayoutParams(params);
             } else {
                 RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) holder.arrivalsDescriptionTextView.getLayoutParams();
                 params.removeRule(RelativeLayout.RIGHT_OF);
                 holder.arrivalsDescriptionTextView.setLayoutParams(params);
                 holder.lineDirectionTextView.setVisibility(View.VISIBLE);
 
             }
              */
             holder.stopID =stop.ID;
         } else {
             Log.w("SquareStopAdapter","!! The selected stop is null !!");
         }
     }
 
     @Override
     public int getItemCount() {
         return routesPairList.size();
     }
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         if(key.equals(KEY_CAPITALIZE)){
             String k = sharedPreferences.getString(KEY_CAPITALIZE, "");
             capit = NameCapitalize.getCapitalize(k);
 
             notifyDataSetChanged();
 
         }
     }
 
     class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener  {
         TextView lineNameTextView;
         TextView lineDirectionTextView;
         TextView stopNameView;
         TextView arrivalsDescriptionTextView;
         TextView arrivalsTextView;
         TextView distancetextView;
         String stopID;
 
         ViewHolder(View holdView){
             super(holdView);
             holdView.setOnClickListener(this);
             lineNameTextView = (TextView) holdView.findViewById(R.id.lineNameTextView);
             lineDirectionTextView = (TextView) holdView.findViewById(R.id.lineDirectionTextView);
             stopNameView = (TextView) holdView.findViewById(R.id.arrivalStopName);
             arrivalsTextView = (TextView) holdView.findViewById(R.id.arrivalsTimeTextView);
             arrivalsDescriptionTextView = (TextView) holdView.findViewById(R.id.arrivalsDescriptionTextView);
             distancetextView = (TextView) holdView.findViewById(R.id.arrivalsDistanceTextView);
         }
 
         @Override
         public void onClick(View v) {
             listener.requestArrivalsForStopID(stopID);
         }
 
     }
     /*
     public void resetRoutesPairList(List<Palina> stopList){
         Collections.sort(stopList,new StopSorterByDistance(userPosition));
 
         this.routesPairList = new ArrayList<>(stopList.size());
         int maxNum = Math.min(MAX_STOPS, stopList.size());
         for(Palina p: stopList.subList(0,maxNum)){
             //if there are no routes available, skip stop
             if(p.queryAllRoutes().size() == 0) continue;
             for(Route r: p.queryAllRoutes()){
                 //if there are no routes, should not do anything
                 routesPairList.add(new Pair<>(p,r));
             }
         }
     }
 
      */
 
     public void updatePosition(@NonNull GPSPoint pos){
         userPosition = pos;
     }
 
     public void setRoutesPairListAndPosition(@NonNull List<RouteWithStop> newList, @Nullable GPSPoint pos) {
         if(pos!=null) updatePosition(pos);
 
         if (routesPairList == null) {
             routesPairList = new ArrayList<>(newList);
             notifyItemRangeInserted(0, newList.size());
             return;
         }
 
         DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new DiffUtil.Callback() {
                     @Override
                     public int getOldListSize() {
                         return routesPairList.size();
                     }
 
                     @Override
                     public int getNewListSize() {
                         return newList.size();
                     }
 
                     @Override
                     public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
 
                         RouteWithStop oldItem = routesPairList.get(oldItemPosition);
                         RouteWithStop newItem = newList.get(newItemPosition);
 
                         // usa un ID univoco
                         return oldItem.getId().equals(newItem.getId());
                     }
 
                     @Override
                     public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
 
                         RouteWithStop oldItem = routesPairList.get(oldItemPosition);
                         RouteWithStop newItem = newList.get(newItemPosition);
 
                         // confronta il contenuto
                         return oldItem.equals(newItem);
                     }
                 }
         );
 
         routesPairList.clear();
         routesPairList.addAll(newList);
 
         diffResult.dispatchUpdatesTo(this);
 
 
         /*if (this.routesPairList == null || routesPairList.size() == 0){
             routesPairList = mRoutesPairList;
             notifyDataSetChanged();
         } else{
 
             final var indexMapIn = getRouteIndexMap(mRoutesPairList);
             final var indexMapExisting = getRouteIndexMap(routesPairList);
             //List<Pair<Stop,Route>> oldList = routesPairList;
             routesPairList = mRoutesPairList;
             /*
             for (Pair<String,String> pair: indexMapIn.keySet()){
                 final Integer posIn = indexMapIn.get(pair);
                 if (posIn == null) continue;
                 if (indexMapExisting.containsKey(pair)){
                     final Integer posExisting = indexMapExisting.get(pair);
                     //THERE IS ALREADY
                     //routesPairList.remove(posExisting.intValue());
                     //routesPairList.add(posIn,mRoutesPairList.get(posIn));
 
                     notifyItemMoved(posExisting, posIn);
                     indexMapExisting.remove(pair);
                 } else{
                     //INSERT IT
                     //routesPairList.add(posIn,mRoutesPairList.get(posIn));
                     notifyItemInserted(posIn);
                 }
             }//
             //REMOVE OLD STOPS
             for (Pair<String,String> pair: indexMapExisting.keySet()) {
                 final Integer posExisting = indexMapExisting.get(pair);
                 if (posExisting == null) continue;
                 //routesPairList.remove(posExisting.intValue());
                 notifyItemRemoved(posExisting);
             }
 
         */
 
     }
 
     /**
      * Sort and remove the repetitions for the routesPairList
      */
     private void resetListAndPosition(){
         //Collections.sort(this.routesPairList,new RoutePositionSorter(userPosition));
         //All of this to get only the first occurrences of a line (name & direction)
         var iterator = routesPairList.listIterator();
         Set<Pair<String,String>> allRoutesDirections = new HashSet<>();
         while(iterator.hasNext()){
             final var stopRoutePair = iterator.next();
             stopRoutePair.getRoute();
             final Pair<String, String> routeNameDirection = new Pair<>(stopRoutePair.getRoute().getName(), stopRoutePair.getRoute().destinazione);
             if (allRoutesDirections.contains(routeNameDirection)) {
                 iterator.remove();
             } else {
                 allRoutesDirections.add(routeNameDirection);
             }
         }
     }
 
 
     private static HashMap<RouteWithStop, Integer> getRouteIndexMap(List<RouteWithStop> routesPairList){
         final HashMap<RouteWithStop, Integer> myMap = new HashMap<>();
         for (int i=0; i<routesPairList.size(); i++){
             myMap.put(routesPairList.get(i), i);
         }
         return myMap;
     }
 
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/adapters/PalinaAdapter.java b/app/src/main/java/it/reyboz/bustorino/adapters/PalinaAdapter.java
index 76e3f0c..76e3be7 100644
--- a/app/src/main/java/it/reyboz/bustorino/adapters/PalinaAdapter.java
+++ b/app/src/main/java/it/reyboz/bustorino/adapters/PalinaAdapter.java
@@ -1,295 +1,302 @@
 /*
 	BusTO (backend components)
     Copyright (C) 2016 Ludovico Pavesi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.adapters;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.cardview.widget.CardView;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.preference.PreferenceManager;
 
 import android.content.SharedPreferences;
 import android.view.Gravity;
 import android.os.Build;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
 import java.util.*;
 
 import androidx.recyclerview.widget.RecyclerView;
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.Palina;
 import it.reyboz.bustorino.backend.Passaggio;
 import it.reyboz.bustorino.backend.Route;
 import it.reyboz.bustorino.backend.utils;
 import it.reyboz.bustorino.util.PassaggiSorter;
 import it.reyboz.bustorino.util.RouteSorterByArrivalTime;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * This once was a ListView Adapter for BusLine[].
  *
  * Thanks to Framentos developers for the guide:
  * http://www.framentos.com/en/android-tutorial/2012/07/16/listview-in-android-using-custom-listadapter-and-viewcache/#
  *
  * @author Valerio Bozzolan
  * @author Ludovico Pavesi
  * @author Fabio Mazza
  */
 public class PalinaAdapter extends RecyclerView.Adapter<PalinaAdapter.PalinaViewHolder> implements SharedPreferences.OnSharedPreferenceChangeListener {
 
     private static final int ROW_LAYOUT = R.layout.entry_bus_line_passage;
     private static final int metroBg = R.drawable.route_background_metro;
     private static final int busBg = R.drawable.route_background_bus;
     private static final int extraurbanoBg = R.drawable.route_background_bus_long_distance;
 
-    private static final int busIcon = R.drawable.bus;
-    private static final int trainIcon = R.drawable.subway;
-    private static final int tramIcon = R.drawable.tram;
+    private static final int busIcon = R.drawable.ic_bus;
+    private static final int trainIcon = R.drawable.ic_subway_filled;
+    private static final int tramIcon = R.drawable.ic_tram_filled_24;
 
     private final String KEY_CAPITALIZE;
     private Capitalize capit;
 
     private final List<Route> mRoutes;
     private final PalinaClickListener mRouteListener;
 
     @NonNull
     @NotNull
     @Override
     public PalinaViewHolder onCreateViewHolder(@NonNull @NotNull ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext())
                 .inflate(ROW_LAYOUT, parent, false);
         return new PalinaViewHolder(view);
     }
 
     @Override
     public void onBindViewHolder(@NonNull @NotNull PalinaViewHolder vh, int position) {
         final Route route = mRoutes.get(position);
         final Context con = vh.itemView.getContext();
         final Resources res = con.getResources();
 
         vh.routeIDTextView.setText(route.getDisplayCode());
         vh.routeCard.setOnClickListener(view -> mRouteListener.requestShowingRoute(route));
 
         // Clicking anywhere on the row shows a popup menu
         vh.itemView.setOnClickListener(view ->
                 openPopupMenuDetails(con,view, route)
         ); //vh.rowRouteDestination.getVisibility() == View.VISIBLE ? vh.rowRouteDestination : vh.itemView
 
         if(route.destinazione==null || route.destinazione.length() == 0) {
             vh.rowRouteDestination.setVisibility(View.GONE);
             // move around the route timetable
             final ViewGroup.MarginLayoutParams pars = (ViewGroup.MarginLayoutParams) vh.rowRouteTimetable.getLayoutParams();
             if (pars!=null){
                 pars.topMargin = 16;
                 if(Build.VERSION.SDK_INT >= 17)
                     pars.setMarginStart(20);
                 pars.leftMargin = 20;
             }
         } else {
             // View Holder Pattern(R) renders each element from a previous one: if the other one had an invisible rowRouteDestination, we need to make it visible.
             vh.rowRouteDestination.setVisibility(View.VISIBLE);
             String dest = route.destinazione;
             switch (capit){
                 case ALL:
                     dest = route.destinazione.toUpperCase(Locale.ROOT);
                     break;
                 case FIRST:
                     dest = utils.toTitleCase(route.destinazione, true);
                     break;
                 case DO_NOTHING:
                 default:
 
             }
             vh.rowRouteDestination.setText(dest);
         }
-
+        Drawable drawable = null;
+        final var resources = con.getResources();
         switch (route.type) {
             //UNKNOWN = BUS for the moment
             case UNKNOWN:
             case BUS:
             default:
                 // convertView could contain another background, reset it
                 //vh.rowStopIcon.setBackgroundResource(busBg);
-
-                vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0);
+                //drawable = ResourcesCompat.getDrawable(con.getResources(), busIcon, con.getTheme());
+                //vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0);
+                vh.busIcon.setImageDrawable(ResourcesCompat.getDrawable(resources, busIcon, con.getTheme()));
                 break;
             case LONG_DISTANCE_BUS:
                 //vh.rowStopIcon.setBackgroundResource(extraurbanoBg);
                 vh.routeCard.setCardBackgroundColor(ResourcesCompat.getColor(res, R.color.extraurban_bus_bg, null));
-                vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0);
+                vh.busIcon.setImageDrawable(ResourcesCompat.getDrawable(resources, extraurbanoBg, con.getTheme()));
                 break;
             case METRO:
                 //vh.rowStopIcon.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
                 //vh.rowStopIcon.setBackgroundResource(metroBg);
                 vh.routeIDTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
                 vh.routeCard.setCardBackgroundColor(ResourcesCompat.getColor(res, R.color.metro_bg, null));
-                vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(trainIcon, 0, 0, 0);
+               // vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(trainIcon, 0, 0, 0);
+                vh.busIcon.setImageDrawable(ResourcesCompat.getDrawable(resources, trainIcon, con.getTheme()));
                 break;
             case RAILWAY:
                 //vh.rowStopIcon.setBackgroundResource(busBg);
-                vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(trainIcon, 0, 0, 0);
+                //vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(trainIcon, 0, 0, 0);
+                vh.busIcon.setImageDrawable(ResourcesCompat.getDrawable(resources, trainIcon, con.getTheme()));
                 break;
             case TRAM: // never used but whatever.
                 //vh.rowStopIcon.setBackgroundResource(busBg);
-                vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(tramIcon, 0, 0, 0);
+                drawable = ResourcesCompat.getDrawable(resources, trainIcon, con.getTheme());
+                assert drawable != null;
+                drawable.setTint(resources.getColor(R.color.black_icon_text, con.getTheme()) );
+                //vh.rowRouteDestination.setCompoundDrawablesWithIntrinsicBounds(tramIcon, 0, 0, 0);
+                vh.busIcon.setImageDrawable(ResourcesCompat.getDrawable(resources, tramIcon, con.getTheme()));
+
                 break;
         }
 
         List<Passaggio> passaggi = route.passaggi;
         //TODO: Sort the passaggi with realtime first if source is GTTJSONFetcher
         if(passaggi.size() == 0) {
             vh.rowRouteTimetable.setText(R.string.no_passages);
 
         } else {
             vh.rowRouteTimetable.setText(route.getPassaggiToString());
         }
 
     }
 
     @Override
     public int getItemCount() {
         return mRoutes.size();
     }
 
     //private static final int cityIcon = R.drawable.city;
 
     // hey look, a pattern!
     public static class PalinaViewHolder extends RecyclerView.ViewHolder {
         //final TextView rowStopIcon;
         final TextView routeIDTextView;
         final CardView routeCard;
         final TextView rowRouteDestination;
         final TextView rowRouteTimetable;
+        final ImageView busIcon;
 
         public PalinaViewHolder(@NonNull @NotNull View view) {
             super(view);
-            /*
-            convertView.findViewById(R.id.routeID);
-            vh.rowRouteDestination = (TextView) convertView.findViewById(R.id.routeDestination);
-            vh.rowRouteTimetable = (TextView) convertView.findViewById(R.id.routesThatStopHere);
-             */
-            //rowStopIcon = view.findViewById(R.id.routeID);
             routeIDTextView = view.findViewById(R.id.routeNameTextView);
             routeCard = view.findViewById(R.id.routeCard);
             rowRouteDestination = view.findViewById(R.id.routeDestination);
             rowRouteTimetable = view.findViewById(R.id.routesThatStopHere);
+            busIcon = view.findViewById(R.id.arrivalsBusIcon);
         }
     }
     private static Capitalize getCapitalize(SharedPreferences shPr, String key){
         String capitalize = shPr.getString(key, "");
 
         switch (capitalize.trim()){
             case "KEEP":
                 return Capitalize.DO_NOTHING;
             case "CAPITALIZE_ALL":
                 return Capitalize.ALL;
 
             case "CAPITALIZE_FIRST":
                 return Capitalize.FIRST;
         }
         return  Capitalize.DO_NOTHING;
     }
 
     private void openPopupMenuDetails(Context con, View view, Route route){
         PopupMenu popup = new PopupMenu(con, view, Gravity.END);
         popup.inflate(R.menu.menu_arrivals_line_item);
         if (route.destinazione == null || route.destinazione.isEmpty()) {
             popup.getMenu().findItem(R.id.action_show_direction).setVisible(false);
         }
         popup.setOnMenuItemClickListener(item -> {
             int id = item.getItemId();
             if (id == R.id.action_open_line) {
                 mRouteListener.requestShowingRoute(route);
                 return true;
             } else if (id == R.id.action_show_direction) {
                 mRouteListener.showRouteFullDirection(route);
                 return true;
             }
             return false;
         });
         popup.show();
     }
 
     public PalinaAdapter(Context context, Palina p, PalinaClickListener listener, boolean hideEmptyRoutes) {
         Comparator<Passaggio> sorter = null;
         if (p.getPassaggiSourceIfAny()== Passaggio.Source.GTTJSON){
             sorter = new PassaggiSorter();
         }
         final List<Route> routes;
         if (hideEmptyRoutes){
             // build the routes by filtering them
             routes = new ArrayList<>();
             for(Route r: p.queryAllRoutes()){
                 //add only if there is at least one passage
                 if (r.numPassaggi()>0){
                     routes.add(r);
                 }
             }
         } else
             routes = p.queryAllRoutes();
         for(Route r: routes){
             if (sorter==null) Collections.sort(r.passaggi);
             else Collections.sort(r.passaggi, sorter);
         }
 
         Collections.sort(routes,new RouteSorterByArrivalTime());
 
         mRoutes = routes;
         KEY_CAPITALIZE = context.getString(R.string.pref_arrival_times_capit);
         SharedPreferences defSharPref = PreferenceManager.getDefaultSharedPreferences(context);
         defSharPref.registerOnSharedPreferenceChangeListener(this);
         this.capit = getCapitalize(defSharPref, KEY_CAPITALIZE);
 
         this.mRouteListener = listener;
     }
 
 
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         if(key.equals(KEY_CAPITALIZE)){
             capit = getCapitalize(sharedPreferences, KEY_CAPITALIZE);
 
             notifyDataSetChanged();
         }
     }
 
     enum Capitalize{
         DO_NOTHING, ALL, FIRST
     }
 
     public interface PalinaClickListener{
         /**
          * Simple click listener for the whole line (show info)
          * @param route for toast
          */
         void showRouteFullDirection(Route route);
 
         /**
          * Show the line with all the stops in the line screen
          * @param route partial line info
          */
         void requestShowingRoute(Route route);
     }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/adapters/SquareStopAdapter.java b/app/src/main/java/it/reyboz/bustorino/adapters/SquareStopAdapter.java
index 4ff5e5b..9505a23 100644
--- a/app/src/main/java/it/reyboz/bustorino/adapters/SquareStopAdapter.java
+++ b/app/src/main/java/it/reyboz/bustorino/adapters/SquareStopAdapter.java
@@ -1,159 +1,157 @@
 /*
 	BusTO  - UI components
     Copyright (C) 2017 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.adapters;
 
-import android.location.Location;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.GPSPoint;
-import it.reyboz.bustorino.backend.RouteWithStop;
 import it.reyboz.bustorino.backend.Stop;
 import it.reyboz.bustorino.util.StopSorterByDistance;
 import it.reyboz.bustorino.fragments.FragmentListenerMain;
 
 import java.util.Collections;
 import java.util.List;
 
 public class SquareStopAdapter extends RecyclerView.Adapter<SquareStopAdapter.SquareViewHolder> {
-    private final static int layoutRes = R.layout.stop_card;
+    private final static int layoutRes = R.layout.item_stop_nearby_card;
     //private List<Stop> stops;
     private @Nullable GPSPoint userPosition;
     private FragmentListenerMain listener;
     private List<Stop> stops;
 
     public SquareStopAdapter(@Nullable List<Stop> stopList, FragmentListenerMain fragmentListener, @Nullable GPSPoint pos) {
         listener  = fragmentListener;
         userPosition = pos;
         stops = stopList;
     }
 
 
 
     @Override
     public SquareViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         final View view = LayoutInflater.from(parent.getContext()).inflate(layoutRes, parent, false);
         //sort the stops by distance
         if(stops != null && stops.size() > 0)
             Collections.sort(stops,new StopSorterByDistance(userPosition));
         return new SquareViewHolder(view);
     }
 
     @Override
     public void onBindViewHolder(SquareViewHolder holder, int position) {
             //DO THE ACTUAL WORK TO PUT THE DATA
         if(stops==null || stops.size() == 0) return; //NO STOPS
         final Stop stop = stops.get(position);
         if(stop!=null){
             if(stop.getDistanceFromLocation(userPosition)!=Double.POSITIVE_INFINITY){
                 Double distance = stop.getDistanceFromLocation(userPosition);
                 holder.distancetextView.setText(distance.intValue()+" m");
             } else {
                 holder.distancetextView.setVisibility(View.GONE);
             }
             holder.stopNameView.setText(stop.getStopDisplayName());
             holder.stopIDView.setText(stop.ID);
             String whatStopsHere = stop.routesThatStopHereToString();
             if(whatStopsHere == null) {
                 holder.routesView.setVisibility(View.GONE);
             } else {
                 holder.routesView.setText(whatStopsHere);
                 holder.routesView.setVisibility(View.VISIBLE); // might be GONE due to View Holder Pattern
             }
             holder.stopID =stop.ID;
         } else {
             Log.w("SquareStopAdapter","!! The selected stop is null !!");
         }
     }
 
     @Override
     public int getItemCount() {
         return stops.size();
     }
 
     class SquareViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener  {
         TextView stopIDView;
         TextView stopNameView;
         TextView routesView;
         TextView distancetextView;
         String stopID;
 
         SquareViewHolder(View holdView){
             super(holdView);
             holdView.setOnClickListener(this);
             stopIDView = (TextView) holdView.findViewById(R.id.stop_numberText);
             stopNameView = (TextView) holdView.findViewById(R.id.stop_nameText);
             routesView = (TextView) holdView.findViewById(R.id.stop_linesText);
             distancetextView = (TextView) holdView.findViewById(R.id.stop_distanceTextView);
         }
 
         @Override
         public void onClick(View v) {
             listener.requestArrivalsForStopID(stopID);
         }
 
     }
 
     public void setStops(List<Stop> newStops) {
        // this.stops = stops;
         DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new DiffUtil.Callback() {
             @Override
             public int getOldListSize() {
                 return stops.size();
             }
             @Override
             public int getNewListSize() {
                 return newStops.size();
             }
             @Override
             public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
                 var oldItem = stops.get(oldItemPosition);
                 var newItem = newStops.get(newItemPosition);
 
                 // usa un ID univoco
                 return oldItem.ID.equals(newItem.ID);
             }
 
             @Override
             public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
                 var oldItem = stops.get(oldItemPosition);
                 var newItem = newStops.get(newItemPosition);
                 return oldItem.equals(newItem);
             }
         });
         this.stops.clear();
         this.stops.addAll(newStops);
         diffResult.dispatchUpdatesTo(this);
     }
 
     public void setUserPosition(@Nullable GPSPoint userPosition) {
         this.userPosition = userPosition;
     }
     /*
     @Override
     public Stop getItem(int position) {
         return stops.get(position);
     }
     */
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/adapters/StopAdapter.java b/app/src/main/java/it/reyboz/bustorino/adapters/StopAdapter.java
index 05daef0..ca7d7c9 100644
--- a/app/src/main/java/it/reyboz/bustorino/adapters/StopAdapter.java
+++ b/app/src/main/java/it/reyboz/bustorino/adapters/StopAdapter.java
@@ -1,118 +1,126 @@
 /*
 	BusTO (backend components)
     Copyright (C) 2016 Ludovico Pavesi
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.adapters;
 
 import android.content.Context;
+import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
 import java.util.List;
 
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.Stop;
 
 /**
  * @see PalinaAdapter
  */
 public class StopAdapter extends ArrayAdapter<Stop> {
     private LayoutInflater li;
     private static final int row_layout = R.layout.entry_bus_stop;
-    private static final int busIcon = R.drawable.bus;
-    private static final int trainIcon = R.drawable.subway;
-    private static final int tramIcon = R.drawable.tram;
+    private static final int busIcon = R.drawable.ic_bus;
+    private static final int trainIcon = R.drawable.ic_subway_filled;
+    private static final int tramIcon = R.drawable.ic_tram_filled_24;
     private static final int cityIcon = R.drawable.city;
 
 
     private static class ViewHolder {
-        TextView busStopIDTextView;
-        TextView busStopNameTextView;
+        final TextView busStopIDTextView;
+        final TextView busStopNameTextView;
         //TextView busLineVehicleIcon;
-        TextView busStopLinesTextView;
-        TextView busStopLocaLityTextView;
+        final TextView busStopLinesTextView;
+        final TextView busStopLocaLityTextView;
+
+        ViewHolder(View view) {
+            busStopIDTextView = view.findViewById(R.id.busStopID);
+            busStopNameTextView = view.findViewById(R.id.busStopName);
+            busStopLinesTextView = view.findViewById(R.id.routesThatStopHere);
+            busStopLocaLityTextView = view.findViewById(R.id.busStopLocality);
+        }
     }
 
     public StopAdapter(Context context, List<Stop> stops) {
         super(context, row_layout, stops);
         li = LayoutInflater.from(context);
     }
 
     @NonNull
     @Override
     public View getView(int position, View convertView, @NonNull ViewGroup parent) {
         ViewHolder vh;
 
         if(convertView == null) {
             convertView = li.inflate(row_layout, null);
-            vh = new ViewHolder();
-            vh.busStopIDTextView = (TextView) convertView.findViewById(R.id.busStopID);
-            vh.busStopNameTextView = (TextView) convertView.findViewById(R.id.busStopName);
-            vh.busStopLinesTextView = (TextView) convertView.findViewById(R.id.routesThatStopHere);
-            vh.busStopLocaLityTextView = (TextView) convertView.findViewById(R.id.busStopLocality);
+            vh = new ViewHolder(convertView);
             convertView.setTag(vh);
         } else {
             vh = (ViewHolder) convertView.getTag();
         }
 
         Stop stop = getItem(position);
         vh.busStopIDTextView.setText(stop.ID);
 
         // NOTE: intentionally ignoring stop username in search results: if it's in the favorites, why are you searching for it?
         vh.busStopNameTextView.setText(stop.getStopDisplayName());
         String whatStopsHere = stop.routesThatStopHereToString();
         if(whatStopsHere == null) {
             vh.busStopLinesTextView.setVisibility(View.GONE);
         } else {
             vh.busStopLinesTextView.setText(whatStopsHere);
             vh.busStopLinesTextView.setVisibility(View.VISIBLE); // might be GONE due to View Holder Pattern
         }
 
+        /*
+        // DEPRECATED CODE: ALWAYS USE BUS STOP ICON
         if(stop.type == null) {
-            vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0);
+                //vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0);
         } else {
             switch(stop.type) {
                 case BUS:
                 default:
                     vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0);
                     break;
                 case METRO:
                 case RAILWAY:
                     vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(trainIcon, 0, 0, 0);
                     break;
                 case TRAM:
                     vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(tramIcon, 0, 0, 0);
                     break;
                 case LONG_DISTANCE_BUS:
                     // è l'opposto della città ma va beh, dettagli.
                     vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(cityIcon, 0, 0, 0);
             }
         }
 
+         */
+
         if (stop.location == null) {
             vh.busStopLocaLityTextView.setVisibility(View.GONE);
         } else {
             vh.busStopLocaLityTextView.setText(stop.location);
             vh.busStopLocaLityTextView.setVisibility(View.VISIBLE); // might be GONE due to View Holder Pattern
         }
 
         return convertView;
     }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java b/app/src/main/java/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
index 3a16073..f507bed 100644
--- a/app/src/main/java/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
+++ b/app/src/main/java/it/reyboz/bustorino/adapters/StopRecyclerAdapter.java
@@ -1,232 +1,236 @@
 /*
 	BusTO  - Adapter components
     Copyright (C) 2021 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.adapters;
 
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.List;
 import java.util.Locale;
 
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.Stop;
 
 public class StopRecyclerAdapter extends RecyclerView.Adapter<StopRecyclerAdapter.ViewHolder> {
     private List<Stop> stops;
     private static final int ITEM_LAYOUT_FAVORITES = R.layout.entry_bus_stop;
     private static final int ITEM_LAYOUT_LINES = R.layout.stop_line_element;
-    private static final int busIcon = R.drawable.bus;
-    private static final int trainIcon = R.drawable.subway;
-    private static final int tramIcon = R.drawable.tram;
+    private static final int busIcon = R.drawable.ic_bus;
+    private static final int trainIcon = R.drawable.ic_subway_filled;
+    private static final int tramIcon = R.drawable.ic_tram_filled_24;
     private static final int cityIcon = R.drawable.city;
 
     private NameCapitalize capitalizeLocation = NameCapitalize.DO_NOTHING;
     private final Use usedFor;
 
     private final StopAdapterListener listener;
     private int position;
 
 
 
     protected static class ViewHolder extends RecyclerView.ViewHolder implements View.OnCreateContextMenuListener{
         TextView busStopIDTextView;
         TextView busStopNameTextView;
         //TextView busLineVehicleIcon;
         TextView busStopLinesTextView;
         TextView busStopLocaLityTextView;
 
         View topStub, bottomStub;
         Stop mStop;
 
         int menuResID=R.menu.menu_favourites_entry;
 
         public ViewHolder(@NonNull View itemView, StopAdapterListener listener, Use usedFor) {
             super(itemView);
             busStopIDTextView = itemView.findViewById(R.id.busStopID);
             busStopNameTextView = itemView.findViewById(R.id.busStopName);
             busStopLinesTextView = itemView.findViewById(R.id.routesThatStopHere);
             busStopLocaLityTextView = itemView.findViewById(R.id.busStopLocality);
             switch (usedFor){
                 case LINES:
                     topStub = itemView.findViewById(R.id.topStub);
                     bottomStub = itemView.findViewById(R.id.bottomStub);
                     menuResID = R.menu.menu_line_item;
                     break;
                 case FAVORITES:
                 default:
                     topStub = null;
                     bottomStub = null;
             }
 
             mStop = new Stop("");
 
             itemView.setOnClickListener(view -> {
                 listener.onTappedStop(mStop);
             });
         }
         //many thanks to https://stackoverflow.com/questions/26466877/how-to-create-context-menu-for-recyclerview
         @Override
         public void onCreateContextMenu(ContextMenu contextMenu, View view, ContextMenu.ContextMenuInfo contextMenuInfo) {
             MenuInflater inflater = new MenuInflater(view.getContext());
             inflater.inflate(menuResID, contextMenu);
         }
     }
 
     public StopRecyclerAdapter(List<Stop> stops, StopAdapterListener listener, Use usedFor) {
         this.stops = stops;
         this.listener = listener;
         this.usedFor = usedFor;
     }
     public StopRecyclerAdapter(List<Stop> stops, StopAdapterListener listener, Use usedFor, NameCapitalize locationCapit) {
         this.stops = stops;
         this.listener = listener;
         this.usedFor = usedFor;
         this.capitalizeLocation = locationCapit;
     }
 
     public NameCapitalize getCapitalizeLocation() {
         return capitalizeLocation;
     }
 
     public void setCapitalizeLocation(NameCapitalize capitalizeLocation) {
         this.capitalizeLocation = capitalizeLocation;
         notifyDataSetChanged();
     }
 
     public void setStops(List<Stop> stops){
         this.stops = stops;
         notifyDataSetChanged();
     }
 
     public List<Stop> getStops() {
         return stops;
     }
 
     public int getPosition() {
         return position;
     }
 
     public void setPosition(int position) {
         this.position = position;
     }
 
     @NonNull
     @Override
     public StopRecyclerAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         final int layoutID;
         switch (usedFor){
             case LINES:
                 layoutID = ITEM_LAYOUT_LINES;
                 break;
             case FAVORITES:
             default:
                 layoutID = ITEM_LAYOUT_FAVORITES;
 
         }
         View view = LayoutInflater.from(parent.getContext())
                 .inflate(layoutID, parent, false);
 
         return  new StopRecyclerAdapter.ViewHolder(view, listener, this.usedFor);
     }
 
     @Override
     public void onViewRecycled(@NonNull StopRecyclerAdapter.ViewHolder holder) {
         holder.itemView.setOnLongClickListener(null);
         super.onViewRecycled(holder);
     }
 
     @Override
     public void onBindViewHolder(@NonNull StopRecyclerAdapter.ViewHolder vh, int position) {
         //Log.d("StopRecyclerAdapter", "Called for position "+position);
         Stop stop = stops.get(position);
         vh.busStopIDTextView.setText(stop.ID);
         vh.mStop = stop;
         //Log.d("StopRecyclerAdapter", "Stop: "+stop.ID);
 
         // NOTE: intentionally ignoring stop username in search results: if it's in the favorites, why are you searching for it?
         vh.busStopNameTextView.setText(stop.getStopDisplayName());
         String whatStopsHere = stop.routesThatStopHereToString();
         if(whatStopsHere == null) {
             vh.busStopLinesTextView.setVisibility(View.GONE);
         } else {
             vh.busStopLinesTextView.setText(whatStopsHere);
             vh.busStopLinesTextView.setVisibility(View.VISIBLE); // might be GONE due to View Holder Pattern
         }
+        /*
+        //This is deprecated, always showing a bus
 
         if(stop.type == null) {
             vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0);
         } else {
             switch(stop.type) {
                 case BUS:
                 default:
                     vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(busIcon, 0, 0, 0);
                     break;
                 case METRO:
                 case RAILWAY:
                     vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(trainIcon, 0, 0, 0);
                     break;
                 case TRAM:
                     vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(tramIcon, 0, 0, 0);
                     break;
                 case LONG_DISTANCE_BUS:
                     // è l'opposto della città ma va beh, dettagli.
                     vh.busStopLinesTextView.setCompoundDrawablesWithIntrinsicBounds(cityIcon, 0, 0, 0);
             }
         }
 
+         */
+
         if (stop.location == null || stop.location.toLowerCase(Locale.ROOT).equals("null")) {
             vh.busStopLocaLityTextView.setVisibility(View.GONE);
         } else {
             vh.busStopLocaLityTextView.setText(NameCapitalize.capitalizePass(stop.location, capitalizeLocation));
             vh.busStopLocaLityTextView.setVisibility(View.VISIBLE); // might be GONE due to View Holder Pattern
         }
         //trick to set the position
         vh.itemView.setOnLongClickListener(view -> {
             setPosition(vh.getAdapterPosition());
             return false;
         });
         if(this.usedFor == Use.LINES){
 
             //vh.menuResID;
             vh.bottomStub.setVisibility(View.VISIBLE);
             vh.topStub.setVisibility(View.VISIBLE);
             if(position == 0) {
                 vh.topStub.setVisibility(View.INVISIBLE);
             }
             else if (position == stops.size()-1) {
                 vh.bottomStub.setVisibility(View.GONE);
             }
         }
     }
 
     @Override
     public int getItemCount() {
         return stops.size();
     }
 
     public enum  Use{
         FAVORITES, LINES
     }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/backend/KotlinUtils.kt b/app/src/main/java/it/reyboz/bustorino/backend/KotlinUtils.kt
new file mode 100644
index 0000000..ab5e7c5
--- /dev/null
+++ b/app/src/main/java/it/reyboz/bustorino/backend/KotlinUtils.kt
@@ -0,0 +1,13 @@
+package it.reyboz.bustorino.backend
+
+import android.content.Context
+import android.content.res.Configuration
+
+object KotlinUtils {
+
+    @JvmStatic
+    fun isDarkTheme(context: Context): Boolean {
+        val uiMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+        return uiMode == Configuration.UI_MODE_NIGHT_YES
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/backend/VehicleUtils.kt b/app/src/main/java/it/reyboz/bustorino/backend/VehicleUtils.kt
index 4c95abb..4861ad2 100644
--- a/app/src/main/java/it/reyboz/bustorino/backend/VehicleUtils.kt
+++ b/app/src/main/java/it/reyboz/bustorino/backend/VehicleUtils.kt
@@ -1,92 +1,94 @@
 package it.reyboz.bustorino.backend
 
 import it.reyboz.bustorino.backend.VehicleUtils.VehicleType
 import java.util.Locale.getDefault
 
 data class VehicleClassInfo(
     val vehClass: Int,
     val name: String,
     val kindString: String,
     val type: VehicleType,
     val matricolaStart: Int,
     val matricolaEnd: Int,
 ) {
     constructor(vehicleClass: Int, name: String, type: String, matricolaStart: Int, matricolaEnd: Int) : this(
         vehicleClass, name, type,VehicleType.fromString(type), matricolaStart, matricolaEnd
     )
 }
 
 object VehicleUtils {
-    private val items = listOf(
-        VehicleClassInfo(2800, "Arancio", "Tram", 2801, 2857),
-        VehicleClassInfo(2800, "Arancio", "Tram", 2858, 2902),
-        VehicleClassInfo(5000, "5000", "Tram", 5000, 5053),
-        VehicleClassInfo(6000, "6000", "Tram", 6000, 6005),
-        VehicleClassInfo(6000, "6000", "Tram", 6006, 6054),
-        VehicleClassInfo(8000, "Hitachi", "Tram", 8000, 8099),
-        VehicleClassInfo(800, "Citelis 18m", "Bus 18m", 790, 797),
-        VehicleClassInfo(800, "Citelis 18m", "Bus 18m", 800, 869),
-        VehicleClassInfo(800, "Citelis 18m", "Bus 18m", 870, 874),
-        VehicleClassInfo(800, "Citelis 18m", "Bus 18m", 1310, 1313),
-        VehicleClassInfo(1350, "Conecto 18m", "Bus 18m", 1350, 1396),
-        VehicleClassInfo(9300, "UrbanWay 18m", "Bus 18m", 9300, 9318),
-        VehicleClassInfo(9300, "UrbanWay 18m", "Bus 18m", 9320, 9356),
-        VehicleClassInfo(30, "BYD K9", "E-Bus", 30, 49),
+    val items = listOf(
+        VehicleClassInfo(30, "BYD K9UB", "E-Bus", 30, 49),
         VehicleClassInfo(50, "BYD K7", "E-Bus", 50, 57),
-        VehicleClassInfo(60, "MiniBusE", "E-Bus", 60, 81),
-        VehicleClassInfo(110, "Neocity", "Bus", 110, 115),
-        VehicleClassInfo(2300, "Cityclass", "Bus", 2300, 2349),
-        VehicleClassInfo(3400, "Conecto", "Bus", 2400, 2447),
-        VehicleClassInfo(2300, "Cityclass", "Bus", 2700, 2787),
-        VehicleClassInfo(3000, "Citelis", "Bus", 3000, 3099),
-        VehicleClassInfo(3000, "Citelis", "Bus", 3300, 3380),
-        VehicleClassInfo(3400, "Conecto", "Bus", 3400, 3440),
-        VehicleClassInfo(9000, "BYD K9", "E-Bus", 9000, 9059),
-        VehicleClassInfo(9000, "BYD K9", "E-Bus", 9060, 9119),
-        VehicleClassInfo(9000, "BYD K9", "E-Bus", 9120, 9121),
-        VehicleClassInfo(9200, "Citymood", "Bus", 9200, 9251),
-        VehicleClassInfo(9200, "Citymood", "Bus", 9252, 9261),
+        VehicleClassInfo(60, "Indcar BlueBus", "E-Bus", 60, 88),
+        VehicleClassInfo(110, "BMC Neocity", "Bus", 110, 115),
+        VehicleClassInfo(800, "Irisbus Citelis 18m", "Bus 18m", 790, 797),
+        VehicleClassInfo(800, "Irisbus Citelis 18m", "Bus 18m", 800, 869),
+        VehicleClassInfo(800, "Irisbus Citelis 18m ", "Bus 18m", 870, 874),
+        VehicleClassInfo(800, "Irisbus Citelis CNG 18m", "Bus 18m", 1310, 1313),
+        VehicleClassInfo(1350, "Mercedes Conecto 18m", "Bus 18m", 1350, 1396),
+        VehicleClassInfo(2300, "Irisbus CityClass", "Bus", 2300, 2349),
+        VehicleClassInfo(3400, "Mercedes Conecto", "Bus", 2400, 2447),
+        VehicleClassInfo(2300, "Irisbus CityClass", "Bus", 2700, 2787),
+        VehicleClassInfo(2800, "2800 (prima serie)", "Tram", 2801, 2857),
+        VehicleClassInfo(2800, "2800 (seconda serie)", "Tram", 2858, 2902),
+        VehicleClassInfo(3000, "Irisbus Citelis", "Bus", 3000, 3099),
+        VehicleClassInfo(3000, "Irisbus Citelis", "Bus", 3300, 3380),
+        VehicleClassInfo(3400, "Mercedes Conecto", "Bus", 3400, 3440),
+        VehicleClassInfo(5000, "P.R. (5000)", "Tram", 5000, 5053),
+        VehicleClassInfo(6000, "CityWay (6000) monodir.", "Tram", 6000, 6005),
+        VehicleClassInfo(6000, "CityWay (6000) bidir.", "Tram", 6006, 6054),
+        VehicleClassInfo(8000, "Hitachi (8000)", "Tram", 8000, 8099),
+        VehicleClassInfo(9000, "BYD K9UB", "E-Bus", 9000, 9059),
+        VehicleClassInfo(9000, "BYD K9UB", "E-Bus", 9060, 9119),
+        VehicleClassInfo(9000, "BYD K9UB", "E-Bus", 9120, 9121),
+        VehicleClassInfo(9200, "Menarini Citymood", "Bus", 9200, 9251),
+        VehicleClassInfo(9200, "Menarini Citymood", "Bus", 9252, 9261),
+        VehicleClassInfo(9300, "Iveco Urbanway 18m", "Bus 18m", 9300, 9318),
+        VehicleClassInfo(9300, "Iveco Urbanway 18m", "Bus 18m", 9320, 9356),
         VehicleClassInfo(9400, "Iveco E-Way", "E-Bus", 9400, 9599),
-        VehicleClassInfo(9600, "Iveco E-Way 18m", "E-Bus", 9600, 9699)
+        VehicleClassInfo(9600, "Iveco E-Way 18m", "E-Bus", 9600, 9699),
+        VehicleClassInfo(9700, "Iveco E-Way 18m BRT", "E-Bus", 9700, 9799)
     )
 
+
     fun getTypeForLabel(label: String): VehicleClassInfo? {
         try {
             val matricola = Integer.parseInt(label)
             for (el in items) {
                 if(matricola >= el.matricolaStart && matricola<= el.matricolaEnd) {
                     return el
                 }
             }
             return null
 
         } catch (e: Exception) {
             return null
         }
     }
     enum class VehicleType {
         BUS, TRAM, ELECTRIC_BUS;
 
         fun getName(): String {
             return when (this) {
                 BUS -> "Bus"
                 TRAM -> "Tram"
                 ELECTRIC_BUS -> "E-Bus"
             }
         }
 
         companion object {
             @JvmStatic
             fun fromString(string: String): VehicleType {
                 return when (string.lowercase(getDefault())) {
                     "bus" -> BUS
                     "bus 18m" -> BUS
                     "tram" -> TRAM
                     "e-bus" -> ELECTRIC_BUS
                     "e-bus 18m" -> ELECTRIC_BUS
                     else -> throw IllegalArgumentException("Unknown vehicle type: $string")
                 }
             }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/data/GtfsMaintenanceWorker.kt b/app/src/main/java/it/reyboz/bustorino/data/GtfsMaintenanceWorker.kt
index ea4489e..39a07d3 100644
--- a/app/src/main/java/it/reyboz/bustorino/data/GtfsMaintenanceWorker.kt
+++ b/app/src/main/java/it/reyboz/bustorino/data/GtfsMaintenanceWorker.kt
@@ -1,58 +1,58 @@
 package it.reyboz.bustorino.data
 
 import android.content.Context
 import androidx.core.app.NotificationCompat
 import androidx.work.*
 import it.reyboz.bustorino.R
 import it.reyboz.bustorino.backend.Notifications
 
 class GtfsMaintenanceWorker(appContext: Context, workerParams: WorkerParameters)
     : CoroutineWorker(appContext, workerParams)  {
     override suspend fun doWork(): Result {
         val data = inputData.getString(OPERATION_TYPE)
         if(data ==null){
             return Result.failure()
         }
         val result = when (data){
             CLEAR_GTFS_TRIPS ->clearGtfsTrips()
             else -> {Result.failure()}
         }
         return result
     }
     private fun clearGtfsTrips(): Result{
         val gtfsRepository = GtfsRepository(applicationContext)
         gtfsRepository.gtfsDao.deleteAllTrips()
 
         return Result.success()
     }
     override suspend fun getForegroundInfo(): ForegroundInfo {
 
         val context = applicationContext
         Notifications.createDBNotificationChannelIfNeeded(context)
 
         val notification = NotificationCompat.Builder(context, Notifications.DB_UPDATE_CHANNELS_ID)
             //.setContentIntent(PendingIntent.getActivity(context, 0, Intent(context, MainActivity::class.java), Constants.PENDING_INTENT_FLAG_IMMUTABLE))
-            .setSmallIcon(R.drawable.bus)
+            .setSmallIcon(R.drawable.ic_bus)
             .setOngoing(true)
             .setAutoCancel(true)
             .setOnlyAlertOnce(true)
             .setPriority(NotificationCompat.PRIORITY_MIN)
             .setContentTitle(context.getString(R.string.app_name))
             .setLocalOnly(true)
             .setVisibility(NotificationCompat.VISIBILITY_SECRET)
             .setContentText("Database maintenance")
             .build()
         return ForegroundInfo(3671672811121.toInt(), notification)
     }
     companion object{
         const val CLEAR_GTFS_TRIPS="trips_clear"
         const val OPERATION_TYPE="oper_type"
         fun makeOneTimeRequest(type: String): OneTimeWorkRequest {
             val data = Data.Builder().putString(OPERATION_TYPE, type).build()
             return OneTimeWorkRequest.Builder(GtfsMaintenanceWorker::class.java)
                 .setInputData(data).setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
                 .addTag(type)
                 .build()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java b/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java
index c08a194..07f802a 100644
--- a/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java
+++ b/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java
@@ -1,108 +1,133 @@
 /*
 	BusTO - Data components
     Copyright (C) 2021 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.data;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatDelegate;
 import it.reyboz.bustorino.R;
 
 import static android.content.Context.MODE_PRIVATE;
 
 import androidx.preference.PreferenceManager;
+import it.reyboz.bustorino.backend.KotlinUtils;
 import it.reyboz.bustorino.fragments.SettingsFragment;
 import it.reyboz.bustorino.map.MapLibreUtils;
 
 import java.util.HashSet;
 import java.util.Set;
 
 /**
  * Static class for commonly used SharedPreference operations
  */
 public abstract class PreferencesHolder {
 
     public static final String PREF_GTFS_DB_VERSION = "gtfs_db_version";
     public static final String PREF_INTRO_ACTIVITY_RUN ="pref_intro_activity_run";
     public static final String DB_GTT_VERSION_KEY = "NextGenDB.GTTVersion";
     public static final String DB_LAST_UPDATE_KEY = "NextGenDB.LastDBUpdate";
     public static final String PREF_FAVORITE_LINES = "pref_favorite_lines";
 
+    // match the one in preferences.xml
+    public static final String PREF_THEME_DAY_NIGHT = "app_theme_day_night";
+
     public static final Set<String> KEYS_MERGE_SET = Set.of(PREF_FAVORITE_LINES);
     public static final Set<String> IGNORE_KEYS_LOAD_MAIN = Set.of(PREF_GTFS_DB_VERSION, PREF_INTRO_ACTIVITY_RUN, DB_GTT_VERSION_KEY, DB_LAST_UPDATE_KEY);
 
     public static SharedPreferences getMainSharedPreferences(Context context){
         return context.getSharedPreferences(context.getString(R.string.mainSharedPreferences), MODE_PRIVATE);
     }
 
     public static SharedPreferences getAppPreferences(Context con){
         return PreferenceManager.getDefaultSharedPreferences(con);
     }
 
     public static int getGtfsDBVersion(SharedPreferences pref){
         return pref.getInt(PREF_GTFS_DB_VERSION,-1);
     }
     public static void setGtfsDBVersion(SharedPreferences pref,int version){
         SharedPreferences.Editor ed = pref.edit();
         ed.putInt(PREF_GTFS_DB_VERSION,version);
         ed.apply();
     }
 
     /**
      * Check if the introduction activity has been run at least one
      * @param con the context needed
      * @return true if it has been run
      */
     public static boolean hasIntroFinishedOneShot(Context con){
         final SharedPreferences pref = getMainSharedPreferences(con);
         return pref.getBoolean(PREF_INTRO_ACTIVITY_RUN, false);
     }
 
     public static boolean addOrRemoveLineToFavorites(Context con, String gtfsLineId, boolean addToFavorites){
         final SharedPreferences pref = getMainSharedPreferences(con);
         final HashSet<String> favorites = new HashSet<>(pref.getStringSet(PREF_FAVORITE_LINES, new HashSet<>()));
         boolean modified = true;
         if(addToFavorites)
             favorites.add(gtfsLineId);
         else if(favorites.contains(gtfsLineId))
             favorites.remove(gtfsLineId);
         else
             modified = false; // we are not changing anything
         if(modified) {
             final SharedPreferences.Editor editor = pref.edit();
             editor.putStringSet(PREF_FAVORITE_LINES, favorites);
             editor.apply();
         }
         return modified;
     }
 
     public static HashSet<String> getFavoritesLinesGtfsIDs(@NonNull Context con){
         final SharedPreferences pref = getMainSharedPreferences(con);
         return new HashSet<>(pref.getStringSet(PREF_FAVORITE_LINES, new HashSet<>()));
     }
 
     public static String getMapLibreStyleFile(Context con){
         final SharedPreferences pref = getAppPreferences(con);
         final String mapStyle_val = pref.getString(SettingsFragment.LIBREMAP_STYLE_PREF_KEY, "");
-        return switch (mapStyle_val) {
+        final boolean isNightMode = KotlinUtils.isDarkTheme(con);
+        String styleFile;
+        switch (mapStyle_val) {
             //MUST MATCH IN keys.xml ->  map_style_pref_values
-            case "versatiles_c" -> MapLibreUtils.STYLE_VERSATILES_COLORFUL_JSON;
-            case "osm_legacy" -> MapLibreUtils.STYLE_OSM_RASTER;
-            default -> MapLibreUtils.getDefaultStyleJson();
+            case "osm_legacy":
+                styleFile = MapLibreUtils.STYLE_OSM_RASTER;
+                break;
+            case "versatiles_c":
+            default:
+                styleFile = (isNightMode) ? MapLibreUtils.STYLE_VERSATILES_ECLIPSE_JSON : MapLibreUtils.STYLE_VERSATILES_COLORFUL_JSON;
+        }
+        return styleFile;
+    }
+
+    public static Integer getAppThemeDayNight(Context context){
+        final SharedPreferences pref = getAppPreferences(context);
+        final var value = pref.getString(PREF_THEME_DAY_NIGHT, "");
+        return getAppThemeDayNight(value);
+    }
+    public static Integer getAppThemeDayNight(String prefValue){
+        return switch (prefValue){
+            case "day" -> AppCompatDelegate.MODE_NIGHT_NO;
+            case "night" -> AppCompatDelegate.MODE_NIGHT_YES;
+            case "system" -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
+            default -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
         };
     }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt
index e487c29..203372d 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/GeneralMapLibreFragment.kt
@@ -1,1210 +1,1231 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2025 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.fragments
 
 import android.Manifest
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Context.LOCATION_SERVICE
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.location.Location
 import android.location.LocationManager
 import android.os.Bundle
 import android.util.Log
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.cardview.widget.CardView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.gson.JsonObject
 import it.reyboz.bustorino.BuildConfig
 import it.reyboz.bustorino.R
 import it.reyboz.bustorino.backend.FiveTNormalizer
 import it.reyboz.bustorino.backend.LivePositionTripPattern
 import it.reyboz.bustorino.backend.LivePositionsServiceStatus
 import it.reyboz.bustorino.backend.Stop
 import it.reyboz.bustorino.backend.VehicleUtils
 import it.reyboz.bustorino.backend.gtfs.GtfsUtils
 import it.reyboz.bustorino.backend.gtfs.LivePositionUpdate
 import it.reyboz.bustorino.backend.utils
 import it.reyboz.bustorino.data.PreferencesHolder
 import it.reyboz.bustorino.data.gtfs.TripAndPatternWithStops
 import it.reyboz.bustorino.map.MapLibreLocationEngine
 import it.reyboz.bustorino.map.MapLibreUtils
 import it.reyboz.bustorino.middleware.FusedNativeLocationProvider
 import it.reyboz.bustorino.util.Permissions
 import it.reyboz.bustorino.util.ViewUtils
 import it.reyboz.bustorino.viewmodels.LivePositionsViewModel
 import it.reyboz.bustorino.viewmodels.MapStateViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.maplibre.android.MapLibre
 import org.maplibre.android.camera.CameraPosition
 import org.maplibre.android.geometry.LatLng
 import org.maplibre.android.location.LocationComponent
 import org.maplibre.android.location.LocationComponentActivationOptions
 import org.maplibre.android.location.engine.LocationEngineCallback
 import org.maplibre.android.location.engine.LocationEngineRequest
 import org.maplibre.android.location.engine.LocationEngineResult
 import org.maplibre.android.maps.MapLibreMap
 import org.maplibre.android.maps.MapView
 import org.maplibre.android.maps.OnMapReadyCallback
 import org.maplibre.android.maps.Style
 import org.maplibre.android.plugins.annotation.Symbol
 import org.maplibre.android.plugins.annotation.SymbolManager
 import org.maplibre.android.plugins.annotation.SymbolOptions
 import org.maplibre.android.style.expressions.Expression
 import org.maplibre.android.style.layers.Property.ICON_ANCHOR_CENTER
 import org.maplibre.android.style.layers.Property.ICON_ROTATION_ALIGNMENT_MAP
 import org.maplibre.android.style.layers.Property.TEXT_ANCHOR_CENTER
 import org.maplibre.android.style.layers.Property.TEXT_ROTATION_ALIGNMENT_VIEWPORT
 import org.maplibre.android.style.layers.PropertyFactory
 import org.maplibre.android.style.layers.SymbolLayer
 import org.maplibre.android.style.sources.GeoJsonSource
 import org.maplibre.geojson.Feature
 import org.maplibre.geojson.FeatureCollection
 import org.maplibre.geojson.Point
 import kotlin.time.Duration.Companion.milliseconds
 
 abstract class GeneralMapLibreFragment: ScreenBaseFragment(), OnMapReadyCallback {
     protected var map: MapLibreMap? = null
     protected var shownStopInBottomSheet : Stop? = null
     //protected var savedMapStateOnPause : Bundle? = null
 
 
     protected var fragmentListener: CommonFragmentListener? = null
 
     // Declare a variable for MapView
     protected var mapView: MapView? = null
     protected lateinit var mapStyle: Style
     protected lateinit var stopsSource: GeoJsonSource
     protected lateinit var busesSource: GeoJsonSource
     protected lateinit var selectedStopSource: GeoJsonSource
     protected lateinit var selectedBusSource: GeoJsonSource //= GeoJsonSource(SEL_BUS_SOURCE)
 
     protected lateinit var sharedPreferences: SharedPreferences
     protected lateinit var bottomSheetBehavior: BottomSheetBehavior<ConstraintLayout>
 
     protected var locationEngine: MapLibreLocationEngine? = null
     protected var locationProvider: FusedNativeLocationProvider? = null
 
     protected var shownToastNoPosition = false
     protected var locationEnabledOnDevice = true
     protected var busLayerStarted = false
 
     //TODO ACTIVATE THIS
     private val preferenceChangeListener = SharedPreferences.OnSharedPreferenceChangeListener(){ pref, key ->
         /*when(key){
             SettingsFragment.LIBREMAP_STYLE_PREF_KEY -> reloadMap()
         }
 
          */
         if(key == SettingsFragment.LIBREMAP_STYLE_PREF_KEY){
             Log.d(DEBUG_TAG,"ASKING RELOAD OF MAP")
 
             //reloadMap()
         }
     }
 
     /**
      * What to do when requesting the permission, when it's ok, initialize the map location component
      */
     protected val positionRequestResponder = registerForActivityResult(
         ActivityResultContracts.RequestMultiplePermissions(), ActivityResultCallback{ res ->
             if(!(res.containsKey(PERM_LOC_COARSE)&&res.containsKey(PERM_LOC_FINE))){
                 Log.e(DEBUG_TAG, "Location request does not have the correct keys")
             } else if(res[PERM_LOC_COARSE]!! && res[PERM_LOC_FINE]!!){
                 //permission OK, init map location
                 val mMap = map
                 if(mMap == null){
                     Log.w(DEBUG_TAG, "Location request completed, but map is null!")
                 }else{
                     initializeMapLocationComponent(mMap,requireContext(), null)
                 }
             } else{
                 // PERMISSION DENIED
                 // TODO find better way to show the necessity of the permission
                 if(shouldShowRequestPermissionRationale(PERM_LOC_FINE))
                     Toast.makeText(requireContext(),
                         R.string.enable_position_message_map, Toast.LENGTH_SHORT).show()
             }
         }
     )
     //Bottom sheet behavior in GeneralMapLibreFragment
     protected var bottomLayout: ConstraintLayout? = null
     protected lateinit var stopTitleTextView: TextView
     protected lateinit var stopNumberTextView: TextView
     protected lateinit var linesPassingTextView: TextView
     protected lateinit var extraBottomTextView: TextView
+    protected lateinit var linesBottomTextView: TextView
     protected lateinit var arrivalsCard: CardView
     protected lateinit var directionsCard: CardView
     protected lateinit var bottomrightImage: ImageView
     protected lateinit var locationComponent: LocationComponent
     protected lateinit var busPositionsIconButton: ImageButton
     protected lateinit var vehicleIcon: ImageView
 
     protected var lastLocation : Location? = null
 
 
     private var lastMapStyle =""
 
     //BUS POSITIONS
     protected val updatesByVehDict = HashMap<String, LivePositionTripPattern>(5)
     protected val animatorsByVeh = HashMap<String, ValueAnimator>()
     protected var vehShowing: String? = null
     protected var lastUpdateTime:Long = -2
     protected var jobUpdate: Job? = null
 
     //private val lifecycleOwnerLiveData = viewLifecycleOwnerLiveData
 
 
     //extra items to use the LibreMap
     protected var symbolManager : SymbolManager? = null
     protected var stopActiveSymbol: Symbol? = null
     protected var stopsLayerStarted = false
     protected val livePositionsViewModel : LivePositionsViewModel by activityViewModels()
 
     //private lateinit var symbolManager: SymbolManager
     protected val mapStateViewModel: MapStateViewModel by viewModels()
     protected var locationInitialized = false
     protected var mapInitialized = false
     protected var receivedFirstLocation = false
 
 
     //location callback to decide if to zoom to the user position
     @SuppressLint("MissingPermission")
     protected val mapLibreLocationCallback = object : LocationEngineCallback<LocationEngineResult> {
         override fun onSuccess(result: LocationEngineResult) {
             val location: Location? = result.lastLocation
             Log.d(DEBUG_TAG, "Received location $location")
             location?.let {
                 //check timing of the location
                 val currentTime = System.currentTimeMillis()
                 val discard = (currentTime - it.time) > 90 * 1000.0  // discard if it is Older than 60 seconds
                 if(!discard) {
                     if (!receivedFirstLocation) {
                         onFirstReceivedLocation(it)
                     }
                     receivedFirstLocation = true
                 }
             }
 
             if(receivedFirstLocation){
                 //remove this listener once we have received the location
                 locationEngine?.removeLocationUpdates(this)
             }
 
         }
 
         override fun onFailure(exception: Exception) {
             Log.e(DEBUG_TAG, "Error in getting position: ${exception.message}")
         }
     }
 
     protected val deviceLocationStatusListener = FusedNativeLocationProvider.LocationStatusListener { isEnabled ->
         mapStateViewModel.locationDeviceEnabled.value = isEnabled
         if(locationEnabledOnDevice && !isEnabled && locationInitialized) {
             warnLocationNotEnabledOnDevice()
             //setMapLocationEnabled(false)
         }
         locationEnabledOnDevice = isEnabled
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         //sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
         lastMapStyle = PreferencesHolder.getMapLibreStyleFile(requireContext())
 
         //init map
         MapLibre.getInstance(requireContext())
 
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         //TODO: Re-create map when this preference changes
         lastMapStyle = PreferencesHolder.getMapLibreStyleFile(requireContext())
         Log.d(DEBUG_TAG, "onCreateView lastMapStyle: $lastMapStyle")
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     protected fun initBottomSheet(view: View){
         val bottomSheet = view.findViewById<ConstraintLayout>(R.id.bottom_sheet)
         bottomLayout = bottomSheet
         stopTitleTextView = view.findViewById(R.id.stopTitleTextView)
         stopNumberTextView = view.findViewById(R.id.stopNumberTextView)
         linesPassingTextView = view.findViewById(R.id.descriptionTextView)
         arrivalsCard = view.findViewById(R.id.arrivalsCardButton)
         directionsCard = view.findViewById(R.id.directionsCardButton)
         vehicleIcon = view.findViewById(R.id.vehicleIcon)
+        linesBottomTextView = view.findViewById(R.id.linesBottomTextView)
+        linesBottomTextView.text = getString(R.string.lines_fill, "")
         bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet)
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
 
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         //init bottom sheet
         initBottomSheet(view)
 
         bottomrightImage = view.findViewById(R.id.rightmostImageView)
         extraBottomTextView = view.findViewById(R.id.extraBottomTextView)
 
     }
 
     override fun onResume() {
         super.onResume()
         mapView?.onResume()
         val newMapStyle = PreferencesHolder.getMapLibreStyleFile(requireContext())
         Log.d(DEBUG_TAG, "onResume newMapStyle: $newMapStyle, lastMapStyle: $lastMapStyle")
         // TODO: reload style if user changed preferences
         //if(newMapStyle!=lastMapStyle){
         //    reloadMap()
         //}
         if(busLayerStarted)
             updatePositionsIcons(false)
     }
 
     override fun onLowMemory() {
         mapView?.onLowMemory()
         super.onLowMemory()
     }
 
     override fun onStart() {
         super.onStart()
         mapView?.onStart()
     }
 
     override fun onDestroy() {
         mapView?.onDestroy()
         Log.d(DEBUG_TAG, "Destroyed mapView Fragment!!")
         busLayerStarted = false
         super.onDestroy()
     }
 
     override fun onStop() {
         locationProvider?.removeListener(deviceLocationStatusListener)
         mapView?.onStop()
         super.onStop()
     }
 
     override fun onPause() {
         jobUpdate?.cancel()
         mapView?.onPause()
         super.onPause()
     }
 
 
     override fun onDestroyView() {
         bottomLayout = null
         mapInitialized = false
         locationInitialized = false
         super.onDestroyView()
     }
 
     protected fun warnLocationNotEnabledOnDevice(){
         context?.let{
             Toast.makeText(it,R.string.enable_location_message,Toast.LENGTH_SHORT).show()
         }
     }
 
     protected fun reloadMap(){
         /*map?.let {
             Log.d("GeneralMapFragment", "RELOADING MAP")
             //save map state
             savedMapStateOnPause = saveMapStateInBundle()
 
             onMapDestroy()
             //Destroy and recreate MAP
             mapView.onDestroy()
             mapView.onCreate(null)
             mapView.getMapAsync(this)
         }
 
          */
     }
 
     //For extra stuff to do when the map is destroyed
     abstract fun onMapDestroy()
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
         if(context is CommonFragmentListener){
             fragmentListener = context
         } else throw RuntimeException("$context must implement CommonFragmentListener")
 
     }
 
     protected fun stopToGeoJsonFeature(s: Stop): Feature{
         return Feature.fromGeometry(
             Point.fromLngLat(s.longitude!!, s.latitude!!),
             JsonObject().apply {
                 addProperty("id", s.ID)
                 addProperty("name", s.stopDefaultName)
                 //addProperty("routes", s.routesThatStopHereToString()) // Add routes array to JSON object
             }
         )
     }
     protected fun isPointInsideVisibleRegion(p: LatLng, other: Boolean): Boolean{
         val bounds = map?.projection?.visibleRegion?.latLngBounds
         var inside = other
         bounds?.let { inside = it.contains(p) }
         return inside
     }
 
     protected fun isPointInsideVisibleRegion(lat: Double, lon: Double, other: Boolean): Boolean{
         val p = LatLng(lat, lon)
         return isPointInsideVisibleRegion(p, other)
     }
 
 
     protected fun removeVehiclesData(vehs: List<String>){
         for(v in vehs){
             if (updatesByVehDict.contains(v)) {
                 updatesByVehDict.remove(v)
                 if (animatorsByVeh.contains(v)){
                     animatorsByVeh[v]?.cancel()
                     animatorsByVeh.remove(v)
                 }
             }
             if (vehShowing==v){
                 hideStopOrBusBottomSheet()
             }
         }
     }
 
     // Hide the bottom sheet and remove extra symbol
     protected open fun hideStopOrBusBottomSheet(){
         if (stopActiveSymbol!=null){
             symbolManager?.delete(stopActiveSymbol)
             stopActiveSymbol = null
         }
         if(!showOpenStopWithSymbolLayer()){
             selectedStopSource.setGeoJson(FeatureCollection.fromFeatures(ArrayList<Feature>()))
         }
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
         //isBottomSheetShowing = false
 
         //reset states
         shownStopInBottomSheet = null
         if (vehShowing!=null){
             //we are hiding a vehicle
             vehShowing = null
             updatePositionsIcons(true)
         }
         extraBottomTextView.visibility = View.GONE
 
     }
 
     protected fun initSymbolManager(mapReady: MapLibreMap , style: Style){
         val sm = SymbolManager(mapView!!, mapReady, style)
         sm.iconAllowOverlap = true
         sm.textAllowOverlap = false
         sm.addClickListener { _ ->
             if (stopActiveSymbol != null) {
                 hideStopOrBusBottomSheet()
                 return@addClickListener true
             } else
                 return@addClickListener false
         }
         symbolManager = sm
     }
 
     /**
      * Change the icon indicating the status of the live Positions
      */
     protected fun setBusPositionsIcon(enabled: Boolean, error: Boolean){
         val ctx = requireContext()
         if(!enabled)
             busPositionsIconButton.setImageDrawable(ContextCompat.getDrawable(ctx, R.drawable.bus_pos_circle_inactive))
         else if(error)
             busPositionsIconButton.setImageDrawable(ContextCompat.getDrawable(ctx, R.drawable.bus_pos_circle_notworking))
         else
             busPositionsIconButton.setImageDrawable(ContextCompat.getDrawable(ctx, R.drawable.bus_pos_circle_active))
 
     }
 
 
     abstract fun onMapLocationComponentInitialized()
 
     @SuppressLint("MissingPermission")
     protected fun setLocationComponentEnabled(enabled: Boolean): Boolean{
         var changed = false
         map?.apply {
             if(locationComponent.isLocationComponentEnabled !=enabled)
             locationComponent.isLocationComponentEnabled= enabled
         changed = true}
         Log.d(DEBUG_TAG, "Asked to set location component enabled: $enabled, changed: $changed")
         mapStateViewModel.locationUserActive.value = enabled
 
 
         return changed
     }
 
     @SuppressLint("MissingPermission")
     protected fun initializeMapLocationComponent(map: MapLibreMap, context: Context, style: Style?){
         val mStyle = style ?: map.style
         if(locationInitialized){
             Log.w(DEBUG_TAG, "trying to initialize Location Component, but it is already done")
             return
         }
         mStyle?.let{ style ->
             locationComponent = map.locationComponent
 
             val locProvider = FusedNativeLocationProvider(context)
             locProvider.addListener(deviceLocationStatusListener)
             locationEngine = MapLibreLocationEngine(locProvider)
             locationProvider = locProvider
             val options = LocationComponentActivationOptions.builder(context, style)
                 .useDefaultLocationEngine(false)
                 .locationEngine(locationEngine)
                 .build()
             locationComponent.activateLocationComponent(options)
 
             if(BuildConfig.DEBUG) Log.d(DEBUG_TAG, "Initializing location, request initial position")
             startInitialPositionRequest()
 
             if(!locationEnabledOnDevice){
                 warnLocationNotEnabledOnDevice()
             }else {
                 setLocationComponentEnabled(true)
             }
             locationInitialized = true
             onMapLocationComponentInitialized()
         }
     }
 
     @SuppressLint("MissingPermission")
     protected fun startInitialPositionRequest(){
         locationEngine?.requestLocationUpdates(LocationEngineRequest.Builder(500).setDisplacement(20.0f).build(),
             mapLibreLocationCallback, null)
 
     }
     protected fun stopInitialPositionRequest(){
         locationEngine?.removeLocationUpdates(mapLibreLocationCallback)
     }
 
 
     /**
      * Update function for the bus positions
      * Takes the processed updates and saves them accordingly
      * Unified version that works with both fragments
      *
      * @param incomingData Map of updates with optional trip and pattern information
      * @param hasVehicleTracking If true, checks if vehShowing is updated and calls callback (default: true)
      * @param trackVehicleCallback Optional callback to show vehicle details when vehShowing is updated
      */
     protected fun updateBusPositionsInMap(
         incomingData: HashMap<String, Pair<LivePositionUpdate,TripAndPatternWithStops?>>,
         hasVehicleTracking: Boolean = true,
         trackVehicleCallback: ((String) -> Unit)? = null
     ) {
         val vehsNew = HashSet(incomingData.values.map { up -> up.first.vehicle })
         val vehsOld = HashSet(updatesByVehDict.keys)
 
         Log.d(DEBUG_TAG, "In fragment, have ${incomingData.size} updates to show")
 
         var countUpds = 0
         var createdVehs = 0
 
         for (upsWithTrp in incomingData.values) {
             val newPos = upsWithTrp.first
             val patternStops = upsWithTrp.second
             val vehID = newPos.vehicle
 
             // Validate coordinates
             if (!vehsOld.contains(vehID)) {
                 if (newPos.latitude <= 0 || newPos.longitude <= 0) {
                     Log.w(DEBUG_TAG, "Update ignored for veh $vehID on line ${newPos.routeID}, lat: ${newPos.latitude}, lon ${newPos.longitude}")
                     continue
                 }
             }
 
             if (vehsOld.contains(vehID)) {
                 // Changing the location of an existing bus
                 val oldPosData = updatesByVehDict[vehID]!!
                 val oldPos = oldPosData.posUpdate
                 val oldPattern = oldPosData.pattern
 
                 var avoidShowingUpdateBecauseIsImpossible = false
 
                 // Check for impossible route changes
                 if (oldPos.routeID != newPos.routeID) {
                     val dist = LatLng(oldPos.latitude, oldPos.longitude).distanceTo(
                         LatLng(newPos.latitude, newPos.longitude)
                     )
                     val speed = dist * 3.6 / (newPos.timestamp - oldPos.timestamp) // km/h
                     Log.w(DEBUG_TAG, "Vehicle $vehID changed route from ${oldPos.routeID} to ${newPos.routeID}, distance: $dist, speed: $speed")
                     if (speed > 120 || speed < 0) {
                         avoidShowingUpdateBecauseIsImpossible = true
                     }
                 }
 
                 if (avoidShowingUpdateBecauseIsImpossible) {
                     Log.w(DEBUG_TAG, "Update for vehicle $vehID skipped")
                     continue
                 }
 
                 // Check if position actually changed
                 val samePosition = (oldPos.latitude == newPos.latitude) &&
                         (oldPos.longitude == newPos.longitude)
 
                 val setPattern = (oldPattern == null) && (patternStops != null)
 
                 // Copy old bearing if new one is missing
                 if (newPos.bearing == null && oldPos.bearing != null) {
                     newPos.bearing = oldPos.bearing
                 }
 
                 if (!samePosition || setPattern) {
                     val newOrOldPosInBounds = isPointInsideVisibleRegion(
                         newPos.latitude, newPos.longitude, true
                     ) || isPointInsideVisibleRegion(oldPos.latitude, oldPos.longitude, true)
 
                     if (newOrOldPosInBounds) {
                         // Update pattern data if available
                         patternStops?.let {
                             updatesByVehDict[vehID]!!.pattern = it.pattern
                         }
                         // Animate the position change
                         animateNewPositionMove(newPos)
                     } else {
                         // Update position without animation
                         updatesByVehDict[vehID] = LivePositionTripPattern(
                             newPos,
                             patternStops?.pattern
                         )
                     }
                 }
                 countUpds++
             } else {
                 // New vehicle - create entry
                 updatesByVehDict[vehID] = LivePositionTripPattern(
                     newPos,
                     patternStops?.pattern
                 )
                 createdVehs++
             }
 
             // Update vehicle details if this is the shown/tracked vehicle
             if (hasVehicleTracking && vehShowing?.isNotEmpty() == true && vehID == vehShowing) {
                 trackVehicleCallback?.invoke(vehID)
             }
         }
 
         // Remove old positions
         Log.d(DEBUG_TAG, "Updated $countUpds vehicles, created $createdVehs vehicles")
         vehsOld.removeAll(vehsNew)
 
         // Clean up stale vehicles (not updated for 2 minutes)
         val currentTimeStamp = System.currentTimeMillis() / 1000
         for (vehID in vehsOld) {
             val posData = updatesByVehDict[vehID]!!
             if (currentTimeStamp - posData.posUpdate.timestamp > 2 * 60) {
                 // Remove the bus
                 updatesByVehDict.remove(vehID)
                 // Cancel and remove animator if exists
                 animatorsByVeh[vehID]?.cancel()
                 animatorsByVeh.remove(vehID)
             }
         }
 
         // Update UI
         updatePositionsIcons(false)
     }
 
     /**
      * Shared bottom sheet setup. The [onDirectionsClick] lambda is called when
      * directionsCard is tapped; it receives the pattern code (empty string when
      * no pattern is available) so each subclass can navigate as it sees fit.
      */
     protected fun showVehicleTripInBottomSheet(
         veh: String,
         onDirectionsClick: (patternCode: String, veh: String) -> Unit
     ) {
         val data = updatesByVehDict[veh] ?: run {
             Log.w(DEBUG_TAG, "Asked to show vehicle $veh, but it's not present in the updates")
             return
         }
         bottomLayout?.let {
             val lineName = FiveTNormalizer.fixShortNameForDisplay(
                 GtfsUtils.getLineNameFromGtfsID(data.posUpdate.routeID), false
             )
             val pat = data.pattern
             if (pat != null) {
                 stopTitleTextView.text = pat.headsign
                 stopTitleTextView.visibility = View.VISIBLE
                 stopNumberTextView.text = getString(R.string.line_fill_towards, lineName)
             } else {
                 stopTitleTextView.visibility = View.GONE
                 stopNumberTextView.text = getString(R.string.line_fill, lineName)
             }
             directionsCard.setOnClickListener {
                 onDirectionsClick(pat?.code ?: "", veh)
             }
             directionsCard.visibility = View.VISIBLE
             bottomrightImage.setImageDrawable(
                 ResourcesCompat.getDrawable(resources, R.drawable.ic_magnifying_glass, activity?.theme)
             )
             // if you change this, remember to change the color of the vehicleIcon
-            val colorBlue = ResourcesCompat.getColor(resources, R.color.blue_500, activity?.theme)
+            val colorBlue = ResourcesCompat.getColor(resources, R.color.bus_marker_color_selected, activity?.theme)
             ViewCompat.setBackgroundTintList(directionsCard, ColorStateList.valueOf(colorBlue))
             linesPassingTextView.text = getString(R.string.vehicle_fill, data.posUpdate.vehicle)
+            linesPassingTextView.gravity = Gravity.CENTER_VERTICAL
+            linesBottomTextView.visibility = View.GONE
             arrivalsCard.visibility = View.GONE
 
             extraBottomTextView.text = getString(R.string.updated_fill,  utils.unixTimestampToLocalTime(data.posUpdate.timestamp))
             extraBottomTextView.visibility = View.VISIBLE
             val update = data.posUpdate
             val vehInfo = VehicleUtils.getTypeForLabel(update.vehicle)
             if(vehInfo == null){
                 vehicleIcon.visibility = View.GONE
             } else{
                 val ico = when(vehInfo.type){
-                    VehicleUtils.VehicleType.BUS -> R.drawable.ic_bus_small
-                    VehicleUtils.VehicleType.ELECTRIC_BUS -> R.drawable.ic_bus_electric_small
-                    VehicleUtils.VehicleType.TRAM -> R.drawable.ic_tram_24
+                    VehicleUtils.VehicleType.BUS -> R.drawable.ic_bus
+                    VehicleUtils.VehicleType.ELECTRIC_BUS -> R.drawable.ic_bus_electric_filled
+                    VehicleUtils.VehicleType.TRAM -> R.drawable.ic_tram_material
                 }
                 vehicleIcon.setImageDrawable(ResourcesCompat.getDrawable(resources, ico, activity?.theme))
                 vehicleIcon.visibility = View.VISIBLE
 
                 vehicleIcon.setOnClickListener {
-                    val print = "${vehInfo.type.getName()} ${vehInfo.name}"
+                    val print = "${vehInfo.type.getName()}: ${vehInfo.name}"
                     makeToast(print)
                 }
             }
 
         }
-        vehShowing = null
+        vehShowing = veh
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
         updatePositionsIcons(true)
         Log.d(DEBUG_TAG, "Shown vehicle $veh in bottom sheet")
     }
 
     /**
      * Update the bus positions displayed on the map, from the existing data
      *
      * @param forced If true, forces immediate update ignoring the 100ms throttle
      */
     protected fun updatePositionsIcons(forced: Boolean) {
         // Avoid frequent updates - throttle to max once per 60ms
         val currentTime = System.currentTimeMillis()
         val isStarted = (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED))
         if(forced){
             // if we're running a forced update, cancel the pending one
-            jobUpdate?.cancel()
+            jobUpdate?.apply{
+                cancel()
+                //Log.d(DEBUG_TAG, "Cancelled update")
+            }
+
         }
         else if (currentTime - lastUpdateTime < 100) {
             // Schedule delayed update
             if(viewLifecycleOwnerLiveData.value != null) {
                 jobUpdate?.cancel()
                 jobUpdate = viewLifecycleOwner.lifecycleScope.launch {
                     delay(100.milliseconds)
+                    //Log.d(DEBUG_TAG, "Running update from delayed")
                     updatePositionsIcons(false)
                 }
+                //Log.d(DEBUG_TAG, "Cancelled previous job, delaying update")
             }
             return
         }
         if(!isStarted){
             Log.w(DEBUG_TAG, "fragment is not started, ")
         }
 
         val busFeatures = ArrayList<Feature>()
         val selectedBusFeatures = ArrayList<Feature>()
 
         for (dat in updatesByVehDict.values) {
             val pos = dat.posUpdate
             val point = Point.fromLngLat(pos.longitude, pos.latitude)
 
             val newFeature = Feature.fromGeometry(
                 point,
                 JsonObject().apply {
                     addProperty("veh", pos.vehicle)
                     addProperty("trip", pos.tripID)
                     addProperty("bearing", pos.bearing ?: 0.0f)
                     addProperty("line", pos.routeID.substringBeforeLast('U'))
                 }
             )
 
             // Separate selected vehicle from others
             if (vehShowing?.isNotEmpty() == true && vehShowing == dat.posUpdate.vehicle) {
                 selectedBusFeatures.add(newFeature)
+                //Log.d(DEBUG_TAG, "Update position for bus $vehShowing")
+                //TODO: Recenter the map on the vehicle
             } else {
                 busFeatures.add(newFeature)
             }
         }
 
         busesSource.setGeoJson(FeatureCollection.fromFeatures(busFeatures))
         selectedBusSource.setGeoJson(FeatureCollection.fromFeatures(selectedBusFeatures))
 
         lastUpdateTime = System.currentTimeMillis()
     }
 
     /**
      * Animates the transition of a vehicle from its current position to a new position
      * This is the tricky part - we need to set the new positions with the data and redraw them all
      *
      * @param positionUpdate The new position update to animate to
      */
     protected fun animateNewPositionMove(positionUpdate: LivePositionUpdate) {
         val vehID = positionUpdate.vehicle
 
         // Check if vehicle exists in our tracking dictionary
         if (vehID !in updatesByVehDict.keys) {
             return
         }
 
         val currentUpdate = updatesByVehDict[vehID] ?: run {
             Log.e(DEBUG_TAG, "Have to run animation for veh $vehID but not in the dict")
             return
         }
 
         // Cancel any current animation for this vehicle
         animatorsByVeh[vehID]?.cancel()
 
         val posUp = currentUpdate.posUpdate
         val currentPos = LatLng(posUp.latitude, posUp.longitude)
         val newPos = LatLng(positionUpdate.latitude, positionUpdate.longitude)
 
         // Create animator for smooth transition
         val valueAnimator = ValueAnimator.ofObject(
             MapLibreUtils.LatLngEvaluator(),
             currentPos,
             newPos
         )
 
         valueAnimator.addUpdateListener { animation ->
             val latLng = animation.animatedValue as LatLng
 
             // Update position during animation
             updatesByVehDict[vehID]?.let { update ->
                 update.posUpdate.latitude = latLng.latitude
                 update.posUpdate.longitude = latLng.longitude
                 updatePositionsIcons(false)
             } ?: run {
                 Log.w(DEBUG_TAG, "The bus position to animate has been removed, but the animator is still running!")
             }
         }
 
         // Set the new position as current but keep old coordinates for animation start
         positionUpdate.latitude = posUp.latitude
         positionUpdate.longitude = posUp.longitude
         updatesByVehDict[vehID]!!.posUpdate = positionUpdate
 
         // Configure and start animation
         valueAnimator.duration = 300
         valueAnimator.interpolator = LinearInterpolator()
         valueAnimator.start()
 
         // Store animator for potential cancellation
         animatorsByVeh[vehID] = valueAnimator
     }
 
     /// STOP OPENING
     abstract fun showOpenStopWithSymbolLayer(): Boolean
     /**
      * Update the bottom sheet with the stop information
      */
     protected fun openStopInBottomSheet(stop: Stop){
         bottomLayout?.let {
 
             //lay.findViewById<TextView>(R.id.stopTitleTextView).text ="${stop.ID} - ${stop.stopDefaultName}"
             val stopName = stop.stopUserName ?: stop.stopDefaultName
             stopTitleTextView.text = stopName//stop.stopDefaultName
             stopNumberTextView.text = getString(R.string.stop_fill,stop.ID)
             stopTitleTextView.visibility = View.VISIBLE
 
             val string_show = if (stop.numRoutesStopping==0) ""
-            else requireContext().getString(R.string.lines_fill, stop.routesThatStopHereToString())
+            else stop.routesThatStopHereToString() //requireContext().getString(R.string.lines_fill, stop.routesThatStopHereToString())
             linesPassingTextView.text = string_show
             linesPassingTextView.visibility = View.VISIBLE
+            linesPassingTextView.gravity = Gravity.TOP
+            linesBottomTextView.visibility =View.VISIBLE
 
             //SET ON CLICK LISTENER
             arrivalsCard.setOnClickListener{
                 fragmentListener?.requestArrivalsForStopID(stop.ID)
             }
 
             arrivalsCard.visibility = View.VISIBLE
             directionsCard.visibility = View.VISIBLE
 
             directionsCard.setOnClickListener {
                 ViewUtils.openStopInOutsideApp(stop, context)
             }
             context?.let {
-                val colorIcon = ViewUtils.getColorFromTheme(it, android.R.attr.colorAccent)//ResourcesCompat.getColor(resources,R.attr.colorAccent,activity?.theme)
+                val colorIcon = ViewUtils.getColorFromTheme(it, R.attr.colorAccent)//ResourcesCompat.getColor(resources,R.attr.colorAccent,activity?.theme)
                 ViewCompat.setBackgroundTintList(directionsCard, ColorStateList.valueOf(colorIcon))
             }
 
             bottomrightImage.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.navigation_right,  activity?.theme))
 
             vehicleIcon.visibility = View.GONE
 
         }
         //add stop marker
         if (stop.latitude!=null && stop.longitude!=null) {
             Log.d(DEBUG_TAG, "Showing stop: ${stop.ID}")
 
             if (showOpenStopWithSymbolLayer()) {
                 stopActiveSymbol = symbolManager?.create(
                     SymbolOptions()
                         .withLatLng(LatLng(stop.latitude!!, stop.longitude!!))
                         .withIconImage(STOP_ACTIVE_IMG)
                         .withIconAnchor(ICON_ANCHOR_CENTER)
                 )
             } else {
                 val list = ArrayList<Feature>()
                 list.add(stopToGeoJsonFeature(stop))
                 selectedStopSource.setGeoJson(
                     FeatureCollection.fromFeatures(list)
                 )
             }
 
         }
         Log.d(DEBUG_TAG, "Shown stop $stop in bottom sheet")
         shownStopInBottomSheet = stop
 
         bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
     }
 
 
 
     protected fun stopAnimations(){
         for(anim in animatorsByVeh.values){
             anim.cancel()
         }
     }
 
     protected fun addImagesStyle(style: Style){
         style.addImage(
             STOP_IMAGE_ID,
             ResourcesCompat.getDrawable(resources,R.drawable.bus_stop_new, activity?.theme)!!)
 
         style.addImage(STOP_ACTIVE_IMG, ResourcesCompat.getDrawable(resources, R.drawable.bus_stop_new_highlight, activity?.theme)!!)
         style.addImage("ball",ResourcesCompat.getDrawable(resources, R.drawable.ball, activity?.theme)!!)
         style.addImage(BUS_IMAGE_ID,ResourcesCompat.getDrawable(resources, R.drawable.map_bus_position_icon, activity?.theme)!!)
         style.addImage(BUS_SEL_IMAGE_ID, ResourcesCompat.getDrawable(resources, R.drawable.map_bus_position_icon_sel, activity?.theme)!!)
         val polyIconArrow = ResourcesCompat.getDrawable(resources, R.drawable.arrow_up_box_fill, activity?.theme)!!
         style.addImage(POLY_ARROW, polyIconArrow)
 
     }
 
     protected fun initStopsLayer(style: Style, stopsFeatures: FeatureCollection?){
         //determine default layer
-        var layerAbove = ""
-        if (lastMapStyle == MapLibreUtils.STYLE_OSM_RASTER){
-            layerAbove = "osm-raster"
-        } else if (lastMapStyle == MapLibreUtils.STYLE_VECTOR){
-            layerAbove = "symbol-transit-airfield"
+
+        val layerAbove = if (lastMapStyle == MapLibreUtils.STYLE_OSM_RASTER){
+           "osm-raster"
+        } else// if (lastMapStyle == MapLibreUtils.STYLE_VERSATILES_ECLIPSE_JSON){
+            "symbol-transit-airfield"
+        /*} else {
+            //
+            "poi_park"
         }
+
+         */
         initStopsLayer(style, stopsFeatures, layerAbove)
     }
 
     protected fun initStopsLayer(style: Style, stopsFeatures: FeatureCollection?, stopsLayerAbove: String){
 
 
         stopsSource = GeoJsonSource(STOPS_SOURCE_ID,stopsFeatures ?: FeatureCollection.fromFeatures(ArrayList<Feature>()))
         style.addSource(stopsSource)
 
 
         // Stops layer
         val stopsLayer = SymbolLayer(STOPS_LAYER_ID, STOPS_SOURCE_ID)
         stopsLayer.withProperties(
             PropertyFactory.iconImage(STOP_IMAGE_ID),
             PropertyFactory.iconAnchor(ICON_ANCHOR_CENTER),
             PropertyFactory.iconAllowOverlap(true),
             PropertyFactory.iconIgnorePlacement(true)
             )
 
         style.addLayerAbove(stopsLayer, stopsLayerAbove ) //"label_country_1") this with OSM Bright
 
 
         selectedStopSource = GeoJsonSource(SEL_STOP_SOURCE, FeatureCollection.fromFeatures(ArrayList<Feature>()))
         style.addSource(selectedStopSource)
 
         val selStopLayer = SymbolLayer(SEL_STOP_LAYER, SEL_STOP_SOURCE)
         selStopLayer.withProperties(
             PropertyFactory.iconImage(STOP_ACTIVE_IMG),
             PropertyFactory.iconAllowOverlap(true),
             PropertyFactory.iconIgnorePlacement(true),
             PropertyFactory.iconAnchor(ICON_ANCHOR_CENTER),
 
             )
         style.addLayerAbove(selStopLayer, STOPS_LAYER_ID)
 
         stopsLayerStarted = true
     }
 
     /**
      * Setup the Map Layers
      */
     protected fun setupBusLayer(style: Style, withLabels: Boolean =false, busIconsScale: Float = 1.0f) {
         // Buses source
         busesSource = GeoJsonSource(BUSES_SOURCE_ID)
         style.addSource(busesSource)
         //style.addImage("bus_symbol",ResourcesCompat.getDrawable(resources, R.drawable.map_bus_position_icon, activity?.theme)!!)
 
         selectedBusSource = GeoJsonSource(SEL_BUS_SOURCE)
         style.addSource(selectedBusSource)
 
         // Buses layer
         val busesLayer = SymbolLayer(BUSES_LAYER_ID, BUSES_SOURCE_ID).apply {
             withProperties(
                 PropertyFactory.iconImage(BUS_IMAGE_ID),
                 PropertyFactory.iconSize(busIconsScale),
                 PropertyFactory.iconAllowOverlap(true),
                 PropertyFactory.iconIgnorePlacement(true),
                 PropertyFactory.iconRotate(Expression.get("bearing")),
                 PropertyFactory.iconRotationAlignment(ICON_ROTATION_ALIGNMENT_MAP)
 
             )
             if (withLabels){
                 withProperties(PropertyFactory.textAnchor(TEXT_ANCHOR_CENTER),
                     PropertyFactory.textAllowOverlap(true),
                     PropertyFactory.textField(Expression.get("line")),
                     PropertyFactory.textColor(Color.WHITE),
                     PropertyFactory.textRotationAlignment(TEXT_ROTATION_ALIGNMENT_VIEWPORT),
                     PropertyFactory.textSize(12f),
                     PropertyFactory.textFont(arrayOf("noto_sans_regular")))
             }
         }
         style.addLayerAbove(busesLayer, STOPS_LAYER_ID)
 
         val selectedBusLayer = SymbolLayer(SEL_BUS_LAYER, SEL_BUS_SOURCE).apply {
             withProperties(
             PropertyFactory.iconImage(BUS_SEL_IMAGE_ID),
             PropertyFactory.iconSize(busIconsScale),
             PropertyFactory.iconAllowOverlap(true),
             PropertyFactory.iconIgnorePlacement(true),
             PropertyFactory.iconRotate(Expression.get("bearing")),
             PropertyFactory.iconRotationAlignment(ICON_ROTATION_ALIGNMENT_MAP)
             )
             if (withLabels){
                 withProperties(PropertyFactory.textAnchor(TEXT_ANCHOR_CENTER),
                     PropertyFactory.textAllowOverlap(true),
                     PropertyFactory.textField(Expression.get("line")),
                     PropertyFactory.textColor(Color.WHITE),
                     PropertyFactory.textRotationAlignment(TEXT_ROTATION_ALIGNMENT_VIEWPORT),
                     PropertyFactory.textSize(12f),
                     PropertyFactory.textFont(arrayOf("noto_sans_regular")))
             }
         }
 
         style.addLayerAbove(selectedBusLayer, BUSES_LAYER_ID)
         busLayerStarted = true
     }
     /**
      * Method used for enabling / disabling the location from the buttons
      */
     protected fun switchUserLocationStatus(view: View?){
         val enabled = if(locationInitialized) locationComponent.isLocationComponentEnabled else false
         val context = context ?: return
         if(enabled) {
             if(!receivedFirstLocation){
                 //use case: the user has decided to disable the location before the first position arrived
                 stopInitialPositionRequest()
             }
             // we have to disable it
             setMapLocationEnabled(false)
         }
         else if(deviceHasLocationProvider()) {
             if(Permissions.bothLocationPermissionsGranted(context)){
                 if(!locationEnabledOnDevice){
                     warnLocationNotEnabledOnDevice()
                 } else{
                     setMapLocationEnabled(true)
                 }
             } else{
                 Log.d(DEBUG_TAG, "Requesting permissions to show location")
                 Permissions.getInstance(context).checkRequestLocationPermissions(requireActivity(), positionRequestResponder)
             }
         } else{
             context.let {
                 Toast.makeText(it, R.string.no_gps_on_device, Toast.LENGTH_SHORT).show()
             }
             //adjust ui
             setLocationIconEnabled(false)
         }
 
     }
 
     /**
      * Set the map location component enabled
      */
     @SuppressLint("MissingPermission")
     protected fun setMapLocationEnabled(enabled: Boolean){
         Log.d(DEBUG_TAG, "Setting map location enabled: $enabled")
         map?.locationComponent?.isLocationComponentEnabled = enabled
         //map?.cameraPosition =
         mapStateViewModel.locationUserActive.value = enabled
         onMapLocationEnabled(enabled)
     }
 
     /**
      * Function to run at the first time the fragment is opened
      * Check if we have the permissions, and then initialize the map location component
      * If we don't have it, request the permission
      */
     protected fun checkInitMapLocation(mapReady: MapLibreMap,style: Style, context: Context) {
         //enable location
         val hasGps = deviceHasLocationProvider()
         val permissions = Permissions.getInstance(context)
         if(hasGps) {
             if (Permissions.bothLocationPermissionsGranted(context)) {
                 Log.d(DEBUG_TAG, "Have got the location permission, init location component")
                 initializeMapLocationComponent(mapReady, context, style)
             }else {
                 var req = false
                 activity?.let{
                     req = permissions.checkRequestLocationPermissions(it, positionRequestResponder)
                 }
 
                 if(!req) {
                     setMapLocationEnabled(false)
                 }
 
             }
         }
     }
 
     /**
      * Set the UI elements showing that the user location is disabled
      */
     abstract fun onMapLocationEnabled(active: Boolean)
 
     /**
      * Helper function to actually set the icon
      */
     abstract fun setLocationIconEnabled(enabled: Boolean)
 
     /**
      * Called when we receive the first fix on the user location
      */
     abstract fun onFirstReceivedLocation(location: Location)
 
     protected fun isBottomSheetShowing(): Boolean {
         return bottomSheetBehavior.state == BottomSheetBehavior.STATE_EXPANDED
     }
 
     protected fun deviceHasLocationProvider(): Boolean{
         val locManager = requireContext().getSystemService(LOCATION_SERVICE) as LocationManager
         return locManager.allProviders.isNotEmpty()
     }
 
     /**
      * Update automatically the icon when the live position service changes status
      */
     protected fun observeStatusLivePositions(){
         livePositionsViewModel.serviceStatus.observe(viewLifecycleOwner){ status ->
             //if service is active, update the bus positions icon
             when(status) {
                 LivePositionsServiceStatus.OK ->
                     setBusPositionsIcon(true, error = false)
 
                 LivePositionsServiceStatus.NO_POSITIONS -> setBusPositionsIcon(true, error = true)
 
                 else -> setBusPositionsIcon( true, error = true)
             }
         }
     }
 
     /**
      * Clear all buses from the map
      */
     protected fun clearAllBusPositionsInMap(){
         for ((k, anim) in animatorsByVeh){
             anim.cancel()
         }
         animatorsByVeh.clear()
         updatesByVehDict.clear()
         updatePositionsIcons(forced = false)
     }
 
     protected fun setCameraPosition(latitude: Double, longitude: Double, zoom: Double) {
         map?.cameraPosition = CameraPosition.Builder()
             .target(LatLng(latitude, longitude))
             .zoom(zoom)
             .build()
     }
 
     protected fun showToastLocation(enabled: Boolean){
         val textid = if (enabled) R.string.location_enabled  else R.string.location_disabled
         context?.let{
             Toast.makeText(it,textid,Toast.LENGTH_SHORT).show()
         }
     }
 
 
 
 
     companion object{
         private const val DEBUG_TAG="GeneralMapLibreFragment"
 
         const val BUSES_SOURCE_ID = "buses-source"
         const val BUSES_LAYER_ID = "buses-layer"
 
         const val SEL_STOP_SOURCE="selected-stop-source"
         const val SEL_STOP_LAYER = "selected-stop-layer"
 
         const val SEL_BUS_SOURCE = "sel_bus_source"
         const val SEL_BUS_LAYER = "sel_bus_layer"
 
         const val KEY_LOCATION_ENABLED="location_enabled"
 
 
         protected const val STOPS_SOURCE_ID = "stops-source"
         protected const val STOPS_LAYER_ID = "stops-layer"
 
         protected const val STOP_IMAGE_ID = "stop-img"
         protected const val STOP_ACTIVE_IMG = "stop_active_img"
         protected const val BUS_IMAGE_ID = "bus_symbol"
         protected const val BUS_SEL_IMAGE_ID = "sel_bus_symbol"
 
         protected const val POLYLINE_LAYER = "polyline-layer"
         protected const val POLYLINE_SOURCE = "polyline-source"
 
         protected const val POLY_ARROWS_LAYER = "arrows-layer"
         protected const val POLY_ARROWS_SOURCE = "arrows-source"
         protected const val POLY_ARROW ="poly-arrow-img"
 
         private const val PERM_LOC_COARSE = Manifest.permission.ACCESS_COARSE_LOCATION
         private const val PERM_LOC_FINE = Manifest.permission.ACCESS_FINE_LOCATION
 
         //TODO: this is hardcoded, make it modifiable by the user
         protected const val MAX_DIST_KM = 90.0
 
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/LivePositionsDialogFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/LivePositionsDialogFragment.kt
index db43348..978749a 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/LivePositionsDialogFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/LivePositionsDialogFragment.kt
@@ -1,104 +1,104 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2025 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.fragments
 
 import it.reyboz.bustorino.R
 
 import android.app.Dialog
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageButton
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.activityViewModels
 import it.reyboz.bustorino.backend.LivePositionsServiceStatus
 import it.reyboz.bustorino.viewmodels.LivePositionsViewModel
 
 class LivePositionsDialogFragment : DialogFragment() {
     private val viewModel: LivePositionsViewModel by activityViewModels()
     private lateinit var providerNameTextView: TextView
     private lateinit var statusMessageTextView: TextView
 
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         //return super.onCreateDialog(savedInstanceState)
         val builder = AlertDialog.Builder(requireContext())
         val view = layoutInflater.inflate(R.layout.fragment_dialog_buspositions, null)
 
         providerNameTextView = view.findViewById<TextView>(R.id.providerNameTextView)
         statusMessageTextView = view.findViewById<TextView>(R.id.statusMessageTextView)
         val btnSwitch = view.findViewById<Button>(R.id.btnSwitch)
         val btnClose = view.findViewById<ImageButton>(R.id.btnClose)
 
         // OBSERVE VIEWMODEL
         /*sharedViewModel.variableTitle.observe(this) {
             tvTitleVariable.text = it
         }
 
         sharedViewModel.statusMessage.observe(this) {
             tvStatusMessage.text = it
         }
 
 
 
          */
 
         btnSwitch.setOnClickListener {
             viewModel.switchPositionsSource()
         }
 
         btnClose.setOnClickListener { dismiss() }
 
         builder.setView(view)
         val res =  builder.create()
-        res.window?.setBackgroundDrawableResource(R.color.grey_100)
+        res.window?.setBackgroundDrawableResource(R.color.card_background)
         return res
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
 
         viewModel.serviceStatus.observe(this) { serviceStatus ->
             val message = when (serviceStatus) {
                 LivePositionsServiceStatus.OK -> getString(R.string.live_positions_msg_ok)
                 LivePositionsServiceStatus.NO_POSITIONS -> getString(R.string.live_positions_msg_no_positions)
                 LivePositionsServiceStatus.ERROR_CONNECTION -> getString(R.string.live_positions_msg_connection_error)
                 LivePositionsServiceStatus.ERROR_NETWORK_RESPONSE -> getString(R.string.live_positions_msg_network_error)
                 LivePositionsServiceStatus.ERROR_PARSING_RESPONSE -> getString(R.string.live_positions_msg_parsing_error)
                 LivePositionsServiceStatus.CONNECTING -> getString(R.string.live_positions_msg_connecting)
 
             }
             statusMessageTextView.text = message
         }
         viewModel.useMQTTPositionsLiveData.observe(this) { useMQTT ->
             val message = if (useMQTT) {
                 getString(R.string.positions_source_mato_short)
             } else getString(R.string.positions_source_gtfsrt_short)
             providerNameTextView.text  = message
         }
 
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/NearbyStopsFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/NearbyStopsFragment.kt
index 6e02307..b34d6dc 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/NearbyStopsFragment.kt
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/NearbyStopsFragment.kt
@@ -1,682 +1,715 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2018 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.fragments
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.location.Location
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.appcompat.widget.AppCompatButton
 import androidx.core.util.Pair
 import androidx.fragment.app.viewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.work.WorkInfo
+import com.google.android.material.button.MaterialButton
 import it.reyboz.bustorino.BuildConfig
 import it.reyboz.bustorino.R
 import it.reyboz.bustorino.adapters.ArrivalsStopAdapter
 import it.reyboz.bustorino.adapters.SquareStopAdapter
 import it.reyboz.bustorino.backend.*
 import it.reyboz.bustorino.data.DatabaseUpdate
 import it.reyboz.bustorino.middleware.AutoFitGridLayoutManager
 import it.reyboz.bustorino.middleware.FusedNativeLocationProvider
 import it.reyboz.bustorino.middleware.FusedNativeLocationProvider.LocationUpdateListener
-import it.reyboz.bustorino.util.Permissions.Companion.anyLocationPermissionsGranted
+import it.reyboz.bustorino.util.Permissions
 import it.reyboz.bustorino.util.Permissions.Companion.bothLocationPermissionsGranted
 import it.reyboz.bustorino.util.StopSorterByDistance
 import it.reyboz.bustorino.viewmodels.NearbyStopsViewModel
 import java.util.*
-import kotlin.math.min
 
 class NearbyStopsFragment : ScreenBaseFragment() {
     override fun getBaseViewForSnackBar(): View? {
         return null
     }
 
     enum class FragType(val num: Int) {
         STOPS(1), ARRIVALS(2);
 
         companion object {
             @JvmStatic
             fun fromNum(i: Int): FragType {
                 when (i) {
                     1 -> return STOPS
                     2 -> return ARRIVALS
                     else -> throw IllegalArgumentException("type not recognized")
                 }
             }
         }
     }
 
     private enum class LocationShowingStatus {
-        SEARCHING, FIRST_FIX, DISABLED, NO_PERMISSION
+        SEARCHING, POSITION_FOUND, DISABLED, NO_PERMISSION
     }
 
     private var mListener: FragmentListenerMain? = null
 
     private var fragment_type = FragType.STOPS
 
     private lateinit var gridRecyclerView: RecyclerView
 
     private var dataAdapter: SquareStopAdapter? = null
     private var gridLayoutManager: AutoFitGridLayoutManager? = null
     private var lastPosition: GPSPoint? = null
     private var circlingProgressBar: ProgressBar? = null
     private lateinit var flatProgressBar: ProgressBar
 
     //protected SharedPreferences globalSharedPref;
     //private SharedPreferences.OnSharedPreferenceChangeListener preferenceChangeListener;
     private var messageTextView: TextView? = null
+    private lateinit var enableLocationButton : MaterialButton
     private var titleTextView: TextView? = null
     private var loadingTextView: TextView? = null
     private var scrollListener: CommonScrollListener? = null
     private var switchButton: AppCompatButton? = null
     private var firstLocForStops = true
     private var firstLocForArrivals = true
     private var stopsMaxDistance = -3
     private var stopsMinNumber = -1
 
     //These are useful for the case of nearby arrivals
     private var arrivalsStopAdapter: ArrivalsStopAdapter? = null
 
     private var currentNearbyStops = ArrayList<Stop>()
 
     private var showingStatus = LocationShowingStatus.NO_PERMISSION
     private var isLocationEnabled = false
 
     private val locationUpdateListener: LocationUpdateListener = object : LocationUpdateListener {
         override fun onLocationUpdate(location: Location) {
             updateLocationViewModel(location)
         }
 
         override fun onFusedStatusChanged(isEnabled: Boolean) {
             Log.d(DEBUG_TAG, "Location provider is enabled: " + isEnabled)
             isLocationEnabled = isEnabled
             if (isEnabled) {
                 setShowingStatus(LocationShowingStatus.SEARCHING)
             } else {
                 setShowingStatus(LocationShowingStatus.DISABLED)
             }
         }
     }
+
+    private val locationPermissionLauncher = getPositionRequestLauncher(){ granted ->
+        startLocationUpdatesByType()
+        setShowingStatus(LocationShowingStatus.SEARCHING)
+    }
     // Two different settings for the location provider
     private val locationOptionsArrivals = FusedNativeLocationProvider.Options(5 * 1000L, 25f)
     private val locationOptionsStops = FusedNativeLocationProvider.Options(1000L, 5f)
 
     private var locationProvider: FusedNativeLocationProvider? = null
 
 
     /*private val arrivalsListener: ArrivalsListener = object : ArrivalsListener {
         override fun setProgress(completedRequests: Int, pendingRequests: Int) {
             if (pendingRequests == 0) {
                 flatProgressBar.setIndeterminate(true)
                 flatProgressBar.setVisibility(View.GONE)
             } else {
                 flatProgressBar.setIndeterminate(false)
                 flatProgressBar.progress = completedRequests
             }
         }
 
         /*override fun onAllRequestsCancelled() {
             if (flatProgressBar != null) flatProgressBar!!.setVisibility(View.GONE)
         }
 
          */
 
         override fun showCompletedArrivals(completedPalinas: ArrayList<Palina>) {
             showArrivalsInRecycler(completedPalinas)
         }
     }
 
      */
 
     //ViewModel
     private val viewModel : NearbyStopsViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let{
 
             setFragmentType(FragType.fromNum(it.getInt(FRAGMENT_TYPE_KEY)))
         }
         //locManager = (LocationManager) requireContext().getSystemService(Context.LOCATION_SERVICE);
         //fragmentLocationListener = new FragmentLocationListener();
         if (getContext() != null) {
             //globalSharedPref = getContext().getSharedPreferences(getString(R.string.mainSharedPreferences), Context.MODE_PRIVATE);
             //globalSharedPref.registerOnSharedPreferenceChangeListener(preferenceChangeListener);
         }
 
         //NearbyArrivalsDownloader nearbyArrivalsDownloader = new NearbyArrivalsDownloader(getContext().getApplicationContext(), arrivalsListener);
         locationProvider = FusedNativeLocationProvider(requireContext())
     }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
         // Inflate the layout for this fragment
-        if (getContext() == null) throw RuntimeException()
+        val context = requireContext()
         val root = inflater.inflate(R.layout.fragment_nearby_stops, container, false)
         gridRecyclerView = root.findViewById<RecyclerView>(R.id.stopGridRecyclerView)
         gridLayoutManager = AutoFitGridLayoutManager(
-            requireContext().getApplicationContext(),
-            utils.convertDipToPixels(getContext(), COLUMN_WIDTH_DP.toFloat()).toInt()
+            context.getApplicationContext(),
+            utils.convertDipToPixels(context, COLUMN_WIDTH_DP.toFloat()).toInt()
         )
         gridRecyclerView.setLayoutManager(gridLayoutManager)
         gridRecyclerView.setHasFixedSize(false)
         circlingProgressBar = root.findViewById<ProgressBar>(R.id.circularProgressBar)
         flatProgressBar = root.findViewById(R.id.horizontalProgressBar)
         messageTextView = root.findViewById<TextView>(R.id.messageTextView)
+        enableLocationButton = root.findViewById(R.id.grantLocationButton)
         titleTextView = root.findViewById<TextView>(R.id.titleTextView)
         loadingTextView = root.findViewById<TextView>(R.id.positionLoadingTextView)
         switchButton = root.findViewById<AppCompatButton>(R.id.switchButton)
 
         scrollListener = CommonScrollListener(mListener, false)
         switchButton!!.setOnClickListener(View.OnClickListener { v: View? -> switchFragmentType() })
         if (BuildConfig.DEBUG) Log.d(DEBUG_TAG, "onCreateView")
 
         val appContext = requireContext().applicationContext
         DatabaseUpdate.watchUpdateWorkStatus(context, this){ workInfos ->
                 if (workInfos.isEmpty()) {
                     viewModel.setDBUpdateRunning(false)
                     return@watchUpdateWorkStatus
                 }
 
                 val wi = workInfos.get(0)
                 if (wi.state == WorkInfo.State.RUNNING && locationProvider!!.isRunning()) {
                     locationProvider!!.stopUpdates()
                     viewModel.setDBUpdateRunning(true)
                 } else {
                     //start the request
-                    if (bothLocationPermissionsGranted(requireContext())) {
-                        if (!locationProvider!!.isRunning()) {
-                            startLocationUpdatesByType()
-                        }
-                    } else {
-                        setShowingStatus(LocationShowingStatus.NO_PERMISSION)
-                    }
-
+                    checkPermissionLocationStart()
                     viewModel.setDBUpdateRunning(false)
                     //actually restart request
                 }
         }
 
-
-        if (anyLocationPermissionsGranted(appContext)) {
-            setShowingStatus(LocationShowingStatus.SEARCHING)
-        } else {
-            setShowingStatus(LocationShowingStatus.NO_PERMISSION)
-        }
         //add location listener
         locationProvider!!.addListener(locationUpdateListener)
 
+        enableLocationButton.setOnClickListener {
+            locationPermissionLauncher.launch(Permissions.LOCATION_PERMISSIONS)
+        }
+
         return root
     }
 
 
+    private fun checkPermissionLocationStart(){
+        Log.d(DEBUG_TAG, "Check permission and start location updates")
+        if (bothLocationPermissionsGranted(requireContext())) {
+            if (!locationProvider!!.isRunning()) {
+                startLocationUpdatesByType()
+                setShowingStatus(LocationShowingStatus.SEARCHING)
+            }
+        } else {
+            setShowingStatus(LocationShowingStatus.NO_PERMISSION)
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         gridRecyclerView.setVisibility(View.INVISIBLE)
         gridRecyclerView.addOnScrollListener(scrollListener!!)
         //mListener?.readyGUIfor(FragmentKind.NEARBY_STOPS)
 
         //observe the livedata
         viewModel.stopsAtDistance.observe(getViewLifecycleOwner()) {stops ->
             Log.d(DEBUG_TAG, "Received " + stops.size + " stops nearby")
             var distance = viewModel.distanceMtLiveData.getValue()
             if (distance == null) {
                 distance = 40
             }
             if ((stops.size < stopsMinNumber && distance <= stopsMaxDistance)) {
                 viewModel.setDistance(distance + 40)
                 //viewModel.requestStopsAtDistance(distance, true);
                 //Log.d(DEBUG_TAG, "Doubling distance now!");
                 return@observe  // THIS WORKS AS AN `else`
             }
             if (!stops.isEmpty()) {
                 currentNearbyStops = stops
+                setShowingStatus(LocationShowingStatus.POSITION_FOUND)
                 showStopsInViews(currentNearbyStops, lastPosition)
             }
         }
 
         viewModel.downloadingArrivals.observe(viewLifecycleOwner){ running ->
             if(!running) flatProgressBar.visibility = View.GONE
             else flatProgressBar.visibility = View.VISIBLE
         }
         viewModel.progressPerc.observe(viewLifecycleOwner){ progress ->
             flatProgressBar.isIndeterminate = false
             flatProgressBar.progress = progress
             flatProgressBar.max = 100
 
             if (progress<100){
                 flatProgressBar.visibility = View.VISIBLE
             }
 
         }
 
         viewModel.arrivalsDecoupled.observe(viewLifecycleOwner){ stoprouteList ->
             if (getContext() == null) {
                 Log.e(DEBUG_TAG, "Trying to show arrivals in Recycler but we're not attached")
                 return@observe
             }
+            val context = requireContext()
             if (firstLocForArrivals) {
-                arrivalsStopAdapter = ArrivalsStopAdapter(stoprouteList, mListener, context, lastPosition!!)
-                gridRecyclerView.setAdapter(arrivalsStopAdapter)
-                firstLocForArrivals = false
+                mListener?.let{
+                    lastPosition?.let{ pos ->
+                        arrivalsStopAdapter = ArrivalsStopAdapter(stoprouteList, it, context, pos)
+                        gridRecyclerView.setAdapter(arrivalsStopAdapter)
+                        firstLocForArrivals = false
+                    }
+                }
             } else {
-                arrivalsStopAdapter!!.setRoutesPairListAndPosition(stoprouteList, lastPosition)
+                lastPosition?.let{ pos ->
+                    arrivalsStopAdapter?.setRoutesPairListAndPosition(stoprouteList, pos)
+                }
             }
 
             //arrivalsStopAdapter.notifyDataSetChanged();
+            setShowingStatus(LocationShowingStatus.POSITION_FOUND)
             showRecyclerHidingLoadMessage()
             //if (mListener != null) mListener!!.readyGUIfor(FragmentKind.NEARBY_ARRIVALS)
         }
+
+        //added
+        checkPermissionLocationStart()
     }
 
 
     /**
      * Internal bit used to start location updates
      */
     private fun startLocationUpdatesByType() {
         when (fragment_type) {
             FragType.STOPS -> locationProvider!!.startUpdates(locationOptionsStops)
             FragType.ARRIVALS -> locationProvider!!.startUpdates(locationOptionsArrivals)
         }
     }
 
 
     /**
      * Use this method to set the fragment type
      * @param type the type, TYPE_ARRIVALS or TYPE_STOPS
      */
     private fun setFragmentType(type: FragType) {
         val isChanged = fragment_type != type
         this.fragment_type = type
         /*switch(type){
             case ARRIVALS:
                 TIME_INTERVAL_REQUESTS = 5*1000;
                 break;
             case STOPS:
                 TIME_INTERVAL_REQUESTS = 1000;
 
         }
 
          */
         if (isChanged) {
             startLocationUpdatesByType()
             setShowingStatus(LocationShowingStatus.SEARCHING)
         }
     }
 
     /**
      * Set the location in the view model if it is good
      * @param location new location
      */
     private fun updateLocationViewModel(location: Location, accuracy: Float = 150f) {
         if (location.getAccuracy() < accuracy) {
             lastPosition = GPSPoint(location.getLatitude(), location.getLongitude())
             //viewModel.requestStopsAtDistance(location.getLatitude(), location.getLongitude(), distance, true);
             viewModel.setLastLocation(location)
         }
     }
 
     private fun setShowingStatus(newStatus: LocationShowingStatus) {
         var newStatus = newStatus
-        if (BuildConfig.DEBUG) Log.d(DEBUG_TAG, "Asked to set showing status : $newStatus")
         if (newStatus == showingStatus) {
             return
         }
+        if (BuildConfig.DEBUG) Log.d(DEBUG_TAG, "Changing showing status from $showingStatus to $newStatus")
+
         if (!isLocationEnabled && newStatus != LocationShowingStatus.NO_PERMISSION) {
             Log.d(DEBUG_TAG, "asked to show status: $newStatus but the position is disabled")
             newStatus = LocationShowingStatus.DISABLED
         }
 
         when (newStatus) {
-            LocationShowingStatus.FIRST_FIX -> {
+            LocationShowingStatus.POSITION_FOUND -> {
                 circlingProgressBar!!.setVisibility(View.GONE)
                 loadingTextView!!.setVisibility(View.GONE)
                 gridRecyclerView.setVisibility(View.VISIBLE)
                 messageTextView!!.setVisibility(View.GONE)
+                enableLocationButton.setVisibility(View.GONE)
+
             }
 
             LocationShowingStatus.NO_PERMISSION -> {
-                circlingProgressBar!!.setVisibility(View.GONE)
-                loadingTextView!!.setVisibility(View.GONE)
-                messageTextView!!.setText(R.string.enable_position_message_nearby)
-                messageTextView!!.setVisibility(View.VISIBLE)
+                circlingProgressBar?.setVisibility(View.GONE)
+                loadingTextView?.setVisibility(View.GONE)
+                messageTextView?.setText(R.string.enable_position_message_nearby)
+                messageTextView?.setVisibility(View.VISIBLE)
+                enableLocationButton.setVisibility(View.VISIBLE)
             }
 
             LocationShowingStatus.DISABLED -> {
                 //if (showingStatus== LocationShowingStatus.SEARCHING){
                 circlingProgressBar!!.setVisibility(View.GONE)
                 loadingTextView!!.setVisibility(View.GONE)
                 //}
                 messageTextView!!.setText(R.string.enable_location_message)
                 messageTextView!!.setVisibility(View.VISIBLE)
+                enableLocationButton.setVisibility(View.GONE)
             }
 
             LocationShowingStatus.SEARCHING -> {
                 circlingProgressBar!!.setVisibility(View.VISIBLE)
                 loadingTextView!!.setVisibility(View.VISIBLE)
                 gridRecyclerView.setVisibility(View.GONE)
                 messageTextView!!.setVisibility(View.GONE)
+                enableLocationButton.setVisibility(View.GONE)
             }
         }
         showingStatus = newStatus
     }
 
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
         if (context is FragmentListenerMain) {
             mListener = context as FragmentListenerMain
         } else {
             throw RuntimeException(
                 context
                     .toString() + " must implement OnFragmentInteractionListener"
             )
         }
         Log.d(DEBUG_TAG, "OnAttach called")
         //viewModel = ViewModelProvider(this).get<NearbyStopsViewModel?>(NearbyStopsViewModel::class.java)
     }
 
     override fun onPause() {
         super.onPause()
 
         //gridRecyclerView.setAdapter(null)
         Log.d(DEBUG_TAG, "On paused called")
 
         locationProvider!!.stopUpdates()
     }
 
     override fun onResume() {
         super.onResume()
         //fix view if we were showing the stops or the arrivals
         prepareForFragmentType()
         when (fragment_type) {
             FragType.STOPS -> if (dataAdapter != null) {
                 //gridRecyclerView.setAdapter(dataAdapter);
                 circlingProgressBar!!.setVisibility(View.GONE)
                 loadingTextView!!.setVisibility(View.GONE)
             }
 
             FragType.ARRIVALS -> if (arrivalsStopAdapter != null) {
                 //gridRecyclerView.setAdapter(arrivalsStopAdapter);
                 circlingProgressBar!!.setVisibility(View.GONE)
                 loadingTextView!!.setVisibility(View.GONE)
             }
         }
 
         mListener!!.enableRefreshLayout(false)
         Log.d(DEBUG_TAG, "OnResume called")
         if (getContext() == null) {
             Log.e(DEBUG_TAG, "NULL CONTEXT, everything is going to crash now")
             stopsMinNumber = 5
             stopsMaxDistance = 600
             return
         }
         //Re-read preferences
         val shpr = PreferenceManager.getDefaultSharedPreferences(requireContext().getApplicationContext())
         //For some reason, they are all saved as strings
         stopsMaxDistance = shpr.getInt(getString(R.string.pref_key_radius_recents), 600)
         var isMinStopInt = true
         try {
             stopsMinNumber = shpr.getInt(getString(R.string.pref_key_num_recents), 5)
         } catch (ex: ClassCastException) {
             isMinStopInt = false
         }
         if (!isMinStopInt) try {
             stopsMinNumber = shpr.getString(getString(R.string.pref_key_num_recents), "5")!!.toInt()
         } catch (ex: NumberFormatException) {
             stopsMinNumber = 5
         }
         if (BuildConfig.DEBUG) Log.d(
             DEBUG_TAG,
             "Max distance for stops: $stopsMaxDistance, Min number of stops: $stopsMinNumber"
         )
 
-        if (!locationProvider!!.isRunning()) {
-            startLocationUpdatesByType()
-        }
+        //checkPermissionLocationStart()
     }
 
 
 
 
     override fun onDetach() {
         super.onDetach()
         mListener = null
         //if (arrivalsManager != null) arrivalsManager!!.cancelAllRequests()
     }
 
+    override fun onStart() {
+        super.onStart()
+        if(BuildConfig.DEBUG) Log.d(DEBUG_TAG, "onStart called")
+        //checkPermissionLocationStart()
+    }
+
     /**
      * Display the stops, or run new set of requests for arrivals
      */
     private fun showStopsInViews(stops: ArrayList<Stop>, location: GPSPoint?) {
         if (stops.isEmpty()) {
             setNoStopsLayout()
             return
         }
         if (location == null) {
             // we could do something better, but it's better to do this for now
             return
         }
 
         /*var minDistance = Double.POSITIVE_INFINITY
         for (s in stops) {
             minDistance = min(minDistance, s.getDistanceFromLocation(location.getLatitude(), location.getLongitude()))
         }
 
          */
 
 
         //quick trial to hopefully always get the stops in the correct order
         Collections.sort<Stop?>(stops, StopSorterByDistance(location))
         when (fragment_type) {
             FragType.STOPS -> showStopsInRecycler(stops)
             FragType.ARRIVALS -> {
                 //don't do anything if we're not attached
                 /*context?.let{
                     if (arrivalsManager == null) arrivalsManager =
                         NearbyArrivalsDownloader(it.applicationContext, arrivalsListener)
                     arrivalsManager!!.requestArrivalsForStops(stops)
                 }
 
                  */
                 viewModel.requestArrivalsForStops(stops)
             }
         }
     }
 
     /**
      * To enable targeting from the Button
      */
     fun switchFragmentType(v: View?) {
         switchFragmentType()
     }
 
     /**
      * Call when you need to switch the type of fragment
      */
     private fun switchFragmentType() {
         when (fragment_type) {
             FragType.ARRIVALS -> setFragmentType(FragType.STOPS)
             FragType.STOPS -> setFragmentType(FragType.ARRIVALS)
             else -> {}
         }
         prepareForFragmentType()
         //locManager.removeLocationRequestFor(fragmentLocationListener);
         //locManager.addLocationRequestFor(fragmentLocationListener);
         if (lastPosition != null) {
             // we have at least one fix on the position
             showStopsInViews(currentNearbyStops, lastPosition)
         }
     }
 
     /**
      * Prepare the views for the set fragment type
      */
     private fun prepareForFragmentType() {
         if (fragment_type == FragType.STOPS) {
             switchButton!!.text = getString(R.string.show_arrivals)
             titleTextView!!.text = getString(R.string.nearby_stops_message)
 
-            dataAdapter?.let{ gridRecyclerView.adapter = it}
+            dataAdapter?.let{ gridRecyclerView.adapter = it
+
+            }
 
             mListener?.readyGUIfor(FragmentKind.NEARBY_STOPS)
 
         } else if (fragment_type == FragType.ARRIVALS) {
             titleTextView!!.text = getString(R.string.nearby_arrivals_message)
             switchButton!!.text = getString(R.string.show_stops)
             val arrivalsSorted = viewModel.arrivalsDecoupled.value
             arrivalsSorted?.let{
                 lastPosition?.let{pos ->
-                    arrivalsStopAdapter = ArrivalsStopAdapter(it,mListener,requireContext(), pos )
+                    arrivalsStopAdapter = ArrivalsStopAdapter(it,mListener!!,requireContext(), pos )
                 }
             }
             arrivalsStopAdapter?.let{
                 gridRecyclerView.setAdapter(it)
             }
 
             mListener?.readyGUIfor(FragmentKind.NEARBY_ARRIVALS)
         }
     }
 
     //useful methods
     /**//// GUI METHODS //////// */
     private fun showStopsInRecycler(stops: MutableList<Stop>?) {
         if (dataAdapter == null) {
             dataAdapter = SquareStopAdapter(stops, mListener, lastPosition)
             gridRecyclerView!!.setAdapter(dataAdapter)
             firstLocForStops = false
         } else {
             dataAdapter!!.setUserPosition(lastPosition)
             dataAdapter!!.setStops(stops)
         }
 
         //showRecyclerHidingLoadMessage();
         if (gridRecyclerView!!.getVisibility() != View.VISIBLE) {
             circlingProgressBar!!.setVisibility(View.GONE)
             loadingTextView!!.setVisibility(View.GONE)
             gridRecyclerView!!.setVisibility(View.VISIBLE)
         }
         messageTextView!!.setVisibility(View.GONE)
 
     }
 
     private fun showArrivalsInRecycler(routesPairList: List<Pair<Stop, Route>>) {
 
 
     }
 
     private fun setNoStopsLayout() {
         messageTextView!!.setVisibility(View.VISIBLE)
         messageTextView!!.setText(R.string.no_stops_nearby)
         circlingProgressBar!!.setVisibility(View.GONE)
         loadingTextView!!.setVisibility(View.GONE)
     }
 
     /**
      * Does exactly what is says on the tin
      */
     private fun showRecyclerHidingLoadMessage() {
         if (gridRecyclerView.getVisibility() != View.VISIBLE) {
             circlingProgressBar!!.setVisibility(View.GONE)
             loadingTextView!!.setVisibility(View.GONE)
             gridRecyclerView.setVisibility(View.VISIBLE)
         }
         messageTextView!!.setVisibility(View.GONE)
     } /*
      * Local locationListener, to use for the GPS
      */
     /*
     class FragmentLocationListener implements LocationListenerCompat {
 
         private long lastUpdateTime = -1;
         public boolean isRegistered = false;
 
         @Override
         public void onLocationChanged(@NonNull Location location) {
             if(viewModel==null){
                 return;
             }
             if(location.getAccuracy()<200) {
 
                lastPosition = new GPSPoint(location.getLatitude(), location.getLongitude());
                //viewModel.requestStopsAtDistance(location.getLatitude(), location.getLongitude(), distance, true);
                 viewModel.setLastLocation(location);
             }
             lastUpdateTime = System.currentTimeMillis();
             //Log.d("BusTO:NearPositListen","can start request for stops: "+ !dbUpdateRunning);
         }
 
         @Override
         public void onProviderEnabled(@NonNull String provider) {
             Log.d(DEBUG_TAG, "Location provider "+provider+" enabled");
             if(provider.equals(LocationManager.GPS_PROVIDER)){
                 setShowingStatus(LocationShowingStatus.SEARCHING);
             }
         }
 
         @Override
         public void onProviderDisabled(@NonNull String provider) {
             Log.d(DEBUG_TAG, "Location provider "+provider+" disabled");
             if(provider.equals(LocationManager.GPS_PROVIDER)) {
                setShowingStatus(LocationShowingStatus.DISABLED);
             }
         }
 
         @Override
         public void onStatusChanged(@NonNull String provider, int status, @Nullable Bundle extras) {
             LocationListenerCompat.super.onStatusChanged(provider, status, extras);
         }
     }
 
      */
 
     companion object {
         private const val DEBUG_TAG = "NearbyStopsFragment"
         private const val FRAGMENT_TYPE_KEY = "FragmentType"
         const val FRAGMENT_TAG: String = "NearbyStopsFrag"
 
         const val COLUMN_WIDTH_DP: Int = 250
 
 
         /**
          * Use this factory method to create a new instance of
          * this fragment using the provided parameters.
          * @return A new instance of fragment NearbyStopsFragment.
          */
         @JvmStatic
         fun newInstance(type: FragType): NearbyStopsFragment {
             //if(fragmentType != TYPE_STOPS && fragmentType != TYPE_ARRIVALS )
             //    throw new IllegalArgumentException("WRONG KIND OF FRAGMENT USED");
             val fragment = NearbyStopsFragment()
             val args = Bundle(1)
             args.putInt(FRAGMENT_TYPE_KEY, type.num)
             fragment.setArguments(args)
             return fragment
         }
     }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/ScreenBaseFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/ScreenBaseFragment.java
index 24c3234..6add841 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/ScreenBaseFragment.java
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/ScreenBaseFragment.java
@@ -1,216 +1,217 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2018-2026 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.fragments;
 
 import android.Manifest;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
 import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
 
 import com.google.android.flexbox.FlexDirection;
 import com.google.android.flexbox.FlexboxLayoutManager;
 import com.google.android.flexbox.JustifyContent;
 import com.google.android.material.snackbar.Snackbar;
 import it.reyboz.bustorino.BuildConfig;
 
 import java.util.Map;
+import java.util.function.Consumer;
 
 import static android.content.Context.MODE_PRIVATE;
 
 public abstract class ScreenBaseFragment extends Fragment {
 
     protected final static String PREF_FILE= BuildConfig.APPLICATION_ID+".fragment_prefs";
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
     }
 
 
 
     protected void setOption(String optionName, boolean value) {
         Context mContext = getContext();
         assert mContext != null;
         SharedPreferences.Editor editor = mContext.getSharedPreferences(PREF_FILE, MODE_PRIVATE).edit();
         editor.putBoolean(optionName, value);
         editor.commit();
     }
 
     protected boolean getOption(String optionName, boolean optDefault) {
         Context mContext = getContext();
         assert mContext != null;
         return getOption(mContext, optionName, optDefault);
     }
 
     protected void showToastMessage(int messageID, boolean shortT) {
         final int length = shortT ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG;
         final Context context = getContext();
         if(context!=null)
             Toast.makeText(context, messageID, length).show();
     }
     protected void makeToast(String message){
         Toast.makeText(getContext(), message, Toast.LENGTH_SHORT).show();
     }
     protected void makeToast(int messageID){
         Toast.makeText(getContext(), messageID, Toast.LENGTH_SHORT).show();
     }
 
     public void hideKeyboard() {
         if (getActivity()==null) return;
         View view = getActivity().getCurrentFocus();
         if (view != null) {
             ((InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE))
                     .hideSoftInputFromWindow(view.getWindowToken(),
                             InputMethodManager.HIDE_NOT_ALWAYS);
         }
     }
 
     /**
      * Find the view on which the snackbar should be shown
      * @return a view or null if you don't want the snackbar shown
      */
     @Nullable
     public abstract View getBaseViewForSnackBar();
 
     /**
      * Empty method to override properties of the Snackbar before showing it
      * @param snackbar the Snackbar to be possibly modified
      */
     public void setSnackbarPropertiesBeforeShowing(Snackbar snackbar){
 
     }
     public boolean showSnackbarOnDBUpdate() {
         return true;
     }
 
     public static boolean getOption(Context context, String optionName, boolean optDefault){
         SharedPreferences preferences = context.getSharedPreferences(PREF_FILE, MODE_PRIVATE);
         return preferences.getBoolean(optionName, optDefault);
     }
     public static void setOption(Context context,String optionName, boolean value) {
         SharedPreferences.Editor editor = context.getSharedPreferences(PREF_FILE, MODE_PRIVATE).edit();
         editor.putBoolean(optionName, value);
         editor.apply();
     }
-    public ActivityResultLauncher<String[]> getPositionRequestLauncher(LocationRequestListener listener){
+    public ActivityResultLauncher<String[]> getPositionRequestLauncher(Consumer<Boolean> listener){
         return registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<>() {
             @Override
             public void onActivityResult(Map<String, Boolean> result) {
                 if (result == null) return;
 
                 if (result.get(Manifest.permission.ACCESS_COARSE_LOCATION) == null ||
                         result.get(Manifest.permission.ACCESS_FINE_LOCATION) == null)
                     return;
                 final boolean coarseGranted = Boolean.TRUE.equals(result.get(Manifest.permission.ACCESS_COARSE_LOCATION));
                 final boolean fineGranted = Boolean.TRUE.equals(result.get(Manifest.permission.ACCESS_FINE_LOCATION));
                 if (coarseGranted != fineGranted){
                     Log.e("BusTO-ScreenBaseFragment", "the two permissions have different values, coarse "+
                             coarseGranted +", fineGranted "+fineGranted);
                 }
 
-                listener.onPermissionResult(coarseGranted || fineGranted);
+                listener.accept(coarseGranted && fineGranted);
             }
         });
     }
 
     protected FlexboxLayoutManager getFlexLayoutManager(@NonNull Context context) {
         var layoutManager = new FlexboxLayoutManager(context);
         layoutManager.setFlexDirection(FlexDirection.ROW);
         layoutManager.setJustifyContent(JustifyContent.FLEX_START);
 
         return layoutManager;
     }
     /*protected void runActionFavorites(@NonNull Stop s, @NonNull FavoritesChangeWorker.Action action, @NonNull FavoritesChangeWorker.Companion.ResultListener resultListener){
         Context mContext = requireContext();
 
         WorkManager workManager = WorkManager.getInstance(mContext);
 
         WorkRequest req = FavoritesChangeWorker.makeRequest(s, action);
         workManager.enqueue(req);
         Context appContext = mContext.getApplicationContext();
 
         //FavoritesChangeWorker.registerListener(mContext, getViewLifecycleOwner(), s, action, resultListener);
         workManager.getWorkInfosByTagLiveData(FavoritesChangeWorker.getTag(s, action))
                 .observe(getViewLifecycleOwner(), wi -> {
                     Log.d("BusTO-BaseFragment", "workinfo for stop "+s.ID+" has arrived");
                     if(wi.isEmpty()){
                         return;
                     }
                     WorkInfo workInfo = wi.get(wi.size() - 1);
                     Data progress = wi.get(wi.size()-1).getProgress();
 
                     int actvalue = progress.getInt(ACTION_ARG,-1);
                     boolean done = progress.getBoolean(DONE_ARG, false);
                     if (done) {
                         // at this point the action should be just ADD or REMOVE
 
                         if (actvalue == FavoritesChangeWorker.Action.ADD.getValue()) {
                             // now added
                             Toast.makeText(appContext, R.string.added_in_favorites, Toast.LENGTH_SHORT).show();
                         } else if (actvalue == FavoritesChangeWorker.Action.REMOVE.getValue()) {
                             // now removed
                             Toast.makeText(appContext, R.string.removed_from_favorites, Toast.LENGTH_SHORT).show();
                         }
                     } else {
                         // wtf
                         Toast.makeText(appContext, R.string.cant_add_to_favorites, Toast.LENGTH_SHORT).show();
                     }
                     Log.d("busTO-ScreenBaseFragm", "favorites action="+actvalue+ ",done="+done);
 
                     // aggiorna UI
                     resultListener.doStuffWithResult(done);
                 });
     }
 
      */
     public static void applyBottomInsetAsPadding(ViewGroup scrollableView) {
         final int originalPaddingBottom = scrollableView.getPaddingBottom();
         scrollableView.setClipToPadding(false); // ora lo trova
         ViewCompat.setOnApplyWindowInsetsListener(scrollableView, (v, insets) -> {
             Insets bars = insets.getInsets(
                     WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime()
             );
             v.setPadding(
                     v.getPaddingLeft(), v.getPaddingTop(),
                     v.getPaddingRight(), originalPaddingBottom + bars.bottom
             );
             return insets;
         });
     }
 
 
     public interface LocationRequestListener{
         void onPermissionResult(boolean locationGranted);
     }
 
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/SettingsFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/SettingsFragment.java
index 49a0b9e..b5822ab 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/SettingsFragment.java
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/SettingsFragment.java
@@ -1,234 +1,249 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2020 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.fragments;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.lifecycle.Observer;
 import androidx.preference.*;
 import androidx.work.OneTimeWorkRequest;
 import androidx.work.WorkInfo;
 import androidx.work.WorkManager;
 import it.reyboz.bustorino.ActivityBackup;
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.data.DBUpdateWorker;
 import it.reyboz.bustorino.data.GtfsMaintenanceWorker;
+import it.reyboz.bustorino.data.PreferencesHolder;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.ref.WeakReference;
 import java.util.HashSet;
 import java.util.List;
 
 public class SettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
     private static final String TAG = SettingsFragment.class.getName();
 
     private static final String DIALOG_FRAGMENT_TAG =
             "androidx.preference.PreferenceFragment.DIALOG";
     //private static final
     Handler mHandler;
     // Matching preferences.xml
     public final static String PREF_KEY_STARTUP_SCREEN="startup_screen_to_show";
     public final static String KEY_ARRIVALS_FETCHERS_USE = "arrivals_fetchers_use_setting";
     public final static String LIVE_POSITIONS_PREF_MQTT_VALUE="mqtt";
     public final static String LIBREMAP_STYLE_PREF_KEY = "libremap_style_1";
 
     private boolean setSummaryStartupPref = false;
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         mHandler = new Handler();
         return super.onCreateView(inflater, container, savedInstanceState);
 
     }
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         //getPreferenceManager().setSharedPreferencesName(getString(R.string.mainSharedPreferences));
         convertStringPrefToIntIfNeeded(getString(R.string.pref_key_num_recents), getContext());
-
-        getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+        var sharedPrefs = getPreferenceManager().getSharedPreferences();
+        if(sharedPrefs!=null) {
+            sharedPrefs.registerOnSharedPreferenceChangeListener(this);
+        }
         setPreferencesFromResource(R.xml.preferences,rootKey);
         /*EditTextPreference editPref = findPreference(getString(R.string.pref_key_num_recents));
         editPref.setOnBindEditTextListener(editText -> {
             editText.setInputType(InputType.TYPE_CLASS_NUMBER);
             editText.setSelection(0,editText.getText().length());
         });
          */
 
         ListPreference startupScreenPref = findPreference(PREF_KEY_STARTUP_SCREEN);
         if(startupScreenPref !=null){
             if (startupScreenPref.getValue()==null){
                 startupScreenPref.setSummary(getString(R.string.nav_arrivals_text));
                 setSummaryStartupPref = true;
             }
         }
 
         //Log.d("BusTO-PrefFrag","startup screen pref is "+startupScreenPref.getValue());
 
         Preference dbUpdateNow = findPreference("pref_db_update_now");
         if (dbUpdateNow!=null)
             dbUpdateNow.setOnPreferenceClickListener(
                 preference -> {
                     //force update
                     if(getContext()!=null) {
                         DBUpdateWorker.requestDBUpdateUniqueWork(requireContext(), true);
                         Toast.makeText(getContext(),R.string.requesting_db_update,Toast.LENGTH_SHORT).show();
                         return true;
                     }
                     return false;
                 }
         );
         //set click listener on backup item
         final Preference backupPref = findPreference("pref_backup_open");
         if (backupPref!=null) backupPref.setOnPreferenceClickListener(
                 preference -> {
                     if(getActivity()!=null){
                         startActivity( new Intent(getActivity().getApplicationContext(), ActivityBackup.class) );
                         return true;
                     } else {
                         return false;
                     }
                 }
         );
 
         else {
             Log.e("BusTO-Preferences", "Cannot find db update preference");
         }
         Preference clearGtfsTrips = findPreference("pref_clear_gtfs_trips");
         if (clearGtfsTrips != null) {
             clearGtfsTrips.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(@NonNull @NotNull Preference preference) {
                     if (getContext() != null) {
                         OneTimeWorkRequest requ = GtfsMaintenanceWorker.Companion.makeOneTimeRequest(GtfsMaintenanceWorker.CLEAR_GTFS_TRIPS);
                         WorkManager.getInstance(getContext()).enqueue(requ);
                         WorkManager.getInstance(getContext()).getWorkInfosByTagLiveData(GtfsMaintenanceWorker.CLEAR_GTFS_TRIPS).observe(getViewLifecycleOwner(),
                                 (Observer<List<WorkInfo>>) workInfos -> {
                                     if(workInfos.isEmpty())
                                         return;
                                     if(workInfos.get(0).getState()==(WorkInfo.State.SUCCEEDED)){
                                         Toast.makeText(
                                                 getContext(), R.string.all_trips_removed, Toast.LENGTH_SHORT
                                         ).show();
                                     }
                                 });
                         return true;
                     }
                     return false;
                 }
             });
         }
 
     }
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         Preference pref = findPreference(key);
         Log.d(TAG,"Preference key "+key+" changed");
         if (key.equals(SettingsFragment.KEY_ARRIVALS_FETCHERS_USE)){
             Log.d(TAG, "New value is: "+sharedPreferences.getStringSet(key, new HashSet<>()));
         }
 
         //sometimes this happens
         if(getContext()==null) return;
         if(key.equals(PREF_KEY_STARTUP_SCREEN) && setSummaryStartupPref && pref !=null){
             ListPreference listPref = (ListPreference) pref;
             pref.setSummary(listPref.getEntry());
         }
+
+        if(key.equals(PreferencesHolder.PREF_THEME_DAY_NIGHT)){
+            String value = sharedPreferences.getString(key, "");
+            Log.d(TAG, "New value is: "+ value);
+            if(!value.isEmpty()){
+                var state = PreferencesHolder.getAppThemeDayNight(value);
+                AppCompatDelegate.setDefaultNightMode(state);
+
+            }
+
+        }
         /*
         THIS CODE STAYS COMMENTED FOR FUTURE REFERENCES
         if (key.equals(getString(R.string.pref_key_num_recents))){
             //check that is it an int
 
             String value = sharedPreferences.getString(key,"");
             boolean valid = value.length() != 0;
             try{
                 Integer intValue = Integer.parseInt(value);
             } catch (NumberFormatException ex){
                 valid = false;
             }
             if (!valid){
                 Toast.makeText(getContext(), R.string.invalid_number, Toast.LENGTH_SHORT).show();
                 if(pref instanceof EditTextPreference){
                     EditTextPreference prefEdit = (EditTextPreference) pref;
                     //Intent intent = prefEdit.getIntent();
                     Log.d(TAG, "opening preference, dialog showing "+
                             (getParentFragmentManager().findFragmentByTag(DIALOG_FRAGMENT_TAG)!=null) );
                     //getPreferenceManager().showDialog(pref);
                     //onDisplayPreferenceDialog(prefEdit);
                     mHandler.postDelayed(new DelayedDisplay(prefEdit), 500);
                 }
 
             }
         }
          */
 
         Log.d("BusTO Settings", "changed "+key+"\n "+sharedPreferences.getAll());
 
     }
 
     private void convertStringPrefToIntIfNeeded(String preferenceKey, Context con){
         if (con == null) return;
         SharedPreferences defaultSharedPref = PreferenceManager.getDefaultSharedPreferences(con);
         try{
 
             Integer val = defaultSharedPref.getInt(preferenceKey, 0);
         } catch (NumberFormatException | ClassCastException ex){
             //convert the preference
             //final String preferenceNumRecents = getString(R.string.pref_key_num_recents);
             Log.d("Preference - BusTO", "Converting to integer the string preference "+preferenceKey);
             String currentValue = defaultSharedPref.getString(preferenceKey, "10");
             int newValue;
             try{
                 newValue = Integer.parseInt(currentValue);
             } catch (NumberFormatException e){
                 newValue = 10;
             }
             final SharedPreferences.Editor editor  = defaultSharedPref.edit();
             editor.remove(preferenceKey);
             editor.putInt(preferenceKey, newValue);
             editor.apply();
         }
     }
 
     class DelayedDisplay implements Runnable{
         private final WeakReference<DialogPreference> preferenceWeakReference;
 
         public DelayedDisplay(DialogPreference preference) {
             this.preferenceWeakReference = new WeakReference<>(preference);
         }
 
         @Override
         public void run() {
             if(preferenceWeakReference.get()==null)
                 return;
 
             getPreferenceManager().showDialog(preferenceWeakReference.get());
         }
     }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/map/MapLibreUtils.kt b/app/src/main/java/it/reyboz/bustorino/map/MapLibreUtils.kt
index 5ee3883..71a4205 100644
--- a/app/src/main/java/it/reyboz/bustorino/map/MapLibreUtils.kt
+++ b/app/src/main/java/it/reyboz/bustorino/map/MapLibreUtils.kt
@@ -1,236 +1,244 @@
 package it.reyboz.bustorino.map
 
 import android.animation.TypeEvaluator
 import android.content.Context
 import android.util.Log
 import it.reyboz.bustorino.BuildConfig
 import it.reyboz.bustorino.backend.Stop
 import org.maplibre.android.geometry.LatLng
 import org.maplibre.android.location.LocationComponentActivationOptions
 import org.maplibre.android.location.LocationComponentOptions
 import org.maplibre.android.location.engine.LocationEngineRequest
 import org.maplibre.android.maps.Style
 import org.maplibre.geojson.Point
 import org.maplibre.turf.TurfMeasurement
 
 
 class MapLibreUtils {
     companion object{
         //const val STYLE_BRIGHT_DEFAULT_JSON = "map_style_good_noshops.json"
         const val STYLE_VERSATILES_COLORFUL_JSON = "versatiles_colorful_light.json"
+        const val STYLE_VERSATILES_ECLIPSE_JSON = "versatiles_eclipse_modif.json" //"versatiles_eclipse.json"
         const val STYLE_OSM_RASTER="openstreetmap_raster.json"
 
-        const val STYLE_VECTOR = STYLE_VERSATILES_COLORFUL_JSON
         private const val DEBUG_TAG ="BusTO-MapLibreUtils"
 
         @JvmStatic
-        fun getDefaultStyleJson() = STYLE_VECTOR
+        fun isStyleVector(styleFile: String): Boolean {
+            return when(styleFile){
+                //be careful to include all the style cases
+                STYLE_OSM_RASTER -> false
+                STYLE_VERSATILES_COLORFUL_JSON -> true
+                STYLE_VERSATILES_ECLIPSE_JSON -> true
+                else -> true
+            }
+        }
 
         @JvmStatic
         fun shortestRotation(from: Float, to: Float): Float {
             var delta = (to - from) % 360
             if (delta > 180) delta -= 360
             if (delta < -180) delta += 360
             return from + delta
         }
         @JvmStatic
         fun buildLocationComponentActivationOptions(
             style: Style,
             locationComponentOptions: LocationComponentOptions,
             context: Context
         ): LocationComponentActivationOptions {
             return LocationComponentActivationOptions
                 .builder(context, style)
                 .locationComponentOptions(locationComponentOptions)
                 .useDefaultLocationEngine(true)
                 .locationEngineRequest(
                     LocationEngineRequest.Builder(750)
                         .setFastestInterval(750)
                         .setPriority(LocationEngineRequest.PRIORITY_HIGH_ACCURACY)
                         .build()
                 )
                 .build()
         }
         @JvmStatic
         fun calcDistanceInSegment(points: List<LatLng>, from: Int, to:Int): Double{
             var d=0.0
             var prev = points[from]
             for(i in from+1..to){
                 d += prev.distanceTo(points[i])
                 prev = points[i]
             }
             return d
         }
         @JvmStatic
         fun findIndexMidPoint(points: List<LatLng>, from: Int, to: Int, distThresh:Double): Int{
             var totdist=0.0
             var idx = -2
             var prev = points[from]
             for(i in from+1..to){
                 totdist += prev.distanceTo(points[i])
                 prev = points[i]
                 if (totdist >= distThresh){
                     idx = i
                     break
                 }
             }
             if(idx==-2) throw Error("Distance out of bounds, total distance is $totdist")
             return idx
         }
 
         @JvmStatic
         fun findPointsToPutDirectionMarkers(polyPoints: List<LatLng>, stops: List<Stop>, distanceIcon: Double): List<Int>{
             //output value
             val pointsOutput = mutableListOf<Int>()
             val closestIndices = findIndicesClosestPointsForStops(polyPoints, stops)
             Log.d(DEBUG_TAG, "idcs: $closestIndices")
             if(closestIndices.size==0)
                 return pointsOutput
 
             val distancesSec = mutableListOf<Double>()
             var pi = closestIndices[0]
             val cumulativeDist = mutableListOf<Double>()
             var sum = 0.0
 
             var nPoints = 0
             var distFromLastPoint = 0.0
             for(i in 1..<stops.size){
                 val newi = closestIndices[i]
                 val dd = calcDistanceInSegment(polyPoints, pi, newi)
                 distancesSec.add(dd)
                 sum += dd
                 cumulativeDist.add(sum)
                 distFromLastPoint += dd
 
 
                 //check if sum is above dist
                 if (distFromLastPoint >= distanceIcon){
                     if(BuildConfig.DEBUG)
                         Log.d(DEBUG_TAG, "Add between stop ${stops[i-1]} and stop ${stops[i]}, distance between: $dd")
                     if(dd>100) {
                         val imid = findIndexMidPoint(polyPoints, pi, newi, dd / 2)
                         pointsOutput.add(imid)
                         nPoints += 1
                         distFromLastPoint=0.0
                     }
                 } else{
                     //add the last distance
                     //distFromLastPoint+=dd/2
                 }
                 pi= newi
             }
             return pointsOutput
         }
         /*
             VERSION WITH TOTAL DISTANCE
             val distancesSec = mutableListOf<Double>()
             var prevk = 0
             val cumulativeDist = mutableListOf<Double>()
             var sum = 0.0
 
             val pointsOutput = mutableListOf<Int>()
             var nPoints = 0
             //for(i in 1..<stops.size){
             var lastStopidx = 0
             var distFromLast = 0.0
             for(k in 1..<polyPoints.size){
                 //val newi = closestIndices[i]
                 val dd = calcDistanceInSegment(polyPoints, prevk, k)
                 distancesSec.add(dd)
                 sum += dd
                 cumulativeDist.add(sum)
                 distFromLast += dd
 
 
                 //check if sum is above dist
                 if (distFromLast >= distanceIcon ){
 
                     //Log.d(DEBUG_TAG, "Add between stop ${stops[lastStopidx]} and stop ${stops[lastStopidx+1]}")
                     //find closest stops
                     var stopDist =
                         Math.min(polyPoints[prevk].distanceTo(polyPoints[lastStopidx]),polyPoints[k].distanceTo(polyPoints[lastStopidx]))
 
                     if(lastStopidx+1 < stops.size){
                         stopDist = Math.min(stopDist,
                             Math.min(polyPoints[prevk].distanceTo(polyPoints[lastStopidx+1]),polyPoints[k].distanceTo(polyPoints[lastStopidx+1]))
                         )
                     }
                     if(stopDist>100) {
                         val imid = findIndexMidPoint(polyPoints, prevk, k, dd / 2)
                         pointsOutput.add(imid)
                         nPoints += 1
                         distFromLast = 0.0
                     }
                 }
                 prevk = k
                 if (k>closestIndices[lastStopidx])
                     lastStopidx +=1
             }
             return pointsOutput
          */
         @JvmStatic
         fun splitPolyWhenDistanceTooBig(points: List<LatLng>, distMax: Double): List<LatLng>{
             val outList = mutableListOf(points[0])
             var oldP = points[0]
             for(i in 1..<points.size){
                 val newP = points[i]
                 val d = oldP.distanceTo(points[i])
                 if(d > distMax){
                     val newLat = (oldP.latitude+newP.latitude)/2
                     val newLong = (oldP.longitude+newP.longitude)/2
                     val extraP = LatLng(newLat,newLong)
                     outList.add(extraP)
                 }
                 outList.add(newP)
 
                 oldP=newP
             }
 
             return outList
         }
 
         @JvmStatic
         fun findIndicesClosestPointsForStops(points:List<LatLng>, stops:List<Stop>): List<Int> {
 
             val closestIndices = stops.map { s->
                 val p = LatLng(s.latitude!!, s.longitude!!)
                 var dist = 10_000_000.0 // in meters
                 var id = -1
                 for (j in points.indices){
                     val newd = p.distanceTo(points[j])
                     if (newd<dist) {
                         id = j
                         dist = newd
                     }
                 }
                 if(id==-1) throw Error("The distance is bigger than 10_000_000")
                 id
             }
 
             return closestIndices
         }
 
         @JvmStatic
         fun getBearing(from: LatLng, to: LatLng): Float {
             return TurfMeasurement.bearing(
                 Point.fromLngLat(from.longitude, from.latitude),
                 Point.fromLngLat(to.longitude, to.latitude)
             ).toFloat()
         }
 
     }
 
 
 
     //TODO: Do the same for LatLng and bearing, if possible
     class LatLngEvaluator : TypeEvaluator<LatLng> {
         private val latLng = LatLng()
         override fun evaluate(fraction: Float, startValue: LatLng, endValue: LatLng): LatLng {
             latLng.latitude = startValue.latitude + (endValue.latitude - startValue.latitude) * fraction
             latLng.longitude = startValue.longitude + (endValue.longitude - startValue.longitude) * fraction
             return latLng
         }
     }
 
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/middleware/GeneralActivity.java b/app/src/main/java/it/reyboz/bustorino/middleware/GeneralActivity.java
index b848a7d..4f33a82 100644
--- a/app/src/main/java/it/reyboz/bustorino/middleware/GeneralActivity.java
+++ b/app/src/main/java/it/reyboz/bustorino/middleware/GeneralActivity.java
@@ -1,274 +1,234 @@
 /*
 	BusTO - Arrival times for Turin public transport.
     Copyright (C) 2021 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.middleware;
 
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.graphics.Rect;
 import android.os.Build;
 import android.view.ViewGroup;
 import androidx.core.graphics.Insets;
 import androidx.core.view.OnApplyWindowInsetsListener;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.preference.PreferenceManager;
 import com.google.android.material.snackbar.Snackbar;
 
 import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.utils;
 import it.reyboz.bustorino.data.PreferencesHolder;
 import it.reyboz.bustorino.fragments.SettingsFragment;
 
 /**
  * Activity class that contains all the generally useful methods
  */
 public abstract class GeneralActivity extends AppCompatActivity {
     final static protected int PERMISSION_REQUEST_POSITION = 33;
     final static protected String LOCATION_PERMISSION_GIVEN = "loc_permission";
     final static protected int STORAGE_PERMISSION_REQ = 291;
 
     final static protected int PERMISSION_OK = 0;
     final static protected int PERMISSION_ASKING = 11;
     final static protected int PERMISSION_NEG_CANNOT_ASK = -3;
 
     final static private String DEBUG_TAG = "BusTO-GeneralAct";
 
     /*
      * Permission stuff
      */
     protected HashMap<String,Runnable> permissionDoneRunnables = new HashMap<>();
     protected HashMap<String,Integer> permissionAsked = new HashMap<>();
 
     protected void setOption(String optionName, boolean value) {
         SharedPreferences.Editor editor = getPreferences(MODE_PRIVATE).edit();
         editor.putBoolean(optionName, value);
         editor.commit();
     }
 
     protected boolean getOption(String optionName, boolean optDefault) {
         SharedPreferences preferences = getPreferences(MODE_PRIVATE);
         return preferences.getBoolean(optionName, optDefault);
     }
 
     protected SharedPreferences getMainSharedPreferences(){
         return PreferencesHolder.getMainSharedPreferences(this);
     }
     public void hideKeyboard() {
         View view = getCurrentFocus();
         if (view != null) {
             ((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE))
                     .hideSoftInputFromWindow(view.getWindowToken(),
                             InputMethodManager.HIDE_NOT_ALWAYS);
         }
     }
 
     public void showToastMessage(int messageID, boolean short_lenght) {
         final int length = short_lenght ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG;
         Toast.makeText(getApplicationContext(), messageID, length).show();
     }
 
     public int askForPermissionIfNeeded(String permission, int requestID){
 
         if(ContextCompat.checkSelfPermission(getApplicationContext(),permission)==PackageManager.PERMISSION_GRANTED){
             return PERMISSION_OK;
         }
         //need to ask for the permission
         //consider scenario when we have already asked for permission
         boolean alreadyAsked = false;
         Integer num_trials = 0;
         synchronized (this){
             if (permissionAsked.containsKey(permission)){
                 num_trials = permissionAsked.get(permission);
                 if (num_trials != null && num_trials > 4)
                     alreadyAsked = true;
 
             }
         }
         Log.d(DEBUG_TAG,"Already asked for permission: "+permission+" -> "+num_trials);
 
         if(!alreadyAsked){
             ActivityCompat.requestPermissions(this,new String[]{permission}, requestID);
             synchronized (this){
                 if (num_trials!=null){
                     permissionAsked.put(permission, num_trials+1);
                 }
             }
             return PERMISSION_ASKING;
         } else {
 
             return PERMISSION_NEG_CANNOT_ASK;
         }
 
     }
 
     public void createSnackbar(int ViewID, String message,int duration){
         Snackbar.make(findViewById(ViewID),message,duration);
     }
 
     /*
     METHOD THAT MIGHT BE USEFUL LATER
     public void assertPermissions(String[] permissions){
         ArrayList<String> permissionstoRequest = new ArrayList<>();
 
         for(int i=0;i<permissions.length;i++){
             if(ContextCompat.checkSelfPermission(getApplicationContext(),permissions[i])!=PackageManager.PERMISSION_GRANTED){
                 permissionstoRequest.add(permissions[i]);
             }
         }
 
         ActivityCompat.requestPermissions(this,permissionstoRequest.toArray(new String[permissionstoRequest]));
     }
     */
 
     //KEYBOARD STUFF
     protected  View getRootView() {
         return findViewById(android.R.id.content);
     }
 
     /**
      * This method doesn't work, DO NOT USE
      * @return if the keyboard is open
      * TODO: fix this if you want
      */
     @Deprecated
     public Boolean isKeyboardOpen(){
         Rect visibleBounds = new Rect();
         this.getRootView().getWindowVisibleDisplayFrame(visibleBounds);
 
         double heightDiff = getRootView().getHeight() - visibleBounds.height();
         final double marginOfError = Math.round(utils.convertDipToPixels(this,50f));
         return heightDiff > marginOfError;
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
     }
 
     protected void setSystemBarAppearance(boolean isSystemInDarkTheme) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             if (isSystemInDarkTheme) {
                 if (getWindow() != null && getWindow().getInsetsController() != null) {
                     getWindow().getInsetsController().setSystemBarsAppearance(
                             0,
                             android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
                     );
                 }
             } else {
                 if (getWindow() != null && getWindow().getInsetsController() != null) {
                     getWindow().getInsetsController().setSystemBarsAppearance(
                             android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS,
                             android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
                     );
                 }
             }
         }
     }
 
     protected OnApplyWindowInsetsListener applyBottomAndBordersInsetsListener = (v, windowInsets) -> {
         Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
         // Apply the insets as a margin to the view. This solution sets only the
         // bottom, left, and right dimensions, but you can apply whichever insets are
         // appropriate to your layout. You can also update the view padding if that's
         // more appropriate.
         ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
         mlp.leftMargin = insets.left;
         mlp.bottomMargin = insets.bottom;
         mlp.rightMargin = insets.right;
         v.setLayoutParams(mlp);
         //set for toolbar
 
         // Return CONSUMED if you don't want the window insets to keep passing
         // down to descendant views.
         return WindowInsetsCompat.CONSUMED;
     };
 
     protected OnApplyWindowInsetsListener applyBottomInsetsListener = (v, windowInsets) -> {
         Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
         // Apply the insets as a margin to the view. This solution sets only the
         // bottom, left, and right dimensions, but you can apply whichever insets are
         // appropriate to your layout. You can also update the view padding if that's
         // more appropriate.
         ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
         mlp.bottomMargin = insets.bottom;
         v.setLayoutParams(mlp);
         //set for toolbar
 
         // Return CONSUMED if you don't want the window insets to keep passing
         // down to descendant views.
         return WindowInsetsCompat.CONSUMED;
     };
 
-    /**
-     * Adjust setting to match the default ones
-     */
-    protected void checkApplyDefaultSettingsValues(){
-        SharedPreferences mainSharedPref = PreferenceManager.getDefaultSharedPreferences(this);
-        SharedPreferences.Editor editor = mainSharedPref.edit();
-        //Main fragment to show
-        String screen = mainSharedPref.getString(SettingsFragment.PREF_KEY_STARTUP_SCREEN, "");
-        boolean edit = false;
-        if (screen.isEmpty()){
-            editor.putString(SettingsFragment.PREF_KEY_STARTUP_SCREEN, "arrivals");
-            edit=true;
-        }
-        //Fetchers
-        final Set<String> setSelected = mainSharedPref.getStringSet(SettingsFragment.KEY_ARRIVALS_FETCHERS_USE, new HashSet<>());
-        if (setSelected.isEmpty()){
-            String[] defaultVals = getResources().getStringArray(R.array.arrivals_sources_values_default);
-            editor.putStringSet(SettingsFragment.KEY_ARRIVALS_FETCHERS_USE, utils.convertArrayToSet(defaultVals));
-            edit=true;
-        }
-        //Live bus positions
-        final String keySourcePositions=getString(R.string.pref_positions_source);
-        final String positionsSource = mainSharedPref.getString(keySourcePositions, "");
-        if(positionsSource.isEmpty()){
-            String[] defaultVals = getResources().getStringArray(R.array.positions_source_values);
-            editor.putString(keySourcePositions, defaultVals[0]);
-            edit=true;
-        }
-        //Map style
-        final String mapStylePref = mainSharedPref.getString(SettingsFragment.LIBREMAP_STYLE_PREF_KEY, "");
-        if(mapStylePref.isEmpty()){
-            final String[] defaultVals = getResources().getStringArray(R.array.map_style_pref_values);
-            editor.putString(SettingsFragment.LIBREMAP_STYLE_PREF_KEY, defaultVals[0]);
-            edit=true;
-        }
-        if (edit){
-            editor.commit();
-        }
-
-    }
 }
diff --git a/app/src/main/res/drawable-hdpi/ic_center_map.png b/app/src/main/res/drawable-hdpi/ic_center_map.png
deleted file mode 100644
index babd8ab..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_center_map.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_follow_me_on.png b/app/src/main/res/drawable-hdpi/ic_follow_me_on.png
deleted file mode 100644
index 7df8c60..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_follow_me_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_center_map.png b/app/src/main/res/drawable-mdpi/ic_center_map.png
deleted file mode 100644
index 70a6861..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_center_map.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_follow_me_on.png b/app/src/main/res/drawable-mdpi/ic_follow_me_on.png
deleted file mode 100644
index fc88b57..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_follow_me_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_center_map.png b/app/src/main/res/drawable-xhdpi/ic_center_map.png
deleted file mode 100644
index 8241800..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_center_map.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_follow_me_on.png b/app/src/main/res/drawable-xhdpi/ic_follow_me_on.png
deleted file mode 100644
index 77a87b1..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_follow_me_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_center_map.png b/app/src/main/res/drawable-xxhdpi/ic_center_map.png
deleted file mode 100644
index 295db21..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_center_map.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_follow_me_on.png b/app/src/main/res/drawable-xxhdpi/ic_follow_me_on.png
deleted file mode 100644
index 9d835c4..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_follow_me_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/bus.png b/app/src/main/res/drawable-xxxhdpi/bus.png
deleted file mode 100644
index 3f2adf0..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/bus.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_center_map.png b/app/src/main/res/drawable-xxxhdpi/ic_center_map.png
deleted file mode 100644
index 502f327..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_center_map.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_follow_me_on.png b/app/src/main/res/drawable-xxxhdpi/ic_follow_me_on.png
deleted file mode 100644
index f335e28..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_follow_me_on.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/subway.png b/app/src/main/res/drawable-xxxhdpi/subway.png
deleted file mode 100644
index a0425c1..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/subway.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/tram.png b/app/src/main/res/drawable-xxxhdpi/tram.png
deleted file mode 100644
index 29cc954..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/tram.png and /dev/null differ
diff --git a/app/src/main/res/drawable/bottom_sheet_background.xml b/app/src/main/res/drawable/bottom_sheet_background.xml
index 9b1165c..4319073 100644
--- a/app/src/main/res/drawable/bottom_sheet_background.xml
+++ b/app/src/main/res/drawable/bottom_sheet_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/white" />
+    <solid android:color="?android:colorBackground" />
     <corners
         android:topLeftRadius="14sp"
         android:topRightRadius="14sp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bus_stop_new.xml b/app/src/main/res/drawable/bus_stop_new.xml
index cfbb96a..c52d01b 100644
--- a/app/src/main/res/drawable/bus_stop_new.xml
+++ b/app/src/main/res/drawable/bus_stop_new.xml
@@ -1,21 +1,21 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="28dp"
     android:height="28dp"
     android:viewportWidth="7.4083"
     android:viewportHeight="7.4087">
   <path
       android:pathData="M0.9452,0L6.4632,0A0.9452,0.9452 0,0 1,7.4083 0.9452L7.4083,6.4635A0.9452,0.9452 0,0 1,6.4632 7.4087L0.9452,7.4087A0.9452,0.9452 0,0 1,0 6.4635L0,0.9452A0.9452,0.9452 0,0 1,0.9452 0z"
       android:strokeLineJoin="round"
       android:strokeWidth="0.0936408"
       android:fillColor="@color/red_orange"
       android:strokeColor="#00000000"/>
   <path
       android:pathData="m3.5412,1.164c-0.732,0 -1.2681,0.085 -1.6077,0.2548 -0.3395,0.1698 -0.509,0.4376 -0.509,0.8036v2.5135c0,0.1279 0.0238,0.2459 0.0723,0.354 0.0485,0.108 0.1129,0.2064 0.1922,0.2946v0.5421c0,0.075 0.0253,0.1379 0.076,0.1886 0.0507,0.0507 0.1137,0.076 0.1886,0.076h0.2646c0.075,0 0.1374,-0.0253 0.1881,-0.076 0.0507,-0.0507 0.0765,-0.1136 0.0765,-0.1886L2.4829,5.662L3.7474,5.662L3.642,5.5565C3.5147,5.4293 3.4139,5.2859 3.3391,5.1328L2.4829,5.1328c-0.1455,0 -0.2705,-0.0519 -0.3741,-0.1555 -0.1036,-0.1036 -0.155,-0.2281 -0.155,-0.3736v-0.7937h1.3565c0.0768,-0.1767 0.1873,-0.3423 0.3318,-0.4868 0.0145,-0.0145 0.0295,-0.0285 0.0444,-0.0424h-0.1452,-1.5875v-0.7937h3.175v0.4175c0.1863,0.0447 0.366,0.124 0.5292,0.2372v-0.9193c0,-0.3792 -0.1636,-0.6502 -0.4899,-0.8134C4.8417,1.2458 4.2997,1.164 3.5412,1.164ZM3.5541,1.6932c0.4851,0 0.837,0.0253 1.0552,0.076 0.2183,0.0507 0.3602,0.1137 0.4263,0.1886L2.0726,1.9578c0.0794,-0.0662 0.2282,-0.1268 0.4465,-0.1819 0.2183,-0.0551 0.5632,-0.0827 1.0351,-0.0827zM2.6152,4.0745c-0.1102,0 -0.2039,0.0386 -0.2811,0.1158 -0.0772,0.0772 -0.1158,0.1709 -0.1158,0.2811 0,0.1102 0.0386,0.2039 0.1158,0.2811 0.0772,0.0772 0.1709,0.1158 0.2811,0.1158 0.1102,0 0.2039,-0.0386 0.2811,-0.1158 0.0772,-0.0772 0.1158,-0.1709 0.1158,-0.2811 0,-0.1102 -0.0386,-0.204 -0.1158,-0.2811 -0.0772,-0.0772 -0.1709,-0.1158 -0.2811,-0.1158z"
       android:strokeWidth="0.00661458"
-      android:fillColor="?colorOnPrimary"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="m4.7541,3.2766c-0.3147,0 -0.6292,0.1199 -0.8693,0.3599 -0.4802,0.4802 -0.4802,1.2587 0,1.7389l0.8693,0.8693 0.8696,-0.8693c0.4801,-0.4802 0.4801,-1.2587 0,-1.7389 -0.2401,-0.2401 -0.5549,-0.3599 -0.8696,-0.3599zM4.7541,3.9596c0.3018,0 0.5464,0.2447 0.5464,0.5464 0,0.3018 -0.2447,0.5464 -0.5464,0.5464 -0.3018,0 -0.5464,-0.2447 -0.5464,-0.5464 0,-0.3018 0.2447,-0.5464 0.5464,-0.5464z"
       android:strokeWidth="0.136612"
-      android:fillColor="?colorOnPrimary"
+      android:fillColor="@color/white"
       android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/bus_stop_new_highlight.xml b/app/src/main/res/drawable/bus_stop_new_highlight.xml
index f5dc16f..780af48 100644
--- a/app/src/main/res/drawable/bus_stop_new_highlight.xml
+++ b/app/src/main/res/drawable/bus_stop_new_highlight.xml
@@ -1,21 +1,22 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="28dp"
     android:height="28dp"
     android:viewportWidth="7.4083"
     android:viewportHeight="7.4087">
   <path
       android:pathData="M0.9452,0L6.4632,0A0.9452,0.9452 0,0 1,7.4083 0.9452L7.4083,6.4635A0.9452,0.9452 0,0 1,6.4632 7.4087L0.9452,7.4087A0.9452,0.9452 0,0 1,0 6.4635L0,0.9452A0.9452,0.9452 0,0 1,0.9452 0z"
       android:strokeLineJoin="round"
       android:strokeWidth="0.0936408"
       android:fillColor="?colorAccent"
       android:strokeColor="#00000000"/>
+  <!-- previously, fillColor was set to ?colorOnPrimary -->
   <path
       android:pathData="m3.5412,1.164c-0.732,0 -1.2681,0.085 -1.6077,0.2548 -0.3395,0.1698 -0.509,0.4376 -0.509,0.8036v2.5135c0,0.1279 0.0238,0.2459 0.0723,0.354 0.0485,0.108 0.1129,0.2064 0.1922,0.2946v0.5421c0,0.075 0.0253,0.1379 0.076,0.1886 0.0507,0.0507 0.1137,0.076 0.1886,0.076h0.2646c0.075,0 0.1374,-0.0253 0.1881,-0.076 0.0507,-0.0507 0.0765,-0.1136 0.0765,-0.1886L2.4829,5.662L3.7474,5.662L3.642,5.5565C3.5147,5.4293 3.4139,5.2859 3.3391,5.1328L2.4829,5.1328c-0.1455,0 -0.2705,-0.0519 -0.3741,-0.1555 -0.1036,-0.1036 -0.155,-0.2281 -0.155,-0.3736v-0.7937h1.3565c0.0768,-0.1767 0.1873,-0.3423 0.3318,-0.4868 0.0145,-0.0145 0.0295,-0.0285 0.0444,-0.0424h-0.1452,-1.5875v-0.7937h3.175v0.4175c0.1863,0.0447 0.366,0.124 0.5292,0.2372v-0.9193c0,-0.3792 -0.1636,-0.6502 -0.4899,-0.8134C4.8417,1.2458 4.2997,1.164 3.5412,1.164ZM3.5541,1.6932c0.4851,0 0.837,0.0253 1.0552,0.076 0.2183,0.0507 0.3602,0.1137 0.4263,0.1886L2.0726,1.9578c0.0794,-0.0662 0.2282,-0.1268 0.4465,-0.1819 0.2183,-0.0551 0.5632,-0.0827 1.0351,-0.0827zM2.6152,4.0745c-0.1102,0 -0.2039,0.0386 -0.2811,0.1158 -0.0772,0.0772 -0.1158,0.1709 -0.1158,0.2811 0,0.1102 0.0386,0.2039 0.1158,0.2811 0.0772,0.0772 0.1709,0.1158 0.2811,0.1158 0.1102,0 0.2039,-0.0386 0.2811,-0.1158 0.0772,-0.0772 0.1158,-0.1709 0.1158,-0.2811 0,-0.1102 -0.0386,-0.204 -0.1158,-0.2811 -0.0772,-0.0772 -0.1709,-0.1158 -0.2811,-0.1158z"
       android:strokeWidth="0.00661458"
-      android:fillColor="?colorOnPrimary"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="m4.7541,3.2766c-0.3147,0 -0.6292,0.1199 -0.8693,0.3599 -0.4802,0.4802 -0.4802,1.2587 0,1.7389l0.8693,0.8693 0.8696,-0.8693c0.4801,-0.4802 0.4801,-1.2587 0,-1.7389 -0.2401,-0.2401 -0.5549,-0.3599 -0.8696,-0.3599zM4.7541,3.9596c0.3018,0 0.5464,0.2447 0.5464,0.5464 0,0.3018 -0.2447,0.5464 -0.5464,0.5464 -0.3018,0 -0.5464,-0.2447 -0.5464,-0.5464 0,-0.3018 0.2447,-0.5464 0.5464,-0.5464z"
       android:strokeWidth="0.136612"
-      android:fillColor="?colorOnPrimary"
+      android:fillColor="@color/white"
       android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_bus.xml b/app/src/main/res/drawable/ic_bus.xml
new file mode 100644
index 0000000..988d424
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bus.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="30dp"
+        android:tint="@color/black_icon_text"
+        android:viewportHeight="24"
+        android:viewportWidth="24"
+        android:width="30dp">
+      
+    <path android:fillColor="#111"
+          android:pathData="M4,16c0,0.88 0.39,1.67 1,2.22L5,20c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h8v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1.78c0.61,-0.55 1,-1.34 1,-2.22L20,6c0,-3.5 -3.58,-4 -8,-4s-8,0.5 -8,4v10zM7.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5S6.67,14 7.5,14s1.5,0.67 1.5,1.5S8.33,17 7.5,17zM16.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM18,11L6,11L6,6h12v5z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/ic_bus_electric_filled.xml b/app/src/main/res/drawable/ic_bus_electric_filled.xml
new file mode 100644
index 0000000..1953a1c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bus_electric_filled.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="24dp"
+    android:viewportWidth="1200"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m1000.4,226.7v186.7h93.3l-140,280v-186.7h-93.3z"
+      android:strokeWidth="46.6668"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="m160,640c0,35.2 15.6,66.8 40,88.8L200,780C200,813.2 226.8,840 260,840 293.2,840 320,813.2 320,780L320,760l320,0l0,20c0,32.8 26.8,60 60,60 32.8,0 60,-26.8 60,-60L760,728.8C784.4,706.8 800,675.2 800,640L800,240C800,100 656.8,80 480,80 303.2,80 160,100 160,240ZM300,680C266.8,680 240,653.2 240,620 240,586.8 266.8,560 300,560 333.2,560 360,586.8 360,620 360,653.2 333.2,680 300,680m360,0C626.8,680 600,653.2 600,620 600,586.8 626.8,560 660,560 693.2,560 720,586.8 720,620 720,653.2 693.2,680 660,680M720,440L240,440L240,240l480,0z"
+      android:fillColor="@color/white"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_bus_electric_small.xml b/app/src/main/res/drawable/ic_bus_electric_small.xml
deleted file mode 100644
index 7df1b74..0000000
--- a/app/src/main/res/drawable/ic_bus_electric_small.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="30dp"
-    android:height="24dp"
-    android:viewportWidth="1200"
-    android:viewportHeight="960">
-  <path
-      android:pathData="m240,840q-17,0 -28.5,-11.5Q200,817 200,800v-82q-18,-20 -29,-44.5 -11,-24.5 -11,-53.5v-380q0,-83 77,-121.5 77,-38.5 243,-38.5 172,0 246,37 74,37 74,123v380q0,29 -11,53.5 -11,24.5 -29,44.5v82q0,17 -11.5,28.5Q737,840 720,840h-40q-17,0 -28.5,-11.5Q640,817 640,800v-40L320,760v40q0,17 -11.5,28.5Q297,840 280,840ZM482,200L706,200 258,200ZM640,480L240,480 720,480ZM240,400L720,400L720,280L240,280ZM382.5,622.5Q400,605 400,580 400,555 382.5,537.5 365,520 340,520q-25,0 -42.5,17.5 -17.5,17.5 -17.5,42.5 0,25 17.5,42.5 17.5,17.5 42.5,17.5 25,0 42.5,-17.5zM662.5,622.5Q680,605 680,580 680,555 662.5,537.5 645,520 620,520q-25,0 -42.5,17.5 -17.5,17.5 -17.5,42.5 0,25 17.5,42.5 17.5,17.5 42.5,17.5 25,0 42.5,-17.5zM258,200L706,200Q691,183 641.5,171.5 592,160 482,160 375,160 325.5,172.5 276,185 258,200ZM320,680h320q33,0 56.5,-23.5Q720,633 720,600L720,480L240,480v120q0,33 23.5,56.5 23.5,23.5 56.5,23.5z"
-      android:fillColor="?colorAccent"/>
-  <path
-      android:pathData="m1000.4,226.7v186.7h93.3l-140,280v-186.7h-93.3z"
-      android:strokeWidth="46.6668"
-      android:fillColor="?colorAccent"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_bus_material.xml b/app/src/main/res/drawable/ic_bus_material.xml
new file mode 100644
index 0000000..8500bd1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bus_material.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,21q-0.425,0 -0.712,-0.288T5,20v-2.05q-0.45,-0.5 -0.725,-1.112T4,15.5L4,6q0,-2.075 1.925,-3.037T12,2q4.3,0 6.15,0.925T20,6v9.5q0,0.725 -0.275,1.338T19,17.95L19,20q0,0.425 -0.288,0.713T18,21h-1q-0.425,0 -0.712,-0.288T16,20v-1L8,19v1q0,0.425 -0.288,0.713T7,21zM6,10h12L18,7L6,7zM9.563,15.563Q10,15.125 10,14.5t-0.437,-1.062T8.5,13t-1.062,0.438T7,14.5t0.438,1.063T8.5,16t1.063,-0.437m7,0Q17,15.125 17,14.5t-0.437,-1.062T15.5,13t-1.062,0.438T14,14.5t0.438,1.063T15.5,16t1.063,-0.437"
+      android:fillColor="@color/grey_500"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_bus_stilized.xml b/app/src/main/res/drawable/ic_bus_stilized.xml
index 5cd6688..40999cc 100644
--- a/app/src/main/res/drawable/ic_bus_stilized.xml
+++ b/app/src/main/res/drawable/ic_bus_stilized.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
     android:height="48dp"
     android:viewportWidth="48"
     android:viewportHeight="48">
   <path
-      android:fillColor="#FFFFFFFF"
+      android:fillColor="?colorPrimary"
       android:pathData="M12.45,42.5q-0.75,0 -1.35,-0.475 -0.6,-0.475 -0.6,-1.175v-4.1q-1.45,-0.85 -2.125,-2.375T7.7,31.15L7.7,11.2q0,-3.85 3.9,-5.65 3.9,-1.8 12.45,-1.8 8.45,0 12.35,1.775Q40.3,7.3 40.3,11.2v19.95q0,1.7 -0.675,3.225Q38.95,35.9 37.5,36.75v4.1q0,0.7 -0.6,1.175 -0.6,0.475 -1.35,0.475h-0.65q-0.85,0 -1.425,-0.475 -0.575,-0.475 -0.575,-1.125v-2.5L15.1,38.4v2.5q0,0.65 -0.575,1.125T13.1,42.5ZM24.05,10L37,10 11,10h13.05ZM32.8,24.65L11.1,24.65h25.8,-4.1ZM11.1,21.65h25.8L36.9,13L11.1,13ZM16.35,32.55q1.15,0 1.95,-0.8t0.8,-1.95q0,-1.15 -0.8,-1.95t-1.95,-0.8q-1.15,0 -1.95,0.8t-0.8,1.95q0,1.15 0.8,1.95t1.95,0.8ZM31.65,32.55q1.15,0 1.95,-0.8t0.8,-1.95q0,-1.15 -0.8,-1.95t-1.95,-0.8q-1.15,0 -1.95,0.8t-0.8,1.95q0,1.15 0.8,1.95t1.95,0.8ZM11,10h26q-1.2,-1.3 -4.6,-2.05 -3.4,-0.75 -8.35,-0.75 -5.9,0 -9.05,0.675 -3.15,0.675 -4,2.125ZM15.2,35h17.6q1.75,0 2.925,-1.375Q36.9,32.25 36.9,30.55v-5.9L11.1,24.65v5.9q0,1.7 1.175,3.075Q13.45,35 15.2,35Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_subway_filled.xml b/app/src/main/res/drawable/ic_subway_filled.xml
new file mode 100644
index 0000000..c576398
--- /dev/null
+++ b/app/src/main/res/drawable/ic_subway_filled.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2c-4.42,0 -8,0.5 -8,4v9.5C4,17.43 5.57,19 7.5,19L6,20.5v0.5h12v-0.5L16.5,19c1.93,0 3.5,-1.57 3.5,-3.5L20,6c0,-3.5 -3.58,-4 -8,-4M7.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5S6.67,14 7.5,14s1.5,0.67 1.5,1.5S8.33,17 7.5,17m3.5,-6L6,11L6,6h5zM16.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5m1.5,-6h-5L13,6h5z"
+      android:fillColor="@color/grey_500"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_tram_filled_24.xml b/app/src/main/res/drawable/ic_tram_filled_24.xml
new file mode 100644
index 0000000..bce7d1b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tram_filled_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@color/white" android:pathData="M19,16.94V8.5c0,-2.79 -2.61,-3.4 -6.01,-3.49l0.76,-1.51H17V2H7v1.5h4.75l-0.76,1.52C7.86,5.11 5,5.73 5,8.5v8.44c0,1.45 1.19,2.66 2.59,2.97L6,21.5v0.5h2.23l2,-2H14l2,2h2v-0.5L16.5,20h-0.08c1.69,0 2.58,-1.37 2.58,-3.06m-7,1.56c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5m5,-4.5H7V9h10z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/ic_tram_material.xml b/app/src/main/res/drawable/ic_tram_material.xml
new file mode 100644
index 0000000..2727fa1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tram_material.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,17.5V8q0,-2.425 2.125,-3.175T11,4l0.75,-1.5H7V1h10v1.5h-3.25L13,4q2.975,0.075 4.988,0.813T20,8v9.5q0,1.475 -1.012,2.488T16.5,21l1.5,1.5v0.5h-2l-2,-2h-4l-2,2H6v-0.5L7.5,21q-1.475,0 -2.488,-1.012T4,17.5m9.063,0.063q0.437,-0.438 0.437,-1.063t-0.437,-1.062T12,15t-1.062,0.438T10.5,16.5t0.438,1.063T12,18t1.063,-0.437M6,12h12V9H6z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/magnifying_glass_larger.xml b/app/src/main/res/drawable/magnifying_glass_larger.xml
index 105a295..7610813 100644
--- a/app/src/main/res/drawable/magnifying_glass_larger.xml
+++ b/app/src/main/res/drawable/magnifying_glass_larger.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="28dp"
     android:height="28dp"
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
       android:pathData="M14.857,13.791 L10.872,9.805A5.409,5.409 0,1 0,9.805 10.871l3.987,3.987zM6.598,10.452A3.853,3.853 0,1 1,10.452 6.597,3.859 3.859,0 0,1 6.598,10.452Z"
       android:strokeWidth="1.36203"
-      android:fillColor="?attr/colorOnPrimary"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/app/src/main/res/drawable/map_bus_position_icon_sel.xml b/app/src/main/res/drawable/map_bus_position_icon_sel.xml
index 80672aa..35bd0db 100644
--- a/app/src/main/res/drawable/map_bus_position_icon_sel.xml
+++ b/app/src/main/res/drawable/map_bus_position_icon_sel.xml
@@ -1,8 +1,8 @@
 <vector android:height="40dp" android:viewportHeight="35.719"
     android:viewportWidth="35.719" android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/blue_500"
-          android:strokeColor="@color/black"
+    <path android:fillColor="@color/bus_marker_color_selected"
+          android:strokeColor="?android:textColorPrimary"
         android:pathData="m17.859,0.505c-2.419,2.799 -6.614,7.924 -8.107,10.349 -1.294,2.102 -2.431,4.162 -2.431,6.824 0,5.83 4.714,10.559 10.538,10.583 5.824,-0.024 10.538,-4.753 10.538,-10.583 0,-2.662 -1.138,-4.722 -2.431,-6.824C24.474,8.429 20.279,3.304 17.859,0.505Z"
         android:strokeLineJoin="round"
           android:strokeWidth="0.8"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index ebc95f3..5bee64a 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,217 +1,218 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
               android:layout_height="match_parent"
               tools:context="it.reyboz.bustorino.ActivityAbout" android:orientation="vertical"
        >
     <!-- The ActionBar displayed at the top -->
     <androidx.appcompat.widget.Toolbar
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:id="@+id/default_toolbar"
            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
            android:background="@drawable/gradient_toolbar"
            android:elevation="4dp"
            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
 
            android:fitsSystemWindows="false"
            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
     <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="0.9"
             android:scrollbars="vertical"
             android:id="@+id/aboutNestedScrollView"
             app:layout_constraintTop_toBottomOf="@id/default_toolbar"
             app:layout_constraintBottom_toTopOf="@id/theDivider"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:gravity="center"
     >
         <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content"
         android:paddingTop="10dp">
             <TextView
                     android:id="@+id/topTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dip"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintBottom_toTopOf="@id/openTutorialButton"
                     android:autoLink="web"
                     android:fontFamily="@font/nevermind_compact"
-                    android:textColor="@color/grey_700"
+                    android:textColor="@color/color_text_grey"
             />
             <com.google.android.material.button.MaterialButton
                     style="@style/Widget.MaterialComponents.Button.Icon"
                     android:id="@+id/openTutorialButton"
                     android:paddingTop="5dp"
                     android:paddingBottom="5dp"
                     app:icon="@drawable/cog_8_question_transp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/topTextView"
                     app:iconGravity="start"
                     android:text="@string/show_introduction"
                     android:fontFamily="@font/pitagon_semibold"
             />
             <TextView
                     android:id="@+id/telegramTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dip"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     app:layout_constraintTop_toBottomOf="@id/openTutorialButton"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     android:autoLink="web"
                     android:fontFamily="@font/nevermind_compact"
-                    android:textColor="@color/grey_700"
+                    android:textColor="@color/color_text_grey"
             />
             <com.google.android.material.button.MaterialButton
                     style="@style/Widget.MaterialComponents.Button.Icon"
                     android:id="@+id/openTelegramButton"
                     android:paddingBottom="8dp"
                     android:paddingTop="8dp"
                     app:icon="@drawable/telegram_logo_white"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/telegramTextView"
                     app:iconGravity="start"
                     android:text="@string/open_telegram"
                     android:fontFamily="@font/pitagon_semibold"
 
             />
             <TextView
                     android:id="@+id/howDoesItWorkTextView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dip"
                     android:layout_marginBottom="5dip"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     app:layout_constraintTop_toBottomOf="@id/openTelegramButton"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     android:autoLink="web"
                     android:fontFamily="@font/nevermind_compact"
-                    android:textColor="@color/grey_700"
+                    android:textColor="@color/color_text_grey"
             />
 
             <com.google.android.material.button.MaterialButton
                     style="@style/Widget.MaterialComponents.Button.Icon"
                     android:id="@+id/openContributeButton"
                     android:paddingTop="8dp"
                     android:paddingBottom="8dp"
                     app:icon="@drawable/journals"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/howDoesItWorkTextView"
                     app:iconGravity="start"
                     android:text="@string/action_wiki"
                     android:fontFamily="@font/pitagon_semibold"
 
             />
             <com.google.android.material.button.MaterialButton
                     style="@style/Widget.MaterialComponents.Button.Icon"
                     android:id="@+id/openSourceButton"
                     android:paddingTop="8dp"
                     android:paddingBottom="8dp"
                     app:icon="@drawable/file_earmark_code_fill"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/openContributeButton"
                     app:iconGravity="start"
                     android:text="@string/action_source"
                     android:fontFamily="@font/pitagon_semibold"
 
             />
             <TextView
                 android:id="@+id/bottomAboutTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dip"
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 app:layout_constraintTop_toBottomOf="@id/openSourceButton"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 android:autoLink="web"
                 android:fontFamily="@font/nevermind_compact"
-                android:textColor="@color/grey_700"
+                android:textColor="@color/color_text_grey"
         /><!--android:layout_weight="0.85"-->
 
             <!--<Button
                     android:text="@string/open_telegram"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="10dp"
                     android:layout_below="@id/aboutTextView"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     android:id="@+id/openTelegramButton"
                     android:drawableEnd="@drawable/telegram_logo_50"
                     android:fontFamily="@font/pitagon_semibold"
                     android:backgroundTint="@color/orange_500"
                     android:textColor="@color/white"
                     app:layout_constraintBottom_toTopOf="@id/newTelegramButton"
             />
             -->
 
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.core.widget.NestedScrollView>
 
 
     <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginRight="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginTop="2dp"
             app:layout_constraintTop_toBottomOf="@id/aboutNestedScrollView"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:id="@+id/theDivider"
             android:background="@android:color/darker_gray"
             app:layout_constraintBottom_toTopOf="@id/versionTextView"
     />
 
     <TextView
             android:text="@string/app_version"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" android:id="@+id/versionTextView"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:gravity="center_horizontal|center_vertical"
             android:layout_marginLeft="20dp"
             android:layout_marginStart="10dp"
             app:layout_constraintTop_toBottomOf="@id/theDivider"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:textColor="@color/black" android:layout_marginTop="10dp" android:layout_marginEnd="10dp"
+            android:textColor="?android:textColorPrimary"
+            android:layout_marginTop="10dp" android:layout_marginEnd="10dp"
             android:layout_marginBottom="10dp"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_principal.xml b/app/src/main/res/layout/activity_principal.xml
index e439b05..ea5afc4 100644
--- a/app/src/main/res/layout/activity_principal.xml
+++ b/app/src/main/res/layout/activity_principal.xml
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
 >
     <RelativeLayout
             android:id="@+id/rootRelativeLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
     <!-- The ActionBar displayed at the top -->
 
         <include
             layout="@layout/default_toobar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentEnd="true"/>
         <!-- The main content view where fragments are loaded -->
 
         <FrameLayout
             android:id="@+id/mainActContentFrame"
             android:layout_below="@id/default_toolbar"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_alignParentBottom="true"
             android:layout_alignParentStart="true"
             android:layout_alignParentEnd="true"
         />
 
     </RelativeLayout>
 
     <com.google.android.material.navigation.NavigationView
 
         android:id="@+id/nvView"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:background="@color/grey_050"
-        android:theme="@style/ThemeOverlay.AppCompat.Light"
+        android:theme="@style/ThemeOverlay.AppCompat.DayNight"
         app:headerLayout="@layout/nav_header"
         app:itemIconTint="@color/teal_500"
         app:itemTextAppearance="?android:attr/textAppearanceMedium"
-        app:itemTextColor="@color/black_900"
+        app:itemTextColor="?android:textColorPrimary"
         android:fitsSystemWindows="true"
-        app:menu="@menu/drawer_main" />
+        app:menu="@menu/drawer_main"
+    />
 
 
 
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/default_toobar.xml b/app/src/main/res/layout/default_toobar.xml
index 3ba935a..40ba1d8 100644
--- a/app/src/main/res/layout/default_toobar.xml
+++ b/app/src/main/res/layout/default_toobar.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
                                    android:layout_height="?attr/actionBarSize"
                                    android:id="@+id/default_toolbar"
     android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
     android:background="?attr/colorPrimaryDark"
     android:fitsSystemWindows="false"
 
     android:elevation="4dp"
-    app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
+    >
 
 </androidx.appcompat.widget.Toolbar>
\ No newline at end of file
diff --git a/app/src/main/res/layout/entry_alert_line_adapter.xml b/app/src/main/res/layout/entry_alert_line_adapter.xml
index 6819e5d..ddd3ee5 100644
--- a/app/src/main/res/layout/entry_alert_line_adapter.xml
+++ b/app/src/main/res/layout/entry_alert_line_adapter.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
                                    xmlns:app="http://schemas.android.com/apk/res-auto"
                                    android:layout_width="match_parent"
                                    android:layout_height="wrap_content"
                                    app:cardCornerRadius="5dp"
                                    app:cardElevation="5dp"
                                    android:layout_marginTop="5dp"
                                    android:layout_margin="5dp"
 
 >
     <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="15dp"
     >
         <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
 
                 android:id="@+id/messageTitleTextView"
                 android:textStyle="bold"
                 android:textSize="17sp"
                 android:fontFamily="@font/lato_bold"
-                android:textColor="@color/black_900"
+                android:textColor="?android:textColorPrimary"
                 android:text="Alerts for line"
                 android:layout_alignParentTop="true"
                 android:layout_marginBottom="5dp"
          />
 
         <TextView
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
 
                 android:id="@+id/messageBodyTextView"
                 android:textSize="16sp"
                 android:fontFamily="@font/lato_regular"
-                android:textColor="@color/black_900"
+                android:textColor="?android:textColorPrimary"
                 android:text="Alert text"
                 android:layout_below="@id/messageTitleTextView"
         />
 
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/entry_bus_line_passage.xml b/app/src/main/res/layout/entry_bus_line_passage.xml
index b829ed9..f231807 100644
--- a/app/src/main/res/layout/entry_bus_line_passage.xml
+++ b/app/src/main/res/layout/entry_bus_line_passage.xml
@@ -1,82 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:paddingTop="8dp"
     android:paddingBottom="8dp"
     android:paddingStart="10dp"
     android:paddingEnd="16dp"
     android:background="?android:attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
 >
 
 
     <androidx.cardview.widget.CardView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/routeCard"
             android:background="@color/orange_500"
             app:cardCornerRadius="25sp"
             app:cardElevation="1sp"
             android:layout_gravity="center_vertical"
             app:cardBackgroundColor="@color/orange_500"
             android:layout_marginEnd="6dp"
             android:foreground="?android:attr/selectableItemBackground"
             android:clickable="true"
             android:focusable="true"
     >
         <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:minHeight="50sp"
                 android:minWidth="50sp"
 
         >
             <TextView
                     android:id="@+id/routeNameTextView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:textColor="@color/grey_100"
                     android:textSize="21sp"
                     android:text="231"
                     android:paddingStart="3dp"
                     android:paddingEnd="3dp"
                     android:maxWidth="60sp"
             >
             </TextView>
         </RelativeLayout>
     </androidx.cardview.widget.CardView>
+    <ImageView
+            android:id="@+id/arrivalsBusIcon"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_alignParentTop="true"
+            android:layout_toEndOf="@id/routeCard"
+            android:src="@drawable/ic_bus"
+            android:scaleType="fitCenter"
+            app:tint="@color/black_icon_text"
+
+    />
 
     <!--the icon comes from setCompoundDrawables in PalinaAdapter -->
     <!--android:drawableLeft="@drawable/bus"
         android:drawableStart="@drawable/bus" -->
     <TextView
         android:id="@+id/routeDestination"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="@color/grey_600"
+        android:textColor="@color/black_icon_text"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_toEndOf="@id/routeCard"
+        android:layout_toEndOf="@id/arrivalsBusIcon"
         android:layout_alignTop="@id/routeCard"
+        android:textSize="21sp"
         android:maxLines="1"
         android:drawablePadding="0dp"
         android:singleLine="true">
     </TextView>
 
     <!-- this can hold 3-4 timetable entries before overflowing into a second line. It's ugly but at least doesn't lose any information. -->
     <TextView
         android:id="@+id/routesThatStopHere"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textColor="@color/blue_500"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:layout_marginStart="5dip"
         android:layout_toEndOf="@id/routeCard"
         android:layout_below="@id/routeDestination">
     </TextView>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/entry_bus_stop.xml b/app/src/main/res/layout/entry_bus_stop.xml
index 6914fb3..43ffb59 100644
--- a/app/src/main/res/layout/entry_bus_stop.xml
+++ b/app/src/main/res/layout/entry_bus_stop.xml
@@ -1,76 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="8dip"
-    android:paddingBottom="8dip"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:paddingTop="8dip"
+                android:paddingBottom="8dip"
                 android:background="?android:attr/selectableItemBackground"
 >
 
     <TextView
             android:id="@+id/busStopName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="16sp"
             android:layout_marginStart="16sp"
             android:layout_marginRight="16sp"
             android:layout_marginEnd="16sp"
             android:layout_marginTop="2sp"
             android:layout_alignParentTop="true"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_toLeftOf="@+id/busStopID"
             android:layout_toStartOf="@+id/busStopID"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/blue_500"/>
 
     <TextView
             android:id="@+id/busStopLocality"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="16sp"
             android:layout_marginStart="16sp"
             android:layout_marginRight="16sp"
             android:layout_marginEnd="16sp"
             android:layout_below="@id/busStopName"
             android:layout_toLeftOf="@+id/busStopID"
             android:layout_toStartOf="@+id/busStopID"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:textColor="@color/grey_600"
             android:textAppearance="?android:attr/textAppearanceMedium"/>
+    <ImageView
+            android:id="@+id/arrivalsBusIcon"
+            android:layout_width="26dp"
+            android:layout_height="26dp"
+            android:layout_alignParentStart="true"
+            android:layout_below="@id/busStopLocality"
+            android:layout_marginStart="16sp"
+            android:src="@drawable/ic_bus"
+            android:scaleType="fitCenter"
+            app:tint="@color/black_icon_text"
+
+    />
 
     <TextView
             android:id="@+id/routesThatStopHere"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/busStopLocality"
-            android:layout_marginLeft="16sp"
-            android:layout_marginStart="16sp"
-            android:layout_marginRight="16sp"
-            android:layout_marginEnd="16sp"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="16dp"
             android:gravity="center_vertical"
-            android:layout_toLeftOf="@id/busStopID"
             android:layout_toStartOf="@id/busStopID"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
+            android:layout_toEndOf="@id/arrivalsBusIcon"
+            android:layout_marginTop="3dp"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/grey_600"/>
 
 
     <TextView
             android:id="@+id/busStopID"
             android:layout_width="70dip"
             android:layout_height="70dip"
             android:layout_marginRight="16sp"
             android:layout_marginEnd="16sp"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
             android:layout_alignTop="@id/busStopName"
             android:layout_centerVertical="true"
             android:background="@drawable/bus_stop_background"
             android:gravity="center"
             android:textColor="@color/grey_100"
             android:textSize="21sp"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_dialog_alerts_line.xml b/app/src/main/res/layout/fragment_dialog_alerts_line.xml
index 80f5936..1d51c23 100644
--- a/app/src/main/res/layout/fragment_dialog_alerts_line.xml
+++ b/app/src/main/res/layout/fragment_dialog_alerts_line.xml
@@ -1,109 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
              xmlns:tools="http://schemas.android.com/tools"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="15dp"
                 tools:context=".fragments.AlertsDialogFragment">
 
     <TextView
             android:id="@+id/titleTextView"
             android:textStyle="bold"
             android:textSize="18sp"
             android:fontFamily="@font/pitagon_medium"
-            android:textColor="@color/black_900"
+            android:textColor="?android:textColorPrimary"
             android:text="Alerts for line"
             android:layout_width="wrap_content"
             android:layout_marginBottom="5dp"
             android:layout_marginStart="10dp"
               android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toTopOf="@id/statusCard"
     />
     <androidx.cardview.widget.CardView
             android:id="@+id/statusCard"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
 
             android:padding="12dp"
             app:cardCornerRadius="12dp"
             app:cardElevation="1dp"
             android:layout_marginStart="5dp"
             android:layout_marginEnd="5dp"
             app:strokeWidth="1dp"
             android:layout_marginBottom="5dp"
             android:backgroundTint="@color/red_orange"
             android:visibility="gone"
             app:strokeColor="@color/grey_050"
             app:layout_constraintTop_toBottomOf="@id/titleTextView"
             app:layout_constraintBottom_toTopOf="@id/alertsRecyclerView"
     >
 
         <TextView
                 android:id="@+id/alertMessageTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="Messaggio di stato..."
                 android:fontFamily="@font/lato_regular"
                 android:textSize="14sp"
                 android:textColor="@color/white"
                 android:padding="8dp"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
 
     </androidx.cardview.widget.CardView>
 
     <androidx.recyclerview.widget.RecyclerView
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:layout_constraintHeight_default="wrap"
             app:layout_constraintHeight_max="460dp"
 
             android:id="@+id/alertsRecyclerView"
             app:layout_constraintTop_toBottomOf="@id/statusCard"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toTopOf="@id/btnClose"
             android:layout_marginBottom="0dp"
             android:layout_marginTop="5dp"
             app:fastScrollEnabled="true"
             app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
             app:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
             app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
             app:fastScrollVerticalTrackDrawable="@drawable/line_drawable"
 
     />
     <ImageButton
             android:id="@+id/btnRefresh"
             android:layout_width="@dimen/dialog_alerts_btn_size"
             android:layout_height="@dimen/dialog_alerts_btn_size"
             android:scaleType="fitCenter"
             android:layout_weight="1"
             app:layout_constraintTop_toTopOf="@id/btnClose"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             android:src="@drawable/refresh_line"
             app:tint="@color/white"
             android:backgroundTint="?colorPrimaryDark"
             android:contentDescription="close"
 
     />
     <ImageButton
             android:id="@+id/btnClose"
             android:layout_width="@dimen/dialog_alerts_btn_size"
             android:layout_height="@dimen/dialog_alerts_btn_size"
             android:scaleType="fitCenter"
             android:layout_weight="1"
             android:layout_marginTop="8dp"
             app:layout_constraintTop_toBottomOf="@id/alertsRecyclerView"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:src="@drawable/close_white_large"
             android:backgroundTint="?colorPrimaryDark"
             android:contentDescription="close"
 
     />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_dialog_buspositions.xml b/app/src/main/res/layout/fragment_dialog_buspositions.xml
index b100817..2ea9c8e 100644
--- a/app/src/main/res/layout/fragment_dialog_buspositions.xml
+++ b/app/src/main/res/layout/fragment_dialog_buspositions.xml
@@ -1,108 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:padding="15dp"
-              android:orientation="vertical">
+> <!-- background color set in Code -->
 
 
         <!-- Label fissa (SX) -->
         <TextView
                 android:id="@+id/tvTitleFixed"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:text="@string/live_positions_dialog_provider_text"
                 android:textStyle="bold"
                 android:textSize="18sp"
                 android:fontFamily="@font/lato_bold"
-                android:textColor="@color/black_900"
+                android:textColor="?android:textColorPrimary"
                 app:layout_constraintHorizontal_bias="0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/providerNameTextView"
                 app:layout_constraintBottom_toTopOf="@id/statusCard"
                 android:layout_marginBottom="8dp"
         />
 
         <!-- Label variabile (DX) -->
     <TextView
             android:id="@+id/providerNameTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Valore"
             android:textSize="18sp"
             app:layout_constraintBottom_toBottomOf="@id/tvTitleFixed"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tvTitleFixed"
             android:layout_marginTop="5dp"
             android:layout_marginEnd="5dp"
             android:layout_marginStart="4dp"
-            android:textColor="@color/black"
+            android:textColor="?android:textColorPrimary"
             android:fontFamily="@font/lato_regular"
             android:textAppearance="@style/TextAppearance.AppCompat.Display3"/>
 
 
     <!-- BOX del messaggio di stato -->
     <androidx.cardview.widget.CardView
             android:id="@+id/statusCard"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="15dp"
             app:layout_constraintTop_toBottomOf="@+id/tvTitleFixed"
             app:layout_constraintBottom_toTopOf="@id/btnSwitch"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             android:padding="12dp"
             app:cardCornerRadius="12dp"
             app:cardElevation="1dp"
             app:strokeWidth="1dp"
             android:layout_marginBottom="16dp"
-            android:backgroundTint="@color/grey_200"
+            android:backgroundTint="@color/message_background_on_black"
             app:strokeColor="@color/grey_050">
 
         <TextView
                 android:id="@+id/statusMessageTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="Messaggio di stato..."
                 android:fontFamily="@font/lato_regular"
                 android:textSize="16sp"
-                android:textColor="@color/black"
+                android:textColor="?android:textColorPrimary"
                 android:padding="8dp"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
 
     </androidx.cardview.widget.CardView>
 
     <!-- Pulsanti -->
 
 
         <Button
                 android:id="@+id/btnSwitch"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 app:layout_constraintTop_toBottomOf="@+id/statusCard"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 android:backgroundTint="?colorPrimaryDark"
                 android:textColor="@color/white"
                 android:text="@string/live_positions_switch_provider" />
 
         <ImageButton
                 android:id="@+id/btnClose"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:layout_marginStart="12dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 android:src="@drawable/close_white_large"
                 android:backgroundTint="?colorPrimaryDark"
                 android:contentDescription="close"
 
         />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_intro.xml b/app/src/main/res/layout/fragment_intro.xml
index 3e4de22..ddefc30 100644
--- a/app/src/main/res/layout/fragment_intro.xml
+++ b/app/src/main/res/layout/fragment_intro.xml
@@ -1,74 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 tools:context=".fragments.IntroFragment">
     <androidx.core.widget.NestedScrollView
                  android:layout_width="match_parent"
                  android:layout_height="wrap_content"
                  android:layout_centerInParent="true"
                  >
         <androidx.constraintlayout.widget.ConstraintLayout
                      android:layout_width="match_parent"
                      android:layout_height="wrap_content"
                      android:layout_marginTop="10dp"
                      android:layout_marginBottom="15dp"
                     >
 
 
             <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:id="@+id/image_tutorial"
                     app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toTopOf="@+id/tutorialTextView"
                 app:layout_constraintVertical_chainStyle="packed"/>
             <TextView
                     android:text="Blabla"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" android:id="@+id/tutorialTextView"
                     app:layout_constraintTop_toBottomOf="@+id/image_tutorial"
                     android:layout_marginTop="30dp"
                     android:maxWidth="280dp"
                     android:textSize="18sp"
                     android:textAlignment="center"
-                    android:textColor="@color/grey_900"
-                    android:fontFamily="@font/pitagon_medium"
+                    android:textColor="?android:textColorPrimary"
+                    android:fontFamily="@font/pitagon_regular"
                     app:layout_constraintBottom_toTopOf="@id/closeAllButton" app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     android:layout_marginBottom="5dp"
             />
             <Button
                     android:text="@string/grant_location_permission"
                     android:layout_width="wrap_content"
                     android:visibility="gone"
                     android:layout_height="wrap_content" android:id="@+id/permissionButton"
                     app:layout_constraintTop_toBottomOf="@id/tutorialTextView"
                     app:layout_constraintBottom_toTopOf="@id/closeAllButton"
                     app:layout_constraintStart_toStartOf="@id/tutorialTextView"
                     android:backgroundTint="?colorPrimaryDark"
                     android:textColor="@color/white"
                     app:layout_constraintEnd_toEndOf="@id/tutorialTextView"
                     android:layout_marginTop="18dp"
                     android:layout_marginBottom="5dp"
             />
             <Button
                     android:text="@string/close_tutorial"
                     android:layout_width="wrap_content"
                     android:visibility="gone"
                     android:layout_height="wrap_content" android:id="@+id/closeAllButton"
                     app:layout_constraintTop_toBottomOf="@id/permissionButton"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="@id/tutorialTextView"
                     android:backgroundTint="?colorPrimaryDark"
                     android:textColor="@color/white"
                     app:layout_constraintEnd_toEndOf="@id/tutorialTextView"
                     android:layout_marginTop="18dp"
                     android:layout_marginBottom="5dp"
             />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_lines_detail.xml b/app/src/main/res/layout/fragment_lines_detail.xml
index be36dda..0e837b7 100644
--- a/app/src/main/res/layout/fragment_lines_detail.xml
+++ b/app/src/main/res/layout/fragment_lines_detail.xml
@@ -1,197 +1,197 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context=".fragments.LinesDetailFragment">
     <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
         <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:textAppearance="@style/TextAppearance.AppCompat.Headline"
                 android:text="Line 10"
                 android:id="@+id/titleTextView"
                 android:textAlignment="center"
                 android:textSize="25sp"
                 android:fontFamily="@font/lato_bold"
 
                 app:layout_constraintTop_toTopOf="parent"
                 android:layout_marginTop="8dp" android:gravity="center_horizontal|center_vertical"
                 app:layout_constraintEnd_toStartOf="@id/switchImageButton"
                 app:layout_constraintStart_toEndOf="@id/starCardView"
                 android:layout_marginStart="8dp" android:layout_marginEnd="8dp"
                 app:layout_constraintBottom_toBottomOf="@+id/switchImageButton"/>
         <ImageButton
                 android:src="@drawable/ic_list_30"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/switchImageButton"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/titleTextView"
                 android:layout_margin="6dp"
                 android:backgroundTint="@color/blue_620"
         />
         <androidx.cardview.widget.CardView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
 
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/switchImageButton"
                 app:layout_constraintBottom_toBottomOf="@id/switchImageButton"
                 app:layout_constraintEnd_toStartOf="@id/titleTextView"
                 android:id="@+id/starCardView"
                 android:layout_marginStart="10dp"
                 android:elevation="8dp"
                 android:padding="5dp">
             <ImageButton
                     android:id="@+id/favoritesButton"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_gravity="end"
                     android:background="@android:color/transparent"
                     android:foreground="?attr/selectableItemBackground"
                     app:srcCompat="@drawable/ic_star_outline"
                     tools:ignore="OnClick"/>
         </androidx.cardview.widget.CardView>
 
         <TextView
                 android:text="DCCII"
                 android:layout_width="0dp"
                 android:layout_marginStart="18dp"
                 android:layout_marginEnd="18dp"
                 android:layout_height="wrap_content"
                 android:id="@+id/lineDescripTextView"
                 app:layout_constraintTop_toBottomOf="@id/switchImageButton"
                 app:layout_constraintEnd_toStartOf="@id/lineInfoWarningButton"
                 app:layout_constraintStart_toStartOf="parent"
-                android:textColor="@color/grey_700"
+                android:textColor="@color/black_icon_text"
                 android:fontFamily="@font/lato_regular"
                 android:textSize="18sp"
                 android:gravity="center"
                 android:maxWidth="300sp"
                 android:layout_marginTop="12dp"
         />
         <ImageButton
                 android:id="@+id/lineInfoWarningButton"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:scaleType="fitCenter"
                 android:layout_gravity="end"
                 android:foreground="?attr/selectableItemBackground"
                 android:background="@android:color/transparent"
                 app:srcCompat="@drawable/chat_bubble_warning_solid"
                 app:tint="?colorPrimary"
                 android:layout_marginTop="0dp"
                 android:layout_marginEnd="5dp"
                 android:layout_marginStart="5dp"
                 android:layout_marginBottom="4dp"
                 app:layout_constraintTop_toTopOf="@id/lineDescripTextView"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/lineDescripTextView"
                 app:layout_constraintBottom_toTopOf="@id/infoBarrier"
                 android:visibility="gone"
                 tools:ignore="OnClick"/>
 
         <androidx.constraintlayout.widget.Barrier
                 android:id="@+id/infoBarrier"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:barrierDirection="bottom"
                 app:constraint_referenced_ids="lineDescripTextView,lineInfoWarningButton"/>
         <Spinner
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:id="@+id/patternsSpinner"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/headingToTextView"
                 android:layout_marginTop="6dp"
                 app:layout_constraintTop_toBottomOf="@+id/infoBarrier"
                 android:layout_marginStart="5dp"/>
         <TextView
                 android:text="@string/direction_duep"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/headingToTextView"
                 app:layout_constraintStart_toStartOf="parent"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textColor="?android:attr/textColorPrimary"
                 android:gravity="center_vertical"
                 android:textSize="18sp"
                 android:layout_marginStart="10dp"
 
                 app:layout_constraintTop_toTopOf="@+id/patternsSpinner"
                 app:layout_constraintBottom_toBottomOf="@+id/patternsSpinner"
         />
         <org.maplibre.android.maps.MapView android:id="@+id/lineMap"
                                     android:layout_width="fill_parent"
                                     android:layout_height="0dp"
                                     android:layout_marginTop="10dp"
                                     app:layout_constraintTop_toBottomOf="@id/patternsSpinner"
                                     app:layout_constraintStart_toStartOf="parent"
                                     app:layout_constraintEnd_toEndOf="parent"
                                     app:layout_constraintBottom_toBottomOf="parent"/>
 
         <ImageButton
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/locationEnableIcon"
                 android:src="@drawable/location_circlew_red"
 
                 android:layout_marginTop="54dp"
                 android:layout_marginEnd="5dp"
                 android:background="#00ffffff"
                 android:contentDescription="@string/enable_position"
                 app:layout_constraintTop_toTopOf="@id/lineMap"
                 app:layout_constraintEnd_toEndOf="@id/lineMap"
                 android:cropToPadding="true" />
         <ImageButton
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/busPositionsImageButton"
                 android:src="@drawable/bus_pos_circle_inactive"
                 android:background="#00ffffff"
                 android:contentDescription="@string/bt_follow_me_description"
                 android:layout_marginEnd="5dp"
 
                 app:layout_constraintTop_toBottomOf="@id/locationEnableIcon"
                 app:layout_constraintEnd_toEndOf="@id/lineMap"
                 android:layout_marginTop="7dp" />
 
 
         <View
                 android:id="@+id/divider"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="?android:attr/listDivider"
                 app:layout_constraintTop_toBottomOf="@id/patternsSpinner"
 
                 android:layout_marginTop="8dp"/>
         <androidx.recyclerview.widget.RecyclerView
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:id="@+id/patternStopsRecyclerView"
                 app:layout_constraintTop_toBottomOf="@+id/divider"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintVertical_bias="0.0"
                 android:layout_marginBottom="8dp"
                 android:layout_marginTop="0dp"
                 android:layout_margin="4dp"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:fastScrollEnabled="true"
                 app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
                 app:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
                 app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
                 app:fastScrollVerticalTrackDrawable="@drawable/line_drawable"
                 android:visibility="gone"
         />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
     <include layout="@layout/include_map_bottom_sheet"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_lines_grid.xml b/app/src/main/res/layout/fragment_lines_grid.xml
index bb14f8e..41f6af4 100644
--- a/app/src/main/res/layout/fragment_lines_grid.xml
+++ b/app/src/main/res/layout/fragment_lines_grid.xml
@@ -1,197 +1,204 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context=".fragments.LinesGridShowingFragment">
         <!--<androidx.core.widget.NestedScrollView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:id="@+id/linesScrollView"
                 android:layout_weight="12"
         >-->
         <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent" android:layout_height="match_parent"
                 android:animateLayoutChanges="true"
         >
             <TextView
                     android:text="@string/database_update_msg_inapp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" android:id="@+id/updateMessageTextView"
                     android:paddingTop="10dp"
                     android:paddingBottom="10dp"
                     android:layout_margin="5dp"
 
                     android:paddingStart="20dp"
                     android:paddingEnd="20dp"
                     android:textColor="@color/grey_200"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                     android:background="@drawable/backgroud_box_round"
                     android:visibility="gone"
 
                     app:layout_constraintBottom_toTopOf="@id/favoritesTitleView"
                     app:layout_constraintEnd_toEndOf="parent"/>
             <ImageView
                     android:src="@drawable/baseline_chevron_right_24"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" android:id="@+id/arrowFavorites"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintBottom_toBottomOf="@id/favoritesTitleView"
                     android:layout_margin="4dp"
                     android:layout_marginStart="16dp"
                     android:rotation="90"
+                    app:tint="?android:textColorPrimary"
+
             />
             <TextView android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:text="@string/favorites_lines"
                       android:textAppearance="@style/TextAppearance.AppCompat.Body2"
                       android:textSize="@dimen/subtitle_size"
                       android:layout_margin="4dp"
-                      android:textColor="@color/black_900"
+                      android:textColor="?android:textColorPrimary"
                       android:gravity="center"
                       android:id="@+id/favoritesTitleView"
                       app:layout_constraintTop_toBottomOf="@id/updateMessageTextView"
                       app:layout_constraintLeft_toRightOf="@id/arrowFavorites"
                       app:layout_constraintBottom_toTopOf="@id/favoritesRecyclerView"
                       android:layout_marginStart="6dp"
                       app:layout_constraintVertical_bias="0.0"
                       app:layout_constraintVertical_chainStyle="packed"/>
             <androidx.recyclerview.widget.RecyclerView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:id="@+id/favoritesRecyclerView"
                     android:layout_marginLeft="20dp"
                     android:layout_marginRight="20dp"
                     android:visibility="visible"
                     app:layout_constraintTop_toBottomOf="@id/favoritesTitleView"
                     app:layout_constraintBottom_toTopOf="@id/urbanLinesTitleView"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintVertical_bias="0.0"
 
             />
             <ImageView
                     android:src="@drawable/baseline_chevron_right_24"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" android:id="@+id/arrowUrb"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintBottom_toBottomOf="@id/urbanLinesTitleView"
                     android:layout_margin="4dp"
                     android:layout_marginStart="16dp"
                     android:rotation="0"
+                    app:tint="?android:textColorPrimary"
+
             />
             <TextView android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:text="@string/urban_lines"
                       android:textAppearance="@style/TextAppearance.AppCompat.Body2"
                       android:textSize="@dimen/subtitle_size"
                       android:layout_margin="4dp"
-                      android:textColor="@color/black_900"
+                      android:textColor="?android:textColorPrimary"
                       android:gravity="center"
                       android:id="@+id/urbanLinesTitleView"
                       app:layout_constraintTop_toBottomOf="@id/favoritesRecyclerView"
                       app:layout_constraintLeft_toRightOf="@id/arrowUrb"
                       app:layout_constraintBottom_toTopOf="@id/urbanLinesRecyclerView"
                       android:layout_marginLeft="6dp"
                       app:layout_constraintVertical_bias="0.0"
             />
             <androidx.recyclerview.widget.RecyclerView
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:id="@+id/urbanLinesRecyclerView"
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
                     android:visibility="visible"
                     android:layout_below="@id/urbanLinesTitleView"
                     app:layout_constraintTop_toBottomOf="@id/urbanLinesTitleView"
                     app:layout_constraintBottom_toTopOf="@id/touristLinesTitleView"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintVertical_bias="0.0"
 
             />
             <ImageView
                     android:src="@drawable/baseline_chevron_right_24"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" android:id="@+id/arrowTourist"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintBottom_toBottomOf="@id/touristLinesTitleView"
                     android:layout_margin="4dp"
                     android:layout_marginStart="16dp"
                     android:rotation="0"
+                    app:tint="?android:textColorPrimary"
             />
             <TextView android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:text="@string/turist_lines"
                       android:textAppearance="@style/TextAppearance.AppCompat.Body2"
                       android:textSize="@dimen/subtitle_size"
-                      android:textColor="@color/black_900"
+                      android:textColor="?android:textColorPrimary"
                       android:layout_margin="4dp"
                       android:layout_marginStart="6dp"
                       android:gravity="center"
                       android:id="@+id/touristLinesTitleView"
                       app:layout_constraintLeft_toRightOf="@id/arrowTourist"
                       app:layout_constraintTop_toBottomOf="@id/urbanLinesRecyclerView"
                       app:layout_constraintBottom_toTopOf="@id/touristLinesRecyclerView"
                       app:layout_constraintVertical_bias="0.0"
                       android:layout_marginLeft="6dp"/>
             <androidx.recyclerview.widget.RecyclerView
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:id="@+id/touristLinesRecyclerView"
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
                     android:visibility="gone"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/touristLinesTitleView"
                     app:layout_constraintBottom_toTopOf="@id/extraurbanLinesTitleView"
                     app:layout_constraintVertical_bias="0.0"
 
             />
             <ImageView
                     android:src="@drawable/baseline_chevron_right_24"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" android:id="@+id/arrowExtraurban"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintBottom_toBottomOf="@id/extraurbanLinesTitleView"
                     android:layout_margin="4dp"
                     android:layout_marginStart="16dp"
                     android:rotation="0"
+                    app:tint="?android:textColorPrimary"
+
             />
             <TextView android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:text="@string/extraurban_lines"
                       android:textAppearance="@style/TextAppearance.AppCompat.Body2"
                       android:textSize="@dimen/subtitle_size"
                       android:layout_margin="4dp"
-                      android:textColor="@color/black_900"
+                      android:textColor="?android:textColorPrimary"
                       android:gravity="center"
                       android:layout_marginStart="6dp"
                       android:id="@+id/extraurbanLinesTitleView"
                       app:layout_constraintTop_toBottomOf="@id/touristLinesRecyclerView"
                       app:layout_constraintLeft_toRightOf="@id/arrowExtraurban"
                       app:layout_constraintBottom_toTopOf="@id/extraurbanLinesRecyclerView"
                       app:layout_constraintVertical_bias="0.0"
 
             />
             <androidx.recyclerview.widget.RecyclerView
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:id="@+id/extraurbanLinesRecyclerView"
                     android:layout_marginLeft="10dp"
                     android:layout_marginRight="10dp"
                     android:visibility="gone"
                     android:layout_below="@id/extraurbanLinesTitleView"
 
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/extraurbanLinesTitleView"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintVertical_bias="0.0"
 
             />
 
 
         </androidx.constraintlayout.widget.ConstraintLayout>
         <!--</androidx.core.widget.NestedScrollView>-->
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_nearby_stops.xml b/app/src/main/res/layout/fragment_nearby_stops.xml
index 4fc237a..f14fbd6 100644
--- a/app/src/main/res/layout/fragment_nearby_stops.xml
+++ b/app/src/main/res/layout/fragment_nearby_stops.xml
@@ -1,100 +1,118 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
              xmlns:tools="http://schemas.android.com/tools"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
              tools:context="it.reyboz.bustorino.fragments.NearbyStopsFragment">
 
     <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/nearby_stops_message" android:id="@+id/titleTextView"
             android:textAppearance="@android:style/TextAppearance.Medium"
             android:layout_marginBottom="6dp"
             android:layout_marginTop="15dp"
             android:paddingTop="3dp"
             android:gravity="center_horizontal"
             android:fontFamily="@font/lato_bold"
             android:textSize="23sp"
             android:layout_toLeftOf="@id/switchButton" android:layout_marginLeft="10dp"
             android:layout_marginStart="10dp" android:layout_marginRight="10dp" android:layout_marginEnd="10dp"
     />
     <androidx.appcompat.widget.AppCompatButton
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:text="@string/show_arrivals"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" android:id="@+id/switchButton"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
             android:layout_margin="10dp"
             app:backgroundTint="@color/blue_500"
             android:textColor="@android:color/white"
     />
     <ProgressBar
             style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
             android:layout_width="6dp"
             android:layout_height="wrap_content"
             android:id="@+id/horizontalProgressBar"
             android:layout_alignParentEnd="true"
             android:layout_alignParentStart="true"
             android:layout_below="@id/titleTextView"
             android:indeterminate="true"
             android:visibility="gone"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
     />
 
 
     <androidx.recyclerview.widget.RecyclerView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/horizontalProgressBar"
             android:id="@+id/stopGridRecyclerView"
             android:clickable="true"
             android:focusable="true"
             android:layout_marginTop="10dp"
             android:layout_marginStart="5dp"
             android:layout_marginEnd="5dp"
             android:visibility="gone"
             android:clipChildren="false"
             android:clipToPadding="true"
             android:horizontalSpacing="10dp"
             android:layout_alignParentBottom="true"
             android:verticalSpacing="10dp"/>
 
 
     <ProgressBar
             style="?android:attr/progressBarStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/circularProgressBar"
             android:layout_marginTop="25dp"
             android:progressDrawable="@color/blue_620"
             android:indeterminate="true"
             android:indeterminateTint="@color/blue_620"
             android:layout_below="@+id/titleTextView"
-            android:layout_centerHorizontal="true"/>
-    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:visibility="gone"
+    />
+    <TextView android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
               android:id="@+id/positionLoadingTextView"
               android:layout_below="@id/circularProgressBar"
               android:text="@string/position_searching_message"
               android:layout_marginTop="8dp"
               android:textSize="15sp"
               android:layout_centerHorizontal="true"
+              android:visibility="gone"
               />
     <TextView
-            android:text="@string/enable_location_message"
+            android:text="@string/enable_position_message_nearby"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/messageTextView"
             android:fontFamily="@font/lato_regular"
-            android:visibility="gone"
+            android:visibility="visible"
             android:textAppearance="@style/Base.ThemeOverlay.AppCompat.Light"
             android:layout_below="@+id/titleTextView"
             android:layout_centerHorizontal="true"
             android:textSize="17sp"
-            android:layout_margin="20dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="30dp"
+            android:textColor="?android:textColorSecondary"
     />
 
+    <com.google.android.material.button.MaterialButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/messageTextView"
+            android:layout_centerHorizontal="true"
+            android:text="@string/grant_location_permission"
+            android:visibility="visible"
+            android:id="@+id/grantLocationButton"
+            android:layout_marginTop="15dp"
+            />
+
 
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/include_map_bottom_sheet.xml b/app/src/main/res/layout/include_map_bottom_sheet.xml
index 1c84811..c49b9f5 100644
--- a/app/src/main/res/layout/include_map_bottom_sheet.xml
+++ b/app/src/main/res/layout/include_map_bottom_sheet.xml
@@ -1,182 +1,196 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/bottom_sheet"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
         android:paddingTop="3dp"
         android:orientation="vertical"
         android:background="@drawable/bottom_sheet_background"
         android:elevation="8dp"
         android:padding="13dp"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
         app:behavior_hideable="true"
         app:behavior_peekHeight="4dp"
         android:clickable="true"
         android:focusable="true">
 
     <TextView
             android:id="@+id/stopNumberTextView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:textSize="17sp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/arrivalsCardButton"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
             android:fontFamily="@font/lato_regular"
 
     />
+
     <TextView
             android:id="@+id/stopTitleTextView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:textSize="19sp"
             app:layout_constraintTop_toBottomOf="@id/stopNumberTextView"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/arrivalsCardButton"
             android:layout_marginTop="4dp"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
             android:fontFamily="@font/lato_bold"
     />
-    <TextView
-            android:id="@+id/descriptionTextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minHeight="22dp"
-            android:textSize="15sp"
-            android:gravity="center_vertical"
-            app:layout_constraintTop_toBottomOf="@id/stopTitleTextView"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/vehicleIcon"
-            android:layout_marginTop="6dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="1dp"
-            android:fontFamily="@font/lato_regular"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintHorizontal_bias="0.0"
-
-    />
-    <ImageView
-            android:layout_width="33dp"
-            android:layout_height="24dp"
-            android:id="@+id/vehicleIcon"
-            android:layout_marginTop="6dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginStart="0dp"
-            android:src="@drawable/ic_bus_electric_small"
-            app:tint="@color/blue_700"
-            app:layout_constraintTop_toBottomOf="@id/stopTitleTextView"
-            app:layout_constraintStart_toEndOf="@id/descriptionTextView"
-            app:layout_constraintEnd_toStartOf="@id/arrivalsCardButton"
-            />
-
     <androidx.constraintlayout.widget.Barrier
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/belowTextBarrier"
+            android:id="@+id/belowBarrier"
             app:barrierDirection="bottom"
-            app:constraint_referenced_ids="vehicleIcon,descriptionTextView"
+            app:constraint_referenced_ids="stopTitleTextView"
     />
+    <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+                  app:layout_constraintStart_toStartOf="parent"
+                  android:layout_marginStart="10dp"
+                  android:layout_marginTop="5dp"
+                  app:layout_constraintTop_toBottomOf="@id/stopTitleTextView"
+                  android:id="@+id/bottomLinearLayout"
+                    app:layout_constraintEnd_toStartOf="@id/arrivalsCardButton"
+                  android:layout_marginEnd="10dp"
+
+    >
+        <TextView android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:text="@string/lines"
+                  android:layout_marginEnd="1dp"
+                  android:id="@+id/linesBottomTextView"
+                  android:fontFamily="@font/lato_regular"
+                  android:textSize="15sp"
+        />
+        <TextView
+                android:id="@+id/descriptionTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minHeight="24dp"
+                android:textSize="15sp"
+                android:text="32119"
+                android:gravity="top"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:fontFamily="@font/lato_regular"
+        />
+        <ImageView
+                android:layout_width="33dp"
+                android:layout_height="24dp"
+                android:id="@+id/vehicleIcon"
+                android:layout_marginStart="1dp"
+                android:src="@drawable/ic_bus_electric_filled"
+                app:tint="@color/blue_700"
+
+        />
+    </LinearLayout>
+
+
+
     <TextView
             android:id="@+id/extraBottomTextView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:textSize="13sp"
-            app:layout_constraintTop_toBottomOf="@id/belowTextBarrier"
+            app:layout_constraintTop_toBottomOf="@id/bottomLinearLayout"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@id/arrivalsCardButton"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
             android:layout_marginTop="5dp"
             android:text="Updated at "
             android:fontFamily="@font/lato_regular"
             android:visibility="gone"
     />
     <androidx.cardview.widget.CardView
             android:id="@+id/arrivalsCardButton"
             android:layout_width="50sp"
             android:layout_height="50sp"
             android:layout_marginStart="5sp"
             android:layout_marginEnd="6sp"
             app:cardCornerRadius="25sp"
             app:cardElevation="2dp"
             android:clickable="true"
             android:focusable="true"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toStartOf="@id/directionsCardButton"
             android:layout_toStartOf="@id/directionsCardButton"
             android:backgroundTint="?android:attr/colorAccent"
             android:foreground="?selectableItemBackground">
 
         <ImageView
                 android:layout_width="30sp"
                 android:layout_height="30sp"
                 android:layout_gravity="center"
-                app:tint="?colorOnPrimary"
+                app:tint="@android:color/white"
                 app:srcCompat="@drawable/ic_baseline_departure_board_24" />
 
     </androidx.cardview.widget.CardView>
 
     <androidx.cardview.widget.CardView
             android:id="@+id/directionsCardButton"
             android:layout_width="50sp"
             android:layout_height="50sp"
             android:layout_marginStart="5sp"
             android:layout_marginEnd="5sp"
             app:cardCornerRadius="25sp"
             app:cardElevation="2dp"
             android:clickable="true"
             android:focusable="true"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:foreground="?selectableItemBackground"
             android:backgroundTint="?android:attr/colorAccent"
     >
 
         <ImageView
                 android:id="@+id/rightmostImageView"
                 android:layout_width="30sp"
                 android:layout_height="30sp"
                 android:layout_gravity="center"
+                app:tint="@android:color/white"
                 app:srcCompat="@drawable/navigation_right" />
 
     </androidx.cardview.widget.CardView>
 
 
     <!-- Additional details -->
 
     <!-- Close button -->
     <ImageView
             android:layout_width="30sp"
             android:layout_height="30sp"
             app:srcCompat="@drawable/baseline_close_16"
             android:id="@+id/btnClose"
             android:layout_marginTop="15dp"
             android:layout_marginEnd="15dp"
             android:layout_marginBottom="5dp"
             android:layout_marginStart="10dp"
             android:layout_below="@id/directionsCardButton"
             app:layout_constraintTop_toBottomOf="@id/directionsCardButton"
             android:layout_alignParentEnd="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             android:foreground="?selectableItemBackground"
             app:layout_constraintBottom_toTopOf="@id/bottomBarrier"
     />
     <androidx.constraintlayout.widget.Barrier
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/bottomBarrier"
             app:barrierDirection="bottom"
             app:constraint_referenced_ids="btnClose,extraBottomTextView"
             app:layout_constraintBottom_toBottomOf="parent"
     />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/arrivals_nearby_card.xml b/app/src/main/res/layout/item_arrivals_nearby_card.xml
similarity index 63%
rename from app/src/main/res/layout/arrivals_nearby_card.xml
rename to app/src/main/res/layout/item_arrivals_nearby_card.xml
index 8c10ca7..2970e36 100644
--- a/app/src/main/res/layout/arrivals_nearby_card.xml
+++ b/app/src/main/res/layout/item_arrivals_nearby_card.xml
@@ -1,100 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+<com.google.android.material.card.MaterialCardView
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/stop_cardView"
         android:foreground="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        card_view:cardCornerRadius="5dp"
+        app:cardBackgroundColor="@color/card_background"
+        app:cardCornerRadius="6dp"
+        app:strokeColor="@color/card_border"
+        app:strokeWidth="1dp"
         android:layout_margin="5dp" android:padding="6dp">
 
 
     <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="8dp"
+            android:paddingTop="6dp"
+            android:paddingStart="8dp"
+            android:paddingEnd="10dp"
     >
-        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
+        <TextView android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:minWidth="40dp"
                   android:id="@+id/lineNameTextView"
-                  android:text="10" android:textSize="22sp"
-                  android:textColor="@color/orange_700"
-                  android:layout_marginLeft="10dp"
-                  android:layout_marginStart="10dp"
-                  android:layout_alignParentLeft="true"
-                  android:gravity="center_vertical"
-                  android:textStyle="normal" android:layout_marginRight="10dp" android:layout_marginEnd="10dp"
-                  android:layout_marginBottom="10dp" android:layout_marginTop="10dp"/>
+                  android:text="10"
+                  android:textSize="22sp"
+                  android:textColor="@color/orange_700_display"
+                  android:layout_marginStart="8dp"
+                  android:gravity="center"
+                  android:textStyle="normal"
+                  android:layout_marginTop="10dp"
+                  android:layout_alignParentTop="true"
+                  android:layout_alignParentStart="true"
+                  android:layout_alignBottom="@id/lineDirectionTextView"
+
+        />
 
         <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/lineDirectionTextView"
                 android:text="MADONNA DEL PILONE, LARGO TABACCHI"
                 android:textSize="20sp"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                android:layout_toLeftOf="@id/arrivalsDistanceTextView"
-                android:layout_toRightOf="@id/lineNameTextView"
+                android:layout_toStartOf="@id/arrivalsDistanceTextView"
                 android:layout_toEndOf="@id/lineNameTextView"
                 android:textStyle="normal"
-                android:layout_marginRight="6dp"
                 android:layout_marginEnd="6dp"
-                android:layout_alignBaseline="@id/lineNameTextView"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="5dp"
+                android:layout_alignParentTop="true"
+                android:layout_marginTop="10dp"
                 android:layout_marginStart="10dp"/>
-        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
+        <TextView android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
                   android:layout_alignBaseline="@id/arrivalsTimeTextView"
                   android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:id="@+id/arrivalsDescriptionTextView" android:text="@string/bus_arriving_at"
+                  android:id="@+id/arrivalsDescriptionTextView"
+                  android:text="@string/bus_arriving_at"
                   android:textSize="@dimen/text_size_nearby_indicate"
-                  android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginStart="8dp"
-                  android:layout_marginRight="8dp" android:layout_marginEnd="8dp" android:layout_marginBottom="8dp"/>
+                  android:layout_margin="8dp"
+                  android:layout_alignParentStart="true"
+        />
         <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
                   android:layout_toRightOf="@id/arrivalsDescriptionTextView"
-                  android:layout_marginLeft="6dp" android:layout_marginTop="6dp" android:layout_marginStart="6dp"
-                  android:layout_marginRight="8dp" android:layout_marginEnd="8dp" android:layout_marginBottom="8dp"
+                  android:layout_marginStart="6dp"
+                  android:layout_marginTop="8dp"
+                  android:layout_marginEnd="8dp"
+                  android:layout_marginBottom="8dp"
                   android:id="@+id/arrivalsTimeTextView" android:text="Orario" android:textSize="@dimen/text_size_nearby"
                   android:layout_below="@id/lineDirectionTextView"
 
                   android:textAppearance="?android:attr/textAppearanceLarge"
                   android:layout_alignParentRight="true"
                   android:layout_alignParentEnd="true"/>
         <!-- Second line -->
         <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
                   android:layout_marginBottom="10dp"
                   android:id="@+id/arrivalStopDescription"
                   android:text="@string/arrivals_card_at_the_stop" android:textSize="@dimen/text_size_nearby_indicate"
                   android:textAppearance="?android:attr/textAppearanceMedium"
                   android:layout_below="@id/arrivalsDescriptionTextView"
                   android:layout_margin="@dimen/default_textView_margin"
                   android:layout_alignBaseline="@id/arrivalStopName"
+                  android:layout_alignParentStart="true"
         />
         <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
                   android:layout_toRightOf="@id/arrivalStopDescription"
                   android:layout_toEndOf="@id/arrivalStopDescription"
                   android:layout_below="@id/arrivalsTimeTextView"
                   android:layout_marginBottom="10dp"
                   android:id="@+id/arrivalStopName" android:text="Prova prova" android:textSize="@dimen/text_size_nearby"
-                  android:layout_marginLeft="10dp"
-                  android:layout_marginStart="10dp"
+                  android:layout_marginStart="6dp"
                   android:textAppearance="?android:attr/textAppearanceLarge"
         />
         <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
                   android:layout_marginTop="12dp"
                   android:layout_marginBottom="10dp"
-                  android:layout_marginEnd="12dp"
-                  android:layout_marginRight="12dp"
+                  android:layout_marginEnd="10dp"
                   android:id="@+id/arrivalsDistanceTextView" android:text="200 m" android:textSize="15sp"
-                  android:layout_marginLeft="15dp"
-                  android:layout_marginStart="15dp"
+                  android:layout_marginStart="5dp"
                   android:textAppearance="?android:attr/textAppearanceSmall"
                   android:layout_alignParentRight="true"
                   android:layout_alignParentEnd="true"
         />
 
     </RelativeLayout>
 
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_card_button.xml b/app/src/main/res/layout/item_card_button.xml
index 4da1fa0..976eaf8 100644
--- a/app/src/main/res/layout/item_card_button.xml
+++ b/app/src/main/res/layout/item_card_button.xml
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/buttonCardView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:cardCornerRadius="10dp"
         app:cardElevation="1dp"
         app:cardBackgroundColor="?colorPrimary"
         app:rippleColor="?attr/colorControlHighlight">
 
     <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:gravity="center"
             android:padding="20dp">
         <TextView
                 android:id="@+id/cardLabel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="18sp"
                 android:text="Trial"
                 android:textColor="@color/grey_100"
                 android:textAlignment="center"
                 android:fontFamily="@font/lato_bold"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintBottom_toTopOf="@id/cardIcon"
                 app:layout_constraintTop_toTopOf="parent"
                 android:textStyle="bold"
                 android:gravity="center"
         />
         <ImageView
                 android:id="@+id/cardIcon"
                 app:layout_constraintTop_toBottomOf="@id/cardLabel"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:contentDescription="@null"
                 app:tint="@color/grey_100"
                 app:layout_constraintVertical_bias="1.0"
-                android:layout_marginTop="12dp"
+                android:layout_marginTop="10dp"
         />
 
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/stop_card.xml b/app/src/main/res/layout/item_stop_nearby_card.xml
similarity index 88%
rename from app/src/main/res/layout/stop_card.xml
rename to app/src/main/res/layout/item_stop_nearby_card.xml
index 3771ff8..8182544 100644
--- a/app/src/main/res/layout/stop_card.xml
+++ b/app/src/main/res/layout/item_stop_nearby_card.xml
@@ -1,117 +1,124 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView
 		xmlns:card_view="http://schemas.android.com/apk/res-auto"
 		xmlns:android="http://schemas.android.com/apk/res/android"
 		android:id="@+id/stop_cardView"
 		android:foreground="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		card_view:cardCornerRadius="5dp"
 		android:layout_margin="5dp" android:padding="4dp">
 
 	<LinearLayout
 			android:orientation="horizontal"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent" android:gravity="center_vertical">
 		<RelativeLayout
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content" android:layout_weight="1">
 
 			<TextView
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:text="Title"
 					android:id="@+id/stop_nameText"
 					style="@style/TextAppearance.AppCompat.Medium"
 					android:layout_alignParentLeft="true"
-					android:layout_alignParentStart="true" android:paddingLeft="6dp"
-					android:textColor="@color/primary_material_dark" android:layout_marginBottom="6dp"
+					android:layout_alignParentStart="true"
+					android:paddingLeft="6dp"
+					android:textSize="20sp"
+					android:textColor="?android:textColorPrimary"
+					android:layout_marginBottom="6dp"
 					android:layout_marginTop="6dp" android:layout_marginLeft="6dp"
 					android:layout_marginStart="6dp" android:layout_marginRight="6dp" android:layout_marginEnd="6dp"/>
 			<TextView
 					android:id="@+id/stop_numberText"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:text="stopNumber"
-					android:textSize="16sp"
+					android:textSize="18sp"
 					android:layout_below="@id/stop_nameText"
 					android:textIsSelectable="true" android:layout_marginTop="6dp"
-					android:textColor="@color/orange_700"
+					android:textColor="?colorPrimaryDark"
 					android:layout_marginStart="12dp" android:layout_marginEnd="8dp"
 					android:layout_marginBottom="8dp"/>
 			<TextView
 					android:text="200m"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginEnd="6dp"
 					android:layout_marginStart="10dp"
 					android:minWidth="50dp"
 					android:textSize="16sp"
-					android:id="@+id/stop_distanceTextView" android:layout_toEndOf="@+id/stop_numberText"
+					android:id="@+id/stop_distanceTextView"
+					android:layout_toEndOf="@+id/stop_numberText"
 					android:layout_toRightOf="@id/stop_numberText"
 					android:layout_alignTop="@+id/stop_numberText"
 			/>
 
 			<!--
         <LinearLayout
                 android:orientation="horizontal"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent" android:id="@+id/row1" android:layout_below="@+id/stopTitle">
             <TextView
                     android:id="@+id/txtLine1_1"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
                     android:text="Name"
                     android:gravity="center_vertical"
                     android:textSize="14sp"
                     android:layout_marginTop="10dp"
                     android:layout_marginLeft="5dp" android:layout_margin="3dp"/>
             <TextView
                     android:id="@+id/txtPass1_1"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
                     android:text="Name"
                     android:gravity="center_vertical"
 
                     android:layout_marginTop="10dp"
                     android:layout_marginLeft="5dp" android:layout_margin="3dp"/>
             <TextView
                     android:id="@+id/txtPass2"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
                     android:text="Name"
                     android:gravity="center_vertical"
                     android:textSize="14sp"
                     android:layout_marginTop="10dp"
                     android:layout_marginLeft="5dp" android:layout_margin="3dp"/>
             <TextView
                     android:id="@+id/txtPass3"
                     android:layout_width="wrap_content"
                     android:layout_height="20dp"
                     android:text="Name"
                     android:gravity="center_vertical"
                     android:textSize="14sp"
                     android:layout_marginTop="10dp"
                     android:layout_marginLeft="5dp" android:layout_margin="3dp"/>
         </LinearLayout>
         -->
 		</RelativeLayout>
 		<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text=""
+				android:text="1,2,3,4"
 				android:id="@+id/stop_linesText"
 				android:layout_toRightOf="@+id/stop_distanceTextView"
 				android:minWidth="80dp"
 				android:layout_alignParentRight="true"
 				android:layout_alignParentEnd="true" android:layout_alignBottom="@+id/stop_distanceTextView"
 				android:layout_alignTop="@+id/stop_nameText"
 				android:nestedScrollingEnabled="true"
 				android:gravity="center_horizontal|center"
-				android:textColor="@color/blue_700" android:textSize="14sp" android:layout_weight="1"
+				android:textColor="@color/lines_nearby_color"
+				android:fontFamily="@font/nevermind_compact"
+				android:textSize="16sp"
+				android:layout_weight="1"
 				android:padding="5dp" android:maxWidth="100sp" android:layout_gravity="center_vertical|end"
 				android:layout_marginRight="5dp"/>
 	</LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b4b6bb3..f7df649 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,260 +1,267 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_description">Stai utilizzando l\'ultimo ritrovato in materia di rispetto della tua privacy.</string>
     <string name="search">Cerca</string>
     <string name="qrcode">Codice QR</string>
     <string name="scan_qr_code_stop">Scansiona codice QR alla fermata</string>
     <string name="yes">Si</string>
     <string name="no">No</string>
     <string name="next">Prossimo</string>
     <string name="previous">Precedente</string>
     <string name="title_barcode_scanner_install">Installare Barcode Scanner?</string>
     <string name="message_install_barcode_scanner">Questa azione richiede un\'altra app per scansionare i codici QR. Vuoi installare Barcode Scanner?</string>
     <string name="insert_bus_stop_number">Numero fermata</string>
     <string name="insert_bus_stop_name">Nome fermata</string>
     <string name="insert_bus_stop_number_error">Inserisci il numero della fermata</string>
     <string name="insert_bus_stop_name_error">Inserisci il nome della fermata</string>
     <string name="network_error">Verifica l\'accesso ad Internet!</string>
     <string name="no_bus_stop_have_this_name">Sembra che nessuna fermata abbia questo nome</string>
     <string name="no_arrivals_stop">Nessun passaggio trovato alla fermata</string>
     <string name="searching_arrivals_fmt">Ricerca arrivi da %1$s</string>
     <string name="parsing_error">Errore di lettura del sito 5T/GTT (dannato sito!)</string>
     <string name="passages_fill">Fermata: %1$s</string>
     <string name="passages">Fermata:</string>
     <string name="line">Linea</string>
     <string name="lines">Linee</string>
     <string name="urban_lines">Linee urbane</string>
     <string name="extraurban_lines">Linee extraurbane</string>
     <string name="turist_lines">Linee turistiche</string>
     <string name="direction_duep">Direzione:</string>
     <string name="no_lines_found">Nessuna linea in questa categoria</string>
     <string name="no_lines_found_query">Nessuna linea corrisponde alla ricerca</string>
     <string name="search_box_lines_suggestion_filter">Filtra per nome</string>
     <string name="line_fill">Linea %1$s</string>
     <string name="lines_fill">Linee: %1$s</string>
     <string name="line_fill_towards">Linea %1$s, direzione:</string>
     <string name="stop_fill">Fermata %1$s</string>
     <string name="results">Scegli la fermata…</string>
     <string name="vehicle_fill">Matricola %1$s</string>
     <string name="no_passages">Nessun passaggio</string>
     <string name="no_qrcode">Nessun QR code trovato, prova ad usare un\'altra app</string>
     <string name="action_favorites">Preferiti</string>
     <string name="action_help">Aiuto</string>
     <string name="action_about">Informazioni</string>
     <string name="action_about_more">Più informazioni</string>
     <string name="action_wiki">Vai alla wiki</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/it/</string>
     <string name="action_source">Codice sorgente</string>
     <string name="action_licence">Licenza</string>
     <string name="action_author">Incontra l\'autore</string>
     <string name="action_open_line">Mostra linea</string>
     <string name="action_show_direction">Vedi direzione</string>
     <string name="added_in_favorites">Fermata aggiunta ai preferiti</string>
     <string name="cant_add_to_favorites">Impossibile aggiungere ai preferiti (memoria piena o database corrotto?)!</string>
     <string name="title_activity_favorites">Preferiti</string>
     <string name="title_activity_map">Mappa</string>
     <string name="tip_add_favorite">Nessun preferito? Arghh!\nSchiaccia sulla stella di una fermata per aggiungerla a questa lista!</string>
     <string name="action_remove_from_favourites">Rimuovi</string>
     <string name="action_rename_bus_stop_username">Rinomina</string>
     <string name="dialog_rename_bus_stop_username_title">Rinomina fermata</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about_activity">Informazioni</string>
     <string name="howDoesItWork"><b>Tocca la stella</b> per aggiungere la fermata ai preferiti\n\n<b>Come leggere gli orari:</b>\n<b> 12:56*</b> Orario in tempo reale\n<b> 12:56</b> Orario programmato\n\n<b>Trascina giù per aggiornare</b> l\'orario. \n<b>Tocca a lungo</b> su <b>Fonte Orari</b> per cambiare sorgente degli orari di arrivo</string>
     <string name="hint_button">OK!</string>
     <string name="about_history_top"><![CDATA["<h1>Benvenuto!</h1>\n        \n        <p>Grazie per aver scelto BusTO, un\'app <b>open source</b> e <b>indipendente</b> da GTT/5T, per spostarsi a Torino attraverso <b>software libero</b>!</p>\n        <p>BusTO rispetta la tua <b>privacy</b> non raccogliendo nessun dato sull\'utilizzo, ed è <b>leggera</b> e senza <b>pubblicità</b>!</p>\n        <br>\n        <p>Qui puoi trovare più informazioni e link riguardo al progetto.</p>\n\t\t<br>\n        <h2>Schermata iniziale</h2>\n        <p>Se vuoi rivedere la schermata iniziale, usa il pulsante qui sotto:</b>"]]></string>
     <string name="about_channel"><![CDATA[
         <h2>Notizie e aggiornamenti</h2>
         <p>Nel canale Telegram puoi trovare informazioni sugli ultimi aggiornamenti dell\'app</p>
         ]]></string>
     <string name="about_how"><![CDATA["<h2>Ma come funziona?</h2>\n        <p>Quest\'app ottiene i passaggi dei bus, le fermate e altre informazioni utili unendo dati forniti dal sito <b>www.gtt.to.it</b>, <i>www.5t.torino.it</i>, <b>muoversiatorino.it</b> \"per uso personale\" e altre fonti Open Data (aperto.comune.torino.it).</p>\n        <br>\n\t\t<p>Ingredienti:<br>\n\t\t- <b>Fabio Mazza</b> attuale rockstar developer anziano.<br>\n\t\t- <b>Andrea Ugo</b> attuale rockstar developer in formazione.<br>\n\t\t- <b>Silviu Chiriac</b> designer del logo 2021.<br>\n\t\t- <b>Marco M</b> formidabile tester e cacciatore di bug.<br>\n\t\t- <b>Ludovico Pavesi</b> ex rockstar developer anziano asd.<br>\n\t\t- <b>Valerio Bozzolan</b> attuale manutentore.<br>\n\t\t- <b>Marco Gagino</b> apprezzato ex collaboratore, ideatore icona e grafica.<br>\n\t\t- <b>JSoup</b> libreria per \"<i>web scaping</i>\".<br>\n\t\t- <b>Google</b> icone e librerie di supporto e design.<br>\n\t\t- Altre icone da <b>Bootstrap</b>, <b>Feather</b> e <b>Hero Icons</b><br>\n\t\t- Tutti i contributori e i beta tester!\n\t\t</p>\n        <br>\n\t\tSe vuoi avere più informazioni o contribuire allo sviluppo, usa i pulsanti qui sotto!</b>"]]></string>
     <string name="about_history_bottom"><![CDATA[<h2>Licenze</h2>\n\t\t<p>L\'app e il relativo codice sorgente sono distribuiti sotto la licenza <i>GNU General Public License v3</i> (https://www.gnu.org/licenses/gpl-3.0.html).\n\t\tCiò <b>significa</b> che puoi usare, studiare, migliorare e ricondividere quest\'app con <b>qualunque mezzo</b> e per <b>qualsiasi scopo</b>: a patto di mantenere sempre questi diritti a tua volta e di dare credito a Valerio Bozzolan e agli altri autori del codice dell\'app.\n\t\t</p>\n\n\t\t<br>\n\t\t<h2>Note</h2>\n\t\t<p>Quest\'applicazione è rilasciata <b>nella speranza che sia utile a tutti</b> ma senza NESSUNA garanzia sul suo funzionamento attuale e/o futuro.</p>\n\t\t<p>Tutti i dati utilizzati dall\'app provengono <b>direttamente</b> da GTT o da simili agenzie pubbliche: se trovi che sono inesatti per qualche motivo, ti invitiamo a rivolgerti a loro.</p>\n\t\t<p>Buon utilizzo! :)</p>]]></string>
     <string name="query_too_short">Nome troppo corto, digita più caratteri e riprova</string>
     <string name="route_towards_destination">%1$s verso %2$s</string>
     <string name="route_towards_unknown">%s (destinazione sconosciuta)</string>
     <string name="internal_error">Errore interno inaspettato, impossibile estrarre dati dal sito GTT/5T</string>
     <string name="action_view_on_map">Visualizza sulla mappa</string>
     <string name="cannot_show_on_map_no_activity">Non trovo un\'applicazione dove mostrarla</string>
     <string name="cannot_show_on_map_no_position">Posizione della fermata non trovata</string>
     <string name="near_me_title">Vicino a me</string>
     <string name="nearby_stops_message">Fermate vicine</string>
     <string name="position_searching_message">Ricerca della posizione</string>
     <string name="no_stops_nearby">Nessuna fermata nei dintorni</string>
     <string name="main_menu_pref">Preferenze</string>
     <string name="database_update_msg_inapp">Aggiornamento del database…</string>
     <string name="database_update_msg_notif">Aggiornamento del database</string>
     <string name="database_update_req">Aggiornamento database forzato</string>
     <string name="database_update_req_descr">Tocca per aggiornare ora il database</string>
     <string name="pref_num_elements">Numero minimo di fermate</string>
     <string name="num_stops_nearby_not_number">Il numero di fermate da ricercare non è valido</string>
     <string name="invalid_number">Valore errato, inserisci un numero</string>
     <string name="title_activity_settings">Impostazioni</string>
     <string name="settings_search_radius">Distanza massima di ricerca (m)</string>
     <string name="settings_experimental">Funzionalità sperimentali</string>
     <string name="action_settings">Impostazioni</string>
     <string name="general_settings">Generali</string>
     <string name="pref_recents_group_title">Fermate recenti</string>
     <string name="settings_group_general">Impostazioni generali</string>
     <string name="settings_group_database">Gestione del database</string>
     <string name="settings_reset_database">Lancia aggiornamento manuale del database</string>
     <string name="enable_position_message_map">Consenti l\'accesso alla posizione per mostrarla sulla mappa</string>
     <string name="enable_position_message_nearby">Consenti l\'accesso alla posizione per mostrare le fermate vicine</string>
     <string name="enable_location_message">Abilitare la posizione sul dispositivo</string>
     <string name="bus_arriving_at">arriva alle</string>
     <string name="arrivals_card_at_the_stop">alla fermata</string>
     <string name="show_arrivals">Mostra arrivi</string>
     <string name="show_stops">Mostra fermate</string>
     <string name="nearby_arrivals_message">Arrivi qui vicino</string>
     <string name="removed_from_favorites">Fermata rimossa dai preferiti</string>
     <!--
     Mixed button strings
     !-->
     <string name="open_telegram">Canale telegram</string>
     <string name="show_introduction">Mostra introduzione</string>
     <!--
     Map view buttons strings
     !-->
     <string name="bt_center_map_description">La mia posizione</string>
     <string name="bt_follow_me_description">Segui posizione</string>
     <string name="enable_position">Attiva o disattiva posizione</string>
     <string name="location_enabled">Posizione attivata</string>
     <string name="location_disabled">Posizione disattivata</string>
     <string name="map_location_disabled_device">La posizione è disabilitata sul dispositivo</string>
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Fonte orari: %1$s</string>
     <string name="fivetapifetcher">App GTT</string>
     <string name="gttjsonfetcher">Sito GTT</string>
     <string name="fivetscraper">Sito 5T Torino</string>
     <string name="source_mato">Muoversi a Torino</string>
     <string name="undetermined_source">Sconosciuta</string>
     <string name="arrival_times_choice_title">Fonti orari di arrivo</string>
     <string name="arrival_times_choice_explanation">Scegli le fonti di orari da usare</string>
     <string name="arrival_source_changing">Cambiamento sorgente orari…</string>
     <string name="change_arrivals_source_message">Premi a lungo per cambiare la sorgente degli orari</string>
     <string name="no_passages_title">Nessun passaggio per le linee:</string>
     <string name="default_notification_channel_description">Canale default delle notifiche</string>
     <string name="database_notification_channel">Operazioni sul database</string>
     <string name="database_notification_channel_desc">Informazioni sul database (aggiornamento)</string>
     <string name="live_position_service_name">BusTO - posizioni in tempo reale</string>
     <string name="live_positions_notification_channel">Posizioni in tempo reale</string>
     <string name="live_positions_notification_channel_desc">Attività del servizio delle posizioni in tempo reale</string>
     <string name="mqtt_notification_text">Servizio posizioni MaTO in tempo reale attivo</string>
     <string name="db_trips_download_message">Download dei trip dal server MaTO</string>
     <string name="too_many_permission_asks">Chiesto troppe volte per il permesso %1$s</string>
     <string name="permission_storage_maps_msg">Non si può usare questa funzionalità senza il permesso di archivio!</string>
     <string name="storage_permission">di archivio</string>
     <string name="message_crash">Un bug ha fatto crashare l\'app!
         \nPremi \"OK\" per inviare il report agli sviluppatori via email, così potranno scovare e risolvere il tuo bug!
         \nIl report contiene piccole informazioni non sensibili sulla configurazione del tuo telefono e sullo stato dell\'app al momento del crash.
     </string>
     <string name="acra_email_message">L\'applicazione è crashata, e il crash report è stato messo negli allegati. Se vuoi, descrivi cosa stavi facendo prima che si interrompesse:</string>
     <string name="nav_arrivals_text">Arrivi</string>
     <string name="nav_map_text">Mappa</string>
     <string name="nav_favorites_text">Preferiti</string>
     <string name="drawer_open">Apri drawer</string>
     <string name="drawer_close">Chiudi drawer</string>
     <string name="experiments">Esperimenti</string>
     <string name="donate_now">Offrici un caffè</string>
     <string name="map">Mappa</string>
     <string name="stop_search_view_title">Ricerca fermate</string>
     <string name="app_version">Versione app</string>
     <string name="arrival_times">Orari di arrivo</string>
     <!--  Preferences -->
     <string name="requesting_db_update">Richiesto aggiornamento del database</string>
     <string name="downloading_data_mato">Download dati dal server MaTO</string>
     <string name="pref_directions_capitalize">Mostra direzioni in maiuscolo</string>
     <string name="directions_capitalize_no_change">Non cambiare</string>
     <string name="directions_capitalize_everything">Tutto in maiuscolo</string>
     <string name="directions_capitalize_first_letter">Solo prima lettera maiuscola</string>
     <string name="pref_lines_click_msg">Mostra arrivi quando tocchi una fermata</string>
     <string name="pref_experimental_msg">Abilita esperimenti</string>
     <string name="pref_shown_startup">Schermata da mostrare all\'avvio</string>
     <string name="pref_shown_startup_def_desc">Tocca per cambiare</string>
     <string name="positions_source_pref_title">Fonte posizioni in tempo reale di bus e tram</string>
     <string name="positions_source_mato_descr">MaTO (aggiornate più spesso, può avere errori)</string>
     <string name="positions_source_gtfsrt_descr">GTFS RT (aggiornato meno frequentemente, posizioni più controllate)</string>
     <string name="favorites_line_add">Linea aggiunta ai preferiti</string>
     <string name="favorites_line_remove">Linea rimossa dai preferiti</string>
     <string name="favorites_lines">Preferite</string>
     <!-- lines -->
     <string name="long_press_stop_4_options">Tocca a lungo la fermata per le opzioni</string>
     <string name="map_style_pref_title">Stile della mappa</string>
     <string name="map_style_versatiles">Versatiles (vettoriale)</string>
     <string name="map_style_legacy_raster">OSM Legacy (raster, più leggera)</string>
     <string name="remove_all_trips">Rimuovi i dati dei trip (libera spazio)</string>
     <string name="all_trips_removed">Tutti i trip GTFS sono rimossi dal database</string>
     <!-- tutorial -->
     <string name="tutorial_action">Mostra introduzione</string>
     <string name="tutorial_first"><![CDATA[Grazie per aver installato BusTO, l\'app gratuita, libera e <b>open source</b> per il trasporto pubblico di Torino. Stai usando un\'app <b>indipendente</b>, senza pubblicità e senza nessun tracciamento.]]></string>
     <string name="tutorial_search"><![CDATA[Puoi cercare gli orari d\'arrivo ad una fermata inserendo il numero nella casella di ricerca.<br>
 Se ti trovi a una fermata, puoi scansionare il codice QR presente sulla palina toccando l\'icona a sinistra della barra di ricerca.]]>
     </string>
     <string name="tutorial_arrivals">
         <![CDATA[Una volta trovata una fermata, puoi aggiungerla ai <b>preferiti</b> toccando la stella a fianco del nome.]]>
     </string>
     <string name="tutorial_stops">
         <![CDATA[Con la posizione abilitata, puoi vedere le <b>fermate più vicine</b> a te direttamente nella schermata principale...]]>
     </string>
     <string name="tutorial_map">
         <![CDATA[...oppure puoi trovarle sulla mappa, assieme alle <b>posizioni in tempo reale</b> dei bus e tram (in <font color="#2F59CC">blu</font>)]]>
     </string>
     <string name="tutorial_line">
         <![CDATA[Scopri il percorso e le fermate della linea che preferisci, insieme alle posizioni in tempo reale dei bus/tram che la servono. Ricorda di scegliere la direzione che ti interessa!]]>
     </string>
     <string name="tutorial_menu">
         <![CDATA[Tutte queste funzioni si trovano nel menu laterale.<br>
 Guarda nelle <b>Impostazioni</b> per personalizzare l\'app come preferisci, e su <b>Informazioni</b> per sapere di più sull\'app e il team di sviluppo.]]>
     </string>
     <string name="close_tutorial">Capito, chiudi introduzione</string>
     <string name="close_tutorial_short">Chiudi introduzione</string>
     <string name="tutorial_permissions"><![CDATA[
          L\'app usa le notifiche per fornire informazioni sullo stato delle attività.
          Tocca il bottone per abilitarle.
         ]]></string>
     <string name="grant_location_permission">Abilita accesso alla posizione</string>
     <string name="location_permission_granted">Accesso alla posizione abilitato</string>
     <string name="location_permission_not_granted">Accesso alla posizione non consentito dall\'utente</string>
     <string name="grant_notification_permission">Abilita notifiche</string>
     <string name="notification_permission_granted">Notifiche abilitate</string>
     <!-- BACKUP -->
     <string name="backup_restore">Backup e ripristino</string>
     <string name="saved_data">Dati salvati</string>
     <string name="backup_title">Backup</string>
     <string name="restore_title">Ripristino</string>
     <string name="backup_completed_toast">Backup completato</string>
     <string name="backup_restore_pref_description">Salva o ripristina i dati</string>
     <string name="btn_backup_message">Salva backup</string>
     <string name="btn_load_backup_message">Importa i dati dal backup</string>
     <string name="data_imported_backup">Backup importato</string>
     <string name="message_check_at_least_one">Seleziona almeno un elemento da importare!</string>
     <string name="load_file_favorites">Importa preferiti dal backup</string>
     <string name="load_preferences">Importa preferenze dal backup</string>
     <string name="no_map_app_to_show_stop">Nessuna app disponibile per mostrare la fermata!</string>
     <string name="destination_unknown">Destinazione sconosciuta</string>
     <string name="showing_same_direction">Direzione già selezionata</string>
     <string name="too_far_not_showing_location">Sei troppo lontano, posizione nascosta</string>
     <string name="destination_loading">Caricamento destinazione…</string>
     <string name="hello_blank_fragment">Ciao fragment vuoto</string>
     <string name="live_positions_msg_ok">Il servizio delle posizioni funziona normalmente</string>
     <string name="live_positions_msg_no_positions">Nessuna posizione ricevuta</string>
     <string name="live_positions_msg_connection_error">Errore nella connessione al server</string>
     <string name="live_positions_msg_parsing_error">Errore nel parsing della risposta</string>
     <string name="live_positions_msg_network_error">Errore: risposta dal server inaspettata</string>
     <string name="live_positions_msg_connecting">In connessione...</string>
     <string name="live_positions_dialog_provider_text">Fonte posizioni in tempo reale:</string>
     <string name="live_positions_switch_provider">Cambia fonte</string>
     <string name="live_positions_preference_switch_clear_title">Rimuovi posizioni sulla mappa quando si cambia fonte delle posizioni in tempo reale</string>
     <string name="updated_fill">Aggiornato: %1$s</string>
     <string name="no_alerts_in_your_language_fill">Nessun avviso nella tua lingua, mostrati in %1$s</string>
     <string name="italian">Italiano</string>
     <string name="english">Inglese</string>
     <string name="alert_line_fill">Avvisi per la linea %1$s:</string>
     <string name="checking_alerts_update">Controllo degli avvisi disponibili in corso</string>
     <string name="no_gps_on_device">Servizio GPS non trovato sul dispositivo!</string>
     <string name="downloading_alerts_message">Download dati avvisi in tempo reale</string>
     <string name="no_permission_dialog_title">Permesso mancante</string>
     <string name="no_permission_dialog_text_location">Per usare questa funzionalità, l\'app necessita dell\'accesso alla posizione, che ora può essere dato solo dalle impostazioni di sistema.</string>
     <string name="no_permission_dialog_open">Apri le impostazioni</string>
     <string name="back_again_to_close">Premi ancora \"indietro\" per uscire dall\'app</string>
+
+    <!-- Theme -->
+    <string name="day_night_theme_set_light">Chiaro</string>
+    <string name="day_night_theme_set_dark">Scuro</string>
+    <string name="day_night_theme_keep_system">Segui il sistema</string>
+
+    <string name="pref_theme_day_night_title">Imposta tema scuro o chiaro</string>
 </resources>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..ff98671
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="black_icon_text">#ababab</color>
+    <!-- luminosity from 52 to 40 -->
+    <color name="blue_500">#0b6fc1</color>
+    <color name="black_800">#bfbfbf</color>
+    <!-- darker color, 40% luminosity -->
+    <color name="blue_700">#1a4db2</color>
+    <!-- lighter color, 55% luminosity -->
+    <!--<color name="blue_7F00">#3770e2</color>-->
+
+    <color name="lines_nearby_color">#3770e2</color>
+
+    <color name="red_orange">#c34322</color>
+    <!-- color of the polyline in line screen-->
+    <color name="red_dark">#861313</color>
+    <!-- bus marker in the map -->
+    <color name="bus_marker_color">#3657b0</color>
+    <color name="bus_marker_color_selected">#2270c3</color>F
+    <color name="card_background">@color/grey_900</color>
+    <color name="card_border">@color/grey_900</color>
+
+    <color name="orange_700_display">@color/orange_700_night</color>
+    <color name="message_background_on_black">#666666</color>
+
+    <!-- Proposal: change the grey_100 so it's less intense
+    <color name="grey_100">#d9d9d9</color> --> <!-- Also 42*3 -->
+
+    <color name="color_text_grey">@color/grey_400</color>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..9bb257f
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppThemeDayNight" parent="Theme.MaterialComponents.DayNight">
+        <item name="android:textColorSecondary">@color/text_secondary_night</item>
+        <item name="colorPrimary">@color/orange_500_night</item>
+        <item name="colorPrimaryDark">@color/orange_700_night</item>
+        <item name="colorAccent">@color/teal_500_night</item>
+
+
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f284e4b..434e46d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,77 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <color name="orange_500">#ff9800</color>
     <color name="orange_600">#E77D13</color>
     <color name="orange_700">#F57C00</color>
     <color name="orange_750">#f57200</color>
     <color name="orange_750_l45">#e66b00</color>
     <color name="orange_700_40light">#cc6600</color>
     <color name="orange_700_30light">#994d00</color>
     <color name="blue_500">#2196F3</color>
     <color name="blue_620">#2a65e8</color>
     <color name="blue_700">#2060dd</color>
     <color name="brown_vd">#8A4247</color><!-- #1976D2 -->
     <color name="dialog_background">#FFF3E0</color>
+    <color name="orange_background">#fff5e5</color>
+    <!-- night color, from 50 to 44 luminosity -->
+    <color name="orange_500_night">#e08700</color>
+
+    <!-- night color, to 41 luminosity -->
+    <color name="orange_700_night">#d16900</color>
 
     <color name="blue_mid_2">#2378e8</color>
     <color name="blue_c_or_700">#0079f5</color>
     <color name="teal_dark">#2a968b</color>
     <color name="blue_comp_500">#0067ff</color>
 
     <color name="blue_extra">#2F59CC</color>
     <color name="brown_mattone">#CC5E43</color>
     <color name="olivegreen">#548017</color>
     <color name="forest_green">#228b22</color>
     <color name="green_extra">#0ABA34</color>
 
-    <color name="teal_500">#009688</color>
+    <color name="OLD_teal_500">#009688</color>
+    <color name="teal_500">#00a38d</color>
+    <color name="teal_500_night">#009480</color>
+    <color name="teal_500_proposal">#00a887</color>
     <color name="teal_300">#4DB6AC</color>
     <color name="teal_200">#80cbc4</color>
     <color name="teal_900">#008175</color>
     <color name="grey_100">#F5F5F5</color>
     <color name="grey_200">#dddddd</color>
     <color name="grey_050">#f8f8f8</color>
     <color name="grey_400">#bababa</color>
     <color name="grey_500">#acacac</color>
     <color name="grey_600">#757575</color>
     <color name="grey_700">#444</color>
     <color name="grey_800">#353535</color>
     <color name="grey_900">#303030</color>
 
+    <color name="grey_L95">#f2f2f2</color>
+
     <!--<color name="white">#FFFFFF</color>
     <color name="accent">#009688</color>-->
     <color name="metro_red">#DE0908</color>
     <color name="red_darker">#b30000</color>
     <color name="red_orange">#dd441f</color>
     <color name="red_dark">#b30d0d</color>
     <color name="orange_icons">#f15000</color>
     <color name="orange_icons_10light">#f2621a</color>
     <color name="orange_icons_20light">#f47333</color>
     <color name="blue_extraurbano">#2060DD</color>
     <color name="white">#FFFFFF</color>
     <color name="black">#000000</color>
     <color name="black_900">#1c1c1c</color>
     <color name="black_800">#3f3f3f</color>
 
     <color name="line_pattern_color">@color/blue_mid_2</color><!-- 2e8df0-->
 
     <color name="line_drawn_poly">@color/red_dark</color>
 
     <color name="bus_marker_color">@color/blue_extra</color>
+    <color name="bus_marker_color_selected">#3089e8</color>
     <color name="light_blue_600">#FF039BE5</color>
     <color name="light_blue_900">#FF01579B</color>
     <color name="light_blue_A200">#FF40C4FF</color>
     <color name="light_blue_A400">#FF00B0FF</color>
     <color name="black_overlay">#66000000</color>
+    <color name="black_icon_text">#555</color>
+    <color name="text_secondary_night">#cccccc</color>
 
-
+    <color name="card_border">@color/grey_500</color>
     <color name="colorTransparent">#00000000</color>
+    <color name="orange_700_display">@color/orange_700</color>
+    <color name="message_background_on_black">@color/grey_200</color>
+    <color name="card_background">@color/grey_050</color>
 
     <color name="urban_bus_bg">@color/orange_500</color>
     <color name="extraurban_bus_bg">@color/blue_extraurbano</color>
     <color name="metro_bg">@color/metro_red</color>
     <color name="map_icon_background_active">@color/orange_icons_10light</color>
     <color name="map_icon_background_inactive">@color/grey_400</color>
     <color name="alerts_color_button">@color/orange_750_l45</color>
+    <color name="color_text_grey">@color/grey_700</color>
+    <color name="lines_nearby_color">@color/blue_700</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index c54d6ee..79cb646 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -1,43 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools"
            tools:ignore="MissingTranslation">
     <string name="pref_layout" translatable="false">layout_pref</string>
     <string name="pref_update_db_now" translatable="false">pref_update_db_now</string>
     <string name="positions_source_mqtt" translatable="false">mqtt</string>
     <string name="positions_source_gtfsrt" translatable="false">gtfsrt</string>
 
 
     <array name="first_screen_values">
         <!-- the "arrivals" key is just a placeholder for "home" screen, keeping for backwards compatibility -->
         <item>arrivals</item>
         <item>nearby</item>
         <item>favorites</item>
         <item>map</item>
         <item>lines</item>
     </array>
 
     <array name="arrivals_sources_values">
         <item>matofetcher</item>
         <item>fivetapifetcher</item>
         <item>gttjsonfetcher</item>
         <item>fivetscraper</item>
     </array>
 
     <array name="arrivals_sources_values_default">
         <item>matofetcher</item>
         <item>gttjsonfetcher</item>
     </array>
 
     <string name="pref_positions_source">pref_positions_source</string>
     <array name="positions_source_values">
         <item>@string/positions_source_mqtt</item>
         <item>@string/positions_source_gtfsrt</item>
     </array>
 
     <!-- MapLibre Preferences -->
     <array name="map_style_pref_values">
         <item>versatiles_c</item>
         <item>osm_legacy</item>
     </array>
 
+    <!-- Tema scuro / chiaro da Material -->
+    <array name="day_night_keys" translatable="false">
+        <item>day</item>
+        <item>night</item>
+        <item>system</item>
+    </array>
+
+    <array name="day_night_values">
+        <item>@string/day_night_theme_set_light</item>
+        <item>@string/day_night_theme_set_dark</item>
+        <item>@string/day_night_theme_keep_system</item>
+    </array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4d29892..6684ecc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,408 +1,416 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="app_name" translatable="false">BusTO</string>
     <string name="app_name_full" translatable="false">Libre BusTO</string>
     <string name="app_name_debug" translatable="false">BusTO dev</string>
     <string name="app_name_gitpull" translatable="false">BusTO git</string>
     <string name="app_description">You\'re using the latest in technology when it comes to respecting your privacy.
     </string>
     <string name="search">Search</string>
     <string name="qrcode">Scan QR Code</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="next">Next</string>
     <string name="previous">Previous</string>
 
     <string name="title_barcode_scanner_install">Install Barcode Scanner?</string>
     <string name="message_install_barcode_scanner">This application requires an app to scan the QR codes. Would you like
         to install Barcode Scanner now?
     </string>
 
     <string name="insert_bus_stop_number">Bus stop number</string>
     <string name="insert_bus_stop_name">Bus stop name</string>
     <string name="insert_bus_stop_number_error">Insert bus stop number</string>
     <string name="insert_bus_stop_name_error">Insert bus stop name</string>
     <string name="route_towards_destination">%1$s towards %2$s</string>
     <string name="route_towards_unknown">%s (unknown destination)</string>
     <string name="network_error">Verify your Internet connection!</string>
     <string name="no_bus_stop_have_this_name">Seems that no bus stop has this name</string>
     <string name="no_arrivals_stop">No arrivals found for this stop</string>
     <string name="parsing_error">Error parsing the 5T/GTT website (damn site!)</string>
     <string name="query_too_short">Name too short, type more characters and retry
     </string> <!-- TODO: carry out experiments to determine the best wording for this message and publish a paper with the findings -->
     <string name="passages_fill">Arrivals at: %1$s</string>
     <string name="passages">Arrivals at:</string>
     <string name="results">Choose the bus stop…</string>
     <string name="line">Line</string>
     <string name="lines">Lines</string>
     <string name="urban_lines">Urban lines</string>
     <string name="extraurban_lines">Extra urban lines</string>
     <string name="turist_lines">Tourist lines</string>
     <string name="no_lines_found">No lines found in this category</string>
     <string name="no_lines_found_query">No lines match the searched name</string>
 
 
     <string name="direction_duep">Destination:</string>
     <string name="lines_fill">Lines: %1$s</string>
     <string name="line_fill">Line %1$s</string>
     <string name="line_fill_towards">Line %1$s towards:</string>
     <string name="stop_fill">Stop %1$s</string>
     <string name="vehicle_fill">Vehicle %1$s</string>
     <string name="no_passages">No timetable found</string>
     <string name="no_qrcode">No QR code found, try using another app to scan</string>
     <string name="scan_qr_code_stop">Scan QR code at the bus stop</string>
     <string name="internal_error">Unexpected internal error, cannot extract data from GTT/5T website</string>
     <string name="action_help">Help</string>
     <string name="action_about">About the app</string>
     <string name="action_about_more">More about</string>
     <string name="action_wiki">Open the wiki</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/en/</string>
     <string name="action_source">Source code</string>
     <string name="action_licence">Licence</string>11
     <string name="action_author">Meet the author</string>
     <string name="added_in_favorites">Bus stop is now in your favorites</string>
     <string name="removed_from_favorites">Bus stop removed from your favorites</string>
     <string name="favorites_line_add">Added line to favorites</string>
     <string name="favorites_line_remove">Remove line from favorites</string>
     <string name="favorites_lines">Favorites</string>
     <string name="action_favorites">Favorites</string>
     <string name="title_activity_favorites">Favorites</string>
     <string name="title_activity_map">Map</string>
     <string name="tip_add_favorite">No favorites? Arghh! Press on a bus stop star to populate this list!</string>
     <string name="action_remove_from_favourites">Delete</string>
     <string name="action_rename_bus_stop_username">Rename</string>
     <string name="dialog_rename_bus_stop_username_title">Rename the bus stop</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about_activity">About the app</string>
     <string name="howDoesItWork">
         <b>Tap the star</b>
         to add the bus stop to the favourites\n\n<b>How to read timelines:</b>\n<b>&#160;&#160;&#160;12:56*</b> Real-time
         arrivals\n<b>&#160;&#160;&#160;12:56</b> &#160; Scheduled arrivals\n\n<b>Pull down to refresh</b> the timetable
         \n <b>Long press on Arrivals source</b> to change the source of the arrival times
     </string>
     <string name="hint_button">GOT IT!</string>
     <string name="arrival_times">Arrival times</string>
     <string name="no_passages_title">No arrivals found for lines:</string>
     <string name="about_history_top">
         <![CDATA[
         <h1>Welcome!</h1>
 
         <p>Thanks for using BusTO, an <b>open source</b> and <b>independent</b> app useful to move around Torino using a <b>Free/Libre software</b>.</p>
         <br>
         <p>Why use this app?</p>
 		<p>
         - You\'ll never be <b>tracked</b><br>
         - You\'ll never see boring <b>ads</b><br>
         - We\'ll always respect your <b>privacy</b><br>
         - Moreover, it\'s lightweight!<br>
         </p>
         <br>
         <h2>Introductory tutorial</h2>
         <p>If you want to see the introduction again, use the button below:</p>
         ]]></string>
     <string name="about_channel">
         <![CDATA[
     <h2>News and Updates</h2>
     <p>On the Telegram channel, you can find information about the latest app updates</p>
     ]]></string>
     <string name="about_how">
         <![CDATA[
     <h2>How does it work?</h2>
         <p>This app is able to do all the amazing things it does by pulling data from <b>www.gtt.to.it</b>, <b>www.5t.torino.it</b> or <b>muoversiatorino.it</b> "for personal use", along with open data from the AperTO (aperto.comune.torino.it) website.</p>
         <br>
 		<p>The work of several people is behind this app, in particular:<br>
 		- <b>Fabio Mazza</b>, current senior rockstar developer.<br>
         - <b>Andrea Ugo</b>, current junior rockstar developer.<br>
 		- <b>Silviu Chiriac</b>, designer of the 2021 logo.<br>
 		- <b>Marco M</b>, rockstar tester and bug hunter.<br>
 		- <b>Ludovico Pavesi</b>, previous senior rockstar developer (asd).<br>
 		- <b>Valerio Bozzolan</b>, maintainer and infrastructure (sponsor).<br>
 		- <b>Marco Gagino</b>, contributor and first icon creator.<br>
 		- <b>JSoup</b> web scraper library.<br>
 		- <b>makovkastar</b> floating buttons.<br>
         - <b>Google</b> for icons and support and design libraries.<br>
         - Other icons from <b>Bootstrap</b>, <b>Feather</b>, and <b>Hero Icons</b>.<br>
 		- All the contributors, and the beta testers, too!
 		</p>
 		<br>
 		 If you want more information or want to contribute to development, use the buttons below!</b>
     ]]></string>
     <string name="about_history_bottom">
         <![CDATA[
 		<h2>Licenses</h2>
 		<p>The app and the related source code are released by Valerio Bozzolan and the other authors under the terms of the <i>GNU General Public License v3+</i>).
 		So everyone is allowed to use, to study, to improve and to share this app by <b>any kind of means</b> and for <b>any purpose</b>: under the conditions of maintaining this rights and of attributing the original work to Valerio Bozzolan.</p>
         <br>
 		<h2>Notes</h2>
 		<p>This app has been developed with the <b>hope to be useful to everyone</b>, but comes without ANY warranty of any kind.</p>
 		<p>The data used by the app comes <b>directly</b> from GTT and other public agencies: if you find any errors, please take it up to them, not to us.</p>
 		<p>This translation is kindly provided by Riccardo Caniato, Marco Gagino and Fabio Mazza.</p>
 		<p>Now you can hack public transport, too! :)</p>
     ]]>
     </string>
 
     <string name="cant_add_to_favorites">Cannot add to favorites (storage full or corrupted database?)!</string>
     <string name="action_view_on_map">View on a map</string>
     <string name="action_open_line">Show line details</string>
     <string name="action_show_direction">Show full direction</string>
     <string name="cannot_show_on_map_no_activity">Cannot find any application to show it in</string>
     <string name="cannot_show_on_map_no_position">Cannot find the position of the stop</string>
 
     <string name="list_fragment_debug" translatable="false">ListFragment - BusTO</string>
     <string name="mainSharedPreferences" translatable="false">it.reyboz.bustorino.preferences</string>
     <string name="databaseUpdatingPref" translatable="false">db_is_updating</string>
 
     <!-- used as generic title for "show what is near me" -->
     <string name="near_me_title">Near me</string>
     <string name="nearby_stops_message">Nearby stops</string>
-    <string name="nearby_arrivals_message">Nearby connections</string>
+    <string name="nearby_arrivals_message">Nearby arrivals</string>
     <string name="app_version">App version</string>
     <string name="num_stops_nearby_not_number">The number of stops to show in the recent stops is invalid</string>
     <string name="invalid_number">Invalid value, put a valid number</string>
 
     <string name="position_searching_message">Finding location</string>
     <string name="no_stops_nearby">No stops nearby</string>
     <string name="pref_num_elements">Minimum number of stops</string>
     <string name="main_menu_pref">Preferences</string>
     <string name="title_activity_settings">Settings</string>
     <string name="action_settings">Settings</string>
     <string name="general_settings">General</string>
     <string name="settings_experimental">Experimental features</string>
     <string name="settings_search_radius">Maximum distance (meters)</string>
     <string name="pref_recents_group_title">Recent stops</string>
     <string name="settings_group_general">General settings</string>
     <string name="settings_group_database">Database management</string>
     <string name="settings_reset_database">Launch manual database update</string>
 
     <string name="enable_position_message_map">Allow access to location to show it on the map</string>
     <string name="enable_position_message_nearby">Allow access to location to show stops nearby</string>
     <string name="enable_location_message">Please enable location on the device</string>
     <string name="no_gps_on_device">No GPS receiver found on the device!</string>
     <string name="database_update_msg_inapp">Database update in progress&#8230;</string>
     <string name="database_update_msg_notif">Updating the database</string>
     <string name="database_update_req">Force database update</string>
     <string name="database_update_req_descr">Touch to update the app database now</string>
     <string name="bus_arriving_at">is arriving at</string>
     <string name="arrivals_card_at_the_stop">at the stop</string>
     <string name="two_strings_format" translatable="false">%1$s - %2$s</string>
     <string name="show_arrivals">Show arrivals</string>
     <string name="show_stops">Show stops</string>
     <!--
     Mixed button strings
     !-->
     <string name="open_telegram">Join Telegram channel</string>
     <string name="show_introduction">Show introduction</string>
     <!--
    Map view buttons strings
    !-->
     <string name="bt_center_map_description">Center on my location</string>
     <string name="bt_follow_me_description">Follow me</string>
     <string name="enable_position">Enable or disable location</string>
     <string name="location_enabled">Location enabled</string>
     <string name="location_disabled">Location disabled</string>
     <string name="map_location_disabled_device">Location is disabled on device</string>
 
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Arrivals source: %1$s</string>
     <string name="searching_arrivals_fmt">Loading arrivals from %1$s</string>
     <string name="fivetapifetcher">GTT App</string>
     <string name="gttjsonfetcher">GTT Website</string>
     <string name="fivetscraper">5T Torino website</string>
     <string name="source_mato">Muoversi a Torino</string>
     <string name="undetermined_source">Undetermined</string>
     <string name="arrival_source_changing">Changing arrival times source…</string>
     <string name="change_arrivals_source_message">Long press to change the source of arrivals</string>
     <string-array name="arrival_times_source_list">
         <item>@string/source_mato</item>
         <item>@string/fivetapifetcher</item>
         <item>@string/gttjsonfetcher</item>
         <item>@string/fivetscraper</item>
     </string-array>
     <string name="arrival_times_choice_title">Sources of arrival times</string>
     <string name="arrival_times_choice_explanation">Select which sources of arrival times to use</string>
 
 
     <!--
     Notifications
     -->
     <string name="default_notification_channel" translatable="false">Default</string>
     <string name="default_notification_channel_description">Default channel for notifications</string>
     <string name="database_notification_channel">Database operations</string>
     <string name="database_notification_channel_desc">Updates of the app database</string>
     <string name="live_position_service_name">BusTO - live position service</string>
     <string name="live_positions_notification_channel">Live positions</string>
     <string name="live_positions_notification_channel_desc">Showing activity related to the live positions service
     </string>
     <string name="mqtt_notification_text">MaTO live bus positions service is running</string>
 
     <string name="db_trips_download_message">Downloading trips from MaTO server</string>
 
     <string name="too_many_permission_asks">Asked for %1$s permission too many times</string>
     <string name="permission_storage_maps_msg">Cannot use the map with the storage permission!</string>
     
     <string name="storage_permission">storage</string>
     <string name="message_crash">The application has crashed because you encountered a bug.
         \nIf you want, you can help the developers by sending the crash report via email.
         \nNote that no sensitive data is contained in the report, just small bits of info on your phone and app
         configuration/state.
     </string>
     <string name="acra_email_message">The application crashed and the crash report is in the attachments. Please
         describe what you were doing before the crash: \n
     </string>
     <string name="nav_arrivals_text">Arrivals</string>
     <string name="nav_home_text">Home</string>
     <string name="nav_map_text">Map</string>
     <string name="nav_favorites_text">Favorites</string>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
     <string name="experiments">Experiments</string>
     <string name="donate_now">Buy us a coffee</string>
     <string name="map">Map</string>
     <string name="stop_search_view_title">Search by stop</string>
     <string name="search_box_lines_suggestion_filter">Filter by name</string>
     <string name="requesting_db_update">Launching database update</string>
     <string name="downloading_data_mato">Downloading data from MaTO server</string>
     <string name="downloading_alerts_message">Downloading realtime alerts data</string>
 
     <!-- preferences -->
     <string name="pref_directions_capitalize">Capitalize directions</string>
     <string-array name="directions_capitalize">
         <item>@string/directions_capitalize_no_change</item>
         <item>@string/directions_capitalize_everything</item>
         <item>@string/directions_capitalize_first_letter</item>
     </string-array>
     <string name="directions_capitalize_no_change">Do not change arrivals directions</string>
     <string name="directions_capitalize_everything">Capitalize everything</string>
     <string name="directions_capitalize_first_letter">Capitalize only first letter</string>
     <array name="directions_capitalize_keys">
         <item>KEEP</item>
         <item>CAPITALIZE_ALL</item>
         <item>CAPITALIZE_FIRST</item>
 
     </array>
     <string name="pref_shown_startup">Section to show on startup</string>
     <string name="pref_shown_startup_def_desc">Touch to change it</string>
     <string name="pref_lines_click_msg">Show arrivals touching on stop</string>
     <string name="pref_experimental_msg">Enable experiments</string>
 
 
     <!-- lines -->
     <string name="long_press_stop_4_options">Long press the stop for options</string>
 
     <array name="first_screen_shown">
         <item>@string/nav_home_text</item>
         <item>@string/near_me_title</item>
         <item>@string/nav_favorites_text</item>
         <item>@string/nav_map_text</item>
         <item>@string/lines</item>
     </array>
+
+
+    <string name="day_night_theme_set_light">Light</string>
+    <string name="day_night_theme_set_dark">Dark</string>
+    <string name="day_night_theme_keep_system">Change it with the system</string>
+
+    <!-- title used in the preferences screen -->
+    <string name="pref_theme_day_night_title">Set dark or light theme</string>
     <string name="positions_source_pref_title">Source of real time positions for buses and trams</string>
     <string name="positions_source_mato_descr">MaTO (updated more frequently, might have errors)</string>
     <string name="positions_source_gtfsrt_descr">GTFS RT (less frequently updated, more accurate)</string>
     <array name="positions_source_sel">
         <item>@string/positions_source_mato_descr</item>
         <item>@string/positions_source_gtfsrt_descr</item>
     </array>
     <string name="too_far_not_showing_location">"You are too far, not showing your position</string>
     <string name="map_style_pref_title">Style of the map</string>
     <string name="map_style_versatiles">Versatiles (vector)</string>
     <string name="map_style_legacy_raster">OSM legacy (raster, lighter)</string>
     <array name="map_style_pref_categories">
         <item>@string/map_style_versatiles</item>
         <item>@string/map_style_legacy_raster</item>
     </array>
 
     <string name="remove_all_trips">Remove trips data (free up space)</string>
     <string name="all_trips_removed">All GTFS trips have been removed from the database</string>
 
     <!-- Tutorial strings -->
     <string name="tutorial_action">Show tutorial</string>
     <string name="tutorial_first">
         <![CDATA[Thank you for installing BusTO, the free and <b>open source</b> app for Turin public transport. This is an <b>independent</b> app, with no ads and no tracking whatsoever.]]> </string>
     <string name="tutorial_search"> <![CDATA[You can search for the arrival times at a bus stop by inserting the number in the top, or scanning a QR code when you are at the stop
         touching the icon on the left ]]>
     </string>
     <string name="tutorial_arrivals">
         <![CDATA[Once you have found a bus stop, you can save it in the <b>favorites</b> by touching the star next to its name]]>
     </string>
     <string name="tutorial_stops">
         <![CDATA[You can see the stops near your position directly in the main screen...]]>
     </string>
 
     <string name="tutorial_map">
         <![CDATA[...or you can find them in the map, along with the real-time positions of the buses running in the city (in <font color="#2F59CC">blue</font>)]]>
     </string>
     <string name="tutorial_line">
         <![CDATA[You can also look at the line you want and see where the stops are, together with the vehicles serving the line at the moment. Remember to choose the direction you\'re interested in!]]>
     </string>
     <string name="tutorial_menu">
         <![CDATA[You can find all of this from the lateral menu.
 Look in the <b>Settings</b> to customize the app behaviour, and in the <b>About the app</b> section if you want to know more about the app and the developers.]]>
     </string>
     <string name="tutorial_permissions">
         <![CDATA[The app needs the <b>Notifications</b> permission to show the information about background processing.
          Press the button below to grant it]]>
     </string>
     <string name="grant_location_permission">Grant location permission</string>
     <string name="location_permission_granted">Location permission granted</string>
     <string name="location_permission_not_granted">Location permission has not been granted</string>
     <string name="no_permission_dialog_title">Missing permission</string>
     <!-- If more permissions are needed, adapt this string to make if "fillable" -->
     <string name="no_permission_dialog_text_location">To use this functionality, the application needs access to the location, which now can only be granted in the system settings.</string>
     <string name="no_permission_dialog_open">Open settings</string>
 
     <string name="close_tutorial">OK, close the tutorial</string>
     <string name="close_tutorial_short">Close the tutorial</string>
     <string name="grant_notification_permission">Enable notifications</string>
     <string name="notification_permission_granted">Notifications enabled</string>
     <!-- BACKUP -->
     <string name="backup_restore">Backup and restore</string>
     <!-- Title of the top section for the backup -->
     <string name="backup_title">Backup</string>
     <!-- Title of the bottom section - for restoring data -->
     <string name="restore_title">Restore</string>
     <!-- String in the settings screen to describe the action that can be performed -->
     <string name="backup_restore_pref_description">Backup or restore data</string>
     <string name="saved_data">Data saved</string>
     <string name="backup_completed_toast">Backup completed</string>
     <string name="btn_backup_message">Backup to file</string>
     <string name="btn_load_backup_message">Import data from backup</string>
     <string name="data_imported_backup">Backup has been imported</string>
     <string name="message_check_at_least_one">Check at least one item to import!</string>
     <string name="load_file_favorites">Import favorites from backup</string>
     <string name="load_preferences">Import preferences from backup</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
 
     <string name="no_map_app_to_show_stop">No map app present to show the stop!</string>
     <string name="showing_same_direction">Direction is already shown</string>
     <string name="destination_loading">Loading destination…</string>
     <string name="destination_unknown">Destination unknown</string>
     <!-- LIVE POSITIONS DIALOG -->
     <string name="live_positions_msg_ok">Service for positions working normally</string>
     <string name="live_positions_msg_no_positions">No positions received</string>
     <string name="live_positions_msg_connection_error">Error connecting to the server</string>
     <string name="live_positions_msg_parsing_error">Error parsing the server response</string>
     <string name="live_positions_msg_network_error">Error: network response is not as expected</string>
     <string name="live_positions_msg_connecting">Connecting...</string>
     <string name="positions_source_mato_short" translatable="false">MaTO</string>
     <string name="positions_source_gtfsrt_short" translatable="false">GTFS RT</string>
     <string name="live_positions_dialog_provider_text">Live positions source:</string>
     <string name="live_positions_switch_provider">Switch source</string>
     <string name="live_positions_preference_switch_clear_title">Clear bus positions when switching live positions
         source
     </string>
 
     <string name="updated_fill">Updated: %1$s</string>
     <string name="alert_line_fill">Alerts for line %1$s:</string>
     <string name="alert_stop_fill">Alerts for stop %1$s:</string>
     <string name="no_alerts_in_your_language_fill">No alerts in your language, showing in %1$s</string>
     <string name="italian">Italian</string>
     <string name="english">English</string>
     <string name="checking_alerts_update">Checking new alerts now</string>
     <string name="back_again_to_close">Press back again to close the app</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cf7314c..75c8645 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,87 +1,103 @@
 <resources>
 
     <!--
         Base application theme, dependent on API level. This theme is replaced
         by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
     -->
 
     <style name="AppBaseTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <!--
             Theme customizations available in newer API levels can go in
             res/values-vXX/styles.xml, while customizations related to
             backward-compatibility can go here.
         -->
     </style>
     <style name="AppMaterialTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
 
     </style>
     <style name="AppMaterialTheme.NoActionBar" parent="Theme.MaterialComponents.Light.NoActionBar">
 
     </style>
 
 
     <!-- Application theme. -->
     <style name="AppTheme" parent="AppBaseTheme">
 
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
         <item name="colorPrimary">@color/orange_500</item>
         <item name="colorPrimaryDark">@color/orange_700</item>
         <item name="colorAccent">@color/teal_500</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- For the preferences Fragment -->
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
 
         <item name="android:textColor">@color/grey_700</item>
 
     </style>
 
     <style name="Widget.MyApp.Button" parent="Widget.MaterialComponents.Button">
         <item name="backgroundTint">?attr/colorSecondary</item>
     </style>
 
     <style name="AppTheme.NoActionBar" parent="AppTheme">
 
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
 
 
     <!-- For the preferences Fragment -->
     <style name="PreferenceThemeOverlay.">
         <item name="preferenceScreenStyle">@style/Preference.PreferenceScreen</item>
         <item name="preferenceFragmentStyle">@style/PreferenceFragment</item>
         <item name="preferenceCategoryStyle">@style/Preference.Category</item>
         <item name="preferenceStyle">@style/Preference</item>
         <item name="preferenceInformationStyle">@style/Preference.Information</item>
         <item name="checkBoxPreferenceStyle">@style/Preference.CheckBoxPreference</item>
         <item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat</item>
         <item name="dialogPreferenceStyle">@style/Preference.DialogPreference</item>
         <item name="editTextPreferenceStyle">@style/Preference.DialogPreference.EditTextPreference</item>
         <item name="preferenceFragmentListStyle">@style/PreferenceFragmentList</item>
     </style>
     <style name="Widget.AppTheme.NoActionBar.ActionBar.Fullscreen" parent="Widget.AppCompat.ActionBar">
         <item name="android:background">@color/black_overlay</item>
     </style>
 
     <style name="Widget.AppTheme.NoActionBar.ButtonBar.Fullscreen" parent="">
         <item name="android:background">@color/black_overlay</item>
         <item name="android:buttonBarStyle">?android:attr/buttonBarStyle</item>
     </style>
 
     <!-- styles that support night mode -->
+    <!-- copied all things inside AppTheme -->
     <style name="AppThemeDayNight" parent="Theme.MaterialComponents.DayNight">
+
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+        <item name="colorPrimary">@color/orange_500</item>
+        <item name="colorPrimaryDark">@color/orange_700</item>
+        <item name="colorAccent">@color/teal_500</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- For the preferences Fragment -->
+        <!--<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>-->
+
+        <item name="android:textColor">@color/black_800</item>
+        <!-- keep default for day, change for night-->
+        <!--
+        <item name="android:textColorPrimary">@color/grey_700</item>
+        <item name="android:textColorSecondary">@color/text_secondary</item>
+        -->
     </style>
 
     <style name="AppThemeDayNight.NoActionBar" parent="AppThemeDayNight">
 
         <item name="android:windowTranslucentStatus">false</item>
 
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
 
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index 9355a41..ff7632c 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="FavTheme" parent="AppMaterialTheme.NoActionBar">
+    <style name="FavTheme" parent="AppThemeDayNight.NoActionBar">
         <item name="colorPrimary">@color/blue_500</item>
         <item name="colorPrimaryDark">@color/blue_700</item>
         <item name="colorAccent">@color/teal_500</item>
     </style>
 
-    <style name="AboutTheme" parent="AppMaterialTheme.NoActionBar">
+    <style name="AboutTheme" parent="AppThemeDayNight.NoActionBar">
         <item name="colorPrimary">@color/teal_500</item>
         <item name="colorPrimaryDark">@color/teal_900</item>
         <item name="colorAccent">@color/blue_700</item>
         <item name="colorOnPrimary">@color/white</item>
     </style>
 
-    <style name="MapTheme" parent="AppMaterialTheme.NoActionBar">
+    <style name="MapTheme" parent="AppThemeDayNight.NoActionBar">
         <item name="colorPrimary">@color/orange_500</item>
         <item name="colorPrimaryDark">@color/orange_700</item>
         <item name="colorAccent">@color/teal_500</item>
         <item name="colorOnPrimary">@color/white</item>
     </style>
 
     <style name="preferenceTheme" parent="PreferenceThemeOverlay"></style>
 
     <style name="AppTheme.NoActionBar.Light" parent="AppTheme.NoActionBar">
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
     <style name="BackupTheme" parent="AppThemeDayNight.NoActionBar">
         <item name="colorPrimary">@color/orange_500</item>
         <item name="colorPrimaryDark">@color/orange_700</item>
         <item name="colorAccent">@color/teal_500</item>
         <item name="colorOnPrimary">@color/white</item>
     </style>
 
 
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 1380f78..21ffbc7 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,138 +1,146 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.preference.PreferenceCategory android:title="@string/general_settings">
+        <androidx.preference.ListPreference
+            android:key="app_theme_day_night"
+            android:entryValues="@array/day_night_keys"
+            android:entries="@array/day_night_values"
+            android:title="@string/pref_theme_day_night_title"
+            android:summary="%s"
+            />
+
         <androidx.preference.ListPreference
             android:key="startup_screen_to_show"
             android:entries="@array/first_screen_shown"
             android:entryValues="@array/first_screen_values"
             android:title="@string/pref_shown_startup"
             android:summary="%s"
             />
 
     </androidx.preference.PreferenceCategory>
 
     <androidx.preference.PreferenceCategory
             android:title="@string/map"
     >
         <androidx.preference.ListPreference
                 android:key="libremap_style_1"
                 android:title="@string/map_style_pref_title"
                 android:entries="@array/map_style_pref_categories"
                 android:entryValues="@array/map_style_pref_values"
                 android:summary="%s"
         />
         <androidx.preference.ListPreference
                 android:key="@string/pref_positions_source"
                 android:entries="@array/positions_source_sel"
                 android:entryValues="@array/positions_source_values"
                 android:title="@string/positions_source_pref_title"
                 android:summary="%s"
 
         />
         <!-- NEVER EVER CHANGE THE KEY PROPERTIES -->
         <androidx.preference.CheckBoxPreference
             android:defaultValue="true"
             android:key="positions_clear_on_switch_pref"
             android:title="@string/live_positions_preference_switch_clear_title"
             app:singleLineTitle="false"
             />
 
     </androidx.preference.PreferenceCategory>
 
     <androidx.preference.PreferenceCategory
             android:title="@string/pref_recents_group_title">
         <!--
     <androidx.preference.EditTextPreference
             android:defaultValue="10"
             android:selectAllOnFocus="true"
             android:singleLine="true"
             android:inputType="number"
             android:title="@string/pref_num_elements" android:key="@string/pref_key_num_recents"
             app:useSimpleSummaryProvider="true"
             android:digits="0123456789"
     />
     -->
         <androidx.preference.SeekBarPreference
                 android:title="@string/pref_num_elements" android:key="@string/pref_key_num_recents"
                 android:defaultValue="6"
                 android:max="40"
                 app:min="1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:showSeekBarValue="true"
 
         />
     <androidx.preference.SeekBarPreference
             android:title="@string/settings_search_radius"
             android:key="@string/pref_key_radius_recents"
             android:defaultValue="500"
             android:max="1000"
             app:min="100"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:showSeekBarValue="true"
 
     />
 
     </androidx.preference.PreferenceCategory>
     <!--
     <androidx.preference.Preference
             android:layout="@layout/pref_extra_version"
             android:key="version"
     />
     -->
     <androidx.preference.PreferenceCategory android:title="@string/arrival_times">
 
         <androidx.preference.MultiSelectListPreference
             android:key="arrivals_fetchers_use_setting"
             android:title="@string/arrival_times_choice_title"
             android:summary="@string/arrival_times_choice_explanation"
             android:entries="@array/arrival_times_source_list"
             android:entryValues="@array/arrivals_sources_values"
             android:defaultValue="@array/arrivals_sources_values_default"
             />
 
         <androidx.preference.ListPreference
             android:title="@string/pref_directions_capitalize"
             android:entries="@array/directions_capitalize"
             android:entryValues="@array/directions_capitalize_keys"
             android:key="@string/pref_arrival_times_capit"
         />
     </androidx.preference.PreferenceCategory>
 
     <!--TODO: If we want lines preferences (eg showing arrivals on click)
     <androidx.preference.PreferenceCategory android:title="@string/lines">
         <androidx.preference.CheckBoxPreference
                 android:title=""
             />
     </androidx.preference.PreferenceCategory>
     -->
 
     <androidx.preference.PreferenceCategory android:title="Database">
             <androidx.preference.Preference
                 android:title="@string/database_update_req"
                 android:summary="@string/database_update_req_descr"
                 android:key="pref_db_update_now"
             />
         <androidx.preference.Preference
                 android:title="@string/remove_all_trips"
                 android:key="pref_clear_gtfs_trips"
             />
     </androidx.preference.PreferenceCategory>
 
     <androidx.preference.PreferenceCategory android:title="@string/backup_restore">
         <androidx.preference.Preference
             android:title="@string/backup_restore_pref_description"
             android:key="pref_backup_open"
             />
     </androidx.preference.PreferenceCategory>
 
     <androidx.preference.PreferenceCategory
             android:title="@string/settings_experimental">
         <androidx.preference.SwitchPreferenceCompat
                 android:defaultValue="false"
                 android:title="@string/pref_experimental_msg" android:key="@string/pref_key_experimental"/>
     </androidx.preference.PreferenceCategory>
 </androidx.preference.PreferenceScreen>