diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 88b87d89d2..3e11fc5d55 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 9777dfb795..7ea4745955 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -103957,69 +103957,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-canal-tunnel"
-  element {
-    scale: 13
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 18
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-}
 cont {
   name: "waterway-dam"
   element {
@@ -104761,89 +104698,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-river-tunnel"
-  element {
-    scale: 11
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 12
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 13
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 18
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-}
 cont {
   name: "waterway-riverbank"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index c0ff062bbe..55f0739e25 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 d386743a45..495d92ffc7 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -6337,6 +6337,87 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-bridleway"
+  element {
+    scale: 18
+    lines {
+      width: 0.9
+      color: 4011550
+      dashdot {
+        dd: 3.6
+        dd: 1.8
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 0.9
+      color: 4011550
+      dashdot {
+        dd: 3.6
+        dd: 1.8
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-bridleway-bridge"
+  element {
+    scale: 18
+    lines {
+      width: 0.9
+      color: 4011550
+      dashdot {
+        dd: 3.6
+        dd: 1.8
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 0.9
+      color: 4011550
+      dashdot {
+        dd: 3.6
+        dd: 1.8
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-bridleway-permissive"
+  element {
+    scale: 18
+    lines {
+      width: 0.9
+      color: 4011550
+      dashdot {
+        dd: 3.6
+        dd: 1.8
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 0.9
+      color: 4011550
+      dashdot {
+        dd: 3.6
+        dd: 1.8
+      }
+      priority: 130
+    }
+  }
+}
 cont {
   name: "highway-construction"
   element {
@@ -6427,6 +6508,63 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-cycleway"
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 16746413
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 16746413
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-cycleway-bridge"
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 16746413
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 16746413
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-cycleway-permissive"
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 16746413
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 16746413
+      priority: 130
+    }
+  }
+}
 cont {
   name: "highway-footway"
   element {
@@ -6444,7 +6582,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 16579836
       dashdot {
         dd: 5.0
@@ -6483,7 +6621,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 16579836
       dashdot {
         dd: 5.0
@@ -6510,7 +6648,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 16579836
       dashdot {
         dd: 5.0
@@ -6537,7 +6675,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 16579836
       dashdot {
         dd: 5.0
@@ -6576,7 +6714,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 16579836
       dashdot {
         dd: 5.0
@@ -6615,7 +6753,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 16579836
       dashdot {
         dd: 5.0
@@ -6654,7 +6792,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 16579836
       dashdot {
         dd: 5.0
@@ -6693,7 +6831,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 16579836
       dashdot {
         dd: 5.0
@@ -6732,7 +6870,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 16579836
       dashdot {
         dd: 5.0
@@ -6758,21 +6896,6 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 2.0
-      color: 16579836
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-}
-cont {
-  name: "highway-footway-tunnel"
-  element {
-    scale: 18
     lines {
       width: 1.5
       color: 16579836
@@ -6783,18 +6906,6 @@ cont {
       priority: 130
     }
   }
-  element {
-    scale: 19
-    lines {
-      width: 2.0
-      color: 16579836
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
 }
 cont {
   name: "highway-ford"
@@ -9667,318 +9778,84 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-tunnel"
-  element {
-    scale: 17
-    lines {
-      width: 0.9
-      color: 10506258
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.1
-      color: 10506258
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 10506258
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-}
 cont {
   name: "highway-pedestrian"
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 13
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 1600
-    }
-  }
   element {
     scale: 18
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 16777215
+    lines {
+      width: 2.0
+      color: 16579836
+      dashdot {
+        dd: 7.0
+        dd: 3.0
       }
-      priority: 1600
+      priority: 130
     }
   }
   element {
     scale: 19
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 16777215
+    lines {
+      width: 2.0
+      color: 16579836
+      dashdot {
+        dd: 7.0
+        dd: 3.0
       }
-      priority: 1600
+      priority: 130
     }
   }
 }
 cont {
   name: "highway-pedestrian-area"
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 13
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 1600
-    }
-  }
   element {
     scale: 18
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 16777215
+    lines {
+      width: 2.0
+      color: 16579836
+      dashdot {
+        dd: 7.0
+        dd: 3.0
       }
-      priority: 1600
+      priority: 130
     }
   }
   element {
     scale: 19
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 16777215
+    lines {
+      width: 2.0
+      color: 16579836
+      dashdot {
+        dd: 7.0
+        dd: 3.0
       }
-      priority: 1600
+      priority: 130
     }
   }
 }
 cont {
   name: "highway-pedestrian-bridge"
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 13
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 1600
-    }
-  }
   element {
     scale: 18
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 16777215
+    lines {
+      width: 2.0
+      color: 16579836
+      dashdot {
+        dd: 7.0
+        dd: 3.0
       }
-      priority: 1600
+      priority: 130
     }
   }
   element {
     scale: 19
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 16777215
+    lines {
+      width: 2.0
+      color: 16579836
+      dashdot {
+        dd: 7.0
+        dd: 3.0
       }
-      priority: 1600
-    }
-  }
-}
-cont {
-  name: "highway-pedestrian-tunnel"
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 13
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 18
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 16777215
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 19
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 16777215
-      }
-      priority: 1600
+      priority: 130
     }
   }
 }
@@ -15119,7 +14996,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 16579836
       dashdot {
         dd: 5.0
@@ -15145,21 +15022,6 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 2.0
-      color: 16579836
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 270
-    }
-  }
-}
-cont {
-  name: "highway-steps-tunnel"
-  element {
-    scale: 18
     lines {
       width: 1.5
       color: 16579836
@@ -15170,18 +15032,6 @@ cont {
       priority: 270
     }
   }
-  element {
-    scale: 19
-    lines {
-      width: 2.0
-      color: 16579836
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 270
-    }
-  }
 }
 cont {
   name: "highway-tertiary"
@@ -16771,57 +16621,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-track-tunnel"
-  element {
-    scale: 16
-    lines {
-      width: 1.1
-      color: 6510384
-      dashdot {
-        dd: 6.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.4
-      color: 6510384
-      dashdot {
-        dd: 6.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.9
-      color: 6510384
-      dashdot {
-        dd: 7.0
-        dd: 3.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 2.5
-      color: 6510384
-      dashdot {
-        dd: 7.0
-        dd: 3.0
-      }
-      priority: 130
-    }
-  }
-}
 cont {
   name: "highway-trunk"
   element {
@@ -27917,79 +27716,6 @@ cont {
     }
   }
 }
-cont {
-  name: "natural-strait"
-  element {
-    scale: 13
-    caption {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 14
-    caption {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-}
 cont {
   name: "natural-water"
   element {
@@ -72510,152 +72236,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-canal"
-  element {
-    scale: 13
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 18
-    path_text {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 19
-    path_text {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-}
-cont {
-  name: "waterway-canal-tunnel"
-  element {
-    scale: 13
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 10
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 18
-    path_text {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 19
-    path_text {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 1500
-    }
-  }
-}
 cont {
   name: "waterway-dam"
   element {
@@ -72740,96 +72320,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-ditch"
-  element {
-    scale: 13
-    lines {
-      width: 1.5
-      color: 10340289
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.5
-      color: 10340289
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 10340289
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 10340289
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 10340289
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 10340289
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 10340289
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-}
 cont {
   name: "waterway-dock"
   element {
@@ -72966,96 +72456,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-drain"
-  element {
-    scale: 13
-    lines {
-      width: 1.5
-      color: 10340289
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.5
-      color: 10340289
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 10340289
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 10340289
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 10340289
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 10340289
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 10340289
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-}
 cont {
   name: "waterway-lock_gate"
   element {
@@ -73242,99 +72642,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-river-tunnel"
-  element {
-    scale: 11
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 12
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 13
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 9
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 18
-    path_text {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 19
-    path_text {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 1550
-    }
-  }
-}
 cont {
   name: "waterway-riverbank"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index e6826aad76..a81564af54 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 7e4fbc656f..c9d113e1aa 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -6337,6 +6337,87 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-bridleway"
+  element {
+    scale: 18
+    lines {
+      width: 0.9
+      color: 2828327
+      dashdot {
+        dd: 3.6
+        dd: 1.8
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 0.9
+      color: 2828327
+      dashdot {
+        dd: 3.6
+        dd: 1.8
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-bridleway-bridge"
+  element {
+    scale: 18
+    lines {
+      width: 0.9
+      color: 2828327
+      dashdot {
+        dd: 3.6
+        dd: 1.8
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 0.9
+      color: 2828327
+      dashdot {
+        dd: 3.6
+        dd: 1.8
+      }
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-bridleway-permissive"
+  element {
+    scale: 18
+    lines {
+      width: 0.9
+      color: 2828327
+      dashdot {
+        dd: 3.6
+        dd: 1.8
+      }
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 0.9
+      color: 2828327
+      dashdot {
+        dd: 3.6
+        dd: 1.8
+      }
+      priority: 130
+    }
+  }
+}
 cont {
   name: "highway-construction"
   element {
@@ -6427,6 +6508,63 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-cycleway"
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 7224647
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 7224647
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-cycleway-bridge"
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 7224647
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 7224647
+      priority: 130
+    }
+  }
+}
+cont {
+  name: "highway-cycleway-permissive"
+  element {
+    scale: 18
+    lines {
+      width: 1.0
+      color: 7224647
+      priority: 130
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.0
+      color: 7224647
+      priority: 130
+    }
+  }
+}
 cont {
   name: "highway-footway"
   element {
@@ -6444,7 +6582,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 2828327
       dashdot {
         dd: 5.0
@@ -6483,7 +6621,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 2828327
       dashdot {
         dd: 5.0
@@ -6510,7 +6648,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 2828327
       dashdot {
         dd: 5.0
@@ -6537,7 +6675,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 2828327
       dashdot {
         dd: 5.0
@@ -6576,7 +6714,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 2828327
       dashdot {
         dd: 5.0
@@ -6615,7 +6753,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 2828327
       dashdot {
         dd: 5.0
@@ -6654,7 +6792,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 2828327
       dashdot {
         dd: 5.0
@@ -6693,7 +6831,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 2828327
       dashdot {
         dd: 5.0
@@ -6732,7 +6870,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 2828327
       dashdot {
         dd: 5.0
@@ -6758,21 +6896,6 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 2.0
-      color: 2828327
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-}
-cont {
-  name: "highway-footway-tunnel"
-  element {
-    scale: 18
     lines {
       width: 1.5
       color: 2828327
@@ -6783,18 +6906,6 @@ cont {
       priority: 130
     }
   }
-  element {
-    scale: 19
-    lines {
-      width: 2.0
-      color: 2828327
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
 }
 cont {
   name: "highway-ford"
@@ -9767,318 +9878,84 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-path-tunnel"
-  element {
-    scale: 17
-    lines {
-      width: 0.9
-      color: 9718290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.1
-      color: 9718290
-      dashdot {
-        dd: 3.5
-        dd: 2.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 9718290
-      dashdot {
-        dd: 4.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-}
 cont {
   name: "highway-pedestrian"
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 12
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 13
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
   element {
     scale: 18
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 1118464
+    lines {
+      width: 2.0
+      color: 5064516
+      dashdot {
+        dd: 7.0
+        dd: 3.0
       }
-      priority: 1600
+      priority: 130
     }
   }
   element {
     scale: 19
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 1118464
+    lines {
+      width: 2.0
+      color: 5064516
+      dashdot {
+        dd: 7.0
+        dd: 3.0
       }
-      priority: 1600
+      priority: 130
     }
   }
 }
 cont {
   name: "highway-pedestrian-area"
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 12
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 13
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
   element {
     scale: 18
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 1118464
+    lines {
+      width: 2.0
+      color: 5064516
+      dashdot {
+        dd: 7.0
+        dd: 3.0
       }
-      priority: 1600
+      priority: 130
     }
   }
   element {
     scale: 19
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 1118464
+    lines {
+      width: 2.0
+      color: 5064516
+      dashdot {
+        dd: 7.0
+        dd: 3.0
       }
-      priority: 1600
+      priority: 130
     }
   }
 }
 cont {
   name: "highway-pedestrian-bridge"
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 12
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 13
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
   element {
     scale: 18
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 1118464
+    lines {
+      width: 2.0
+      color: 5064516
+      dashdot {
+        dd: 7.0
+        dd: 3.0
       }
-      priority: 1600
+      priority: 130
     }
   }
   element {
     scale: 19
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 1118464
+    lines {
+      width: 2.0
+      color: 5064516
+      dashdot {
+        dd: 7.0
+        dd: 3.0
       }
-      priority: 1600
-    }
-  }
-}
-cont {
-  name: "highway-pedestrian-tunnel"
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 12
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 13
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 18
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 1118464
-      }
-      priority: 1600
-    }
-  }
-  element {
-    scale: 19
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 1118464
-      }
-      priority: 1600
+      priority: 130
     }
   }
 }
@@ -15373,7 +15250,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 1.5
       color: 2828327
       dashdot {
         dd: 5.0
@@ -15399,21 +15276,6 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 2.0
-      color: 2828327
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 270
-    }
-  }
-}
-cont {
-  name: "highway-steps-tunnel"
-  element {
-    scale: 18
     lines {
       width: 1.5
       color: 2828327
@@ -15424,18 +15286,6 @@ cont {
       priority: 270
     }
   }
-  element {
-    scale: 19
-    lines {
-      width: 2.0
-      color: 2828327
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 270
-    }
-  }
 }
 cont {
   name: "highway-tertiary"
@@ -17047,57 +16897,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-track-tunnel"
-  element {
-    scale: 16
-    lines {
-      width: 1.1
-      color: 6247213
-      dashdot {
-        dd: 6.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.4
-      color: 6247213
-      dashdot {
-        dd: 6.0
-        dd: 2.5
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.9
-      color: 6247213
-      dashdot {
-        dd: 7.0
-        dd: 3.0
-      }
-      priority: 130
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 2.5
-      color: 6247213
-      dashdot {
-        dd: 7.0
-        dd: 3.0
-      }
-      priority: 130
-    }
-  }
-}
 cont {
   name: "highway-trunk"
   element {
@@ -28293,79 +28092,6 @@ cont {
     }
   }
 }
-cont {
-  name: "natural-strait"
-  element {
-    scale: 13
-    caption {
-      primary {
-        height: 9
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 14
-    caption {
-      primary {
-        height: 9
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 9
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 10
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 10
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-}
 cont {
   name: "natural-water"
   element {
@@ -72886,152 +72612,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-canal"
-  element {
-    scale: 13
-    path_text {
-      primary {
-        height: 9
-        color: 19033
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 9
-        color: 19033
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 10
-        color: 19033
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 10
-        color: 19033
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 10
-        color: 19033
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 18
-    path_text {
-      primary {
-        height: 11
-        color: 19033
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 19
-    path_text {
-      primary {
-        height: 11
-        color: 19033
-      }
-      priority: 1500
-    }
-  }
-}
-cont {
-  name: "waterway-canal-tunnel"
-  element {
-    scale: 13
-    path_text {
-      primary {
-        height: 9
-        color: 19033
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 9
-        color: 19033
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 10
-        color: 19033
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 10
-        color: 19033
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 10
-        color: 19033
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 18
-    path_text {
-      primary {
-        height: 11
-        color: 19033
-      }
-      priority: 1500
-    }
-  }
-  element {
-    scale: 19
-    path_text {
-      primary {
-        height: 11
-        color: 19033
-      }
-      priority: 1500
-    }
-  }
-}
 cont {
   name: "waterway-dam"
   element {
@@ -73116,96 +72696,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-ditch"
-  element {
-    scale: 13
-    lines {
-      width: 1.5
-      color: 9758
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.5
-      color: 9758
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 9758
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 9758
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 9758
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 9758
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 9758
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-}
 cont {
   name: "waterway-dock"
   element {
@@ -73342,96 +72832,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-drain"
-  element {
-    scale: 13
-    lines {
-      width: 1.5
-      color: 9758
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.5
-      color: 9758
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 9758
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 9758
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 9758
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 9758
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 9758
-      dashdot {
-        dd: 2.7
-        dd: 2.7
-      }
-      priority: -990
-    }
-  }
-}
 cont {
   name: "waterway-lock_gate"
   element {
@@ -73618,99 +73018,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-river-tunnel"
-  element {
-    scale: 11
-    path_text {
-      primary {
-        height: 9
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 12
-    path_text {
-      primary {
-        height: 9
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 13
-    path_text {
-      primary {
-        height: 9
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 14
-    path_text {
-      primary {
-        height: 9
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 15
-    path_text {
-      primary {
-        height: 11
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 16
-    path_text {
-      primary {
-        height: 11
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 17
-    path_text {
-      primary {
-        height: 11
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 18
-    path_text {
-      primary {
-        height: 11
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-  element {
-    scale: 19
-    path_text {
-      primary {
-        height: 11
-        color: 19033
-      }
-      priority: 1550
-    }
-  }
-}
 cont {
   name: "waterway-riverbank"
   element {
diff --git a/data/visibility.txt b/data/visibility.txt
index be56cf6c9d..9590bc1d44 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -385,9 +385,9 @@ world  00000000000000000000  +
         speech_therapist  00000000000000000000  -
         {}
     highway  00000000000000000000  +
-        bridleway  00000000000000000000  +
-            bridge  00000000000000000000  -
-            permissive  00000000000000000000  -
+        bridleway  00000000000000000011  +
+            bridge  00000000000000000011  -
+            permissive  00000000000000000011  -
             tunnel  00000000000000000000  -
             {}
         bus_stop  00000000000000000000  -
@@ -396,9 +396,9 @@ world  00000000000000000000  +
             tunnel  00000000000000000000  -
             {}
         construction  00000000000001111111  -
-        cycleway  00000000000000000000  +
-            bridge  00000000000000000000  -
-            permissive  00000000000000000000  -
+        cycleway  00000000000000000011  +
+            bridge  00000000000000000011  -
+            permissive  00000000000000000011  -
             tunnel  00000000000000000000  -
             {}
         elevator  00000000000000000000  -
@@ -412,7 +412,7 @@ world  00000000000000000000  +
             hiking  00000000000000000111  -
             mountain_hiking  00000000000000000111  -
             permissive  00000000000000000011  -
-            tunnel  00000000000000000011  -
+            tunnel  00000000000000000000  -
             {}
         ford  00000000000000111111  -
         living_street  00000000000011111111  +
@@ -439,12 +439,12 @@ world  00000000000000000000  +
             horse  00000000000000000111  -
             mountain_hiking  00000000000000000111  -
             permissive  00000000000000000111  -
-            tunnel  00000000000000000111  -
+            tunnel  00000000000000000000  -
             {}
-        pedestrian  00000000000000111111  +
-            area  00000000000000111111  -
-            bridge  00000000000000111111  -
-            tunnel  00000000000000111111  -
+        pedestrian  00000000000000000011  +
+            area  00000000000000000011  -
+            bridge  00000000000000000011  -
+            tunnel  00000000000000000000  -
             {}
         primary  00000000111111111111  +
             bridge  00000000111111111111  -
@@ -485,7 +485,7 @@ world  00000000000000000000  +
         speed_camera  00000000000001111111  -
         steps  00000000000000000011  +
             bridge  00000000000000000011  -
-            tunnel  00000000000000000011  -
+            tunnel  00000000000000000000  -
             {}
         tertiary  00000000000111111111  +
             bridge  00000000000111111111  -
@@ -505,7 +505,7 @@ world  00000000000000000000  +
             grade5  00000000000000001111  -
             no-access  00000000000000001111  -
             permissive  00000000000000001111  -
-            tunnel  00000000000000001111  -
+            tunnel  00000000000000000000  -
             {}
         traffic_signals  00000000000000000000  -
         trunk  00000001111111111111  +
@@ -738,7 +738,7 @@ world  00000000000000000000  +
         saddle  00000000000000000000  -
         scrub  00000000000000111111  -
         spring  00000000000000000000  -
-        strait  00000000000001111111  -
+        strait  00000000000000000000  -
         tree  00000000000000000000  -
         tree_row  00000000000000000000  -
         volcano  00000000000000000000  -
@@ -1372,15 +1372,15 @@ world  00000000000000000000  +
         hump  00000000000000000000  -
         {}
     waterway  00000000000000000000  +
-        canal  00000000000001111111  +
-            tunnel  00000000000001111111  -
+        canal  00000000000000000000  +
+            tunnel  00000000000000000000  -
             {}
         dam  00000000000000011111  -
-        ditch  00000000000001111111  +
+        ditch  00000000000000000000  +
             tunnel  00000000000000000000  -
             {}
         dock  11111111111111111111  -
-        drain  00000000000001111111  +
+        drain  00000000000000000000  +
             tunnel  00000000000000000000  -
             {}
         fish_pass  00000000000000000000  +
@@ -1388,7 +1388,7 @@ world  00000000000000000000  +
             {}
         lock_gate  00000000000000001111  -
         river  00000000001111111111  +
-            tunnel  00000000000111111111  -
+            tunnel  00000000000000000000  -
             {}
         riverbank  11111111111111111111  -
         stream  00000000000000000000  +