diff --git a/data/colors.txt b/data/colors.txt
index 807c9e1f8a..52ed7ad91e 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -29,6 +29,7 @@
 1844736
 1913758
 1973790
+2004720
 2038026
 2038555
 2171163
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 8593781bf2..e2fda68bd1 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 84ac6bdd80..57ff080738 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -64550,37 +64550,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-ditch-tunnel"
-  element {
-    scale: 17
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
 cont {
   name: "waterway-dock"
   element {
@@ -64769,37 +64738,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-drain-tunnel"
-  element {
-    scale: 17
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
 cont {
   name: "waterway-lock"
   element {
@@ -65046,94 +64984,84 @@ cont {
 }
 cont {
   name: "waterway-river-tunnel"
-  element {
-    scale: 10
-    lines {
-      width: 1.0
-      color: 3584191
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 11
-    lines {
-      width: 1.0
-      color: 3584191
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
+    path_text {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 16921
     }
   }
   element {
     scale: 12
-    lines {
-      width: 1.0
-      color: 3584191
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
+    path_text {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 16921
     }
   }
   element {
     scale: 13
-    lines {
-      width: 1.0
-      color: 3584191
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
+    path_text {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 16921
     }
   }
   element {
     scale: 14
-    lines {
-      width: 1.0
-      color: 3584191
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
+    path_text {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 16921
     }
   }
   element {
     scale: 15
-    lines {
-      width: 1.0
-      color: 3584191
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
+    path_text {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 16921
     }
   }
   element {
     scale: 16
-    lines {
-      width: 1.0
-      color: 3584191
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
+    path_text {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 16921
     }
   }
   element {
     scale: 17
-    lines {
-      width: 1.0
-      color: 3584191
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
+    path_text {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 16921
     }
   }
   element {
     scale: 18
-    lines {
-      width: 1.0
-      color: 3584191
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
+    path_text {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 16921
     }
   }
 }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 77b0a2d11e..4d72b847d0 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 5e599fb705..484028cbba 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -65323,6 +65323,12 @@ cont {
   }
 }
 colors {
+  value {
+    name: "DefaultTrackColor"
+    color: 2004720
+    x: 0
+    y: 0
+  }
   value {
     name: "RoadShieldWhiteText"
     color: 16777215
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index c306b498d8..df903bd6e3 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 3f615e2799..0fada5a547 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -65323,6 +65323,12 @@ cont {
   }
 }
 colors {
+  value {
+    name: "DefaultTrackColor"
+    color: 2004720
+    x: 0
+    y: 0
+  }
   value {
     name: "RoadShieldWhiteText"
     color: 12039862
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 6b83739450..fe15d23f5d 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 5f34f6bc1a..e093f7438c 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -39587,51 +39587,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-ditch-tunnel"
-  element {
-    scale: 17
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
 cont {
   name: "waterway-dock"
   element {
@@ -39820,51 +39775,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-drain-tunnel"
-  element {
-    scale: 17
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
 cont {
   name: "waterway-lock"
   element {
@@ -40111,25 +40021,8 @@ cont {
 }
 cont {
   name: "waterway-river-tunnel"
-  element {
-    scale: 10
-    lines {
-      width: 1.0
-      color: 3584191
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 11
-    lines {
-      width: 1.2
-      color: 3584191
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 9
@@ -40140,13 +40033,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 1.2
-      color: 3584191
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 9
@@ -40157,13 +40043,6 @@ cont {
   }
   element {
     scale: 13
-    lines {
-      width: 1.6
-      color: 3584191
-      priority: 1921
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 9
@@ -40174,13 +40053,6 @@ cont {
   }
   element {
     scale: 14
-    lines {
-      width: 1.8
-      color: 3584191
-      priority: 1921
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 9
@@ -40191,13 +40063,6 @@ cont {
   }
   element {
     scale: 15
-    lines {
-      width: 2.2
-      color: 3584191
-      priority: 1921
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 11
@@ -40208,13 +40073,6 @@ cont {
   }
   element {
     scale: 16
-    lines {
-      width: 2.2
-      color: 3584191
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
     path_text {
       primary {
         height: 11
@@ -40225,13 +40083,6 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 2.2
-      color: 3584191
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
     path_text {
       primary {
         height: 11
@@ -40242,13 +40093,6 @@ cont {
   }
   element {
     scale: 18
-    lines {
-      width: 2.2
-      color: 3584191
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
     path_text {
       primary {
         height: 11
@@ -40259,13 +40103,6 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 2.2
-      color: 3584191
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
     path_text {
       primary {
         height: 11
@@ -40605,6 +40442,12 @@ cont {
   }
 }
 colors {
+  value {
+    name: "DefaultTrackColor"
+    color: 2004720
+    x: 0
+    y: 0
+  }
   value {
     name: "RoadShieldWhiteText"
     color: 16777215
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index d3ea1e3709..96b2fc7097 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 c6d6f33420..fb44e5f3bb 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -39587,51 +39587,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-ditch-tunnel"
-  element {
-    scale: 17
-    lines {
-      width: 1.8
-      color: 401446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.8
-      color: 401446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.8
-      color: 401446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
 cont {
   name: "waterway-dock"
   element {
@@ -39820,51 +39775,6 @@ cont {
     }
   }
 }
-cont {
-  name: "waterway-drain-tunnel"
-  element {
-    scale: 17
-    lines {
-      width: 1.8
-      color: 401446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.8
-      color: 401446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.8
-      color: 401446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
 cont {
   name: "waterway-lock"
   element {
@@ -40111,25 +40021,8 @@ cont {
 }
 cont {
   name: "waterway-river-tunnel"
-  element {
-    scale: 10
-    lines {
-      width: 1.0
-      color: 401446
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 11
-    lines {
-      width: 1.2
-      color: 401446
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 9
@@ -40140,13 +40033,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 1.2
-      color: 401446
-      priority: 1921
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 9
@@ -40157,13 +40043,6 @@ cont {
   }
   element {
     scale: 13
-    lines {
-      width: 1.6
-      color: 401446
-      priority: 1921
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 9
@@ -40174,13 +40053,6 @@ cont {
   }
   element {
     scale: 14
-    lines {
-      width: 1.8
-      color: 401446
-      priority: 1921
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 9
@@ -40191,13 +40063,6 @@ cont {
   }
   element {
     scale: 15
-    lines {
-      width: 2.2
-      color: 401446
-      priority: 1921
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
     path_text {
       primary {
         height: 11
@@ -40208,13 +40073,6 @@ cont {
   }
   element {
     scale: 16
-    lines {
-      width: 2.2
-      color: 401446
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
     path_text {
       primary {
         height: 11
@@ -40225,13 +40083,6 @@ cont {
   }
   element {
     scale: 17
-    lines {
-      width: 2.2
-      color: 401446
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
     path_text {
       primary {
         height: 11
@@ -40242,13 +40093,6 @@ cont {
   }
   element {
     scale: 18
-    lines {
-      width: 2.2
-      color: 401446
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
     path_text {
       primary {
         height: 11
@@ -40259,13 +40103,6 @@ cont {
   }
   element {
     scale: 19
-    lines {
-      width: 2.2
-      color: 401446
-      priority: 1921
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
     path_text {
       primary {
         height: 11
@@ -40605,6 +40442,12 @@ cont {
   }
 }
 colors {
+  value {
+    name: "DefaultTrackColor"
+    color: 2004720
+    x: 0
+    y: 0
+  }
   value {
     name: "RoadShieldWhiteText"
     color: 12039862
diff --git a/data/visibility.txt b/data/visibility.txt
index 7bd8a73d5a..c5b224a3ea 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -887,16 +887,16 @@ world  00000000000000000000  +
             {}
         dam  00000000000000011111  -
         ditch  00000000000000000111  +
-            tunnel  00000000000000000111  -
+            tunnel  00000000000000000000  -
             {}
         dock  11111111111111111111  -
         drain  00000000000000000111  +
-            tunnel  00000000000000000111  -
+            tunnel  00000000000000000000  -
             {}
         lock  00000000000000001111  -
         lock_gate  00000000000000001111  -
         river  00000000001111111111  +
-            tunnel  00000000001111111111  -
+            tunnel  00000000000111111111  -
             {}
         riverbank  11111111111111111111  -
         stream  00000000000000000000  +