diff --git a/data/classificator.txt b/data/classificator.txt
index 894e88e9ae..02ac1e57a7 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -634,6 +634,7 @@ world  +
             pond  -
             reservoir  -
             river  -
+            tunnel  -
             {}
         wetland  +
             bog  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index c4a8576544..83dc880f0f 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 afe63a4a89..c8e0820052 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -21085,12 +21085,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 90
-    }
   }
   element {
     scale: 13
@@ -21108,12 +21102,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -21131,12 +21119,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -21154,12 +21136,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 250
-    }
   }
   element {
     scale: 16
@@ -21176,12 +21152,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 17
@@ -21198,12 +21168,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 10
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 18
@@ -21261,12 +21225,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 90
-    }
   }
   element {
     scale: 13
@@ -21284,12 +21242,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -21307,12 +21259,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -21330,12 +21276,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 250
-    }
   }
   element {
     scale: 16
@@ -21352,12 +21292,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 17
@@ -21374,12 +21308,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 10
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 18
@@ -21437,12 +21365,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 90
-    }
   }
   element {
     scale: 13
@@ -21460,12 +21382,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -21499,12 +21415,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -21538,12 +21448,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 250
-    }
   }
   element {
     scale: 16
@@ -21576,12 +21480,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 17
@@ -21614,12 +21512,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 10
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 18
@@ -21709,12 +21601,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 90
-    }
   }
   element {
     scale: 13
@@ -21732,12 +21618,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -21755,12 +21635,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -21778,12 +21652,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 250
-    }
   }
   element {
     scale: 16
@@ -21810,12 +21678,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 17
@@ -21842,12 +21704,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 10
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 18
@@ -24627,12 +24483,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 90
-    }
   }
   element {
     scale: 13
@@ -24650,12 +24500,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -24673,12 +24517,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -24821,12 +24659,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 90
-    }
   }
   element {
     scale: 13
@@ -24844,12 +24676,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -24883,12 +24709,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -25111,12 +24931,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 90
-    }
   }
   element {
     scale: 13
@@ -25134,12 +24948,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -25157,12 +24965,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -43454,6 +43256,350 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-tunnel"
+  element {
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-wetland"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 7d656c3323..23227eddd6 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 337bdca5c8..e4eeb3b2e8 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -20875,12 +20875,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 90
-    }
   }
   element {
     scale: 13
@@ -20898,12 +20892,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -20921,12 +20909,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -20944,12 +20926,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 250
-    }
   }
   element {
     scale: 16
@@ -20966,12 +20942,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 17
@@ -20988,12 +20958,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 10
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 18
@@ -21051,12 +21015,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 90
-    }
   }
   element {
     scale: 13
@@ -21074,12 +21032,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -21097,12 +21049,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -21120,12 +21066,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 250
-    }
   }
   element {
     scale: 16
@@ -21142,12 +21082,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 17
@@ -21164,12 +21098,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 10
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 18
@@ -21227,12 +21155,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 90
-    }
   }
   element {
     scale: 13
@@ -21250,12 +21172,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -21289,12 +21205,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -21328,12 +21238,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 250
-    }
   }
   element {
     scale: 16
@@ -21366,12 +21270,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 17
@@ -21404,12 +21302,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 10
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 18
@@ -21499,12 +21391,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 90
-    }
   }
   element {
     scale: 13
@@ -21522,12 +21408,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -21545,12 +21425,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -21568,12 +21442,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 250
-    }
   }
   element {
     scale: 16
@@ -21600,12 +21468,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 17
@@ -21632,12 +21494,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 10
-      color: 16777215
-      priority: 16378
-      min_distance: 300
-    }
   }
   element {
     scale: 18
@@ -24289,12 +24145,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 90
-    }
   }
   element {
     scale: 13
@@ -24312,12 +24162,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -24335,12 +24179,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -24483,12 +24321,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 90
-    }
   }
   element {
     scale: 13
@@ -24506,12 +24338,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -24545,12 +24371,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -24773,12 +24593,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 90
-    }
   }
   element {
     scale: 13
@@ -24796,12 +24610,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -24819,12 +24627,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16378
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -43116,6 +42918,350 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-tunnel"
+  element {
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 9163744
+      priority: -15030
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4495803
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-wetland"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index fe611d7e41..6e6eba0cea 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 2ebf466a66..cb0c89f8b4 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -20956,13 +20956,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 90
-      text_color: 11711154
-    }
   }
   element {
     scale: 13
@@ -20980,13 +20973,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 120
-      text_color: 11711154
-    }
   }
   element {
     scale: 14
@@ -21004,13 +20990,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 175
-      text_color: 11711154
-    }
   }
   element {
     scale: 15
@@ -21028,13 +21007,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 250
-      text_color: 11711154
-    }
   }
   element {
     scale: 16
@@ -21051,13 +21023,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 300
-      text_color: 11711154
-    }
   }
   element {
     scale: 17
@@ -21074,13 +21039,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 10
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 300
-      text_color: 11711154
-    }
   }
   element {
     scale: 18
@@ -21140,13 +21098,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 90
-      text_color: 11711154
-    }
   }
   element {
     scale: 13
@@ -21164,13 +21115,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 120
-      text_color: 11711154
-    }
   }
   element {
     scale: 14
@@ -21188,13 +21132,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 175
-      text_color: 11711154
-    }
   }
   element {
     scale: 15
@@ -21212,13 +21149,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 250
-      text_color: 11711154
-    }
   }
   element {
     scale: 16
@@ -21235,13 +21165,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 300
-      text_color: 11711154
-    }
   }
   element {
     scale: 17
@@ -21258,13 +21181,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 10
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 300
-      text_color: 11711154
-    }
   }
   element {
     scale: 18
@@ -21324,13 +21240,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 90
-      text_color: 11711154
-    }
   }
   element {
     scale: 13
@@ -21348,13 +21257,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 120
-      text_color: 11711154
-    }
   }
   element {
     scale: 14
@@ -21388,13 +21290,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 175
-      text_color: 11711154
-    }
   }
   element {
     scale: 15
@@ -21428,13 +21323,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 250
-      text_color: 11711154
-    }
   }
   element {
     scale: 16
@@ -21467,13 +21355,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 300
-      text_color: 11711154
-    }
   }
   element {
     scale: 17
@@ -21506,13 +21387,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 10
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 300
-      text_color: 11711154
-    }
   }
   element {
     scale: 18
@@ -21604,13 +21478,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 90
-      text_color: 11711154
-    }
   }
   element {
     scale: 13
@@ -21628,13 +21495,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 120
-      text_color: 11711154
-    }
   }
   element {
     scale: 14
@@ -21652,13 +21512,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 175
-      text_color: 11711154
-    }
   }
   element {
     scale: 15
@@ -21676,13 +21529,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 250
-      text_color: 11711154
-    }
   }
   element {
     scale: 16
@@ -21708,13 +21554,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 300
-      text_color: 11711154
-    }
   }
   element {
     scale: 17
@@ -21740,13 +21579,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 10
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 300
-      text_color: 11711154
-    }
   }
   element {
     scale: 18
@@ -24414,13 +24246,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 90
-      text_color: 11711154
-    }
   }
   element {
     scale: 13
@@ -24438,13 +24263,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 120
-      text_color: 11711154
-    }
   }
   element {
     scale: 14
@@ -24462,13 +24280,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 175
-      text_color: 11711154
-    }
   }
   element {
     scale: 15
@@ -24616,13 +24427,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 90
-      text_color: 11711154
-    }
   }
   element {
     scale: 13
@@ -24640,13 +24444,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 120
-      text_color: 11711154
-    }
   }
   element {
     scale: 14
@@ -24680,13 +24477,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 175
-      text_color: 11711154
-    }
   }
   element {
     scale: 15
@@ -24914,13 +24704,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 90
-      text_color: 11711154
-    }
   }
   element {
     scale: 13
@@ -24938,13 +24721,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 120
-      text_color: 11711154
-    }
   }
   element {
     scale: 14
@@ -24962,13 +24738,6 @@ cont {
       }
       priority: 16378
     }
