From 771c3d9c93b7859eb917193d0f4e67d3ac1a5b17 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sat, 12 Jul 2025 13:56:41 +0700
Subject: [PATCH] [styles] Regenerate for wetlands types

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/classificator.txt                        |   8 +
 data/drules_proto.bin                         | Bin 441049 -> 443282 bytes
 data/drules_proto.txt                         | 756 ++++++++++++++++++
 data/drules_proto_default_dark.bin            | Bin 421197 -> 423255 bytes
 data/drules_proto_default_dark.txt            | 756 ++++++++++++++++++
 data/drules_proto_default_light.bin           | Bin 423726 -> 425959 bytes
 data/drules_proto_default_light.txt           | 756 ++++++++++++++++++
 data/drules_proto_outdoors_dark.bin           | Bin 441769 -> 443827 bytes
 data/drules_proto_outdoors_dark.txt           | 756 ++++++++++++++++++
 data/drules_proto_outdoors_light.bin          | Bin 444409 -> 446642 bytes
 data/drules_proto_outdoors_light.txt          | 756 ++++++++++++++++++
 data/drules_proto_vehicle_dark.bin            | Bin 281622 -> 283680 bytes
 data/drules_proto_vehicle_dark.txt            | 756 ++++++++++++++++++
 data/drules_proto_vehicle_light.bin           | Bin 281500 -> 283733 bytes
 data/drules_proto_vehicle_light.txt           | 756 ++++++++++++++++++
 .../include/priorities_1_BG-by-size.prio.txt  |  14 +-
 .../include/priorities_4_overlays.prio.txt    |  14 +-
 .../include/priorities_1_BG-by-size.prio.txt  |  14 +-
 .../include/priorities_4_overlays.prio.txt    |  14 +-
 .../include/priorities_1_BG-by-size.prio.txt  |  14 +-
 .../include/priorities_4_overlays.prio.txt    |  14 +-
 data/types.txt                                |  14 +-
 data/visibility.txt                           |   8 +
 23 files changed, 5357 insertions(+), 49 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index 5314be138..e28bc793e 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -790,7 +790,15 @@ world  +
             {}
         wetland  +
             bog  -
+            fen  -
+            mangrove  -
             marsh  -
+            reedbed  -
+            saltmarsh  +
+                tidal  -
+                {}
+            swamp  -
+            tidalflat  -
             {}
         {}
     noexit  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index cec8cadb8d300d8958da8f30287268f4296c8e4c..79c7b15d59d1dde47c0e559e6b91d968c09e390a 100644
GIT binary patch
delta 248
zcmcclRccbZbVCbc3)2>68K3EoyqHCp(^B)c@AqU@W|Y~(#3hlJSW;S)n4?>sT9T8P
zm!g}Sn3rCZUzQ3{vR%f9*@jVSHxrjQy27H=)Rd&u?fX2LRTw4qGI2?wD=1FPDcNq|
z!>qxme3*$#9-DM-Vo`C1Zb@cJVh+T<=|KBLSc}UOa|<8>ve--pYe>sUEP<$LkMLy%
PViq7~-5%k~)|d+b?9^46

