diff --git a/biomes/hot/desert-dunes-red.json b/biomes/hot/desert-dunes-red.json
index 5e9ec8fb..9aad35e8 100644
--- a/biomes/hot/desert-dunes-red.json
+++ b/biomes/hot/desert-dunes-red.json
@@ -6,7 +6,7 @@
     "vanillaDerivative": "DESERT",
     "generators": [{
         "generator": "smooth-dunes",
-        "max": 43,
+        "max": 35,
         "min": 30
     }],
     "layers": [
@@ -76,6 +76,20 @@
                 "z": 0
             }
         },
+        {
+            "mode": "PAINT",
+            "place": ["structures/ruins-desert-1", "structures/ruins-desert-2"],
+            "chance": 0.005,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": -360,
+                    "max": 360
+                }
+            }
+        },
         {
             "chance": 0.0014,
             "mode": "PAINT",
diff --git a/biomes/hot/desert-dunes.json b/biomes/hot/desert-dunes.json
index 3cdc113f..ad2d0369 100644
--- a/biomes/hot/desert-dunes.json
+++ b/biomes/hot/desert-dunes.json
@@ -53,6 +53,20 @@
                 "clutter/desertpost3"
             ]
         },
+        {
+            "mode": "PAINT",
+            "place": ["structures/ruins-desert-1", "structures/ruins-desert-2"],
+            "chance": 0.005,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": -360,
+                    "max": 360
+                }
+            }
+        },
         {
             "chance": 0.0018,
             "mode": "PAINT",
diff --git a/biomes/ocean/deep.json b/biomes/ocean/deep.json
index 92d14e17..cc01606f 100644
--- a/biomes/ocean/deep.json
+++ b/biomes/ocean/deep.json
@@ -73,7 +73,6 @@
             "waterloggable": true,
             "chance": 0.008,
             "mode": "PAINT",
-            "bottom": true,
             "rotation": {
                 "enabled": true,
                 "yAxis": {
@@ -95,12 +94,22 @@
                 "structures/shipgenericc",
                 "structures/shipgenericr",
                 "structures/shipgenericu",
-                "structures/shipgenericc"
+                "structures/shipgenericc",
+                "structures/BShip1",
+                "structures/BShip2",
+                "structures/BShip3",
+                "structures/BShip4",
+                "structures/BShip5",
+                "structures/BShip6",
+                "structures/kship1",
+                "structures/kship2",
+                "structures/kship3",
+                "structures/kship4"
             ],
             "chance": 0.001,
             "markers": [{
                 "mark": [{"block": "minecraft:spruce_planks"}],
-                "maximumMarkers": 5,
+                "maximumMarkers": 4,
                 "marker": "skelepirate"
             }],
             "onwater": true,
diff --git a/biomes/ocean/warm-bottom.json b/biomes/ocean/warm-bottom.json
index 3f901a2e..62160b4e 100644
--- a/biomes/ocean/warm-bottom.json
+++ b/biomes/ocean/warm-bottom.json
@@ -168,46 +168,28 @@
                 }
             ]
         },
-        {
-            "place": ["landform/underwater/ellipsoid-1"],
-            "chance": 0.5,
-            "underwater": true,
-            "mode": "CENTER_HEIGHT",
-            "clamp": {
-                "minimumHeight": 30,
-                "maximumHeight": 255
-            },
-            "edit": [{
-                "find": [{"block": "minecraft:clay"}],
-                "replace": {
-                    "style": {
-                        "style": "GLOB",
-                        "zoom": 0.02
-                    },
-                    "palette": [
-                        {
-                            "weight": 2,
-                            "block": "minecraft:sand"
-                        },
-                        {
-                            "weight": 1,
-                            "block": "minecraft:cave_air"
-                        }
-                    ]
-                }
-            }]
-        },
         {
             "place": [
                 "structures/shipgenericw",
                 "structures/shipgenericc",
                 "structures/shipgenericr",
                 "structures/shipgenericu",
-                "structures/shipgenericc"
+                "structures/shipgenericc",
+                "structures/BShip1",
+                "structures/BShip2",
+                "structures/BShip3",
+                "structures/BShip4",
+                "structures/BShip5",
+                "structures/BShip6",
+                "structures/kship1",
+                "structures/kship2",
+                "structures/kship3",
+                "structures/kship4"
+
             ],
             "markers": [{
                 "mark": [{"block": "minecraft:spruce_planks"}],
-                "maximumMarkers": 5,
+                "maximumMarkers": 4,
                 "marker": "skelepirate"
             }],
             "chance": 0.005,
diff --git a/biomes/ocean/warm.json b/biomes/ocean/warm.json
index 14109bf2..68e32aea 100644
--- a/biomes/ocean/warm.json
+++ b/biomes/ocean/warm.json
@@ -169,11 +169,21 @@
                 "structures/shipgenericc",
                 "structures/shipgenericr",
                 "structures/shipgenericu",
-                "structures/shipgenericc"
+                "structures/shipgenericc",
+                "structures/BShip1",
+                "structures/BShip2",
+                "structures/BShip3",
+                "structures/BShip4",
+                "structures/BShip5",
+                "structures/BShip6",
+                "structures/kship1",
+                "structures/kship2",
+                "structures/kship3",
+                "structures/kship4"
             ],
             "markers": [{
                 "mark": [{"block": "minecraft:spruce_planks"}],
-                "maximumMarkers": 5,
+                "maximumMarkers": 4,
                 "marker": "skelepirate"
             }],
             "chance": 0.005,
