diff --git a/tasks/enduro-trails/prototype/static/style.json b/tasks/enduro-trails/prototype/static/style.json
index a83dd02..c15fe02 100644
--- a/tasks/enduro-trails/prototype/static/style.json
+++ b/tasks/enduro-trails/prototype/static/style.json
@@ -20,21 +20,21 @@
       "attribution": "© OpenStreetMap contributors"
     }
   },
-  "glyphs": "https://demotiles.maplibre.org/font/{fontstack}/{range}.pbf",
+  "glyphs": "https://fonts.openmaptiles.org/{fontstack}/{range}.pbf",
   "layers": [
     {
       "id": "background",
       "type": "background",
-      "paint": { "background-color": "#f5f3ee" }
+      "paint": { "background-color": "#f0ede6" }
     },
     {
       "id": "osm-base",
       "type": "raster",
       "source": "osm-raster",
       "paint": {
-        "raster-opacity": 0.45,
-        "raster-saturation": -0.6,
-        "raster-brightness-min": 0.6,
+        "raster-opacity": 0.35,
+        "raster-saturation": -0.3,
+        "raster-brightness-min": 0.7,
         "raster-brightness-max": 1.0
       }
     },
@@ -43,51 +43,46 @@
       "type": "line",
       "source": "trails-tiles",
       "source-layer": "trails",
-      "filter": ["in", "highway", "primary", "secondary", "tertiary", "residential", "cycleway"],
+      "filter": ["in", "highway", "primary", "secondary", "tertiary", "residential"],
       "paint": {
-        "line-color": "#aaaaaa",
-        "line-width": 1,
-        "line-opacity": 0.6
+        "line-color": "#bbbbbb",
+        "line-width": ["interpolate", ["linear"], ["zoom"], 8, 0.5, 10, 1, 14, 2],
+        "line-opacity": 0.35
       },
       "layout": { "line-cap": "round", "line-join": "round" }
     },
     {
-      "id": "trails-grade12",
+      "id": "trails-track",
       "type": "line",
       "source": "trails-tiles",
       "source-layer": "trails",
-      "filter": ["all", ["==", "highway", "track"], ["in", "tracktype", "grade1", "grade2"]],
+      "filter": ["==", ["get", "highway"], "track"],
       "paint": {
-        "line-color": "#e07b00",
-        "line-width": ["interpolate", ["linear"], ["zoom"], 8, 1.5, 12, 2.5, 16, 4],
+        "line-color": [
+          "match", ["get", "tracktype"],
+          "grade1", "#e07b00",
+          "grade2", "#e07b00",
+          "grade3", "#ff6600",
+          "grade4", "#ff5500",
+          "grade5", "#ff4400",
+          "#ff6600"
+        ],
+        "line-width": ["interpolate", ["linear"], ["zoom"], 6, 0.5, 8, 1.2, 10, 2, 12, 3.5, 16, 6],
         "line-opacity": 0.9
       },
       "layout": { "line-cap": "round", "line-join": "round" }
     },
-    {
-      "id": "trails-grade345",
-      "type": "line",
-      "source": "trails-tiles",
-      "source-layer": "trails",
-      "filter": ["all", ["==", "highway", "track"], ["!in", "tracktype", "grade1", "grade2"]],
-      "paint": {
-        "line-color": "#ff6600",
-        "line-width": ["interpolate", ["linear"], ["zoom"], 8, 2, 12, 3.5, 16, 5],
-        "line-opacity": 0.95
-      },
-      "layout": { "line-cap": "round", "line-join": "round" }
-    },
     {
       "id": "trails-path-bridleway",
       "type": "line",
       "source": "trails-tiles",
       "source-layer": "trails",
-      "filter": ["in", "highway", "path", "bridleway", "footway"],
+      "filter": ["in", ["get", "highway"], "literal", ["path", "bridleway", "footway"]],
       "paint": {
         "line-color": "#cc9900",
-        "line-width": ["interpolate", ["linear"], ["zoom"], 8, 1, 12, 1.5, 16, 3],
-        "line-opacity": 0.85,
-        "line-dasharray": [3, 2]
+        "line-width": ["interpolate", ["linear"], ["zoom"], 7, 0.5, 10, 1, 12, 1.5, 16, 3],
+        "line-opacity": 0.8,
+        "line-dasharray": [2, 1.5]
       },
       "layout": { "line-cap": "butt", "line-join": "round" }
     },
@@ -97,7 +92,7 @@
       "source": "trails-tiles",
       "source-layer": "poi",
       "paint": {
-        "circle-radius": ["interpolate", ["linear"], ["zoom"], 8, 3, 12, 6, 16, 10],
+        "circle-radius": ["interpolate", ["linear"], ["zoom"], 8, 2, 12, 6, 16, 10],
         "circle-color": [
           "match", ["get", "poi_type"],
           "natural=peak",          "#e63946",