delta 39
scmbQ#E`9T>R6`463)2>68K3P_{g`bS+XcgzftUq|S+@&@u{Gub02llWi2wiq

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 21c9ed0cd..b4e3f39c7 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -66880,6 +66880,222 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wetland-fen"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-mangrove"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
 cont {
   name: "natural-wetland-marsh"
   element {
@@ -66988,6 +67204,546 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wetland-reedbed"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-saltmarsh"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-saltmarsh-tidal"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-swamp"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-tidalflat"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
 cont {
   name: "office"
   element {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 5f686ab45c9f0bd67bb3742fe51483b7787822ef..149a2b34b460cd5aa93307503b8f23357c1a900b 100644
GIT binary patch
delta 242
zcmX?mOY-_F$%Yoj7N#xCCj8Td`ItqR(^B)c`|>k$G0H4v;*!WqEGaEY%+W1REy+pD
zOVQ0u%u6rIFH40e*>1wmtjs9Ah>1%aU13pbYD!XS3Phd65+*K5bQQ&kIVIaY_?h_`
zl~*xw$zzkwO)M(T&@IVKNz8#5G#zN62y1b9Vr~IMKo*<HU=3+Gi6!koj{q?X5VJ1#
I<!6fn0Li^fs{jB1

delta 39
scmccqO7iS2$%Yoj7N#xCCj8s01(}r@+Y=?2ftUq|S+^%juziaG03$#R9smFU

diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index 0d730e5ef..0e3aa019e 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -62567,6 +62567,222 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wetland-fen"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-mangrove"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+}
 cont {
   name: "natural-wetland-marsh"
   element {
@@ -62675,6 +62891,546 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wetland-reedbed"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-saltmarsh"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-saltmarsh-tidal"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-swamp"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-tidalflat"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+}
 cont {
   name: "office"
   element {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 9d79ce371731616d41b6f8c23a7f595c8857a4ac..f16c5e3209f728452561b62692eeb11beec6c577 100644
GIT binary patch
delta 243
zcmZ4YPV)JG$%Yoj7N#xCTScc=i!h5Yr={j?KPSqp%qX*miAy3cv81#pF-NyNwInAo
zFGV*uF)zI+zbqA^WcyZ8W*bK7-Ar8K=n9KcQ&W;sQy}Uj_A+rvqN^xQ%qiJ^Qj}SP
zQTZ?vmpnG<+{B{d4Be8<l*Al}LDPX2im(=!C*~GF1Z1(94AzjAlUULY^av2M05L02
IJzGK|0N5W@tpET3

delta 39
scmaF<Uvk|$$%Yoj7N#xCTSd3)Nif?mwy%<B24WT<X5GF@p3OD^06e!29RL6T

diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index 37483c290..9b431b731 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -62537,6 +62537,222 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wetland-fen"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-mangrove"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
 cont {
   name: "natural-wetland-marsh"
   element {
@@ -62645,6 +62861,546 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wetland-reedbed"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-saltmarsh"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-saltmarsh-tidal"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-swamp"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-tidalflat"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
 cont {
   name: "office"
   element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index beb2ecc2a876f347e2eb2282735e28b5c5107292..f79011f0627b46081d06966e3a5ed09f769a586e 100644
GIT binary patch
delta 301
zcmZ4aTWWK+bVCbc3)2?n#m>{4oR~$}(^B(<ggCgTZ**c7p1#3}`Ln`eCN7D*#FEmY
z#2nr7)RLUUycFHs#Ju#P{IXQI((OQ{VodUjn7G8z)fT0urX;1Nz?FhcRb0ZvC5f)G
zI5DRrH?gQV168g1Dkd&@oN9GTGE)+B;5tAKVQ1tlE>FxYfD7Wb60A8bC$R)oZTm47
RW*}w(V%F`)T-Y90000#AXKMfe

delta 39
scmdnoExq!$R6`463)2?n#m?JbxiTv=wqNjJ24WT<X5D_lhwX6%07-rjb^rhX

diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index e2ad8f5de..3c80bf48f 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -66912,6 +66912,222 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wetland-fen"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-mangrove"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+}
 cont {
   name: "natural-wetland-marsh"
   element {
@@ -67020,6 +67236,546 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wetland-reedbed"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-saltmarsh"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-saltmarsh-tidal"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-swamp"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-tidalflat"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 19033
+      }
+      priority: 1800
+    }
+  }
+}
 cont {
   name: "office"
   element {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 272c35ef60fe2b29ae187255c47dfa66ea91bd4c..cdd1a2cc6b06fdd5bc96fbf090b163e4ca5d50d7 100644
GIT binary patch
delta 243
zcmey_FTH7@bVCbc3)2>61Fz}dJeWn8(^B)c^LjEXGs^5?;*!WqEGaEY%+W1REy+pD
zOVQ0u%u6rIFG~d}iD#1D&BP^+uB0e6H6<xE1!9QoUM4O{bQQ&kIVHJ?Ma3BqHOhyX
yxa4uF(JjeLNz4JMG-qTjE>FxYz+*C4ZCXxZ2}DhMjyE$9vj8#c_8f1v-WmXFfl?m;

delta 39
scmdnAQ2J-TbVCbc3)2>61F!8XeVA<++f_rDftUq|S+}c(u=Ume03Ia`1poj5

diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 06156e711..ca9b1508b 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -66882,6 +66882,222 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wetland-fen"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-mangrove"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
 cont {
   name: "natural-wetland-marsh"
   element {
@@ -66990,6 +67206,546 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wetland-reedbed"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-saltmarsh"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-saltmarsh-tidal"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-swamp"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
+cont {
+  name: "natural-wetland-tidalflat"
+  element {
+    scale: 11
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 12837073
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 12837073
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2592674
+      }
+      priority: 1800
+    }
+  }
+}
 cont {
   name: "office"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 6c3e3e7dede05255672c44a249c2d1f473962216..71e23b4d29da908d28945fcd9e25a827bcefeb7c 100644
GIT binary patch
delta 297
zcmbO>LvX<g!G<l26K+k<zsV@Vo|c*?B*eizec}y9;pqo%F@9E9%)}*;msnC-l$fJi
zo?4QVn3tlPo0ykglwX#Ls&xB=Ta3z#@{5?b#L+brrKYANrKX^&S6srxC5f)GI5DRr
zH?gQV168g1Dkd&@oN9GTGE)+BP<2cPx<-VvxI8hp09693wO|9%auQ46YTJRn2V$n}
K2W~Nk6#@Vg!Eo0A