diff --git a/biomes/swamp/sea/ocean-tree.json b/biomes/swamp/sea/ocean-tree.json
index 5c9d084e..30d2d08c 100644
--- a/biomes/swamp/sea/ocean-tree.json
+++ b/biomes/swamp/sea/ocean-tree.json
@@ -4,8 +4,8 @@
     "vanillaDerivative": "OCEAN",
     "color": "#183860",
     "generators": [{
-        "min": -1,
-        "max": 0,
+        "min": -2,
+        "max": -1,
         "generator": "river"
     }],
     "layers": [
diff --git a/biomes/swamp/sea/ocean.json b/biomes/swamp/sea/ocean.json
index 617e0842..1b3bfc53 100644
--- a/biomes/swamp/sea/ocean.json
+++ b/biomes/swamp/sea/ocean.json
@@ -4,8 +4,8 @@
     "vanillaDerivative": "OCEAN",
     "color": "#102540",
     "generators": [{
-        "min": -32,
-        "max": -10,
+        "min": -2,
+        "max": -1,
         "generator": "mountain"
     }],
     "layers": [
diff --git a/biomes/swamp/swamp-forest.json b/biomes/swamp/swamp-forest.json
new file mode 100644
index 00000000..1ca075de
--- /dev/null
+++ b/biomes/swamp/swamp-forest.json
@@ -0,0 +1,198 @@
+{
+    "name": "Swamp Forest",
+    "derivative": "SWAMP",
+    "vanillaDerivative": "SWAMP",
+    "rarity": 2,
+    "generators": [{
+        "generator": "plain",
+        "max": 4,
+        "min": 1
+    }],
+    "children": ["swamp/swamp-puddle"],
+    "childStyle": {
+        "style": "IRIS",
+        "exponent": 1.3
+    },
+    "childShrinkFactor": 8,
+    "customDerivitives": [{
+        "id": "k530forestswamp",
+        "foliageColor": "#4a532f",
+        "waterColor": "#49521d",
+        "waterFogColor": "#49521d",
+        "fogColor": "#325729",
+        "grassColor": "#4b5332",
+        "category": "forest"
+    }],
+    "decorators": [
+        {
+            "chance": 0.1,
+            "absoluteMaxStack": 2,
+            "heightVariance":{
+                "style": "SIMPLEX",
+                "zoom": 0.4
+            },
+            "style":{
+                "style": "IRIS",
+                "exponent": 1.4,
+                "zoom": 0.8
+            },
+            "palette": [{"block": "minecraft:dark_oak_leaves"}]
+        },
+        {
+            "chance": 0.25,
+            "palette": [{"block": "minecraft:grass"}]
+        },
+        {
+            "chance": 0.065,
+            "palette": [{"block": "minecraft:fern"}]
+        },
+        {
+            "chance": 0.005,
+            "palette": [{"block": "minecraft:blue_orchid"}]
+        },
+        {
+            "chance": 0.005,
+            "palette": [{"block": "minecraft:brown_mushroom"},{"block": "minecraft:red_mushroom"}]
+        },
+        {
+            "chance": 0.065,
+            "palette": [{"block": "minecraft:large_fern"}]
+        }
+    ],
+    "layers": [
+        {
+            "style": {
+                "style": "SIMPLEX",
+                "exponent": 0.75,
+                "fracture": {
+                    "style": "STATIC",
+                    "multiplier": 15
+                }
+            },
+            "zoom": 0.8,
+            "palette": [
+                {
+                    "block": "minecraft:grass_block",
+                    "weight": 8
+                },
+                {
+                    "block": "minecraft:brown_concrete_powder",
+                    "weight": 1
+                },
+                {
+                    "block": "minecraft:dirt",
+                    "weight": 1
+                },
+                {
+                    "block": "minecraft:coarse_dirt",
+                    "weight": 1
+                }
+            ]
+        },
+        {
+            "maxHeight": 3,
+            "minHeight": 3,
+            "palette": [
+                {
+                    "block": "minecraft:dirt",
+                    "weight": 7
+                },
+                {
+                    "block": "minecraft:coarse_dirt",
+                    "weight": 1
+                }
+            ]
+        },
+        {
+            "maxHeight": 3,
+            "minHeight": 3,
+            "palette": [
+                {
+                    "block": "minecraft:dirt",
+                    "weight": 7
+                },
+                {
+                    "block": "minecraft:coarse_dirt",
+                    "weight": 7
+                },
+                {
+                    "block": "minecraft:stone",
+                    "weight": 8
+                },
+                {
+                    "block": "minecraft:coal_ore",
+                    "weight": 1
+                }
+            ]
+        }
+    ],
+    "objects": [
+        {
+            "mode": "STILT",
+        "place": [
+            "trees/mixed/dotree1",
+            "trees/mixed/dotree2",
+            "trees/mixed/dotree3",
+            "trees/mixed/dotree4",
+            "trees/mixed/dotree5",
+            "trees/mixed/dotree6",
+            "trees/mixed/dotree7",
+            "trees/mixed/dotree8",
+            "trees/mixed/dotree9",
+            "trees/mixed/dotree10"
+        ],
+        "chance": 0.65,
+        "rotation": {
+            "enabled": true,
+            "yAxis": {
+                "enabled": true,
+                "interval": 90,
+                "min": -360,
+                "max": 360
+            }
+        },
+        "translate": {"y": -1}
+    },
+        {
+            "place": [
+                "trees/acacia/17",
+                "trees/acacia/18"
+            ],
+            "translate":{
+                "y": -4
+            },
+            "chance": 0.3,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": -360,
+                    "max": 360
+                }
+            }
+        },
+        {
+            "mode": "PAINT",
+            "place": [
+                "clutter/stump1",
+                "clutter/stump2",
+                "clutter/stump3",
+                "clutter/stump4",
+                "clutter/stump5",
+                "clutter/stump6",
+                "clutter/stump7"
+            ],
+            "chance": 0.2,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": -360,
+                    "max": 360
+                }
+            }
+        }
+    ]
+}
diff --git a/biomes/swamp/swamp-mangrove-lake.json b/biomes/swamp/swamp-mangrove-lake.json
new file mode 100644
index 00000000..fe4ac5c0
--- /dev/null
+++ b/biomes/swamp/swamp-mangrove-lake.json
@@ -0,0 +1,118 @@
+{
+    "name": "Swamp Mangrove Forest",
+    "derivative": "SWAMP",
+    "vanillaDerivative": "SWAMP",
+    "rarity": 2,
+    "generators": [{
+        "generator": "mountain",
+        "max": -1,
+        "min": -3
+    }],
+    "customDerivitives": [{
+        "id": "k530mangroveswamp",
+        "foliageColor": "#4a532f",
+        "waterColor": "#49521d",
+        "waterFogColor": "#49521d",
+        "fogColor": "#325729",
+        "grassColor": "#4b5332",
+        "category": "forest"
+    }],
+    "layers": [
+        {
+            "minHeight": 2,
+            "maxHeight": 3,
+            "style": {
+                "style": "SIMPLEX",
+                "fracture": {
+                    "style": "STATIC",
+                    "multiplier": 15
+                }
+            },
+            "zoom": 0.8,
+            "palette": [
+                {"block": "minecraft:dirt"},
+                {"block": "minecraft:coarse_dirt"}
+            ]
+        },
+        {
+            "maxHeight": 3,
+            "minHeight": 3,
+            "palette": [
+                {
+                    "block": "minecraft:dirt",
+                    "weight": 7
+                },
+                {
+                    "block": "minecraft:coarse_dirt",
+                    "weight": 1
+                }
+            ]
+        },
+        {
+            "maxHeight": 3,
+            "minHeight": 3,
+            "palette": [
+                {
+                    "block": "minecraft:dirt",
+                    "weight": 7
+                },
+                {
+                    "block": "minecraft:coarse_dirt",
+                    "weight": 7
+                },
+                {
+                    "block": "minecraft:stone",
+                    "weight": 8
+                },
+                {
+                    "block": "minecraft:coal_ore",
+                    "weight": 1
+                }
+            ]
+        }
+    ],
+    "objects": [
+        {
+            "mode": "PAINT",
+            "onwater": true,
+            "chance": 1,
+            "density": 4,
+            "place": [
+                "trees/mangrove/mangrove1",
+                "trees/mangrove/mangrove2",
+                "trees/mangrove/mangrove3",
+                "trees/mangrove/mangrove4",
+                "trees/mangrove/mangrove5",
+                "trees/mangrove/mangrove6",
+                "trees/mangrove/mangrove7",
+                "trees/mangrove/mangrove8",
+                "trees/mangrove/mangrove9",
+                "trees/mangrove/mangrove10",
+                "trees/mangrove/mangrove11",
+                "trees/mangrove/mangrove12",
+                "trees/mangrove/mangrove13",
+                "trees/mangrove/mangrove14",
+                "trees/mangrove/mangrove15",
+                "trees/mangrove/mangrove16",
+                "trees/mangrove/mangrove17",
+                "trees/mangrove/mangrove18",
+                "trees/mangrove/mangrove19",
+                "trees/mangrove/mangrove20"
+            ],
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": -360,
+                    "max": 360
+                }
+            },
+            "translate": {"y": -7},
+            "edit": [{
+                "find": [{"block": "minecraft:oak_fence"}],
+                "replace": {"palette": [{"block": "minecraft:air"}]}
+            }]
+        }
+    ]
+}
diff --git a/biomes/swamp/swamp-puddle.json b/biomes/swamp/swamp-puddle.json
new file mode 100644
index 00000000..4e6d1edc
--- /dev/null
+++ b/biomes/swamp/swamp-puddle.json
@@ -0,0 +1,139 @@
+{
+    "name": "Swamp Puddle",
+    "derivative": "SWAMP",
+    "vanillaDerivative": "SWAMP",
+    "rarity": 2,
+    "generators": [{
+        "generator": "plain",
+        "max": -7,
+        "min": -6
+    }],
+    "customDerivitives": [{
+        "id": "k530puddle",
+        "foliageColor": "#4a532f",
+        "waterColor": "#49521d",
+        "waterFogColor": "#49521d",
+        "fogColor": "#325729",
+        "grassColor": "#4b5332",
+        "category": "forest"
+    }],
+    "decorators": [
+        {
+            "chance": 0.25,
+            "palette": [{"block": "minecraft:grass"}]
+        },
+        {
+            "chance": 0.065,
+            "palette": [{"block": "minecraft:fern"}]
+        },
+        {
+            "chance": 0.005,
+            "palette": [{"block": "minecraft:blue_orchid"}]
+        },
+        {
+            "chance": 0.065,
+            "palette": [{"block": "minecraft:large_fern"}]
+        }
+    ],
+    "layers": [
+        {
+            "style": {
+                "style": "SIMPLEX",
+                "exponent": 0.75,
+                "fracture": {
+                    "style": "STATIC",
+                    "multiplier": 15
+                }
+            },
+            "zoom": 0.8,
+            "palette": [
+                {
+                    "block": "minecraft:grass_block",
+                    "weight": 8
+                },
+                {
+                    "block": "minecraft:brown_concrete_powder",
+                    "weight": 1
+                },
+                {
+                    "block": "minecraft:dirt",
+                    "weight": 1
+                },
+                {
+                    "block": "minecraft:coarse_dirt",
+                    "weight": 1
+                }
+            ]
+        },
+        {
+            "maxHeight": 3,
+            "minHeight": 3,
+            "palette": [
+                {
+                    "block": "minecraft:dirt",
+                    "weight": 7
+                },
+                {
+                    "block": "minecraft:coarse_dirt",
+                    "weight": 1
+                }
+            ]
+        },
+        {
+            "maxHeight": 3,
+            "minHeight": 3,
+            "palette": [
+                {
+                    "block": "minecraft:dirt",
+                    "weight": 7
+                },
+                {
+                    "block": "minecraft:coarse_dirt",
+                    "weight": 7
+                },
+                {
+                    "block": "minecraft:stone",
+                    "weight": 8
+                },
+                {
+                    "block": "minecraft:coal_ore",
+                    "weight": 1
+                }
+            ]
+        }
+    ],
+    "objects": [
+        {
+            "mode": "PAINT",
+            "place": [
+                "trees/willow/t1",
+                "trees/willow/t2",
+                "trees/willow/t3",
+                "trees/willow/t4",
+                "trees/willow/t5",
+                "trees/willow/t6",
+                "trees/willow/t7",
+                "trees/willow/t8",
+                "trees/mangrove/t1",
+                "trees/mangrove/t2",
+                "trees/mangrove/t3",
+                "trees/mangrove/t4"
+            ],
+            "chance": 0.5,
+            "rotation": {
+                "enabled": true,
+                "yAxis": {
+                    "enabled": true,
+                    "interval": 90,
+                    "min": -360,
+                    "max": 360
+                }
+            },
+            "translate": {
+                "x": 0,
+                "y": -3,
+                "z": 0
+            }
+        }
+    ]
+}
diff --git a/biomes/tropical/sea/river-soft.json b/biomes/tropical/sea/river-soft.json
index 9b362867..229f86ec 100644
--- a/biomes/tropical/sea/river-soft.json
+++ b/biomes/tropical/sea/river-soft.json
@@ -177,11 +177,21 @@
                 "structures/shipgenericc",
                 "structures/shipgenericr",
                 "structures/shipgenericu",
