diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 5b367bc92..5df285dc8 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 1c5d1a5cf..a2ff025a7 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -28806,7 +28806,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -28815,11 +28815,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -28828,11 +28836,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -28841,11 +28857,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -28854,6 +28878,14 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 15
@@ -28989,7 +29021,6 @@ cont {
     }
     lines {
       width: 0.9
-      color: 1720602141
       dashdot {
         dd: 3.5
         dd: 2.7
@@ -29008,7 +29039,6 @@ cont {
     }
     lines {
       width: 0.9
-      color: 1720602141
       dashdot {
         dd: 3.5
         dd: 2.7
@@ -29027,7 +29057,6 @@ cont {
     }
     lines {
       width: 0.9
-      color: 1720602141
       dashdot {
         dd: 3.5
         dd: 2.7
@@ -29046,7 +29075,6 @@ cont {
     }
     lines {
       width: 0.9
-      color: 1720602141
       dashdot {
         dd: 3.5
         dd: 2.7
@@ -29213,7 +29241,13 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 3.2
+      color: 872215006
+      priority: 150
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -29222,11 +29256,25 @@ cont {
       priority: 155
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 3.2
+      color: 872215006
+      priority: 150
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -29235,11 +29283,25 @@ cont {
       priority: 155
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 3.2
+      color: 872215006
+      priority: 150
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -29248,11 +29310,25 @@ cont {
       priority: 155
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 3.2
+      color: 872215006
+      priority: 150
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -29261,6 +29337,14 @@ cont {
       priority: 155
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 15
@@ -29449,7 +29533,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 1.0
@@ -29458,11 +29542,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 1.0
@@ -29471,11 +29563,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 1.0
@@ -29484,11 +29584,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 1.0
@@ -29497,6 +29605,14 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 15
@@ -29625,7 +29741,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.1
       color: 1715283479
       dashdot {
         dd: 1.0
@@ -29634,11 +29750,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.1
       color: 1715283479
       dashdot {
         dd: 1.0
@@ -29647,11 +29771,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.1
       color: 1715283479
       dashdot {
         dd: 1.0
@@ -29660,11 +29792,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.1
       color: 1715283479
       dashdot {
         dd: 1.0
@@ -29673,6 +29813,14 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 15
@@ -29801,7 +29949,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -29810,11 +29958,19 @@ cont {
       priority: 155
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -29823,11 +29979,19 @@ cont {
       priority: 155
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -29836,11 +30000,19 @@ cont {
       priority: 155
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -29849,6 +30021,14 @@ cont {
       priority: 155
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 15
@@ -29977,7 +30157,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -29986,11 +30166,19 @@ cont {
       priority: 155
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -29999,11 +30187,19 @@ cont {
       priority: 155
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -30012,11 +30208,19 @@ cont {
       priority: 155
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.1
       color: 1720602141
       dashdot {
         dd: 3.5
@@ -30025,6 +30229,14 @@ cont {
       priority: 155
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2820
+    }
   }
   element {
     scale: 15
@@ -38371,7 +38583,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38380,11 +38592,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38393,11 +38613,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38406,11 +38634,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38419,6 +38655,14 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 15
@@ -38547,7 +38791,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38556,11 +38800,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38569,11 +38821,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38582,11 +38842,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38595,6 +38863,14 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 15
@@ -38723,7 +38999,13 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 3.8
+      color: 872215006
+      priority: 150
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38732,11 +39014,25 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 3.8
+      color: 872215006
+      priority: 150
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38745,11 +39041,25 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 3.8
+      color: 872215006
+      priority: 150
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38758,11 +39068,25 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 3.8
+      color: 872215006
+      priority: 150
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38771,6 +39095,14 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 15
@@ -38959,7 +39291,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38968,11 +39300,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38981,11 +39321,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -38994,11 +39342,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -39007,6 +39363,14 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 15
@@ -39135,7 +39499,7 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -39144,11 +39508,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 12
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -39157,11 +39529,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -39170,11 +39550,19 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 14
     lines {
-      width: 1.1
+      width: 1.4
       color: 1717786416
       dashdot {
         dd: 6.0
@@ -39183,6 +39571,14 @@ cont {
       priority: 180
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 8
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 2780
+    }
   }
   element {
     scale: 15
@@ -67592,7 +67988,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 0.9
+      width: 1.1
       color: 2579790591
       dashdot {
         dd: 3.5
@@ -67601,11 +67997,19 @@ cont {
       priority: 120
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 9
+        color: 2236962
+        stroke_color: 1308622847
+      }
+      priority: 2770
+    }
   }
   element {
     scale: 13
     lines {
-      width: 0.9
+      width: 1.1
       color: 2579790591
       dashdot {
         dd: 3.5
@@ -67614,11 +68018,19 @@ cont {
       priority: 120
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 9
+        color: 2236962
+        stroke_color: 1308622847
+      }
+      priority: 2770
+    }
   }
   element {
     scale: 14
     lines {
-      width: 0.9
+      width: 1.1
       color: 2579790591
       dashdot {
         dd: 3.5
@@ -67627,6 +68039,14 @@ cont {
       priority: 120
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 9
+        color: 2236962
+        stroke_color: 1308622847
+      }
+      priority: 2770
+    }
   }
   element {
     scale: 15
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 9be9a83eb..280afe616 100644
Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ
diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index f090cda5e..7e3c3a540 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -26904,19 +26904,6 @@ cont {
 }
 cont {
   name: "highway-path"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -27051,7 +27038,6 @@ cont {
     }
     lines {
       width: 0.9
-      color: 1720994322
       dashdot {
         dd: 3.5
         dd: 2.7
@@ -27215,19 +27201,6 @@ cont {
 }
 cont {
   name: "highway-path-bridge"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -27412,19 +27385,6 @@ cont {
 }
 cont {
   name: "highway-path-difficult"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1720994322
-      dashdot {
-        dd: 1.0
-        dd: 2.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -27549,19 +27509,6 @@ cont {
 }
 cont {
   name: "highway-path-expert"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1716665907
-      dashdot {
-        dd: 1.0
-        dd: 4.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -27686,19 +27633,6 @@ cont {
 }
 cont {
   name: "highway-path-horse"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -27823,19 +27757,6 @@ cont {
 }
 cont {
   name: "highway-path-tunnel"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1720994322
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -35974,19 +35895,6 @@ cont {
 }
 cont {
   name: "highway-track"
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 1717523245
-      dashdot {
-        dd: 6.0
-        dd: 2.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -36111,19 +36019,6 @@ cont {
 }
 cont {
   name: "highway-track-area"
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 1717523245
-      dashdot {
-        dd: 6.0
-        dd: 2.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -36248,19 +36143,6 @@ cont {
 }
 cont {
   name: "highway-track-bridge"
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 1717523245
-      dashdot {
-        dd: 6.0
-        dd: 2.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -36445,19 +36327,6 @@ cont {
 }
 cont {
   name: "highway-track-no-access"
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 1717523245
-      dashdot {
-        dd: 6.0
-        dd: 2.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -36582,19 +36451,6 @@ cont {
 }
 cont {
   name: "highway-track-tunnel"
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 1717523245
-      dashdot {
-        dd: 6.0
-        dd: 2.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -63404,19 +63260,6 @@ cont {
 }
 cont {
   name: "piste:type-hike"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 2573352319
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 2bd21dd3d..4eecbf5d1 100644
Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ
diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index bc91fdaf1..96e5b3966 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -26838,19 +26838,6 @@ cont {
 }
 cont {
   name: "highway-path"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1720602141
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -26985,7 +26972,6 @@ cont {
     }
     lines {
       width: 0.9
-      color: 1720602141
       dashdot {
         dd: 3.5
         dd: 2.7
@@ -27149,19 +27135,6 @@ cont {
 }
 cont {
   name: "highway-path-bridge"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1720602141
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -27346,19 +27319,6 @@ cont {
 }
 cont {
   name: "highway-path-difficult"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1720602141
-      dashdot {
-        dd: 1.0
-        dd: 2.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -27483,19 +27443,6 @@ cont {
 }
 cont {
   name: "highway-path-expert"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1715283479
-      dashdot {
-        dd: 1.0
-        dd: 4.0
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -27620,19 +27567,6 @@ cont {
 }
 cont {
   name: "highway-path-horse"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1720602141
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -27757,19 +27691,6 @@ cont {
 }
 cont {
   name: "highway-path-tunnel"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 1720602141
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 155
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -35770,19 +35691,6 @@ cont {
 }
 cont {
   name: "highway-track"
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 1717786416
-      dashdot {
-        dd: 6.0
-        dd: 2.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -35907,19 +35815,6 @@ cont {
 }
 cont {
   name: "highway-track-area"
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 1717786416
-      dashdot {
-        dd: 6.0
-        dd: 2.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -36044,19 +35939,6 @@ cont {
 }
 cont {
   name: "highway-track-bridge"
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 1717786416
-      dashdot {
-        dd: 6.0
-        dd: 2.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -36241,19 +36123,6 @@ cont {
 }
 cont {
   name: "highway-track-no-access"
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 1717786416
-      dashdot {
-        dd: 6.0
-        dd: 2.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -36378,19 +36247,6 @@ cont {
 }
 cont {
   name: "highway-track-tunnel"
-  element {
-    scale: 14
-    lines {
-      width: 1.1
-      color: 1717786416
-      dashdot {
-        dd: 6.0
-        dd: 2.5
-      }
-      priority: 180
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
@@ -63178,19 +63034,6 @@ cont {
 }
 cont {
   name: "piste:type-hike"
-  element {
-    scale: 14
-    lines {
-      width: 0.9
-      color: 2579790591
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt
index 8acf9e7a7..3119007d6 100644
--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -276,15 +276,15 @@ highway-bridleway-tunnel                            # line z14- (also has line::
 highway-footway                                     # line z15- (also has pathtext z15-)
 highway-footway-area                                # line z15- and area z14- (also has pathtext z15-)
 highway-footway-crossing                            # line z16-
-highway-path                                        # line z14- (also has pathtext z15-)
-highway-path-difficult                              # line z14- (also has pathtext z15-)
-highway-path-expert                                 # line z14- (also has pathtext z15-)
+highway-path                                        # line z15- (also has pathtext z15-)
+highway-path-difficult                              # line z15- (also has pathtext z15-)
+highway-path-expert                                 # line z15- (also has pathtext z15-)
 highway-raceway                                     # line z14- (also has pathtext z16-)
-highway-track                                       # line z14- (also has pathtext z15-)
-highway-track-area                                  # line z14- (also has pathtext z15-)
-highway-track-bridge                                # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-track-no-access                             # line z14- (also has pathtext z15-)
-highway-track-tunnel                                # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+highway-track                                       # line z15- (also has pathtext z15-)
+highway-track-area                                  # line z15- (also has pathtext z15-)
+highway-track-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-track-no-access                             # line z15- (also has pathtext z15-)
+highway-track-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
 === 180
 
 highway-construction                                # line z13- (also has pathtext z15-)
@@ -302,25 +302,25 @@ railway-preserved-tunnel                            # line z15-
 highway-footway-bridge                              # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
 highway-footway-sidewalk                            # line z16-
 highway-footway-tunnel                              # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
-highway-path-bridge                                 # line z14- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
-highway-path-horse                                  # line z14- (also has pathtext z15-)
-highway-path-tunnel                                 # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
+highway-path-bridge                                 # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-)
+highway-path-horse                                  # line z15- (also has pathtext z15-)
+highway-path-tunnel                                 # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-)
 === 155
 
 highway-bridleway-tunnel::tunnelBackground          # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-)
 highway-cycleway-tunnel::tunnelBackground           # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-)
 highway-footway-tunnel::tunnelBackground            # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
-highway-path-tunnel::tunnelBackground               # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-)
+highway-path-tunnel::tunnelBackground               # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
 highway-steps-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z16-)
-highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-)
+highway-track-tunnel::tunnelBackground              # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-)
 === 154
 
 highway-bridleway-tunnel::tunnelCasing              # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-)
 highway-cycleway-tunnel::tunnelCasing               # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-)
 highway-footway-tunnel::tunnelCasing                # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
-highway-path-tunnel::tunnelCasing                   # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-)
+highway-path-tunnel::tunnelCasing                   # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
 highway-steps-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z16-)
-highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-)
+highway-track-tunnel::tunnelCasing                  # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-)
 === 153
 
 highway-bridleway-bridge::bridgewhite               # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
@@ -328,7 +328,7 @@ highway-cycleway-bridge::bridgewhite                # line::bridgewhite z15- (al
 highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
 highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
 highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
-highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
+highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
 highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
 highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
 highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
@@ -340,7 +340,7 @@ highway-service-bridge::bridgewhite                 # line::bridgewhite z16- (al
 highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
 highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
 highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-)
-highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
+highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
 highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
 highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
 highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
@@ -363,7 +363,7 @@ highway-cycleway-bridge::bridgeblack                # line::bridgeblack z17- (al
 highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
 highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
 highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-)
+highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
 highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
 highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
 highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
@@ -375,7 +375,7 @@ highway-service-bridge::bridgeblack                 # line::bridgeblack z16- (al
 highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
 highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
 highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-)
-highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-)
+highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
 highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
 highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
 highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
@@ -407,7 +407,7 @@ piste:type-downhill-expert                          # line z14- (also has pathte
 piste:type-downhill-freeride                        # line z14- (also has pathtext z15-)
 piste:type-downhill-intermediate                    # line z14- (also has pathtext z15-)
 piste:type-downhill-novice                          # line z14- (also has pathtext z15-)
-piste:type-hike                                     # line z14- (also has pathtext z15-)
+piste:type-hike                                     # line z15- (also has pathtext z15-)
 piste:type-nordic                                   # line z14- (also has pathtext z15-)
 piste:type-skitour                                  # line z14- (also has pathtext z15-)
 piste:type-sled                                     # line z14- (also has pathtext z15-)
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index ccc6eeaff..21598b9aa 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -705,13 +705,13 @@ natural-rock                                        # icon z17- (also has captio
 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-tunnel                            # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-)
-highway-path                                        # pathtext z15- (also has line z14-)
+highway-path                                        # pathtext z15- (also has line z15-)
 highway-path-bicycle                                # pathtext z15- (also has line z14-, line::cycleline z14-)
-highway-path-bridge                                 # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-path-difficult                              # pathtext z15- (also has line z14-)
-highway-path-expert                                 # pathtext z15- (also has line z14-)
-highway-path-horse                                  # pathtext z15- (also has line z14-)
-highway-path-tunnel                                 # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-path-bridge                                 # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-path-difficult                              # pathtext z15- (also has line z15-)
+highway-path-expert                                 # pathtext z15- (also has line z15-)
+highway-path-horse                                  # pathtext z15- (also has line z15-)
+highway-path-tunnel                                 # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2820
 
 highway-steps                                       # pathtext z16- (also has line z15-)
@@ -719,11 +719,11 @@ highway-steps-bridge                                # pathtext z16- (also has li
 highway-steps-tunnel                                # pathtext z16- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2810
 
-highway-track                                       # pathtext z15- (also has line z14-)
-highway-track-area                                  # pathtext z15- (also has line z14-)
-highway-track-bridge                                # pathtext z15- (also has line z14-, line::bridgeblack z17-, line::bridgewhite z15-)
-highway-track-no-access                             # pathtext z15- (also has line z14-)
-highway-track-tunnel                                # pathtext z15- (also has line z14-, line::tunnelBackground z17-, line::tunnelCasing z17-)
+highway-track                                       # pathtext z15- (also has line z15-)
+highway-track-area                                  # pathtext z15- (also has line z15-)
+highway-track-bridge                                # pathtext z15- (also has line z15-, line::bridgeblack z17-, line::bridgewhite z15-)
+highway-track-no-access                             # pathtext z15- (also has line z15-)
+highway-track-tunnel                                # pathtext z15- (also has line z15-, line::tunnelBackground z17-, line::tunnelCasing z17-)
 === 2780
 
 highway-service                                     # pathtext z16- (also has line z15-)
@@ -739,7 +739,7 @@ piste:type-downhill-expert                          # pathtext z15- (also has li
 piste:type-downhill-freeride                        # pathtext z15- (also has line z14-)
 piste:type-downhill-intermediate                    # pathtext z15- (also has line z14-)
 piste:type-downhill-novice                          # pathtext z15- (also has line z14-)
-piste:type-hike                                     # pathtext z15- (also has line z14-)
+piste:type-hike                                     # pathtext z15- (also has line z15-)
 piste:type-nordic                                   # pathtext z15- (also has line z14-)
 piste:type-skitour                                  # pathtext z15- (also has line z14-)
 piste:type-sled                                     # pathtext z15- (also has line z14-)