-    shield {
-      height: 9
-      stroke_color: 11711154
-      priority: 16378
-      min_distance: 175
-      text_color: 11711154
-    }
   }
   element {
     scale: 15
@@ -43244,6 +43013,350 @@ cont {
     apply_if: "bbox_area<4000000"
   }
 }
+cont {
+  name: "natural-water-tunnel"
+  element {
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 8738
+      priority: -15030
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 8738
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 8738
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 8738
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 8738
+      priority: -15030
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -15030
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 15970
+    }
+    apply_if: "bbox_area<4000000"
+  }
+}
 cont {
   name: "natural-wetland"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 57f80c2068..3be7c52259 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 3a45ceb89d..5d0617e0f4 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -10016,12 +10016,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 100
-    }
   }
   element {
     scale: 13
@@ -10039,12 +10033,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -10062,12 +10050,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -10093,12 +10075,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 250
-    }
   }
   element {
     scale: 16
@@ -10123,12 +10099,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 300
-    }
   }
   element {
     scale: 17
@@ -10153,12 +10123,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 10
-      color: 16777215
-      priority: 16423
-      min_distance: 350
-    }
   }
   element {
     scale: 18
@@ -10240,12 +10204,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 100
-    }
   }
   element {
     scale: 13
@@ -10263,12 +10221,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -10286,12 +10238,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -10317,12 +10263,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 250
-    }
   }
   element {
     scale: 16
@@ -10347,12 +10287,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 300
-    }
   }
   element {
     scale: 17
@@ -10377,12 +10311,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 10
-      color: 16777215
-      priority: 16423
-      min_distance: 350
-    }
   }
   element {
     scale: 18
@@ -10464,12 +10392,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 100
-    }
   }
   element {
     scale: 13
@@ -10487,12 +10409,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -10526,12 +10442,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -10573,12 +10483,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 250
-    }
   }
   element {
     scale: 16
@@ -10619,12 +10523,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 300
-    }
   }
   element {
     scale: 17
@@ -10665,12 +10563,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 10
-      color: 16777215
-      priority: 16423
-      min_distance: 350
-    }
   }
   element {
     scale: 18
@@ -10784,12 +10676,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 100
-    }
   }
   element {
     scale: 13
@@ -10807,12 +10693,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -10830,12 +10710,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -10861,12 +10735,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 250
-    }
   }
   element {
     scale: 16
@@ -10893,12 +10761,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 300
-    }
   }
   element {
     scale: 17
@@ -10925,12 +10787,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 10
-      color: 16777215
-      priority: 16423
-      min_distance: 350
-    }
   }
   element {
     scale: 18
@@ -13357,12 +13213,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 100
-    }
   }
   element {
     scale: 13
@@ -13380,12 +13230,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -13403,12 +13247,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -13591,12 +13429,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 100
-    }
   }
   element {
     scale: 13
@@ -13614,12 +13446,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -13653,12 +13479,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -13921,12 +13741,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 100
-    }
   }
   element {
     scale: 13
@@ -13944,12 +13758,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 120
-    }
   }
   element {
     scale: 14
@@ -13967,12 +13775,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 16777215
-      priority: 16423
-      min_distance: 175
-    }
   }
   element {
     scale: 15
@@ -26571,6 +26373,478 @@ cont {
     apply_if: "bbox_area>=1000000"
   }
 }