-                "structures/shipgenericc"
+                "structures/shipgenericc",
+                "structures/BShip1",
+                "structures/BShip2",
+                "structures/BShip3",
+                "structures/BShip4",
+                "structures/BShip5",
+                "structures/BShip6",
+                "structures/kship1",
+                "structures/kship2",
+                "structures/kship3",
+                "structures/kship4"
             ],
             "markers": [{
                 "mark": [{"block": "minecraft:spruce_planks"}],
-                "maximumMarkers": 5,
+                "maximumMarkers": 4,
                 "marker": "skelepirate"
             }],
             "chance": 0.003,
diff --git a/biomes/tropical/sea/river-steep.json b/biomes/tropical/sea/river-steep.json
index 52469e40..d80b1cb1 100644
--- a/biomes/tropical/sea/river-steep.json
+++ b/biomes/tropical/sea/river-steep.json
@@ -137,11 +137,21 @@
                 "structures/shipgenericc",
                 "structures/shipgenericr",
                 "structures/shipgenericu",
-                "structures/shipgenericc"
+                "structures/shipgenericc",
+                "structures/BShip1",
+                "structures/BShip2",
+                "structures/BShip3",
+                "structures/BShip4",
+                "structures/BShip5",
+                "structures/BShip6",
+                "structures/kship1",
+                "structures/kship2",
+                "structures/kship3",
+                "structures/kship4"
             ],
             "markers": [{
                 "mark": [{"block": "minecraft:spruce_planks"}],
-                "maximumMarkers": 5,
+                "maximumMarkers": 4,
                 "marker": "skelepirate"
             }],
             "chance": 0.005,
