diff --git a/data/minecraft/dimension/extra/default_block_terrain.json b/data/minecraft/dimension/extra/default_block_terrain.json
index 63330e2..ff32754 100644
--- a/data/minecraft/dimension/extra/default_block_terrain.json
+++ b/data/minecraft/dimension/extra/default_block_terrain.json
@@ -13,85 +13,95 @@
           "count": 128
         },
         "structures": {
-          "minecraft:jungle_pyramid": {
-            "spacing": 32,
-            "separation": 8,
-            "salt": 14357619
-          },
-          "minecraft:endcity": {
-            "spacing": 20,
-            "separation": 11,
-            "salt": 10387313
-          },
           "minecraft:village": {
             "spacing": 32,
             "separation": 8,
             "salt": 10387312
           },
-          "minecraft:ruined_portal": {
-            "spacing": 40,
-            "separation": 15,
-            "salt": 34222645
+          "minecraft:desert_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357617
           },
           "minecraft:igloo": {
             "spacing": 32,
             "separation": 8,
             "salt": 14357618
           },
+          "minecraft:jungle_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357619
+          },
+          "minecraft:swamp_hut": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357620
+          },
+          "minecraft:pillager_outpost": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 165745296
+          },
           "minecraft:stronghold": {
             "spacing": 1,
             "separation": 0,
             "salt": 0
           },
