diff --git a/data/colors.txt b/data/colors.txt
index 5182669583..39a2167dce 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -292,9 +292,11 @@
 67108863
 436207616
 437326080
+439563059
 440681540
 442260561
 444234362
+448970931
 451800027
 452984831
 609045837
@@ -329,12 +331,16 @@
 1090519039
 1216522952
 1291845632
+1292174597
 1292964096
+1295201075
 1296319556
 1296845900
 1297438037
 1298359132
 1301911961
+1304608947
+1306780114
 1308576652
 1308604747
 1308622847
@@ -343,6 +349,7 @@
 1545508592
 1548466662
 1711276032
+1712264192
 1712394496
 1713512994
 1714104359
@@ -351,11 +358,13 @@
 1717328977
 1719302778
 1724500155
+1724896680
 1727592696
 1728053247
 1931024665
 1943327690
 2147483648
+2149128473
 2149720610
 2150311975
 2151957572
@@ -363,11 +372,14 @@
 2153149782
 2157549977
 2159483932
+2160576191
 2160707771
 2162506037
 2163800312
 2164214668
 2566914048
+2567507722
+2579945899
 2583691263
 2787649562
 2801593470
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 5e511e2f7c..d9d8ca1e45 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 a39c0b7d83..01fc0ee389 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -5136,18 +5136,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5155,22 +5155,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5186,11 +5186,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5209,18 +5209,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5228,22 +5228,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5259,11 +5259,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5282,18 +5282,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5301,22 +5301,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5332,11 +5332,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5355,18 +5355,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5374,22 +5374,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5405,11 +5405,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5428,18 +5428,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5447,22 +5447,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5478,11 +5478,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5501,18 +5501,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5520,22 +5520,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5551,11 +5551,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5574,18 +5574,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5593,22 +5593,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5624,11 +5624,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5647,18 +5647,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5666,22 +5666,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5697,11 +5697,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5720,7 +5720,7 @@ cont {
     scale: 15
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5728,7 +5728,7 @@ cont {
     scale: 16
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5778,7 +5778,7 @@ cont {
     scale: 15
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5786,7 +5786,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5836,7 +5836,7 @@ cont {
     scale: 15
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5844,7 +5844,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5894,7 +5894,7 @@ cont {
     scale: 15
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5902,7 +5902,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -37897,7 +37897,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
+      width: 1.5
       color: 14934482
       priority: 1475
       cap: BUTTCAP
@@ -37923,7 +37923,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
+      width: 3.0
       color: 14934482
       priority: 1475
     }
@@ -37935,7 +37935,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 4.5
       color: 14934482
       priority: 1475
     }
@@ -37954,7 +37954,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.0
+      width: 6.0
       color: 14934482
       priority: 1475
     }
@@ -37973,7 +37973,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 8.0
       color: 14934482
       priority: 1475
     }
@@ -38042,8 +38042,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
-      color: 14934482
+      width: 1.0
+      color: 1724896680
       priority: 1194
       cap: BUTTCAP
     }
@@ -38051,8 +38051,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 2.0
-      color: 14934482
+      width: 1.5
+      color: 1724896680
       priority: 1194
       cap: BUTTCAP
     }
@@ -38061,31 +38061,31 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 14934482
+      color: 1724896680
       priority: 1194
     }
   }
   element {
     scale: 17
     lines {
-      width: 2.0
-      color: 14934482
+      width: 3.0
+      color: 1724896680
       priority: 1194
     }
   }
   element {
     scale: 18
     lines {
-      width: 2.0
-      color: 14934482
+      width: 4.5
+      color: 1724896680
       priority: 1194
     }
   }
   element {
     scale: 19
     lines {
-      width: 2.0
-      color: 14934482
+      width: 6.0
+      color: 1724896680
       priority: 1194
     }
   }
@@ -38281,7 +38281,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
+      width: 1.5
       color: 14934482
       priority: 1475
       cap: BUTTCAP
@@ -38307,7 +38307,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
+      width: 3.0
       color: 14934482
       priority: 1475
     }
@@ -38319,7 +38319,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 4.5
       color: 14934482
       priority: 1475
     }