+cont {
+  name: "natural-water-tunnel"
+  element {
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 9163744
+      priority: -15071
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 9163744
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+}
 cont {
   name: "natural-wetland"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 75d542d484..f5c26e2afc 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 1a00a45896..8eba4a0165 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -10183,14 +10183,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 100
-      text_color: 3158064
-    }
   }
   element {
     scale: 13
@@ -10208,14 +10200,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 120
-      text_color: 3158064
-    }
   }
   element {
     scale: 14
@@ -10233,14 +10217,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 175
-      text_color: 3158064
-    }
   }
   element {
     scale: 15
@@ -10266,14 +10242,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 250
-      text_color: 3158064
-    }
   }
   element {
     scale: 16
@@ -10298,14 +10266,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 300
-      text_color: 3158064
-    }
   }
   element {
     scale: 17
@@ -10330,14 +10290,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 10
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 350
-      text_color: 3158064
-    }
   }
   element {
     scale: 18
@@ -10423,14 +10375,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 100
-      text_color: 3158064
-    }
   }
   element {
     scale: 13
@@ -10448,14 +10392,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 120
-      text_color: 3158064
-    }
   }
   element {
     scale: 14
@@ -10473,14 +10409,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 175
-      text_color: 3158064
-    }
   }
   element {
     scale: 15
@@ -10506,14 +10434,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 250
-      text_color: 3158064
-    }
   }
   element {
     scale: 16
@@ -10538,14 +10458,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 300
-      text_color: 3158064
-    }
   }
   element {
     scale: 17
@@ -10570,14 +10482,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 10
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 350
-      text_color: 3158064
-    }
   }
   element {
     scale: 18
@@ -10663,14 +10567,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 100
-      text_color: 3158064
-    }
   }
   element {
     scale: 13
@@ -10688,14 +10584,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 120
-      text_color: 3158064
-    }
   }
   element {
     scale: 14
@@ -10729,14 +10617,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 175
-      text_color: 3158064
-    }
   }
   element {
     scale: 15
@@ -10778,14 +10658,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 250
-      text_color: 3158064
-    }
   }
   element {
     scale: 16
@@ -10826,14 +10698,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 300
-      text_color: 3158064
-    }
   }
   element {
     scale: 17
@@ -10874,14 +10738,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 10
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 350
-      text_color: 3158064
-    }
   }
   element {
     scale: 18
@@ -10999,14 +10855,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 100
-      text_color: 3158064
-    }
   }
   element {
     scale: 13
@@ -11024,14 +10872,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 120
-      text_color: 3158064
-    }
   }
   element {
     scale: 14
@@ -11049,14 +10889,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 175
-      text_color: 3158064
-    }
   }
   element {
     scale: 15
@@ -11082,14 +10914,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 250
-      text_color: 3158064
-    }
   }
   element {
     scale: 16
@@ -11115,14 +10939,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 300
-      text_color: 3158064
-    }
   }
   element {
     scale: 17
@@ -11148,14 +10964,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 10
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 350
-      text_color: 3158064
-    }
   }
   element {
     scale: 18
@@ -13624,14 +13432,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 100
-      text_color: 3158064
-    }
   }
   element {
     scale: 13
@@ -13649,14 +13449,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 120
-      text_color: 3158064
-    }
   }
   element {
     scale: 14
@@ -13674,14 +13466,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 175
-      text_color: 3158064
-    }
   }
   element {
     scale: 15
@@ -13874,14 +13658,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 100
-      text_color: 3158064
-    }
   }
   element {
     scale: 13
@@ -13899,14 +13675,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 120
-      text_color: 3158064
-    }
   }
   element {
     scale: 14
@@ -13940,14 +13708,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 175
-      text_color: 3158064
-    }
   }
   element {
     scale: 15
@@ -14220,14 +13980,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 100
-      text_color: 3158064
-    }
   }
   element {
     scale: 13
@@ -14245,14 +13997,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 120
-      text_color: 3158064
-    }
   }
   element {
     scale: 14
@@ -14270,14 +14014,6 @@ cont {
       }
       priority: 16423
     }