delta 31
lcmZ3mLU7s)!G<l26K-w4euq(+v3>7j5N6uG_c3#F0RZxe4@Cd~

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 2cb01f3e7..74ff2c22b 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -37428,6 +37428,222 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wetland-fen"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+}
+cont {
+  name: "natural-wetland-mangrove"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+}
 cont {
   name: "natural-wetland-marsh"
   element {
@@ -37536,6 +37752,546 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wetland-reedbed"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+}
+cont {
+  name: "natural-wetland-saltmarsh"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+}
+cont {
+  name: "natural-wetland-saltmarsh-tidal"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+}
+cont {
+  name: "natural-wetland-swamp"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+}
+cont {
+  name: "natural-wetland-tidalflat"
+  element {
+    scale: 11
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 6425
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 6425
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 19033
+      }
+      priority: 450
+    }
+  }
+}
 cont {
   name: "place-city"
   element {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index 26066f2325bffa2382eef11fffbd8fb051356106..aa783e7310f910440427c995df1ea3c529a73c6b 100644
GIT binary patch
delta 240
zcmbO;UGVA(!G<l2w%4aKUt<(uPD{<({@@CuGNa5MCN7D*#FEmY#2nr7)RLUUycFHs
z#Ju#P{IXPtlI^zF8EqJ)b~AB_qbn>*O-)Hk-G2WHqY9(MUM4O{bOptUIVIZzuQO^e
zDj#OzlE)^Un^;twp<9xfl9&UrZ#vLE5!T}J#M}aifGjqX!5Y$X5=$Uz+AD7`0x{F}
J${Wne#Q<RuTL%CD

delta 31
lcmcb*LU7J>!G<l2w%50ByUA$7*lzR?gqgM*J!Doc1_0r)4LSe-

diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt
index 6d40adc15..8cb937f67 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -36888,6 +36888,222 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wetland-fen"
+  element {
+    scale: 11
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+}
+cont {
+  name: "natural-wetland-mangrove"
+  element {
+    scale: 11
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+}
 cont {
   name: "natural-wetland-marsh"
   element {
@@ -36996,6 +37212,546 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-wetland-reedbed"
+  element {
+    scale: 11
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+}
+cont {
+  name: "natural-wetland-saltmarsh"
+  element {
+    scale: 11
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+}
+cont {
+  name: "natural-wetland-saltmarsh-tidal"
+  element {
+    scale: 11
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+}
+cont {
+  name: "natural-wetland-swamp"
+  element {
+    scale: 11
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+}
+cont {
+  name: "natural-wetland-tidalflat"
+  element {
+    scale: 11
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 12
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13229526
+      priority: -1910
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13229526
+      priority: -1910
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4495803
+      }
+      priority: 450
+    }
+  }
+}
 cont {
   name: "place-city"
   element {
diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
index 81d05016a..f08fb3c04 100644
--- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -118,14 +118,14 @@ amenity-parking-street_side-private                 # area z17- (also has icon z
 
 natural-wetland                                     # area z11- (also has caption z16-)
 natural-wetland-bog                                 # area z11- (also has caption z16-)
+natural-wetland-fen                                 # area z11- (also has caption z16-)
+natural-wetland-mangrove                            # area z11- (also has caption z16-)
 natural-wetland-marsh                               # area z11- (also has caption z16-)
-natural-wetland-saltmarsh
-natural-wetland-saltmarsh-tidal
-natural-wetland-fen
-natural-wetland-reedbed
-natural-wetland-swamp
-natural-wetland-mangrove
-natural-wetland-tidalflat
+natural-wetland-reedbed                             # area z11- (also has caption z16-)
+natural-wetland-saltmarsh                           # area z11- (also has caption z16-)
+natural-wetland-saltmarsh-tidal                     # area z11- (also has caption z16-)
+natural-wetland-swamp                               # area z11- (also has caption z16-)
+natural-wetland-tidalflat                           # area z11- (also has caption z16-)
 === 90
 
 landuse-farmyard                                    # area z10- (also has caption z15-)
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 98774755c..f25c8e19e 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -894,14 +894,14 @@ leisure-golf_course                                 # icon z15- (also has captio
 leisure-miniature_golf                              # icon z17- (also has caption(optional) z17-, area z14-)
 natural-wetland                                     # caption z16- (also has area z11-)
 natural-wetland-bog                                 # caption z16- (also has area z11-)
+natural-wetland-fen                                 # caption z16- (also has area z11-)
+natural-wetland-mangrove                            # caption z16- (also has area z11-)
 natural-wetland-marsh                               # caption z16- (also has area z11-)
-natural-wetland-saltmarsh
-natural-wetland-saltmarsh-tidal
-natural-wetland-fen
-natural-wetland-reedbed
-natural-wetland-swamp
-natural-wetland-mangrove
-natural-wetland-tidalflat
+natural-wetland-reedbed                             # caption z16- (also has area z11-)
+natural-wetland-saltmarsh                           # caption z16- (also has area z11-)
+natural-wetland-saltmarsh-tidal                     # caption z16- (also has area z11-)
+natural-wetland-swamp                               # caption z16- (also has area z11-)
+natural-wetland-tidalflat                           # caption z16- (also has area z11-)
 tourism-picnic_site                                 # icon z16- (also has caption(optional) z16-)
 === 1800
 
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index 7b3e8d4ff..eb36ded72 100644
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -118,14 +118,14 @@ amenity-parking-street_side-private                 # area z17- (also has icon z
 
 natural-wetland                                     # area z11- (also has caption z16-)
 natural-wetland-bog                                 # area z11- (also has caption z16-)
+natural-wetland-fen                                 # area z11- (also has caption z16-)
+natural-wetland-mangrove                            # area z11- (also has caption z16-)
 natural-wetland-marsh                               # area z11- (also has caption z16-)
-natural-wetland-saltmarsh
-natural-wetland-saltmarsh-tidal
-natural-wetland-fen
-natural-wetland-reedbed
-natural-wetland-swamp
-natural-wetland-mangrove
-natural-wetland-tidalflat
+natural-wetland-reedbed                             # area z11- (also has caption z16-)
+natural-wetland-saltmarsh                           # area z11- (also has caption z16-)
+natural-wetland-saltmarsh-tidal                     # area z11- (also has caption z16-)
+natural-wetland-swamp                               # area z11- (also has caption z16-)
+natural-wetland-tidalflat                           # area z11- (also has caption z16-)
 === 90
 
 landuse-farmyard                                    # area z10- (also has caption z15-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index da2b8a278..074733116 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -894,14 +894,14 @@ leisure-golf_course                                 # icon z15- (also has captio
 leisure-miniature_golf                              # icon z17- (also has caption(optional) z17-, area z14-)
 natural-wetland                                     # caption z16- (also has area z11-)
 natural-wetland-bog                                 # caption z16- (also has area z11-)
+natural-wetland-fen                                 # caption z16- (also has area z11-)
+natural-wetland-mangrove                            # caption z16- (also has area z11-)
 natural-wetland-marsh                               # caption z16- (also has area z11-)
-natural-wetland-saltmarsh
-natural-wetland-saltmarsh-tidal
-natural-wetland-fen
-natural-wetland-reedbed
-natural-wetland-swamp
-natural-wetland-mangrove
-natural-wetland-tidalflat
+natural-wetland-reedbed                             # caption z16- (also has area z11-)
+natural-wetland-saltmarsh                           # caption z16- (also has area z11-)
+natural-wetland-saltmarsh-tidal                     # caption z16- (also has area z11-)
+natural-wetland-swamp                               # caption z16- (also has area z11-)
+natural-wetland-tidalflat                           # caption z16- (also has area z11-)
 tourism-picnic_site                                 # icon z14- (also has caption(optional) z14-)
 === 1800
 
diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
index dbee7766e..549198ca7 100644
--- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
@@ -50,14 +50,14 @@ leisure-golf_course                                 # area z12-
 leisure-miniature_golf                              # area z12-
 natural-wetland                                     # area z11- (also has caption z16-)
 natural-wetland-bog                                 # area z11- (also has caption z16-)
+natural-wetland-fen                                 # area z11- (also has caption z16-)
+natural-wetland-mangrove                            # area z11- (also has caption z16-)
 natural-wetland-marsh                               # area z11- (also has caption z16-)
-natural-wetland-saltmarsh
-natural-wetland-saltmarsh-tidal
-natural-wetland-fen
-natural-wetland-reedbed
-natural-wetland-swamp
-natural-wetland-mangrove
-natural-wetland-tidalflat
+natural-wetland-reedbed                             # area z11- (also has caption z16-)
+natural-wetland-saltmarsh                           # area z11- (also has caption z16-)
+natural-wetland-saltmarsh-tidal                     # area z11- (also has caption z16-)
+natural-wetland-swamp                               # area z11- (also has caption z16-)
+natural-wetland-tidalflat                           # area z11- (also has caption z16-)
 === 90
 
 landuse-grass                                       # area z12-
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index d5cbc63d0..5943de823 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -693,14 +693,14 @@ emergency-emergency_ward_entrance                   # icon z18- (also has captio
 
 natural-wetland                                     # caption z16- (also has area z11-)
 natural-wetland-bog                                 # caption z16- (also has area z11-)
+natural-wetland-fen                                 # caption z16- (also has area z11-)
+natural-wetland-mangrove                            # caption z16- (also has area z11-)
 natural-wetland-marsh                               # caption z16- (also has area z11-)
-natural-wetland-saltmarsh
-natural-wetland-saltmarsh-tidal
-natural-wetland-fen
-natural-wetland-reedbed
-natural-wetland-swamp
-natural-wetland-mangrove
-natural-wetland-tidalflat
+natural-wetland-reedbed                             # caption z16- (also has area z11-)
+natural-wetland-saltmarsh                           # caption z16- (also has area z11-)
+natural-wetland-saltmarsh-tidal                     # caption z16- (also has area z11-)
+natural-wetland-swamp                               # caption z16- (also has area z11-)
+natural-wetland-tidalflat                           # caption z16- (also has area z11-)
 === 450
 
 railway-tram_stop                                   # icon z17- (also has caption(optional) z17-)
diff --git a/data/types.txt b/data/types.txt
index 3f51ad324..b513b6eab 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -655,13 +655,13 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
+*natural|wetland|saltmarsh
+*natural|wetland|saltmarsh|tidal
+*natural|wetland|fen
+*natural|wetland|reedbed
+*natural|wetland|swamp
+*natural|wetland|mangrove
+*natural|wetland|tidalflat
 mapswithme
 mapswithme
 mapswithme
diff --git a/data/visibility.txt b/data/visibility.txt
index c22e0f5ec..c931bfbbd 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -790,7 +790,15 @@ world  000000000000000000000  +
             {}
         wetland  000000000001111111111  +
             bog  000000000001111111111  -
+            fen  000000000001111111111  -
+            mangrove  000000000001111111111  -
             marsh  000000000001111111111  -
+            reedbed  000000000001111111111  -
+            saltmarsh  000000000001111111111  +
+                tidal  000000000001111111111  -
+                {}
+            swamp  000000000001111111111  -
+            tidalflat  000000000001111111111  -
             {}
         {}
     noexit  000000000000000000000  -