@@ -38338,7 +38338,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.0
+      width: 6.0
       color: 14934482
       priority: 1475
     }
@@ -38357,7 +38357,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 8.0
       color: 14934482
       priority: 1475
     }
@@ -67928,13 +67928,30 @@ cont {
 cont {
   name: "waterway-dam"
   element {
-    scale: 15
+    scale: 14
     lines {
-      width: 1.0
-      color: 8421504
+      width: 1.5
+      color: 1304608947
       priority: 1970
       cap: BUTTCAP
     }
+    area {
+      color: 2160707771
+      priority: 1971
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 1304608947
+      priority: 1970
+      cap: BUTTCAP
+    }
+    area {
+      color: 13224123
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67946,10 +67963,26 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 8421504
+      width: 5.0
+      color: 10592406
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3.0
+      color: 1304608947
       priority: 1970
     }
+    area {
+      color: 13224123
+      border {
+        width: 1.0
+        color: 10592406
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67961,10 +67994,26 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 8421504
+      width: 6.5
+      color: 10197647
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4.5
+      color: 448970931
       priority: 1970
     }
+    area {
+      color: 12763315
+      border {
+        width: 1.0
+        color: 10197647
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67976,10 +68025,26 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 8421504
+      width: 8.0
+      color: 10197647
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 6.0
+      color: 12763315
       priority: 1970
     }
+    area {
+      color: 12763315
+      border {
+        width: 1.0
+        color: 10197647
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67991,10 +68056,26 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 8421504
+      width: 10.0
+      color: 10197647
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 8.0
+      color: 12763315
       priority: 1970
     }
+    area {
+      color: 12763315
+      border {
+        width: 1.0
+        color: 10197647
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -69307,11 +69388,20 @@ cont {
 }
 cont {
   name: "waterway-weir"
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 1304608947
+      priority: 1970
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 15
     lines {
-      width: 1.0
-      color: 8421504
+      width: 2.0
+      color: 1304608947
       priority: 1475
       cap: BUTTCAP
     }
@@ -69326,8 +69416,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 8421504
+      width: 3.0
+      color: 1304608947
       priority: 1475
     }
     path_text {
@@ -69341,8 +69431,8 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 8421504
+      width: 4.5
+      color: 1304608947
       priority: 1475
     }
     path_text {
@@ -69356,8 +69446,8 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 8421504
+      width: 6.0
+      color: 1304608947
       priority: 1475
     }
     path_text {
@@ -69371,8 +69461,8 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 8421504
+      width: 8.0
+      color: 1304608947
       priority: 1475
     }
     path_text {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index aa2d9daa0d..cc93c4b3bc 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 ba2b8da369..a5bda8c739 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -5102,18 +5102,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5121,22 +5121,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5152,11 +5152,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5175,18 +5175,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5194,22 +5194,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5225,11 +5225,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5248,18 +5248,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5267,22 +5267,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5298,11 +5298,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5321,18 +5321,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5340,22 +5340,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5371,11 +5371,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5394,18 +5394,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5413,22 +5413,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5444,11 +5444,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5467,18 +5467,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5486,22 +5486,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5517,11 +5517,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5540,18 +5540,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5559,22 +5559,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5590,11 +5590,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5613,18 +5613,18 @@ cont {
     scale: 15
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5632,22 +5632,22 @@ cont {
     scale: 17
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5663,11 +5663,11 @@ cont {
     scale: 19
     area {
       color: 15921870
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5686,7 +5686,7 @@ cont {
     scale: 16
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5736,7 +5736,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5786,7 +5786,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5836,7 +5836,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -37703,7 +37703,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
+      width: 1.5
       color: 14934482
       priority: 1475
       cap: BUTTCAP
@@ -37729,7 +37729,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
+      width: 3.0
       color: 14934482
       priority: 1475
     }
@@ -37741,7 +37741,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 4.5
       color: 14934482
       priority: 1475
     }
@@ -37760,7 +37760,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.0
+      width: 6.0
       color: 14934482
       priority: 1475
     }
@@ -37779,7 +37779,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 8.0
       color: 14934482
       priority: 1475
     }
@@ -37848,8 +37848,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
-      color: 14934482
+      width: 1.0
+      color: 1724896680
       priority: 1194
       cap: BUTTCAP
     }
@@ -37857,8 +37857,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 2.0
-      color: 14934482
+      width: 1.5
+      color: 1724896680
       priority: 1194
       cap: BUTTCAP
     }
@@ -37867,31 +37867,31 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 14934482
+      color: 1724896680
       priority: 1194
     }
   }
   element {
     scale: 17
     lines {
-      width: 2.0
-      color: 14934482
+      width: 3.0
+      color: 1724896680
       priority: 1194
     }
   }
   element {
     scale: 18
     lines {
-      width: 2.0
-      color: 14934482
+      width: 4.5
+      color: 1724896680
       priority: 1194
     }
   }
   element {
     scale: 19
     lines {
-      width: 2.0
-      color: 14934482
+      width: 6.0
+      color: 1724896680
       priority: 1194
     }
   }
@@ -38087,7 +38087,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
+      width: 1.5
       color: 14934482
       priority: 1475
       cap: BUTTCAP
@@ -38113,7 +38113,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
+      width: 3.0
       color: 14934482
       priority: 1475
     }
@@ -38125,7 +38125,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 4.5
       color: 14934482
       priority: 1475
     }
@@ -38144,7 +38144,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.0
+      width: 6.0
       color: 14934482
       priority: 1475
     }
@@ -38163,7 +38163,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 8.0
       color: 14934482
       priority: 1475
     }
@@ -67503,13 +67503,30 @@ cont {
 cont {
   name: "waterway-dam"
   element {
-    scale: 15
+    scale: 14
     lines {
-      width: 1.0
-      color: 8421504
+      width: 1.5
+      color: 1304608947
       priority: 1970
       cap: BUTTCAP
     }
+    area {
+      color: 2160707771
+      priority: 1971
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 1304608947
+      priority: 1970
+      cap: BUTTCAP
+    }
+    area {
+      color: 13224123
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67521,10 +67538,26 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 8421504
+      width: 5.0
+      color: 10592406
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3.0
+      color: 1304608947
       priority: 1970
     }
+    area {
+      color: 13224123
+      border {
+        width: 1.0
+        color: 10592406
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67536,10 +67569,26 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 8421504
+      width: 6.5
+      color: 10197647
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4.5
+      color: 448970931
       priority: 1970
     }
+    area {
+      color: 12763315
+      border {
+        width: 1.0
+        color: 10197647
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67551,10 +67600,26 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 8421504
+      width: 8.0
+      color: 10197647
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 6.0
+      color: 12763315
       priority: 1970
     }
+    area {
+      color: 12763315
+      border {
+        width: 1.0
+        color: 10197647
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67566,10 +67631,26 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 8421504
+      width: 10.0
+      color: 10197647
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 8.0
+      color: 12763315
       priority: 1970
     }
+    area {
+      color: 12763315
+      border {
+        width: 1.0
+        color: 10197647
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -68799,11 +68880,20 @@ cont {
 }
 cont {
   name: "waterway-weir"
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 1304608947
+      priority: 1970
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 15
     lines {
-      width: 1.0
-      color: 8421504
+      width: 2.0
+      color: 1304608947
       priority: 1475
       cap: BUTTCAP
     }
@@ -68818,8 +68908,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 8421504
+      width: 3.0
+      color: 1304608947
       priority: 1475
     }
     path_text {
@@ -68833,8 +68923,8 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 8421504
+      width: 4.5
+      color: 1304608947
       priority: 1475
     }
     path_text {
@@ -68848,8 +68938,8 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 8421504
+      width: 6.0
+      color: 1304608947
       priority: 1475
     }
     path_text {
@@ -68863,8 +68953,8 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 8421504
+      width: 8.0
+      color: 1304608947
       priority: 1475
     }
     path_text {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 2ddcf61908..44cf2ff0e9 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 a7d44aca77..adbb1bde52 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -5102,18 +5102,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5121,22 +5121,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5152,11 +5152,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5175,18 +5175,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5194,22 +5194,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5225,11 +5225,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5248,18 +5248,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5267,22 +5267,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5298,11 +5298,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5321,18 +5321,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5340,22 +5340,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5371,11 +5371,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5394,18 +5394,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5413,22 +5413,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5444,11 +5444,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5467,18 +5467,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5486,22 +5486,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5517,11 +5517,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5540,18 +5540,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5559,22 +5559,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5590,11 +5590,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5613,18 +5613,18 @@ cont {
     scale: 15
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16126
       min_distance: 25
     }
   }
@@ -5632,22 +5632,22 @@ cont {
     scale: 17
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5663,11 +5663,11 @@ cont {
     scale: 19
     area {
       color: 2038555
-      priority: -15952
+      priority: -15874
     }
     symbol {
       name: "parking-m"
-      priority: 16048
+      priority: 16126
     }
     caption {
       primary {
@@ -5686,7 +5686,7 @@ cont {
     scale: 16
     symbol {
       name: "parking-s"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5736,7 +5736,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5786,7 +5786,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -5836,7 +5836,7 @@ cont {
     scale: 16
     symbol {
       name: "zero-icon"
-      priority: 16048
+      priority: 16000
       min_distance: 25
     }
   }
@@ -37877,7 +37877,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
+      width: 1.5
       priority: 1475
       cap: BUTTCAP
     }
@@ -37899,7 +37899,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
+      width: 3.0
       priority: 1475
     }
     area {
@@ -37909,7 +37909,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 4.5
       priority: 1475
     }
     area {
@@ -37926,7 +37926,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.0
+      width: 6.0
       priority: 1475
     }
     area {
@@ -37943,7 +37943,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 8.0
       priority: 1475
     }
     area {
@@ -38010,7 +38010,8 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
+      width: 1.0
+      color: 1712264192
       priority: 1194
       cap: BUTTCAP
     }
@@ -38018,7 +38019,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 2.0
+      width: 1.5
+      color: 1712264192
       priority: 1194
       cap: BUTTCAP
     }
@@ -38027,27 +38029,31 @@ cont {
     scale: 16
     lines {
       width: 2.0
+      color: 1712264192
       priority: 1194
     }
   }
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 3.0
+      color: 1712264192
       priority: 1194
     }
   }
   element {
     scale: 18
     lines {
-      width: 2.0
+      width: 4.5
+      color: 1712264192
       priority: 1194
     }
   }
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 6.0
+      color: 1712264192
       priority: 1194
     }
   }
@@ -38241,7 +38247,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 2.0
+      width: 1.5
       priority: 1475
       cap: BUTTCAP
     }
@@ -38263,7 +38269,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
+      width: 3.0
       priority: 1475
     }
     area {
@@ -38273,7 +38279,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 4.5
       priority: 1475
     }
     area {
@@ -38290,7 +38296,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.0
+      width: 6.0
       priority: 1475
     }
     area {
@@ -38307,7 +38313,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.0
+      width: 8.0
       priority: 1475
     }
     area {
@@ -67615,13 +67621,30 @@ cont {
 cont {
   name: "waterway-dam"
   element {
-    scale: 15
+    scale: 14
     lines {
-      width: 1.0
-      color: 4473924
+      width: 1.5
+      color: 1295201075
       priority: 1970
       cap: BUTTCAP
     }
+    area {
+      color: 2149720610
+      priority: 1971
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 1295201075
+      priority: 1970
+      cap: BUTTCAP
+    }
+    area {
+      color: 2236962
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67633,10 +67656,26 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 4473924
+      width: 5.0
+      color: 3158064
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3.0
+      color: 1295201075
       priority: 1970
     }
+    area {
+      color: 2236962
+      border {
+        width: 1.0
+        color: 3158064
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67648,10 +67687,26 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 4473924
+      width: 6.5
+      color: 4671303
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4.5
+      color: 439563059
       priority: 1970
     }
+    area {
+      color: 3355443
+      border {
+        width: 1.0
+        color: 4671303
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67663,10 +67718,26 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 4473924
+      width: 8.0
+      color: 4671303
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 6.0
+      color: 3355443
       priority: 1970
     }
+    area {
+      color: 3355443
+      border {
+        width: 1.0
+        color: 4671303
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -67678,10 +67749,26 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 4473924
+      width: 10.0
+      color: 4671303
+      dashdot {
+      }
+      priority: 1969
+      cap: BUTTCAP
+    }
+    lines {
+      width: 8.0
+      color: 3355443
       priority: 1970
     }
+    area {
+      color: 3355443
+      border {
+        width: 1.0
+        color: 4671303
+      }
+      priority: 1971
+    }
     path_text {
       primary {
         height: 10
@@ -68911,11 +68998,20 @@ cont {
 }
 cont {
   name: "waterway-weir"
+  element {
+    scale: 14
+    lines {
+      width: 1.5
+      color: 1295201075
+      priority: 1970
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 15
     lines {
-      width: 1.0
-      color: 4473924
+      width: 2.0
+      color: 1295201075
       priority: 1475
       cap: BUTTCAP
     }
@@ -68930,8 +69026,8 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 4473924
+      width: 3.0
+      color: 1295201075
       priority: 1475
     }
     path_text {
@@ -68945,8 +69041,8 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 4473924
+      width: 4.5
+      color: 1295201075
       priority: 1475
     }
     path_text {
@@ -68960,8 +69056,8 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 4473924
+      width: 6.0
+      color: 1295201075
       priority: 1475
     }
     path_text {
@@ -68975,8 +69071,8 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 4473924
+      width: 8.0
+      color: 1295201075
       priority: 1475
     }
     path_text {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index c8c1f230bf..ac82fc9c60 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 6ec515b452..876397a2c5 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -4881,7 +4881,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -4900,7 +4900,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -4919,7 +4919,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5030,7 +5030,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5049,7 +5049,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5068,7 +5068,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5112,7 +5112,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5131,7 +5131,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5150,7 +5150,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5223,7 +5223,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5247,7 +5247,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5271,7 +5271,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5309,7 +5309,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5320,7 +5320,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -5331,7 +5331,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -20015,7 +20015,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -20026,7 +20026,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -20037,7 +20037,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 13947850
+      color: 1943327690
       border {
         width: 1.0
         color: 13947850
@@ -22335,235 +22335,200 @@ cont {
 }
 cont {
   name: "man_made-breakwater"
-  element {
-    scale: 12
-    area {
-      color: 14934482
-      priority: -15471
-    }
-  }
   element {
     scale: 13
     area {
-      color: 14934482
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 14
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 15
+    lines {
+      width: 2.0
+      color: 1306780114
+      priority: 1529
+      cap: BUTTCAP
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 16
+    lines {
+      width: 3.0
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 17
+    lines {
+      width: 4.5
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 18
+    lines {
+      width: 6.0
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 19
+    lines {
+      width: 8.0
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
 }
 cont {
   name: "man_made-cutline"
-  element {
-    scale: 14
-    area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15777
-    }
-  }
   element {
     scale: 15
-    area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15777
+    lines {
+      width: 1.5
+      color: 2579945899
+      priority: 1223
+      cap: BUTTCAP
     }
   }
   element {
     scale: 16
-    area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15777
+    lines {
+      width: 2.0
+      color: 2579945899
+      priority: 1223
     }
   }
   element {
     scale: 17
-    area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15777
+    lines {
+      width: 3.0
+      color: 2579945899
+      priority: 1223
     }
   }
   element {
     scale: 18
-    area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15777
+    lines {
+      width: 4.5
+      color: 2579945899
+      priority: 1223
     }
   }
   element {
     scale: 19
-    area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15777
+    lines {
+      width: 6.0
+      color: 2579945899
+      priority: 1223
     }
   }
 }
 cont {
   name: "man_made-pier"
-  element {
-    scale: 12
-    area {
-      color: 14934482
-      priority: -15471
-    }
-  }
   element {
     scale: 13
     area {
-      color: 14934482
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 14
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 15
+    lines {
+      width: 2.0
+      color: 1306780114
+      priority: 1529
+      cap: BUTTCAP
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 16
+    lines {
+      width: 3.0
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 17
+    lines {
+      width: 4.5
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 18
+    lines {
+      width: 6.0
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
   element {
     scale: 19
+    lines {
+      width: 8.0
+      color: 1306780114
+      priority: 1529
+    }
     area {
-      color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
+      color: 1306780114
       priority: -15471
     }
   }
@@ -42154,43 +42119,123 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.0
-      color: 8421504
+      width: 4.0
+      color: 13947850
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 2.0
+      color: 2160576191
       priority: 1929
       cap: BUTTCAP
     }
+    area {
+      color: 1523897290
+      border {
+        width: 1.0
+        color: 13947850
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 8421504
+      width: 5.0
+      color: 13947850
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3.0
+      color: 2160576191
       priority: 1929
     }
+    area {
+      color: 1943327690
+      border {
+        width: 1.0
+        color: 13947850
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 8421504
+      width: 6.5
+      color: 13947850
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4.5
+      color: 2160576191
       priority: 1929
     }
+    area {
+      color: 1943327690
+      border {
+        width: 1.0
+        color: 13947850
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 8421504
+      width: 8.0
+      color: 13947850
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 6.0
+      color: 2160576191
       priority: 1929
     }
+    area {
+      color: 1943327690
+      border {
+        width: 1.0
+        color: 13947850
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 8421504
+      width: 10.0
+      color: 13947850
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 8.0
+      color: 2160576191
       priority: 1929
     }
+    area {
+      color: 1943327690
+      border {
+        width: 1.0
+        color: 13947850
+      }
+      priority: 1930
+    }
   }
 }
 cont {
@@ -43000,8 +43045,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.0
-      color: 8421504
+      width: 2.0
+      color: 2160576191
       priority: 1929
       cap: BUTTCAP
     }
@@ -43009,32 +43054,32 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 8421504
+      width: 3.0
+      color: 2160576191
       priority: 1929
     }
   }
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 8421504
+      width: 4.5
+      color: 2160576191
       priority: 1929
     }
   }
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 8421504
+      width: 6.0
+      color: 2160576191
       priority: 1929
     }
   }
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 8421504
+      width: 8.0
+      color: 2160576191
       priority: 1929
     }
   }
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index dcc7b02395..1828c13c0e 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 d6be181389..12a4207cf3 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -4881,7 +4881,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -4900,7 +4900,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -4919,7 +4919,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5030,7 +5030,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5049,7 +5049,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5068,7 +5068,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5112,7 +5112,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5131,7 +5131,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5150,7 +5150,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5223,7 +5223,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5247,7 +5247,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5271,7 +5271,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5309,7 +5309,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5320,7 +5320,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -5331,7 +5331,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -20405,7 +20405,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -20416,7 +20416,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -20427,7 +20427,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1644825
+      color: 1931024665
       border {
         width: 1.0
         color: 1842204
@@ -22725,235 +22725,200 @@ cont {
 }
 cont {
   name: "man_made-breakwater"
-  element {
-    scale: 12
-    area {
-      color: 328965
-      priority: -15471
-    }
-  }
   element {
     scale: 13
     area {
-      color: 328965
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 14
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 15
+    lines {
+      width: 2.0
+      color: 1292174597
+      priority: 1529
+      cap: BUTTCAP
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 16
+    lines {
+      width: 3.0
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 17
+    lines {
+      width: 4.5
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 18
+    lines {
+      width: 6.0
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 19
+    lines {
+      width: 8.0
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
 }
 cont {
   name: "man_made-cutline"
-  element {
-    scale: 14
-    area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
-      priority: -15777
-    }
-  }
   element {
     scale: 15
-    area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
-      priority: -15777
+    lines {
+      width: 1.5
+      color: 2567507722
+      priority: 1223
+      cap: BUTTCAP
     }
   }
   element {
     scale: 16
-    area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
-      priority: -15777
+    lines {
+      width: 2.0
+      color: 2567507722
+      priority: 1223
     }
   }
   element {
     scale: 17
-    area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
-      priority: -15777
+    lines {
+      width: 3.0
+      color: 2567507722
+      priority: 1223
     }
   }
   element {
     scale: 18
-    area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
-      priority: -15777
+    lines {
+      width: 4.5
+      color: 2567507722
+      priority: 1223
     }
   }
   element {
     scale: 19
-    area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
-      priority: -15777
+    lines {
+      width: 6.0
+      color: 2567507722
+      priority: 1223
     }
   }
 }
 cont {
   name: "man_made-pier"
-  element {
-    scale: 12
-    area {
-      color: 328965
-      priority: -15471
-    }
-  }
   element {
     scale: 13
     area {
-      color: 328965
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 14
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 15
+    lines {
+      width: 2.0
+      color: 1292174597
+      priority: 1529
+      cap: BUTTCAP
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 16
+    lines {
+      width: 3.0
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 17
+    lines {
+      width: 4.5
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 18
+    lines {
+      width: 6.0
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
   element {
     scale: 19
+    lines {
+      width: 8.0
+      color: 1292174597
+      priority: 1529
+    }
     area {
-      color: 328965
-      border {
-        width: 2.0
-        color: 328965
-      }
+      color: 1292174597
       priority: -15471
     }
   }
@@ -42544,43 +42509,123 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.0
-      color: 855309
+      width: 4.0
+      color: 1842204
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 2.0
+      color: 2149128473
       priority: 1929
       cap: BUTTCAP
     }
+    area {
+      color: 1511594265
+      border {
+        width: 1.0
+        color: 1842204
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 855309
+      width: 5.0
+      color: 1842204
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3.0
+      color: 2149128473
       priority: 1929
     }
+    area {
+      color: 1931024665
+      border {
+        width: 1.0
+        color: 1842204
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 855309
+      width: 6.5
+      color: 1842204
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4.5
+      color: 2149128473
       priority: 1929
     }
+    area {
+      color: 1931024665
+      border {
+        width: 1.0
+        color: 1842204
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 855309
+      width: 8.0
+      color: 1842204
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 6.0
+      color: 2149128473
       priority: 1929
     }
+    area {
+      color: 1931024665
+      border {
+        width: 1.0
+        color: 1842204
+      }
+      priority: 1930
+    }
   }
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 855309
+      width: 10.0
+      color: 1842204
+      dashdot {
+      }
+      priority: 1928
+      cap: BUTTCAP
+    }
+    lines {
+      width: 8.0
+      color: 2149128473
       priority: 1929
     }
+    area {
+      color: 1931024665
+      border {
+        width: 1.0
+        color: 1842204
+      }
+      priority: 1930
+    }
   }
 }
 cont {
@@ -43390,8 +43435,8 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.0
-      color: 855309
+      width: 2.0
+      color: 2149128473
       priority: 1929
       cap: BUTTCAP
     }
@@ -43399,32 +43444,32 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.0
-      color: 855309
+      width: 3.0
+      color: 2149128473
       priority: 1929
     }
   }
   element {
     scale: 17
     lines {
-      width: 1.0
-      color: 855309
+      width: 4.5
+      color: 2149128473
       priority: 1929
     }
   }
   element {
     scale: 18
     lines {
-      width: 1.0
-      color: 855309
+      width: 6.0
+      color: 2149128473
       priority: 1929
     }
   }
   element {
     scale: 19
     lines {
-      width: 1.0
-      color: 855309
+      width: 8.0
+      color: 2149128473
       priority: 1929
     }
   }
diff --git a/data/visibility.txt b/data/visibility.txt
index 67b8dbb74b..411d9191a2 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -567,14 +567,14 @@ world  00000000000000000000  +
         water_park  00000000000000000000  -
         {}
     man_made  00000000000000000000  +
-        breakwater  00000000000011111111  -
+        breakwater  00000000000001111111  -
         cairn  00000000000000000000  -
         chimney  00000000000000000000  -
-        cutline  00000000000000111111  -
+        cutline  00000000000000011111  -
         flagpole  00000000000000000000  -
         lighthouse  00000000000000000000  -
         mast  00000000000000000000  -
-        pier  00000000000011111111  -
+        pier  00000000000001111111  -
         pipeline  00000000000000000000  +
             overground  00000000000000000000  -
             {}