diff --git a/objects/structures/BShip1.iob b/objects/structures/BShip1.iob
new file mode 100644
index 00000000..c7e7817a
Binary files /dev/null and b/objects/structures/BShip1.iob differ
diff --git a/objects/structures/BShip2.iob b/objects/structures/BShip2.iob
new file mode 100644
index 00000000..7b9d6548
Binary files /dev/null and b/objects/structures/BShip2.iob differ
diff --git a/objects/structures/BShip3.iob b/objects/structures/BShip3.iob
new file mode 100644
index 00000000..79b71455
Binary files /dev/null and b/objects/structures/BShip3.iob differ
diff --git a/objects/structures/BShip4.iob b/objects/structures/BShip4.iob
new file mode 100644
index 00000000..628ad327
Binary files /dev/null and b/objects/structures/BShip4.iob differ
diff --git a/objects/structures/BShip5.iob b/objects/structures/BShip5.iob
new file mode 100644
index 00000000..b23be946
Binary files /dev/null and b/objects/structures/BShip5.iob differ
diff --git a/objects/structures/BShip6.iob b/objects/structures/BShip6.iob
new file mode 100644
index 00000000..648db0f3
Binary files /dev/null and b/objects/structures/BShip6.iob differ
diff --git a/objects/structures/kship1.iob b/objects/structures/kship1.iob
new file mode 100644
index 00000000..9fee161a
Binary files /dev/null and b/objects/structures/kship1.iob differ
diff --git a/objects/structures/kship2.iob b/objects/structures/kship2.iob
new file mode 100644
index 00000000..07e7a824
Binary files /dev/null and b/objects/structures/kship2.iob differ
diff --git a/objects/structures/kship3.iob b/objects/structures/kship3.iob
new file mode 100644
index 00000000..1bbf32d9
Binary files /dev/null and b/objects/structures/kship3.iob differ
diff --git a/objects/structures/kship4.iob b/objects/structures/kship4.iob
new file mode 100644
index 00000000..e8434dd1
Binary files /dev/null and b/objects/structures/kship4.iob differ
diff --git a/objects/structures/ruins-desert-1.iob b/objects/structures/ruins-desert-1.iob
new file mode 100644
index 00000000..7486adbb
Binary files /dev/null and b/objects/structures/ruins-desert-1.iob differ
diff --git a/objects/structures/ruins-desert-2.iob b/objects/structures/ruins-desert-2.iob
new file mode 100644
index 00000000..29f6cc24
Binary files /dev/null and b/objects/structures/ruins-desert-2.iob differ
diff --git a/objects/trees/acacia/17.iob b/objects/trees/acacia/17.iob
new file mode 100644
index 00000000..3449aa03
Binary files /dev/null and b/objects/trees/acacia/17.iob differ
diff --git a/objects/trees/acacia/18.iob b/objects/trees/acacia/18.iob
new file mode 100644
index 00000000..6b2ce4d8
Binary files /dev/null and b/objects/trees/acacia/18.iob differ
diff --git a/objects/trees/mangrove/mangrove1.iob b/objects/trees/mangrove/mangrove1.iob
new file mode 100644
index 00000000..00744dbc
Binary files /dev/null and b/objects/trees/mangrove/mangrove1.iob differ
diff --git a/objects/trees/mangrove/mangrove10.iob b/objects/trees/mangrove/mangrove10.iob
new file mode 100644
index 00000000..912c1e13
Binary files /dev/null and b/objects/trees/mangrove/mangrove10.iob differ
diff --git a/objects/trees/mangrove/mangrove11.iob b/objects/trees/mangrove/mangrove11.iob
new file mode 100644
index 00000000..0df4f59f
Binary files /dev/null and b/objects/trees/mangrove/mangrove11.iob differ
diff --git a/objects/trees/mangrove/mangrove12.iob b/objects/trees/mangrove/mangrove12.iob
new file mode 100644
index 00000000..d3db28f6
Binary files /dev/null and b/objects/trees/mangrove/mangrove12.iob differ
diff --git a/objects/trees/mangrove/mangrove13.iob b/objects/trees/mangrove/mangrove13.iob
new file mode 100644
index 00000000..d3db28f6
Binary files /dev/null and b/objects/trees/mangrove/mangrove13.iob differ
diff --git a/objects/trees/mangrove/mangrove14.iob b/objects/trees/mangrove/mangrove14.iob
new file mode 100644
index 00000000..e76a8b92
Binary files /dev/null and b/objects/trees/mangrove/mangrove14.iob differ
diff --git a/objects/trees/mangrove/mangrove15.iob b/objects/trees/mangrove/mangrove15.iob
new file mode 100644
index 00000000..d3a085a9
Binary files /dev/null and b/objects/trees/mangrove/mangrove15.iob differ
diff --git a/objects/trees/mangrove/mangrove16.iob b/objects/trees/mangrove/mangrove16.iob
new file mode 100644
index 00000000..282a43c4
Binary files /dev/null and b/objects/trees/mangrove/mangrove16.iob differ
diff --git a/objects/trees/mangrove/mangrove17.iob b/objects/trees/mangrove/mangrove17.iob
new file mode 100644
index 00000000..56b957d7
Binary files /dev/null and b/objects/trees/mangrove/mangrove17.iob differ
diff --git a/objects/trees/mangrove/mangrove18.iob b/objects/trees/mangrove/mangrove18.iob
new file mode 100644
index 00000000..eb95eda5
Binary files /dev/null and b/objects/trees/mangrove/mangrove18.iob differ
diff --git a/objects/trees/mangrove/mangrove19.iob b/objects/trees/mangrove/mangrove19.iob
new file mode 100644
index 00000000..954412ea
Binary files /dev/null and b/objects/trees/mangrove/mangrove19.iob differ
diff --git a/objects/trees/mangrove/mangrove2.iob b/objects/trees/mangrove/mangrove2.iob
new file mode 100644
index 00000000..64dcabeb
Binary files /dev/null and b/objects/trees/mangrove/mangrove2.iob differ
diff --git a/objects/trees/mangrove/mangrove20.iob b/objects/trees/mangrove/mangrove20.iob
new file mode 100644
index 00000000..4054e107
Binary files /dev/null and b/objects/trees/mangrove/mangrove20.iob differ
diff --git a/objects/trees/mangrove/mangrove3.iob b/objects/trees/mangrove/mangrove3.iob
new file mode 100644
index 00000000..aaa2b1db
Binary files /dev/null and b/objects/trees/mangrove/mangrove3.iob differ
diff --git a/objects/trees/mangrove/mangrove4.iob b/objects/trees/mangrove/mangrove4.iob
new file mode 100644
index 00000000..ff9381c3
Binary files /dev/null and b/objects/trees/mangrove/mangrove4.iob differ
diff --git a/objects/trees/mangrove/mangrove5.iob b/objects/trees/mangrove/mangrove5.iob
new file mode 100644
index 00000000..f344737c
Binary files /dev/null and b/objects/trees/mangrove/mangrove5.iob differ
diff --git a/objects/trees/mangrove/mangrove6.iob b/objects/trees/mangrove/mangrove6.iob
new file mode 100644
index 00000000..efec4c02
Binary files /dev/null and b/objects/trees/mangrove/mangrove6.iob differ
diff --git a/objects/trees/mangrove/mangrove7.iob b/objects/trees/mangrove/mangrove7.iob
new file mode 100644
index 00000000..294b072d
Binary files /dev/null and b/objects/trees/mangrove/mangrove7.iob differ
diff --git a/objects/trees/mangrove/mangrove8.iob b/objects/trees/mangrove/mangrove8.iob
new file mode 100644
index 00000000..8d6ca1f6
Binary files /dev/null and b/objects/trees/mangrove/mangrove8.iob differ
diff --git a/objects/trees/mangrove/mangrove9.iob b/objects/trees/mangrove/mangrove9.iob
new file mode 100644
index 00000000..95968138
Binary files /dev/null and b/objects/trees/mangrove/mangrove9.iob differ
diff --git a/objects/trees/mangrove/t1.iob b/objects/trees/mangrove/t1.iob
new file mode 100644
index 00000000..938a323a
Binary files /dev/null and b/objects/trees/mangrove/t1.iob differ
diff --git a/objects/trees/mangrove/t2.iob b/objects/trees/mangrove/t2.iob
new file mode 100644
index 00000000..fec4fdd4
Binary files /dev/null and b/objects/trees/mangrove/t2.iob differ
diff --git a/objects/trees/mangrove/t3.iob b/objects/trees/mangrove/t3.iob
new file mode 100644
index 00000000..03d4b5cf
Binary files /dev/null and b/objects/trees/mangrove/t3.iob differ
diff --git a/objects/trees/mangrove/t4.iob b/objects/trees/mangrove/t4.iob
new file mode 100644
index 00000000..c9c5592d
Binary files /dev/null and b/objects/trees/mangrove/t4.iob differ
diff --git a/objects/trees/mangrove/t5.iob b/objects/trees/mangrove/t5.iob
new file mode 100644
index 00000000..b258a18c
Binary files /dev/null and b/objects/trees/mangrove/t5.iob differ
diff --git a/objects/trees/mangrove/tree1.iob b/objects/trees/mangrove/tree1.iob
new file mode 100644
index 00000000..80f58fdc
Binary files /dev/null and b/objects/trees/mangrove/tree1.iob differ
diff --git a/objects/trees/mangrove/tree10.iob b/objects/trees/mangrove/tree10.iob
new file mode 100644
index 00000000..000f5418
Binary files /dev/null and b/objects/trees/mangrove/tree10.iob differ
diff --git a/objects/trees/mangrove/tree11.iob b/objects/trees/mangrove/tree11.iob
new file mode 100644
index 00000000..4ce65b4e
Binary files /dev/null and b/objects/trees/mangrove/tree11.iob differ
diff --git a/objects/trees/mangrove/tree12.iob b/objects/trees/mangrove/tree12.iob
new file mode 100644
index 00000000..44e6b607
Binary files /dev/null and b/objects/trees/mangrove/tree12.iob differ
diff --git a/objects/trees/mangrove/tree13.iob b/objects/trees/mangrove/tree13.iob
new file mode 100644
index 00000000..853e0778
Binary files /dev/null and b/objects/trees/mangrove/tree13.iob differ
diff --git a/objects/trees/mangrove/tree14.iob b/objects/trees/mangrove/tree14.iob
new file mode 100644
index 00000000..e4aeb924
Binary files /dev/null and b/objects/trees/mangrove/tree14.iob differ
diff --git a/objects/trees/mangrove/tree15.iob b/objects/trees/mangrove/tree15.iob
new file mode 100644
index 00000000..e7b8a2ef
Binary files /dev/null and b/objects/trees/mangrove/tree15.iob differ
diff --git a/objects/trees/mangrove/tree16.iob b/objects/trees/mangrove/tree16.iob
new file mode 100644
index 00000000..dd301fe8
Binary files /dev/null and b/objects/trees/mangrove/tree16.iob differ
diff --git a/objects/trees/mangrove/tree17.iob b/objects/trees/mangrove/tree17.iob
new file mode 100644
index 00000000..91e50562
Binary files /dev/null and b/objects/trees/mangrove/tree17.iob differ
diff --git a/objects/trees/mangrove/tree18.iob b/objects/trees/mangrove/tree18.iob
new file mode 100644
index 00000000..efbc8146
Binary files /dev/null and b/objects/trees/mangrove/tree18.iob differ
diff --git a/objects/trees/mangrove/tree19.iob b/objects/trees/mangrove/tree19.iob
new file mode 100644
index 00000000..cba46db8
Binary files /dev/null and b/objects/trees/mangrove/tree19.iob differ
diff --git a/objects/trees/mangrove/tree2.iob b/objects/trees/mangrove/tree2.iob
new file mode 100644
index 00000000..f6a866c9
Binary files /dev/null and b/objects/trees/mangrove/tree2.iob differ
diff --git a/objects/trees/mangrove/tree20.iob b/objects/trees/mangrove/tree20.iob
new file mode 100644
index 00000000..fca46357
Binary files /dev/null and b/objects/trees/mangrove/tree20.iob differ
diff --git a/objects/trees/mangrove/tree21.iob b/objects/trees/mangrove/tree21.iob
new file mode 100644
index 00000000..684fd9d7
Binary files /dev/null and b/objects/trees/mangrove/tree21.iob differ
diff --git a/objects/trees/mangrove/tree3.iob b/objects/trees/mangrove/tree3.iob
new file mode 100644
index 00000000..c46ba601
Binary files /dev/null and b/objects/trees/mangrove/tree3.iob differ
diff --git a/objects/trees/mangrove/tree4.iob b/objects/trees/mangrove/tree4.iob
new file mode 100644
index 00000000..dfc2a277
Binary files /dev/null and b/objects/trees/mangrove/tree4.iob differ
diff --git a/objects/trees/mangrove/tree5.iob b/objects/trees/mangrove/tree5.iob
new file mode 100644
index 00000000..67495a0d
Binary files /dev/null and b/objects/trees/mangrove/tree5.iob differ
diff --git a/objects/trees/mangrove/tree6.iob b/objects/trees/mangrove/tree6.iob
new file mode 100644
index 00000000..d2e33dd3
Binary files /dev/null and b/objects/trees/mangrove/tree6.iob differ
diff --git a/objects/trees/mangrove/tree7.iob b/objects/trees/mangrove/tree7.iob
new file mode 100644
index 00000000..0461d4f4
Binary files /dev/null and b/objects/trees/mangrove/tree7.iob differ
diff --git a/objects/trees/mangrove/tree8.iob b/objects/trees/mangrove/tree8.iob
new file mode 100644
index 00000000..cfba2553
Binary files /dev/null and b/objects/trees/mangrove/tree8.iob differ
diff --git a/objects/trees/mangrove/tree9.iob b/objects/trees/mangrove/tree9.iob
new file mode 100644
index 00000000..3e9a33f7
Binary files /dev/null and b/objects/trees/mangrove/tree9.iob differ
diff --git a/objects/trees/willow/bt1.iob b/objects/trees/willow/bt1.iob
new file mode 100644
index 00000000..ba6d5f18
Binary files /dev/null and b/objects/trees/willow/bt1.iob differ
diff --git a/objects/trees/willow/bt2.iob b/objects/trees/willow/bt2.iob
new file mode 100644
index 00000000..2f2fa9f0
Binary files /dev/null and b/objects/trees/willow/bt2.iob differ
diff --git a/objects/trees/willow/bt3.iob b/objects/trees/willow/bt3.iob
new file mode 100644
index 00000000..bdf375cb
Binary files /dev/null and b/objects/trees/willow/bt3.iob differ
diff --git a/objects/trees/willow/bt4.iob b/objects/trees/willow/bt4.iob
new file mode 100644
index 00000000..7700335b
Binary files /dev/null and b/objects/trees/willow/bt4.iob differ
diff --git a/objects/trees/willow/bt5.iob b/objects/trees/willow/bt5.iob
new file mode 100644
index 00000000..67ed1219
Binary files /dev/null and b/objects/trees/willow/bt5.iob differ
diff --git a/objects/trees/willow/bt6.iob b/objects/trees/willow/bt6.iob
new file mode 100644
index 00000000..1fbac21b
Binary files /dev/null and b/objects/trees/willow/bt6.iob differ
diff --git a/objects/trees/willow/bt7.iob b/objects/trees/willow/bt7.iob
new file mode 100644
index 00000000..57f29a9f
Binary files /dev/null and b/objects/trees/willow/bt7.iob differ
diff --git a/objects/trees/willow/bt8.iob b/objects/trees/willow/bt8.iob
new file mode 100644
index 00000000..37c39c97
Binary files /dev/null and b/objects/trees/willow/bt8.iob differ
diff --git a/objects/trees/willow/bt9.iob b/objects/trees/willow/bt9.iob
new file mode 100644
index 00000000..4e254375
Binary files /dev/null and b/objects/trees/willow/bt9.iob differ
diff --git a/objects/trees/willow/t1.iob b/objects/trees/willow/t1.iob
new file mode 100644
index 00000000..f1d07355
Binary files /dev/null and b/objects/trees/willow/t1.iob differ
diff --git a/objects/trees/willow/t2.iob b/objects/trees/willow/t2.iob
new file mode 100644
index 00000000..343d4ab9
Binary files /dev/null and b/objects/trees/willow/t2.iob differ
diff --git a/objects/trees/willow/t3.iob b/objects/trees/willow/t3.iob
new file mode 100644
index 00000000..770bb716
Binary files /dev/null and b/objects/trees/willow/t3.iob differ
diff --git a/objects/trees/willow/t4.iob b/objects/trees/willow/t4.iob
new file mode 100644
index 00000000..babdfee1
Binary files /dev/null and b/objects/trees/willow/t4.iob differ
diff --git a/objects/trees/willow/t5.iob b/objects/trees/willow/t5.iob
new file mode 100644
index 00000000..2010bae5
Binary files /dev/null and b/objects/trees/willow/t5.iob differ
diff --git a/objects/trees/willow/t6.iob b/objects/trees/willow/t6.iob
new file mode 100644
index 00000000..2172de31
Binary files /dev/null and b/objects/trees/willow/t6.iob differ
diff --git a/objects/trees/willow/t7.iob b/objects/trees/willow/t7.iob
new file mode 100644
index 00000000..f24be16a
Binary files /dev/null and b/objects/trees/willow/t7.iob differ
diff --git a/objects/trees/willow/t8.iob b/objects/trees/willow/t8.iob
new file mode 100644
index 00000000..4da87d01
Binary files /dev/null and b/objects/trees/willow/t8.iob differ
diff --git a/objects/trees/willow/w1.iob b/objects/trees/willow/w1.iob
new file mode 100644
index 00000000..61d832de
Binary files /dev/null and b/objects/trees/willow/w1.iob differ
diff --git a/objects/trees/willow/w2.iob b/objects/trees/willow/w2.iob
new file mode 100644
index 00000000..8d1e18a3
Binary files /dev/null and b/objects/trees/willow/w2.iob differ
diff --git a/objects/trees/willow/w3.iob b/objects/trees/willow/w3.iob
new file mode 100644
index 00000000..a833e687
Binary files /dev/null and b/objects/trees/willow/w3.iob differ
diff --git a/objects/trees/willow/w4.iob b/objects/trees/willow/w4.iob
new file mode 100644
index 00000000..fe45a0cf
Binary files /dev/null and b/objects/trees/willow/w4.iob differ
diff --git a/objects/trees/willow/w5.iob b/objects/trees/willow/w5.iob
new file mode 100644
index 00000000..ff810ae3
Binary files /dev/null and b/objects/trees/willow/w5.iob differ
diff --git a/objects/trees/willow/w6.iob b/objects/trees/willow/w6.iob
new file mode 100644
index 00000000..937dbac8
Binary files /dev/null and b/objects/trees/willow/w6.iob differ
diff --git a/objects/trees/willow/w7.iob b/objects/trees/willow/w7.iob
new file mode 100644
index 00000000..2cdd1e2b
Binary files /dev/null and b/objects/trees/willow/w7.iob differ
diff --git a/objects/trees/willow/w8.iob b/objects/trees/willow/w8.iob
new file mode 100644
index 00000000..5f6fbbe3
Binary files /dev/null and b/objects/trees/willow/w8.iob differ
diff --git a/objects/trees/willow/w9.iob b/objects/trees/willow/w9.iob
new file mode 100644
index 00000000..f317f640
Binary files /dev/null and b/objects/trees/willow/w9.iob differ
diff --git a/regions/swamp.json b/regions/swamp.json
index e7842bf7..183b51c5 100644
--- a/regions/swamp.json
+++ b/regions/swamp.json
@@ -6,6 +6,7 @@
         "swamp/willow-forest",
         "swamp/sea/lake",
         "swamp/roofed-wayward",
+        "swamp/swamp-forest",
         "swamp/cambian-drift",
         "swamp/marsh"
     ],
@@ -16,6 +17,7 @@
     }],
     "seaBiomes": [
         "swamp/sea/ocean",
+        "swamp/swamp-mangrove-lake",
         "swamp/sea/ocean-tree"
     ],
     "riverStyle": {