diff --git a/data/classificator.txt b/data/classificator.txt
index f4cee2114e..e6645637b8 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -454,7 +454,10 @@ world  +
             hiking  -
             horse  -
             mountain_hiking  -
+            named  -
             permissive  -
+            route  -
+            surface_good  -
             tunnel  -
             {}
         pedestrian  +
@@ -518,8 +521,11 @@ world  +
             grade3  -
             grade4  -
             grade5  -
+            named  -
             no-access  -
             permissive  -
+            route  -
+            surface_good  -
             tunnel  -
             {}
         traffic_signals  -
diff --git a/data/colors.txt b/data/colors.txt
index 9e918f8ae8..b9b6ec6dbc 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -1,4 +1,5 @@
 0
+255
 6425
 8738
 9758
@@ -10,6 +11,7 @@
 21569
 26316
 26972
+32768
 34815
 39468
 42380
@@ -299,6 +301,7 @@
 16575614
 16579778
 16579836
+16711680
 16728450
 16733986
 16740096
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 725acd9286..71e5c576e6 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 0a3a7c6813..74de38e689 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -27004,7 +27004,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27017,7 +27017,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27030,7 +27030,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27043,7 +27043,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27056,7 +27056,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27180,7 +27180,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27193,7 +27193,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27206,7 +27206,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27219,7 +27219,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27232,7 +27232,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27356,7 +27356,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27369,7 +27369,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27382,7 +27382,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27395,7 +27395,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27408,7 +27408,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27532,7 +27532,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27545,7 +27545,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27558,7 +27558,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27571,7 +27571,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27584,13 +27584,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 3.2
+      width: 4.0
       color: 15592411
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27768,7 +27768,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27781,7 +27781,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27794,7 +27794,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27807,7 +27807,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27820,7 +27820,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27944,7 +27944,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27957,7 +27957,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27970,7 +27970,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27983,7 +27983,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27996,7 +27996,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28120,7 +28120,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28133,7 +28133,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28146,7 +28146,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28159,7 +28159,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28172,7 +28172,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28296,7 +28296,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28309,7 +28309,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28322,7 +28322,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28335,7 +28335,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28348,7 +28348,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28472,7 +28472,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28485,7 +28485,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28498,7 +28498,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28511,7 +28511,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28524,7 +28524,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28648,7 +28648,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28661,7 +28661,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28674,7 +28674,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28687,7 +28687,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28700,7 +28700,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28819,12 +28819,190 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-named"
+  element {
+    scale: 11
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 255
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 255
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 255
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-path-permissive"
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28837,7 +29015,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28850,7 +29028,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28863,7 +29041,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28876,7 +29054,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -28995,12 +29173,368 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-route"
+  element {
+    scale: 11
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 16711680
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 16711680
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 16711680
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-surface_good"
+  element {
+    scale: 11
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 32768
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 32768
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 32768
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-path-tunnel"
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -29013,7 +29547,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -29026,7 +29560,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -29039,7 +29573,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -29052,7 +29586,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -37186,7 +37720,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37199,7 +37733,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37212,7 +37746,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37225,7 +37759,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37238,7 +37772,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37362,7 +37896,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37375,7 +37909,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37388,7 +37922,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37401,7 +37935,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37414,7 +37948,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37538,7 +38072,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37551,7 +38085,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37564,7 +38098,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37577,7 +38111,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37590,13 +38124,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 3.8
+      width: 4.4
       color: 15592411
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37774,7 +38308,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37787,7 +38321,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37800,7 +38334,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37813,7 +38347,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37826,7 +38360,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37950,7 +38484,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37963,7 +38497,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37976,7 +38510,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37989,7 +38523,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38002,7 +38536,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38126,7 +38660,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38139,7 +38673,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38152,7 +38686,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38165,7 +38699,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38178,7 +38712,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38302,7 +38836,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38315,7 +38849,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38328,7 +38862,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38341,7 +38875,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38354,7 +38888,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38478,7 +39012,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38491,7 +39025,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38504,7 +39038,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38517,7 +39051,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38530,7 +39064,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38649,12 +39183,190 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-named"
+  element {
+    scale: 11
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.5
+      color: 255
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.5
+      color: 255
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.5
+      color: 255
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-track-no-access"
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38667,7 +39379,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38680,7 +39392,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38693,7 +39405,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38706,7 +39418,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38830,7 +39542,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38843,7 +39555,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38856,7 +39568,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38869,7 +39581,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -38882,7 +39594,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -39001,12 +39713,368 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-route"
+  element {
+    scale: 11
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.5
+      color: 16711680
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.5
+      color: 16711680
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.5
+      color: 16711680
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-track-surface_good"
+  element {
+    scale: 11
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.5
+      color: 32768
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.5
+      color: 32768
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.5
+      color: 32768
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-track-tunnel"
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -39019,7 +40087,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -39032,7 +40100,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -39045,7 +40113,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -39058,7 +40126,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 83cc3fbe03..c486255dc4 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index d68618c221..1f8d2a57e5 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -26387,7 +26387,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -26400,7 +26400,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -26524,7 +26524,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -26537,7 +26537,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -26661,7 +26661,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -26674,7 +26674,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -26798,7 +26798,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -26811,13 +26811,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 3.2
+      width: 4.0
       color: 15592411
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -26995,7 +26995,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27008,7 +27008,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27132,7 +27132,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27145,7 +27145,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27269,7 +27269,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27282,7 +27282,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27406,7 +27406,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27419,7 +27419,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27543,7 +27543,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27556,7 +27556,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27680,7 +27680,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27693,7 +27693,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27812,12 +27812,176 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-named"
+  element {
+    scale: 12
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 255
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 255
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 255
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-path-permissive"
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27830,7 +27994,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27949,12 +28113,340 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-route"
+  element {
+    scale: 12
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 16711680
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 16711680
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 16711680
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-surface_good"
+  element {
+    scale: 12
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 32768
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 32768
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 32768
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-path-tunnel"
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -27967,7 +28459,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 10506258
       dashdot {
         dd: 3.5
@@ -35901,7 +36393,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -35914,7 +36406,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -36038,7 +36530,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -36051,7 +36543,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -36175,7 +36667,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -36188,13 +36680,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 3.8
+      width: 4.4
       color: 15592411
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -36372,7 +36864,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -36385,7 +36877,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -36509,7 +37001,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -36522,7 +37014,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -36646,7 +37138,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -36659,7 +37151,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -36783,7 +37275,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -36796,7 +37288,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -36920,7 +37412,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -36933,7 +37425,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37052,12 +37544,176 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-named"
+  element {
+    scale: 12
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.5
+      color: 255
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.5
+      color: 255
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.5
+      color: 255
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-track-no-access"
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37070,7 +37726,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37194,7 +37850,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37207,7 +37863,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37326,12 +37982,340 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-route"
+  element {
+    scale: 12
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.5
+      color: 16711680
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.5
+      color: 16711680
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.5
+      color: 16711680
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-track-surface_good"
+  element {
+    scale: 12
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.5
+      color: 32768
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.5
+      color: 32768
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.5
+      color: 32768
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-track-tunnel"
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
@@ -37344,7 +38328,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6510384
       dashdot {
         dd: 6.0
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index e25c89ed73..56f059da30 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 27267f1312..a875be531e 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -26430,7 +26430,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -26443,7 +26443,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -26567,7 +26567,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -26580,7 +26580,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -26704,7 +26704,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -26717,7 +26717,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -26841,7 +26841,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -26854,13 +26854,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 3.2
+      width: 4.0
       color: 2894874
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.1
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27038,7 +27038,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27051,7 +27051,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27175,7 +27175,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27188,7 +27188,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27312,7 +27312,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27325,7 +27325,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27449,7 +27449,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27462,7 +27462,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27586,7 +27586,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27599,7 +27599,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27723,7 +27723,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27736,7 +27736,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27855,12 +27855,176 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-named"
+  element {
+    scale: 12
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 255
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 255
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 255
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 255
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-path-permissive"
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27873,7 +28037,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -27992,12 +28156,340 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-route"
+  element {
+    scale: 12
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 16711680
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 16711680
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 16711680
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 16711680
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-surface_good"
+  element {
+    scale: 12
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.0
+      color: 32768
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 32768
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 32768
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 32768
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-path-tunnel"
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -28010,7 +28502,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.1
+      width: 1.5
       color: 9718290
       dashdot {
         dd: 3.5
@@ -36038,7 +36530,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -36051,7 +36543,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -36175,7 +36667,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -36188,7 +36680,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -36312,7 +36804,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -36325,13 +36817,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 3.8
+      width: 4.4
       color: 2894874
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -36509,7 +37001,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -36522,7 +37014,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -36646,7 +37138,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -36659,7 +37151,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -36783,7 +37275,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -36796,7 +37288,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -36920,7 +37412,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -36933,7 +37425,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -37057,7 +37549,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -37070,7 +37562,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -37189,12 +37681,176 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-named"
+  element {
+    scale: 12
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.3
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 255
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.5
+      color: 255
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.5
+      color: 255
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.5
+      color: 255
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-track-no-access"
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -37207,7 +37863,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -37331,7 +37987,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -37344,7 +38000,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -37463,12 +38119,340 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-route"
+  element {
+    scale: 12
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.3
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 16711680
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.5
+      color: 16711680
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.5
+      color: 16711680
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.5
+      color: 16711680
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-track-surface_good"
+  element {
+    scale: 12
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.3
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2.5
+      color: 32768
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.5
+      color: 32768
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.5
+      color: 32768
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.5
+      color: 32768
+      dashdot {
+        dd: 12.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-track-tunnel"
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
@@ -37481,7 +38465,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.7
       color: 6247213
       dashdot {
         dd: 6.0
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index e57e2f3729..fede0240c6 100644
Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ
diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index fad3013e10..2762de1560 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -28987,6 +28987,200 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-named"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 10506258
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 10506258
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-path-permissive"
   element {
@@ -29181,6 +29375,394 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-route"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 10506258
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 10506258
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-surface_good"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 10506258
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 10506258
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 10506258
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 10506258
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-path-tunnel"
   element {
@@ -38869,6 +39451,200 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-named"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 6510384
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 6510384
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-track-no-access"
   element {
@@ -39257,6 +40033,394 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-route"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 6510384
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 6510384
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-track-surface_good"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 6510384
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 6510384
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6510384
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6510384
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-track-tunnel"
   element {
@@ -97385,7 +98549,7 @@ cont {
     scale: 13
     symbol {
       name: "subway-singapore-s"
-      priority: 6300
+      priority: 6650
       min_distance: 1
     }
   }
@@ -97393,7 +98557,7 @@ cont {
     scale: 14
     symbol {
       name: "subway-singapore-s"
-      priority: 6300
+      priority: 6650
       min_distance: 1
     }
     caption {
@@ -97411,14 +98575,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -3700
+      priority: -3350
     }
   }
   element {
     scale: 15
     symbol {
       name: "subway-singapore-m"
-      priority: 6300
+      priority: 6650
     }
     caption {
       primary {
@@ -97435,14 +98599,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -3700
+      priority: -3350
     }
   }
   element {
     scale: 16
     symbol {
       name: "subway-singapore-m"
-      priority: 6300
+      priority: 6650
     }
     caption {
       primary {
@@ -97459,14 +98623,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -3700
+      priority: -3350
     }
   }
   element {
     scale: 17
     symbol {
       name: "subway-singapore-m"
-      priority: 6300
+      priority: 6650
     }
     caption {
       primary {
@@ -97483,14 +98647,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -3700
+      priority: -3350
     }
   }
   element {
     scale: 18
     symbol {
       name: "subway-singapore-m"
-      priority: 6300
+      priority: 6650
     }
     caption {
       primary {
@@ -97507,14 +98671,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -3700
+      priority: -3350
     }
   }
   element {
     scale: 19
     symbol {
       name: "subway-singapore-m"
-      priority: 6300
+      priority: 6650
     }
     caption {
       primary {
@@ -97531,14 +98695,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -3700
+      priority: -3350
     }
   }
   element {
     scale: 20
     symbol {
       name: "subway-singapore-m"
-      priority: 6300
+      priority: 6650
     }
     caption {
       primary {
@@ -97555,7 +98719,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -3700
+      priority: -3350
     }
   }
 }
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index ae87deee4b..dedb074e4f 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 47f4001f90..3353f18411 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -29030,6 +29030,200 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-named"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 9718290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 9718290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-path-permissive"
   element {
@@ -29224,6 +29418,394 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-route"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 9718290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 9718290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-path-surface_good"
+  element {
+    scale: 11
+    lines {
+      width: 1.0
+      color: 9718290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.1
+      color: 9718290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.3
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 1.6
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 9718290
+      dashdot {
+        dd: 6.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.3
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 9718290
+      dashdot {
+        dd: 8.0
+        dd: 4.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-path-tunnel"
   element {
@@ -39006,6 +39588,200 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-named"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 6247213
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 6247213
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-track-no-access"
   element {
@@ -39394,6 +40170,394 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-route"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 6247213
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 6247213
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 187
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 187
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 187
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2820
+    }
+  }
+}
+cont {
+  name: "highway-track-surface_good"
+  element {
+    scale: 11
+    lines {
+      width: 1.1
+      color: 6247213
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1.3
+      color: 6247213
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 185
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 1.6
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2.0
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.5
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 185
+      cap: BUTTCAP
+    }
+    path_text {
+      primary {
+        height: 8
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 3.2
+      color: 6247213
+      dashdot {
+        dd: 9.0
+        dd: 3.5
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 5.0
+      color: 6247213
+      dashdot {
+        dd: 12.0
+        dd: 4.0
+      }
+      priority: 185
+    }
+    path_text {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 2810
+    }
+  }
+}
 cont {
   name: "highway-track-tunnel"
   element {
@@ -97496,7 +98660,7 @@ cont {
     scale: 13
     symbol {
       name: "subway-singapore-s"
-      priority: 6300
+      priority: 6650
       min_distance: 1
     }
   }
@@ -97504,7 +98668,7 @@ cont {
     scale: 14
     symbol {
       name: "subway-singapore-s"
-      priority: 6300
+      priority: 6650
       min_distance: 1
     }
     caption {
@@ -97522,14 +98686,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -3700
+      priority: -3350
     }
   }
   element {
     scale: 15
     symbol {
       name: "subway-singapore-m"
-      priority: 6300
+      priority: 6650
     }
     caption {
       primary {
@@ -97546,14 +98710,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -3700
+      priority: -3350
     }
   }
   element {
     scale: 16
     symbol {
       name: "subway-singapore-m"
-      priority: 6300
+      priority: 6650
     }
     caption {
       primary {
@@ -97570,14 +98734,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -3700
+      priority: -3350
     }
   }
   element {
     scale: 17
     symbol {
       name: "subway-singapore-m"
-      priority: 6300
+      priority: 6650
     }
     caption {
       primary {
@@ -97594,14 +98758,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -3700
+      priority: -3350
     }
   }
   element {
     scale: 18
     symbol {
       name: "subway-singapore-m"
-      priority: 6300
+      priority: 6650
     }
     caption {
       primary {
@@ -97618,14 +98782,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -3700
+      priority: -3350
     }
   }
   element {
     scale: 19
     symbol {
       name: "subway-singapore-m"
-      priority: 6300
+      priority: 6650
     }
     caption {
       primary {
@@ -97642,14 +98806,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -3700
+      priority: -3350
     }
   }
   element {
     scale: 20
     symbol {
       name: "subway-singapore-m"
-      priority: 6300
+      priority: 6650
     }
     caption {
       primary {
@@ -97666,7 +98830,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -3700
+      priority: -3350
     }
   }
 }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index bc29071ed5..edb3ad148b 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 330f320e39..502a9e4874 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -12637,6 +12637,57 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-named"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 10506258
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 10506258
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+}
 cont {
   name: "highway-path-permissive"
   element {
@@ -12688,6 +12739,146 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-route"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 10506258
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 137
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 10506258
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 137
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 137
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 137
+    }
+  }
+}
+cont {
+  name: "highway-path-surface_good"
+  element {
+    scale: 14
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 135
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 16579836
+      dashdot {
+        dd: 2.2
+        dd: 1.26
+      }
+      priority: 135
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 16579836
+      dashdot {
+        dd: 3.3
+        dd: 1.8
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 10506258
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 10506258
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 10506258
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+}
 cont {
   name: "highway-pedestrian"
   element {
@@ -20483,6 +20674,69 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-named"
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 6510384
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 6510384
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 135
+    }
+  }
+}
 cont {
   name: "highway-track-no-access"
   element {
@@ -20609,6 +20863,158 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-route"
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 6510384
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 137
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 6510384
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 137
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 137
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 137
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 137
+    }
+  }
+}
+cont {
+  name: "highway-track-surface_good"
+  element {
+    scale: 14
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 135
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 16579836
+      dashdot {
+        dd: 2.2
+        dd: 1.26
+      }
+      priority: 135
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 6510384
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 6510384
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 6510384
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 135
+    }
+  }
+}
 cont {
   name: "highway-trunk"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 37c8dd10fe..1749145a46 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 5c57f5662e..cdadfda165 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -12746,6 +12746,57 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-named"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 9718290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 9718290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+}
 cont {
   name: "highway-path-permissive"
   element {
@@ -12797,6 +12848,146 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-path-route"
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 9718290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 137
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 9718290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 137
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 137
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 137
+    }
+  }
+}
+cont {
+  name: "highway-path-surface_good"
+  element {
+    scale: 14
+    lines {
+      width: 1.4
+      color: 5064516
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 135
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 5064516
+      dashdot {
+        dd: 2.2
+        dd: 1.26
+      }
+      priority: 135
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 5064516
+      dashdot {
+        dd: 3.3
+        dd: 1.8
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 0.9
+      color: 9718290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.1
+      color: 9718290
+      dashdot {
+        dd: 3.5
+        dd: 2.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.5
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.5
+      color: 9718290
+      dashdot {
+        dd: 4.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+}
 cont {
   name: "highway-pedestrian"
   element {
@@ -20829,6 +21020,69 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-named"
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 6247213
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 6247213
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 135
+    }
+  }
+}
 cont {
   name: "highway-track-no-access"
   element {
@@ -20955,6 +21209,158 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-track-route"
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 6247213
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 137
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 6247213
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 137
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 137
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 137
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 137
+    }
+  }
+}
+cont {
+  name: "highway-track-surface_good"
+  element {
+    scale: 14
+    lines {
+      width: 1.4
+      color: 5064516
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 135
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 5064516
+      dashdot {
+        dd: 2.2
+        dd: 1.26
+      }
+      priority: 135
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.1
+      color: 6247213
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 6247213
+      dashdot {
+        dd: 6.0
+        dd: 2.5
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.9
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2.5
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 135
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 2.5
+      color: 6247213
+      dashdot {
+        dd: 7.0
+        dd: 3.0
+      }
+      priority: 135
+    }
+  }
+}
 cont {
   name: "highway-trunk"
   element {
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 092eb10e0a..107560decb 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -184,7 +184,7 @@ amenity|recycling|container;[amenity=recycling][recycling_type=container];;name;
 leisure|garden;110;
 landuse|commercial;111;
 railway|station;112;
-highway|path|hiking;[highway=path][route=hiking],[highway=path][sac_scale=hiking];;name;int_name;113;
+highway|path|hiking;[highway=path][sac_scale=hiking];;name;int_name;113;
 amenity|hospital;114;
 waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115;
 highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116;
@@ -1677,3 +1677,9 @@ amenity|compressed_air;1592;
 leisure|hackerspace;1593;
 railway|station|subway|singapore;[railway=station][transport=subway][city=singapore],[railway=station][station=subway][city=singapore];;name;int_name;1594;
 railway|subway_entrance|singapore;[railway=subway_entrance][city=singapore];;name;int_name;1595;
+highway|path|route;[highway=path][route?];;name;int_name;1600;
+highway|path|named;[highway=path][_named];;name;int_name;1601;
+highway|path|surface_good;[highway=path][psurface=unpaved_good];;name;int_name;1602;
+highway|track|route;[highway=track][route?];;name;int_name;1603;
+highway|track|named;[highway=track][_named];;name;int_name;1604;
+highway|track|surface_good;[highway=track][psurface=unpaved_good],[highway=track][psurface=paved_good],[highway=track][psurface=paved_bad],[highway=track][tracktype=grade1],[highway=track][tracktype=grade2];;name;int_name;1605;
diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss
index 0a1363b982..969c614445 100644
--- a/data/styles/clear/include/Roads.mapcss
+++ b/data/styles/clear/include/Roads.mapcss
@@ -611,6 +611,17 @@ line|z15-[leisure=track][!area],
 line|z14-[highway=path],
 line|z14-[highway=footway][sac_scale],
 {color: @path;opacity: 1;}
+
+line|z12-[highway=path][route?],
+line|z12-[highway=track][route?],
+{color: red;opacity: 1;}
+line|z12-[highway=path][psurface=unpaved_good],
+line|z12-[highway=track][psurface=unpaved_good],
+{color: green;opacity: 1;}
+line|z12-[highway=path][_named],
+line|z12-[highway=track][_named],
+{color: blue;opacity: 1;}
+
 line|z14-[highway=bridleway]
 {color: @bridleway;opacity: 1;}
 line|z15-[highway=footway],
@@ -773,6 +784,14 @@ line|z15[highway=track],
 {width: 1.4; dashes: 6,2.5;}
 line|z16[highway=track],
 {width: 1.9; dashes: 7,3;}
+
+line|z14-15[highway=track],
+{width: 1.7;}
+line|z12-[highway=track][route?],
+line|z12-[highway=track][psurface=unpaved_good],
+line|z12-[highway=track][_named],
+{width: 2.3; dashes: 7,3;}
+
 line|z17[highway=track],
 {width: 2.5; dashes: 7,3;}
 line|z18[highway=track],
@@ -792,9 +811,21 @@ line|z16[highway=footway][sac_scale],
 line|z17[highway=path],
 line|z17[highway=footway][sac_scale],
 {width: 2; dashes: 4,2.5;}
+
+line|z14-15[highway=path],
+{width: 1.5;}
+line|z12-[highway=path][route?],
+line|z12-[highway=path][_named],
+line|z12-[highway=path][psurface=unpaved_good],
+{width: 2.0; dashes: 4,2.5;}
+
+line|z18[highway=path][_named],
+line|z18[highway=path][psurface=unpaved_good],
 line|z18[highway=path],
 line|z18[highway=footway][sac_scale],
 {width: 3; dashes: 6,3.5;}
+line|z19-[highway=path][_named],
+line|z19-[highway=path][psurface=unpaved_good],
 line|z19-[highway=path],
 line|z19-[highway=footway][sac_scale],
 {width: 4; dashes: 8,4.5;}
diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt
index 746e1b45ec..61e65e38ef 100644
--- a/data/styles/clear/include/priorities_3_FG.prio.txt
+++ b/data/styles/clear/include/priorities_3_FG.prio.txt
@@ -260,6 +260,16 @@ highway-service-parking_aisle                       # line z15- (also has pathte
 highway-service-tunnel                              # line z15- (also has pathtext z16-)
 === 190
 
+highway-path-route                                  # line z12- (also has pathtext z15-)
+highway-track-route                                 # line z12- (also has pathtext z15-)
+=== 187
+
+highway-path-named                                  # line z12- (also has pathtext z15-)
+highway-path-surface_good                           # line z12- (also has pathtext z15-)
+highway-track-named                                 # line z12- (also has pathtext z15-)
+highway-track-surface_good                          # line z12- (also has pathtext z15-)
+=== 185
+
 highway-footway                                     # line z15- (also has pathtext z15-)
 highway-footway-alpine_hiking                       # line z14- (also has pathtext z15-)
 highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index 82f7e4d127..8f39477bbc 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -751,6 +751,16 @@ amenity-shelter                                     # icon z16- (also has captio
 highway-ford                                        # icon z16- and pathtext z16- (also has line z13-)
 === 2850
 
+highway-path-route                                  # pathtext z15- (also has line z12-)
+highway-track-route                                 # pathtext z15- (also has line z12-)
+=== 2820
+
+highway-path-named                                  # pathtext z15- (also has line z12-)
+highway-path-surface_good                           # pathtext z15- (also has line z12-)
+highway-track-named                                 # pathtext z15- (also has line z12-)
+highway-track-surface_good                          # pathtext z15- (also has line z12-)
+=== 2810
+
 highway-bridleway                                   # pathtext z15- (also has line z14-)
 highway-bridleway-bridge                            # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-bridleway-permissive                        # pathtext z15- (also has line z14-)
diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt
index 2fa0bd5e29..191f5b38c7 100644
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -260,6 +260,16 @@ highway-service-parking_aisle                       # line z15- (also has pathte
 highway-service-tunnel                              # line z13- (also has pathtext z16-)
 === 190
 
+highway-path-route                                  # line z11- (also has pathtext z13-)
+highway-track-route                                 # line z11- (also has pathtext z13-)
+=== 187
+
+highway-path-named                                  # line z11- (also has pathtext z13-)
+highway-path-surface_good                           # line z11- (also has pathtext z13-)
+highway-track-named                                 # line z11- (also has pathtext z13-)
+highway-track-surface_good                          # line z11- (also has pathtext z13-)
+=== 185
+
 highway-footway                                     # line z15- (also has pathtext z15-)
 highway-footway-alpine_hiking                       # line z11- (also has pathtext z15-)
 highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index e3b5a15271..b5087da246 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -136,6 +136,7 @@ railway-station-subway-paris                        # icon z12- (also has captio
 railway-station-subway-roma                         # icon z12- (also has caption(optional) z14-)
 railway-station-subway-sf                           # icon z12- (also has caption(optional) z14-)
 railway-station-subway-shanghai                     # icon z12- (also has caption(optional) z14-)
+railway-station-subway-singapore                    # icon z13- (also has caption(optional) z14-)
 railway-station-subway-stockholm                    # icon z12- (also has caption(optional) z14-)
 railway-station-subway-tokyo                        # icon z14- (also has caption(optional) z14-)
 railway-station-subway-vienna                       # icon z12- (also has caption(optional) z14-)
@@ -244,7 +245,6 @@ railway-station-subway-saopaulo                     # icon z13- (also has captio
 railway-station-subway-sapporo                      # icon z13- (also has caption(optional) z14-)
 railway-station-subway-sendai                       # icon z13- (also has caption(optional) z14-)
 railway-station-subway-shiraz                       # icon z13- (also has caption(optional) z14-)
-railway-station-subway-singapore                    # icon z13- (also has caption(optional) z14-)
 railway-station-subway-sofia                        # icon z13- (also has caption(optional) z14-)
 railway-station-subway-tabriz                       # icon z13- (also has caption(optional) z14-)
 railway-station-subway-taipei                       # icon z13- (also has caption(optional) z14-)
@@ -751,6 +751,16 @@ amenity-shelter                                     # icon z13- (also has captio
 highway-ford                                        # icon z14- and pathtext z16- (also has line z13-)
 === 2850
 
+highway-path-route                                  # pathtext z13- (also has line z11-)
+highway-track-route                                 # pathtext z13- (also has line z11-)
+=== 2820
+
+highway-path-named                                  # pathtext z13- (also has line z11-)
+highway-path-surface_good                           # pathtext z13- (also has line z11-)
+highway-track-named                                 # pathtext z13- (also has line z11-)
+highway-track-surface_good                          # pathtext z13- (also has line z11-)
+=== 2810
+
 highway-bridleway                                   # pathtext z15- (also has line z14-)
 highway-bridleway-bridge                            # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-)
 highway-bridleway-permissive                        # pathtext z15- (also has line z14-)
@@ -1360,6 +1370,7 @@ amenity-parking_entrance-private                    # icon z19- (also has captio
 # railway-station-subway-roma                       # caption(optional) z14- (also has icon z12-)
 # railway-station-subway-sf                         # caption(optional) z14- (also has icon z12-)
 # railway-station-subway-shanghai                   # caption(optional) z14- (also has icon z12-)
+# railway-station-subway-singapore                  # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-stockholm                  # caption(optional) z14- (also has icon z12-)
 # railway-station-subway-tokyo                      # caption(optional) z14- (also has icon z14-)
 # railway-station-subway-vienna                     # caption(optional) z14- (also has icon z12-)
@@ -1464,7 +1475,6 @@ amenity-parking_entrance-private                    # icon z19- (also has captio
 # railway-station-subway-sapporo                    # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-sendai                     # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-shiraz                     # caption(optional) z14- (also has icon z13-)
-# railway-station-subway-singapore                  # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-sofia                      # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-tabriz                     # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-taipei                     # caption(optional) z14- (also has icon z13-)
diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt
index 93ca801596..37f2dbcb2a 100644
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -235,6 +235,16 @@ highway-service-parking_aisle                       # line z14- (also has pathte
 highway-service-tunnel                              # line z14- (also has pathtext z16-)
 === 140
 
+highway-path-route                                  # line z17-
+highway-track-route                                 # line z16-
+=== 137
+
+highway-path-named                                  # line z17-
+highway-path-surface_good                           # line z14-
+highway-track-named                                 # line z16-
+highway-track-surface_good                          # line z14-
+=== 135
+
 highway-bridleway                                   # line z18-
 highway-bridleway-bridge                            # line z18-
 highway-bridleway-permissive                        # line z18-
diff --git a/data/types.txt b/data/types.txt
index 5ccbca1812..7d0c51d1d8 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1593,3 +1593,13 @@ amenity|recycling|container
 *leisure|hackerspace
 *railway|station|subway|singapore
 *railway|subway_entrance|singapore
+mapswithme
+mapswithme
+mapswithme
+mapswithme
+*highway|path|route
+*highway|path|named
+*highway|path|surface_good
+*highway|track|route
+*highway|track|named
+*highway|track|surface_good
diff --git a/data/visibility.txt b/data/visibility.txt
index e04b52dd67..3bce13dcd8 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -454,7 +454,10 @@ world  000000000000000000000  +
             hiking  000000000000000001111  -
             horse  000000000000000001111  -
             mountain_hiking  000000000000000001111  -
+            named  000000000000000001111  -
             permissive  000000000000000001111  -
+            route  000000000000000001111  -
+            surface_good  000000000000001111111  -
             tunnel  000000000000000000000  -
             {}
         pedestrian  000000000000000000111  +
@@ -518,8 +521,11 @@ world  000000000000000000000  +
             grade3  000000000000000011111  -
             grade4  000000000000000011111  -
             grade5  000000000000000011111  -
+            named  000000000000000011111  -
             no-access  000000000000000011111  -
             permissive  000000000000000011111  -
+            route  000000000000000011111  -
+            surface_good  000000000000001111111  -
             tunnel  000000000000000000000  -
             {}
         traffic_signals  000000000000000000000  -
diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp
index 25a843ecf3..1f3922a87c 100644
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -1174,6 +1174,8 @@ void GetNameAndType(OsmElement * p, FeatureBuilderParams & params,
   NamesExtractor namesExtractor(params);
   ForEachTag(p, namesExtractor);
   namesExtractor.Finish();
+  if (!params.name.IsEmpty())
+    p->AddTag("_named", "yes");
 
   // Stage3: Process base feature tags.
   std::string houseName, houseNumber, conscriptionHN, streetHN, addrPostcode;
diff --git a/generator/relation_tags.cpp b/generator/relation_tags.cpp
index a83792ba52..b668305d84 100644
--- a/generator/relation_tags.cpp
+++ b/generator/relation_tags.cpp
@@ -144,7 +144,25 @@ void RelationTagsWay::Process(RelationElement const & e)
       if (route == "bicycle")
         Base::AddCustomTag({"bicycle", "yes"});
       else if (route == "foot" || route == "hiking")
+      {
         Base::AddCustomTag({"foot", "yes"});
+
+        if (route == "hiking")
+        {
+          auto const hwValue = m_current->GetTag("highway");
+          if (hwValue == "path" || hwValue == "track")
+          {
+            Base::AddCustomTag({"route", "hiking"});
+
+            if (!Base::IsKeyTagExists("name"))
+            {
+              std::string name(e.GetTagValue("name"));
+              if (!name.empty()) //pastk: prefer name from the most local network
+                Base::AddCustomTag({"name", std::move(name)});
+            }
+          }
+        }        
+      }
     }
 
     if (!fetchTags)