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 cec8cadb8..79c7b15d5 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 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 5f686ab45..149a2b34b 100644
Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ
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 9d79ce371..f16c5e320 100644
Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ
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 beb2ecc2a..f79011f06 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
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 272c35ef6..cdd1a2cc6 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
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 6c3e3e7de..71e23b4d2 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 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 26066f232..aa783e731 100644
Binary files a/data/drules_proto_vehicle_light.bin and b/data/drules_proto_vehicle_light.bin differ
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  -