-          "minecraft:bastion_remnant": {
-            "spacing": 30,
-            "separation": 4,
-            "salt": 30084232
-          },
-          "minecraft:desert_pyramid": {
+          "minecraft:monument": {
             "spacing": 32,
-            "separation": 8,
-            "salt": 14357617
+            "separation": 5,
+            "salt": 10387313
           },
-          "minecraft:nether_fossil": {
-            "spacing": 2,
-            "separation": 1,
-            "salt": 14357921
+          "minecraft:endcity": {
+            "spacing": 20,
+            "separation": 11,
+            "salt": 10387313
           },
           "minecraft:mansion": {
             "spacing": 80,
             "separation": 20,
             "salt": 10387319
           },
+          "minecraft:buried_treasure": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:mineshaft": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:ruined_portal": {
+            "spacing": 40,
+            "separation": 15,
+            "salt": 34222645
+          },
           "minecraft:shipwreck": {
             "spacing": 24,
             "separation": 4,
             "salt": 165745295
           },
-          "minecraft:monument": {
-            "spacing": 32,
-            "separation": 5,
-            "salt": 10387313
-          },
-          "minecraft:swamp_hut": {
-            "spacing": 32,
+          "minecraft:ocean_ruin": {
+            "spacing": 20,
             "separation": 8,
-            "salt": 14357620
+            "salt": 14357621
           },
-          "minecraft:fortress": {
-            "spacing": 30,
+          "minecraft:bastion_remnant": {
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
-          "minecraft:pillager_outpost": {
-            "spacing": 32,
-            "separation": 8,
-            "salt": 165745296
+          "minecraft:fortress": {
+            "spacing": 27,
+            "separation": 4,
+            "salt": 30084232
           },
-          "minecraft:ocean_ruin": {
-            "spacing": 20,
-            "separation": 8,
-            "salt": 14357621
+          "minecraft:nether_fossil": {
+            "spacing": 2,
+            "separation": 1,
+            "salt": 14357921
           }
         }
       },
diff --git a/data/minecraft/dimension/extra/noise_based_void.json b/data/minecraft/dimension/extra/noise_based_void.json
index 4d811c7..1c74cfe 100644
--- a/data/minecraft/dimension/extra/noise_based_void.json
+++ b/data/minecraft/dimension/extra/noise_based_void.json
@@ -59,9 +59,19 @@
             "separation": 20,
             "salt": 10387319
           },
+          "minecraft:buried_treasure": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:mineshaft": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
           "minecraft:ruined_portal": {
-            "spacing": 25,
-            "separation": 10,
+            "spacing": 40,
+            "separation": 15,
             "salt": 34222645
           },
           "minecraft:shipwreck": {
@@ -75,12 +85,12 @@
             "salt": 14357621
           },
           "minecraft:bastion_remnant": {
-            "spacing": 30,
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
           "minecraft:fortress": {
-            "spacing": 30,
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
diff --git a/data/minecraft/dimension/extra/overworld_floating_islands.json b/data/minecraft/dimension/extra/overworld_floating_islands.json
index ad481bd..cad44aa 100644
--- a/data/minecraft/dimension/extra/overworld_floating_islands.json
+++ b/data/minecraft/dimension/extra/overworld_floating_islands.json
@@ -9,85 +9,95 @@
     "settings": {
       "structures": {
         "structures": {
-          "minecraft:jungle_pyramid": {
-            "spacing": 32,
-            "separation": 8,
-            "salt": 14357619
-          },
-          "minecraft:endcity": {
-            "spacing": 20,
-            "separation": 11,
-            "salt": 10387313
-          },
           "minecraft:village": {
             "spacing": 32,
             "separation": 8,
             "salt": 10387312
           },
-          "minecraft:ruined_portal": {
-            "spacing": 40,
-            "separation": 15,
-            "salt": 34222645
+          "minecraft:desert_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357617
           },
           "minecraft:igloo": {
             "spacing": 32,
             "separation": 8,
             "salt": 14357618
           },
+          "minecraft:jungle_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357619
+          },
+          "minecraft:swamp_hut": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357620
+          },
+          "minecraft:pillager_outpost": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 165745296
+          },
           "minecraft:stronghold": {
             "spacing": 1,
             "separation": 0,
             "salt": 0
           },
-          "minecraft:bastion_remnant": {
-            "spacing": 30,
-            "separation": 4,
-            "salt": 30084232
-          },
-          "minecraft:desert_pyramid": {
+          "minecraft:monument": {
             "spacing": 32,
-            "separation": 8,
-            "salt": 14357617
+            "separation": 5,
+            "salt": 10387313
           },
-          "minecraft:nether_fossil": {
-            "spacing": 2,
-            "separation": 1,
-            "salt": 14357921
+          "minecraft:endcity": {
+            "spacing": 20,
+            "separation": 11,
+            "salt": 10387313
           },
           "minecraft:mansion": {
             "spacing": 80,
             "separation": 20,
             "salt": 10387319
           },
+          "minecraft:buried_treasure": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:mineshaft": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:ruined_portal": {
+            "spacing": 40,
+            "separation": 15,
+            "salt": 34222645
+          },
           "minecraft:shipwreck": {
             "spacing": 24,
             "separation": 4,
             "salt": 165745295
           },
-          "minecraft:monument": {
-            "spacing": 32,
-            "separation": 5,
-            "salt": 10387313
-          },
-          "minecraft:swamp_hut": {
-            "spacing": 32,
+          "minecraft:ocean_ruin": {
+            "spacing": 20,
             "separation": 8,
-            "salt": 14357620
+            "salt": 14357621
           },
-          "minecraft:fortress": {
-            "spacing": 30,
+          "minecraft:bastion_remnant": {
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
-          "minecraft:pillager_outpost": {
-            "spacing": 32,
-            "separation": 8,
-            "salt": 165745296
+          "minecraft:fortress": {
+            "spacing": 27,
+            "separation": 4,
+            "salt": 30084232
           },
-          "minecraft:ocean_ruin": {
-            "spacing": 20,
-            "separation": 8,
-            "salt": 14357621
+          "minecraft:nether_fossil": {
+            "spacing": 2,
+            "separation": 1,
+            "salt": 14357921
           }
         }
       },
diff --git a/data/minecraft/dimension/extra/the_nether_amplified.json b/data/minecraft/dimension/extra/the_nether_amplified.json
index 7d5f0f9..cf1c628 100644
--- a/data/minecraft/dimension/extra/the_nether_amplified.json
+++ b/data/minecraft/dimension/extra/the_nether_amplified.json
@@ -110,6 +110,16 @@
             "separation": 20,
             "salt": 10387319
           },
+          "minecraft:buried_treasure": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:mineshaft": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
           "minecraft:ruined_portal": {
             "spacing": 25,
             "separation": 10,
@@ -126,12 +136,12 @@
             "salt": 14357621
           },
           "minecraft:bastion_remnant": {
-            "spacing": 30,
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
           "minecraft:fortress": {
-            "spacing": 30,
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
diff --git a/data/minecraft/dimension/fake/overworld.json b/data/minecraft/dimension/fake/overworld.json
index 7891307..acf945e 100644
--- a/data/minecraft/dimension/fake/overworld.json
+++ b/data/minecraft/dimension/fake/overworld.json
@@ -14,85 +14,95 @@
           "count": 128
         },
         "structures": {
-          "minecraft:jungle_pyramid": {
-            "spacing": 32,
-            "separation": 8,
-            "salt": 14357619
-          },
-          "minecraft:endcity": {
-            "spacing": 20,
-            "separation": 11,
-            "salt": 10387313
-          },
           "minecraft:village": {
             "spacing": 32,
             "separation": 8,
             "salt": 10387312
           },
-          "minecraft:ruined_portal": {
-            "spacing": 40,
-            "separation": 15,
-            "salt": 34222645
+          "minecraft:desert_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357617
           },
           "minecraft:igloo": {
             "spacing": 32,
             "separation": 8,
             "salt": 14357618
           },
+          "minecraft:jungle_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357619
+          },
+          "minecraft:swamp_hut": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357620
+          },
+          "minecraft:pillager_outpost": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 165745296
+          },
           "minecraft:stronghold": {
             "spacing": 1,
             "separation": 0,
             "salt": 0
           },
-          "minecraft:bastion_remnant": {
-            "spacing": 30,
-            "separation": 4,
-            "salt": 30084232
-          },
-          "minecraft:desert_pyramid": {
+          "minecraft:monument": {
             "spacing": 32,
-            "separation": 8,
-            "salt": 14357617
+            "separation": 5,
+            "salt": 10387313
           },
-          "minecraft:nether_fossil": {
-            "spacing": 2,
-            "separation": 1,
-            "salt": 14357921
+          "minecraft:endcity": {
+            "spacing": 20,
+            "separation": 11,
+            "salt": 10387313
           },
           "minecraft:mansion": {
             "spacing": 80,
             "separation": 20,
             "salt": 10387319
           },
+          "minecraft:buried_treasure": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:mineshaft": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:ruined_portal": {
+            "spacing": 40,
+            "separation": 15,
+            "salt": 34222645
+          },
           "minecraft:shipwreck": {
             "spacing": 24,
             "separation": 4,
             "salt": 165745295
           },
-          "minecraft:monument": {
-            "spacing": 32,
-            "separation": 5,
-            "salt": 10387313
-          },
-          "minecraft:swamp_hut": {
-            "spacing": 32,
+          "minecraft:ocean_ruin": {
+            "spacing": 20,
             "separation": 8,
-            "salt": 14357620
+            "salt": 14357621
           },
-          "minecraft:fortress": {
-            "spacing": 30,
+          "minecraft:bastion_remnant": {
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
-          "minecraft:pillager_outpost": {
-            "spacing": 32,
-            "separation": 8,
-            "salt": 165745296
+          "minecraft:fortress": {
+            "spacing": 27,
+            "separation": 4,
+            "salt": 30084232
           },
-          "minecraft:ocean_ruin": {
-            "spacing": 20,
-            "separation": 8,
-            "salt": 14357621
+          "minecraft:nether_fossil": {
+            "spacing": 2,
+            "separation": 1,
+            "salt": 14357921
           }
         }
       },
diff --git a/data/minecraft/dimension/fake/overworld_amplified.json b/data/minecraft/dimension/fake/overworld_amplified.json
index a5290ab..f50a81b 100644
--- a/data/minecraft/dimension/fake/overworld_amplified.json
+++ b/data/minecraft/dimension/fake/overworld_amplified.json
@@ -14,85 +14,95 @@
           "count": 128
         },
         "structures": {
-          "minecraft:jungle_pyramid": {
-            "spacing": 32,
-            "separation": 8,
-            "salt": 14357619
-          },
-          "minecraft:endcity": {
-            "spacing": 20,
-            "separation": 11,
-            "salt": 10387313
-          },
           "minecraft:village": {
             "spacing": 32,
             "separation": 8,
             "salt": 10387312
           },
-          "minecraft:ruined_portal": {
-            "spacing": 40,
-            "separation": 15,
-            "salt": 34222645
+          "minecraft:desert_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357617
           },
           "minecraft:igloo": {
             "spacing": 32,
             "separation": 8,
             "salt": 14357618
           },
+          "minecraft:jungle_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357619
+          },
+          "minecraft:swamp_hut": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357620
+          },
+          "minecraft:pillager_outpost": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 165745296
+          },
           "minecraft:stronghold": {
             "spacing": 1,
             "separation": 0,
             "salt": 0
           },
-          "minecraft:bastion_remnant": {
-            "spacing": 30,
-            "separation": 4,
-            "salt": 30084232
-          },
-          "minecraft:desert_pyramid": {
+          "minecraft:monument": {
             "spacing": 32,
-            "separation": 8,
-            "salt": 14357617
+            "separation": 5,
+            "salt": 10387313
           },
-          "minecraft:nether_fossil": {
-            "spacing": 2,
-            "separation": 1,
-            "salt": 14357921
+          "minecraft:endcity": {
+            "spacing": 20,
+            "separation": 11,
+            "salt": 10387313
           },
           "minecraft:mansion": {
             "spacing": 80,
             "separation": 20,
             "salt": 10387319
           },
+          "minecraft:buried_treasure": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:mineshaft": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:ruined_portal": {
+            "spacing": 40,
+            "separation": 15,
+            "salt": 34222645
+          },
           "minecraft:shipwreck": {
             "spacing": 24,
             "separation": 4,
             "salt": 165745295
           },
-          "minecraft:monument": {
-            "spacing": 32,
-            "separation": 5,
-            "salt": 10387313
-          },
-          "minecraft:swamp_hut": {
-            "spacing": 32,
+          "minecraft:ocean_ruin": {
+            "spacing": 20,
             "separation": 8,
-            "salt": 14357620
+            "salt": 14357621
           },
-          "minecraft:fortress": {
-            "spacing": 30,
+          "minecraft:bastion_remnant": {
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
-          "minecraft:pillager_outpost": {
-            "spacing": 32,
-            "separation": 8,
-            "salt": 165745296
+          "minecraft:fortress": {
+            "spacing": 27,
+            "separation": 4,
+            "salt": 30084232
           },
-          "minecraft:ocean_ruin": {
-            "spacing": 20,
-            "separation": 8,
-            "salt": 14357621
+          "minecraft:nether_fossil": {
+            "spacing": 2,
+            "separation": 1,
+            "salt": 14357921
           }
         }
       },
diff --git a/data/minecraft/dimension/fake/overworld_caves.json b/data/minecraft/dimension/fake/overworld_caves.json
index d5d80d0..3dfb0ba 100644
--- a/data/minecraft/dimension/fake/overworld_caves.json
+++ b/data/minecraft/dimension/fake/overworld_caves.json
@@ -59,9 +59,19 @@
             "separation": 20,
             "salt": 10387319
           },
+          "minecraft:buried_treasure": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:mineshaft": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
           "minecraft:ruined_portal": {
-            "spacing": 25,
-            "separation": 10,
+            "spacing": 40,
+            "separation": 15,
             "salt": 34222645
           },
           "minecraft:shipwreck": {
@@ -75,12 +85,12 @@
             "salt": 14357621
           },
           "minecraft:bastion_remnant": {
-            "spacing": 30,
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
           "minecraft:fortress": {
-            "spacing": 30,
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
diff --git a/data/minecraft/dimension/fake/overworld_floating_islands.json b/data/minecraft/dimension/fake/overworld_floating_islands.json
index e80ca2b..e45313b 100644
--- a/data/minecraft/dimension/fake/overworld_floating_islands.json
+++ b/data/minecraft/dimension/fake/overworld_floating_islands.json
@@ -9,85 +9,95 @@
     "settings": {
       "structures": {
         "structures": {
-          "minecraft:jungle_pyramid": {
-            "spacing": 32,
-            "separation": 8,
-            "salt": 14357619
-          },
-          "minecraft:endcity": {
-            "spacing": 20,
-            "separation": 11,
-            "salt": 10387313
-          },
           "minecraft:village": {
             "spacing": 32,
             "separation": 8,
             "salt": 10387312
           },
-          "minecraft:ruined_portal": {
-            "spacing": 40,
-            "separation": 15,
-            "salt": 34222645
+          "minecraft:desert_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357617
           },
           "minecraft:igloo": {
             "spacing": 32,
             "separation": 8,
             "salt": 14357618
           },
+          "minecraft:jungle_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357619
+          },
+          "minecraft:swamp_hut": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357620
+          },
+          "minecraft:pillager_outpost": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 165745296
+          },
           "minecraft:stronghold": {
             "spacing": 1,
             "separation": 0,
             "salt": 0
           },
-          "minecraft:bastion_remnant": {
-            "spacing": 30,
-            "separation": 4,
-            "salt": 30084232
-          },
-          "minecraft:desert_pyramid": {
+          "minecraft:monument": {
             "spacing": 32,
-            "separation": 8,
-            "salt": 14357617
+            "separation": 5,
+            "salt": 10387313
           },
-          "minecraft:nether_fossil": {
-            "spacing": 2,
-            "separation": 1,
-            "salt": 14357921
+          "minecraft:endcity": {
+            "spacing": 20,
+            "separation": 11,
+            "salt": 10387313
           },
           "minecraft:mansion": {
             "spacing": 80,
             "separation": 20,
             "salt": 10387319
           },
+          "minecraft:buried_treasure": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:mineshaft": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:ruined_portal": {
+            "spacing": 40,
+            "separation": 15,
+            "salt": 34222645
+          },
           "minecraft:shipwreck": {
             "spacing": 24,
             "separation": 4,
             "salt": 165745295
           },
-          "minecraft:monument": {
-            "spacing": 32,
-            "separation": 5,
-            "salt": 10387313
-          },
-          "minecraft:swamp_hut": {
-            "spacing": 32,
+          "minecraft:ocean_ruin": {
+            "spacing": 20,
             "separation": 8,
-            "salt": 14357620
+            "salt": 14357621
           },
-          "minecraft:fortress": {
-            "spacing": 30,
+          "minecraft:bastion_remnant": {
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
-          "minecraft:pillager_outpost": {
-            "spacing": 32,
-            "separation": 8,
-            "salt": 165745296
+          "minecraft:fortress": {
+            "spacing": 27,
+            "separation": 4,
+            "salt": 30084232
           },
-          "minecraft:ocean_ruin": {
-            "spacing": 20,
-            "separation": 8,
-            "salt": 14357621
+          "minecraft:nether_fossil": {
+            "spacing": 2,
+            "separation": 1,
+            "salt": 14357921
           }
         }
       },
diff --git a/data/minecraft/dimension/fake/overworld_large_biomes.json b/data/minecraft/dimension/fake/overworld_large_biomes.json
index 2a0780d..0eb7123 100644
--- a/data/minecraft/dimension/fake/overworld_large_biomes.json
+++ b/data/minecraft/dimension/fake/overworld_large_biomes.json
@@ -14,85 +14,95 @@
           "count": 128
         },
         "structures": {
-          "minecraft:jungle_pyramid": {
-            "spacing": 32,
-            "separation": 8,
-            "salt": 14357619
-          },
-          "minecraft:endcity": {
-            "spacing": 20,
-            "separation": 11,
-            "salt": 10387313
-          },
           "minecraft:village": {
             "spacing": 32,
             "separation": 8,
             "salt": 10387312
           },
-          "minecraft:ruined_portal": {
-            "spacing": 40,
-            "separation": 15,
-            "salt": 34222645
+          "minecraft:desert_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357617
           },
           "minecraft:igloo": {
             "spacing": 32,
             "separation": 8,
             "salt": 14357618
           },
+          "minecraft:jungle_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357619
+          },
+          "minecraft:swamp_hut": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357620
+          },
+          "minecraft:pillager_outpost": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 165745296
+          },
           "minecraft:stronghold": {
             "spacing": 1,
             "separation": 0,
             "salt": 0
           },
-          "minecraft:bastion_remnant": {
-            "spacing": 30,
-            "separation": 4,
-            "salt": 30084232
-          },
-          "minecraft:desert_pyramid": {
+          "minecraft:monument": {
             "spacing": 32,
-            "separation": 8,
-            "salt": 14357617
+            "separation": 5,
+            "salt": 10387313
           },
-          "minecraft:nether_fossil": {
-            "spacing": 2,
-            "separation": 1,
-            "salt": 14357921
+          "minecraft:endcity": {
+            "spacing": 20,
+            "separation": 11,
+            "salt": 10387313
           },
           "minecraft:mansion": {
             "spacing": 80,
             "separation": 20,
             "salt": 10387319
           },
+          "minecraft:buried_treasure": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:mineshaft": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:ruined_portal": {
+            "spacing": 40,
+            "separation": 15,
+            "salt": 34222645
+          },
           "minecraft:shipwreck": {
             "spacing": 24,
             "separation": 4,
             "salt": 165745295
           },
-          "minecraft:monument": {
-            "spacing": 32,
-            "separation": 5,
-            "salt": 10387313
-          },
-          "minecraft:swamp_hut": {
-            "spacing": 32,
+          "minecraft:ocean_ruin": {
+            "spacing": 20,
             "separation": 8,
-            "salt": 14357620
+            "salt": 14357621
           },
-          "minecraft:fortress": {
-            "spacing": 30,
+          "minecraft:bastion_remnant": {
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
-          "minecraft:pillager_outpost": {
-            "spacing": 32,
-            "separation": 8,
-            "salt": 165745296
+          "minecraft:fortress": {
+            "spacing": 27,
+            "separation": 4,
+            "salt": 30084232
           },
-          "minecraft:ocean_ruin": {
-            "spacing": 20,
-            "separation": 8,
-            "salt": 14357621
+          "minecraft:nether_fossil": {
+            "spacing": 2,
+            "separation": 1,
+            "salt": 14357921
           }
         }
       },
diff --git a/data/minecraft/dimension/fake/the_end.json b/data/minecraft/dimension/fake/the_end.json
index 99d83ea..0ce8b83 100644
--- a/data/minecraft/dimension/fake/the_end.json
+++ b/data/minecraft/dimension/fake/the_end.json
@@ -8,85 +8,95 @@
     "settings": {
       "structures": {
         "structures": {
-          "minecraft:jungle_pyramid": {
-            "spacing": 32,
-            "separation": 8,
-            "salt": 14357619
-          },
-          "minecraft:endcity": {
-            "spacing": 20,
-            "separation": 11,
-            "salt": 10387313
-          },
           "minecraft:village": {
             "spacing": 32,
             "separation": 8,
             "salt": 10387312
           },
-          "minecraft:ruined_portal": {
-            "spacing": 40,
-            "separation": 15,
-            "salt": 34222645
+          "minecraft:desert_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357617
           },
           "minecraft:igloo": {
             "spacing": 32,
             "separation": 8,
             "salt": 14357618
           },
+          "minecraft:jungle_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357619
+          },
+          "minecraft:swamp_hut": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357620
+          },
+          "minecraft:pillager_outpost": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 165745296
+          },
           "minecraft:stronghold": {
             "spacing": 1,
             "separation": 0,
             "salt": 0
           },
-          "minecraft:bastion_remnant": {
-            "spacing": 30,
-            "separation": 4,
-            "salt": 30084232
-          },
-          "minecraft:desert_pyramid": {
+          "minecraft:monument": {
             "spacing": 32,
-            "separation": 8,
-            "salt": 14357617
+            "separation": 5,
+            "salt": 10387313
           },
-          "minecraft:nether_fossil": {
-            "spacing": 2,
-            "separation": 1,
-            "salt": 14357921
+          "minecraft:endcity": {
+            "spacing": 20,
+            "separation": 11,
+            "salt": 10387313
           },
           "minecraft:mansion": {
             "spacing": 80,
             "separation": 20,
             "salt": 10387319
           },
+          "minecraft:buried_treasure": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:mineshaft": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:ruined_portal": {
+            "spacing": 40,
+            "separation": 15,
+            "salt": 34222645
+          },
           "minecraft:shipwreck": {
             "spacing": 24,
             "separation": 4,
             "salt": 165745295
           },
-          "minecraft:monument": {
-            "spacing": 32,
-            "separation": 5,
-            "salt": 10387313
-          },
-          "minecraft:swamp_hut": {
-            "spacing": 32,
+          "minecraft:ocean_ruin": {
+            "spacing": 20,
             "separation": 8,
-            "salt": 14357620
+            "salt": 14357621
           },
-          "minecraft:fortress": {
-            "spacing": 30,
+          "minecraft:bastion_remnant": {
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
-          "minecraft:pillager_outpost": {
-            "spacing": 32,
-            "separation": 8,
-            "salt": 165745296
+          "minecraft:fortress": {
+            "spacing": 27,
+            "separation": 4,
+            "salt": 30084232
           },
-          "minecraft:ocean_ruin": {
-            "spacing": 20,
-            "separation": 8,
-            "salt": 14357621
+          "minecraft:nether_fossil": {
+            "spacing": 2,
+            "separation": 1,
+            "salt": 14357921
           }
         }
       },
diff --git a/data/minecraft/dimension/fake/the_nether.json b/data/minecraft/dimension/fake/the_nether.json
index aa7a725..2568af0 100644
--- a/data/minecraft/dimension/fake/the_nether.json
+++ b/data/minecraft/dimension/fake/the_nether.json
@@ -110,6 +110,16 @@
             "separation": 20,
             "salt": 10387319
           },
+          "minecraft:buried_treasure": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
+          "minecraft:mineshaft": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          },
           "minecraft:ruined_portal": {
             "spacing": 25,
             "separation": 10,
@@ -126,12 +136,12 @@
             "salt": 14357621
           },
           "minecraft:bastion_remnant": {
-            "spacing": 30,
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
           "minecraft:fortress": {
-            "spacing": 30,
+            "spacing": 27,
             "separation": 4,
             "salt": 30084232
           },
diff --git a/data/minecraft/dimension/superflat/bottomless_pit.json b/data/minecraft/dimension/superflat/bottomless_pit.json
index 2d5cfd6..8c853ab 100644
--- a/data/minecraft/dimension/superflat/bottomless_pit.json
+++ b/data/minecraft/dimension/superflat/bottomless_pit.json
@@ -2,7 +2,13 @@
   "generator": {
     "settings": {
       "structures": {
-        "structures": {}
+        "structures": {
+          "minecraft:village": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 10387312
+          }
+        }
       },
       "layers": [
         {
@@ -18,6 +24,8 @@
           "block": "minecraft:grass_block"
         }
       ],
+      "lakes": false,
+      "features": false,
       "biome": "minecraft:plains"
     },
     "type": "minecraft:flat"
diff --git a/data/minecraft/dimension/superflat/classic_flat.json b/data/minecraft/dimension/superflat/classic_flat.json
index 1d59bab..04905a3 100644
--- a/data/minecraft/dimension/superflat/classic_flat.json
+++ b/data/minecraft/dimension/superflat/classic_flat.json
@@ -2,11 +2,6 @@
   "generator": {
     "settings": {
       "structures": {
-        "stronghold": {
-          "distance": 32,
-          "spread": 3,
-          "count": 128
-        },
         "structures": {
           "minecraft:village": {
             "spacing": 32,
@@ -29,6 +24,8 @@
           "block": "minecraft:grass_block"
         }
       ],
+      "lakes": false,
+      "features": false,
       "biome": "minecraft:plains"
     },
     "type": "minecraft:flat"
diff --git a/data/minecraft/dimension/superflat/desert.json b/data/minecraft/dimension/superflat/desert.json
index 7492e9c..2123e7b 100644
--- a/data/minecraft/dimension/superflat/desert.json
+++ b/data/minecraft/dimension/superflat/desert.json
@@ -2,7 +2,28 @@
   "generator": {
     "settings": {
       "structures": {
-        "structures": {}
+        "stronghold": {
+          "distance": 32,
+          "spread": 3,
+          "count": 128
+        },
+        "structures": {
+          "minecraft:desert_pyramid": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357617
+          },
+          "minecraft:village": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 10387312
+          },
+          "minecraft:mineshaft": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          }
+        }
       },
       "layers": [
         {
@@ -22,6 +43,8 @@
           "block": "minecraft:sand"
         }
       ],
+      "lakes": false,
+      "features": true,
       "biome": "minecraft:desert"
     },
     "type": "minecraft:flat"
diff --git a/data/minecraft/dimension/superflat/overworld.json b/data/minecraft/dimension/superflat/overworld.json
index 96c788e..7fc01e7 100644
--- a/data/minecraft/dimension/superflat/overworld.json
+++ b/data/minecraft/dimension/superflat/overworld.json
@@ -2,7 +2,33 @@
   "generator": {
     "settings": {
       "structures": {
-        "structures": {}
+        "stronghold": {
+          "distance": 32,
+          "spread": 3,
+          "count": 128
+        },
+        "structures": {
+          "minecraft:ruined_portal": {
+            "spacing": 40,
+            "separation": 15,
+            "salt": 34222645
+          },
+          "minecraft:village": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 10387312
+          },
+          "minecraft:pillager_outpost": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 165745296
+          },
+          "minecraft:mineshaft": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          }
+        }
       },
       "layers": [
         {
@@ -22,6 +48,8 @@
           "block": "minecraft:grass_block"
         }
       ],
+      "lakes": true,
+      "features": true,
       "biome": "minecraft:plains"
     },
     "type": "minecraft:flat"
diff --git a/data/minecraft/dimension/superflat/redstone_ready.json b/data/minecraft/dimension/superflat/redstone_ready.json
index 08ff5a2..c090235 100644
--- a/data/minecraft/dimension/superflat/redstone_ready.json
+++ b/data/minecraft/dimension/superflat/redstone_ready.json
@@ -18,6 +18,8 @@
           "block": "minecraft:sandstone"
         }
       ],
+      "lakes": false,
+      "features": false,
       "biome": "minecraft:desert"
     },
     "type": "minecraft:flat"
diff --git a/data/minecraft/dimension/superflat/snowy_kingdom.json b/data/minecraft/dimension/superflat/snowy_kingdom.json
index 4c29527..6559e4a 100644
--- a/data/minecraft/dimension/superflat/snowy_kingdom.json
+++ b/data/minecraft/dimension/superflat/snowy_kingdom.json
@@ -2,7 +2,18 @@
   "generator": {
     "settings": {
       "structures": {
-        "structures": {}
+        "structures": {
+          "minecraft:igloo": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 14357618
+          },
+          "minecraft:village": {
+            "spacing": 32,
+            "separation": 8,
+            "salt": 10387312
+          }
+        }
       },
       "layers": [
         {
@@ -26,6 +37,8 @@
           "block": "minecraft:snow"
         }
       ],
+      "lakes": false,
+      "features": false,
       "biome": "minecraft:snowy_tundra"
     },
     "type": "minecraft:flat"
diff --git a/data/minecraft/dimension/superflat/the_void.json b/data/minecraft/dimension/superflat/the_void.json
index 7853bba..6a31f2a 100644
--- a/data/minecraft/dimension/superflat/the_void.json
+++ b/data/minecraft/dimension/superflat/the_void.json
@@ -10,6 +10,8 @@
           "block": "minecraft:air"
         }
       ],
+      "lakes": false,
+      "features": true,
       "biome": "minecraft:the_void"
     },
     "type": "minecraft:flat"
diff --git a/data/minecraft/dimension/superflat/tunnelers_dream.json b/data/minecraft/dimension/superflat/tunnelers_dream.json
index 5a75740..f3e50e1 100644
--- a/data/minecraft/dimension/superflat/tunnelers_dream.json
+++ b/data/minecraft/dimension/superflat/tunnelers_dream.json
@@ -2,7 +2,18 @@
   "generator": {
     "settings": {
       "structures": {
-        "structures": {}
+        "stronghold": {
+          "distance": 32,
+          "spread": 3,
+          "count": 128
+        },
+        "structures": {
+          "minecraft:mineshaft": {
+            "spacing": 1,
+            "separation": 0,
+            "salt": 0
+          }
+        }
       },
       "layers": [
         {
@@ -22,6 +33,8 @@
           "block": "minecraft:grass_block"
         }
       ],
+      "lakes": false,
+      "features": true,
       "biome": "minecraft:mountains"
     },
     "type": "minecraft:flat"
diff --git a/data/minecraft/dimension/superflat/water_world.json b/data/minecraft/dimension/superflat/water_world.json
index 09bc816..532dc1e 100644
--- a/data/minecraft/dimension/superflat/water_world.json
+++ b/data/minecraft/dimension/superflat/water_world.json
@@ -2,7 +2,23 @@
   "generator": {
     "settings": {
       "structures": {
-        "structures": {}
+        "structures": {
+          "minecraft:ocean_ruin": {
+            "spacing": 20,
+            "separation": 8,
+            "salt": 14357621
+          },
+          "minecraft:shipwreck": {
+            "spacing": 24,
+            "separation": 4,
+            "salt": 165745295
+          },
+          "minecraft:monument": {
+            "spacing": 32,
+            "separation": 5,
+            "salt": 10387313
+          }
+        }
       },
       "layers": [
         {
@@ -26,6 +42,8 @@
           "block": "minecraft:water"
         }
       ],
+      "lakes": false,
+      "features": false,
       "biome": "minecraft:deep_ocean"
     },
     "type": "minecraft:flat"
diff --git a/pack.mcmeta b/pack.mcmeta
index 2d82113..1497546 100644
--- a/pack.mcmeta
+++ b/pack.mcmeta
@@ -1,6 +1,6 @@
 {
     "pack": {
         "pack_format": 5,
-        "description": "v0.3 Fake dimensions with variants, superflat & extras"
+        "description": "v0.4 Fake dimensions with variants, superflat & extras"
     }
 }
\ No newline at end of file