-    shield {
-      height: 9
-      color: 10066329
-      stroke_color: 3158064
-      priority: 16423
-      min_distance: 175
-      text_color: 3158064
-    }
   }
   element {
     scale: 15
@@ -26961,6 +26697,478 @@ cont {
     apply_if: "bbox_area>=1000000"
   }
 }
+cont {
+  name: "natural-water-tunnel"
+  element {
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 1
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 2
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 3
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 4
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 5
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 6
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 7
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 8
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 9
+    area {
+      color: 8738
+      priority: -15071
+    }
+  }
+  element {
+    scale: 10
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 10
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 11
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 12
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 13
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 14
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 15
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 9
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 16
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 17
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 18
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=80000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area>=4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -15071
+    }
+    apply_if: "bbox_area<4000000"
+  }
+  element {
+    scale: 19
+    area {
+      color: 8738
+      priority: -15071
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 15929
+    }
+    apply_if: "bbox_area>=1000000"
+  }
+}
 cont {
   name: "natural-wetland"
   element {
diff --git a/data/types.txt b/data/types.txt
index b28f3cf6bd..2b1170d6f2 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1222,7 +1222,7 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-mapswithme
+*natural|water|tunnel
 *place|square
 *tourism|artwork|architecture
 *tourism|artwork|sculpture
diff --git a/data/visibility.txt b/data/visibility.txt
index 267ab5ca4c..4798d148e9 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -634,6 +634,7 @@ world  00000000000000000000  +
             pond  11111111111111111111  -
             reservoir  11111111111111111111  -
             river  11111111111111111111  -
+            tunnel  11111111111111111111  -
             {}
         wetland  00000000000111111111  +
             bog  00000000000111111111  -