diff --git a/mapgen.lua b/mapgen.lua
index d563754..f6446c0 100644
--- a/mapgen.lua
+++ b/mapgen.lua
@@ -22,55 +22,101 @@ end
 
 -- SHAPES
 
+-- Layer 1: Deepslate layer
+
 ns_cavegen.register_shape({
-    name = "ns_vl_caves:bubbles_many",
+    name = "ns_vl_caves:layer_1_bulbs",
     noise_params = {
         offset = 0,
-        scale = 0.8,
-        spread = { x = 30, y = 30, z = 30 },
-        seed = 364802,
-        octaves = 1,
-        persistence = 0.2,
-        lacunarity = 1.0,
-        flags = "eased",
-    },
-    connectivity_point = 44,
-    verticality_point = 37,
-})
-ns_cavegen.register_shape({
-    name = "ns_vl_caves:bubbles",
-    noise_params = {
-        offset = 0.2,
-        scale = 0.6,
-        spread = { x = 100, y = 100, z = 100 },
-        seed = 248039,
-        octaves = 2,
-        persistence = 0.6,
-        lacunarity = 2.0,
+        scale = 1,
+        spread = { x = 30, y = 10, z = 30 },
+        seed = 90658795,
+        octaves = 3,
+        persistence = 0.75,
+        lacunarity = 0.8,
         flags = "eased"
     },
-    connectivity_point = 10,
-    verticality_point = 20,
+    y_max = -100,
+    y_min = -900,
+    connectivity_point = 71,
+    verticality_point = 43,
+})
+ns_cavegen.register_shape({
+    name = "ns_vl_caves:layer_1_pods",
+    noise_params = {
+        offset = -10,
+        scale = 11,
+        spread = { x = 5, y = 10, z = 5 },
+        seed = 90658795,
+        octaves = 2,
+        persistence = 0.75,
+        lacunarity = 0.8,
+        flags = "eased"
+    },
+    y_max = -100,
+    y_min = -900,
+    connectivity_point = 8,
+    verticality_point = 23,
 })
 
+-- Layer 2: Leagueschist layer
+
 ns_cavegen.register_shape({
-    name = "ns_vl_caves:cliffs",
+    name = "ns_vl_caves:layer_2_bulbs",
     noise_params = {
-        offset = -0.3,
-        scale = 0.7,
-        spread = { x = 40, y = 300, z = 10 },
-        seed = 1012434,
+        offset = 0,
+        scale = 1,
+        spread = { x = 30, y = 10, z = 30 },
+        seed = 90658795,
         octaves = 3,
-        persistence = 0.3,
-        lacunarity = 3.0,
+        persistence = 0.75,
+        lacunarity = 0.8,
+        flags = "eased"
+    },
+    y_max = -1000,
+    y_min = -1950,
+    connectivity_point = 71,
+    verticality_point = 43,
+})
+ns_cavegen.register_shape({
+    name = "ns_vl_caves:layer_2_swirls",
+    noise_params = {
+        offset = 0,
+        scale = 1,
+        spread = { x = 10, y = 50, z = 10 },
+        seed = 19220,
+        octaves = 3,
+        persistence = 0.9,
+        lacunarity = 0.9,
         flags = "eased",
     },
-    connectivity_point = 18,
-    verticality_point = 96,
+    y_max = -900,
+    y_min = -2100,
+    connectivity_point = 38,
+    verticality_point = 63,
 })
 
+-- Layer 3: Bandgneiss layer
+
 ns_cavegen.register_shape({
-    name = "ns_vl_caves:horizontal_spaghetti",
+    name = "ns_vl_caves:layer_3_cliffs",
+    noise_params = {
+        offset = 0,
+        scale = 1,
+        spread = { x = 50, y = 200, z = 50 },
+        seed = 1854392,
+        octaves = 3,
+        persistence = 0.8,
+        lacunarity = 3.0,
+        flags = "",
+    },
+    y_max = -1500,
+    y_min = -3000,
+    connectivity_point = 45,
+    verticality_point = 89,
+})
+ns_cavegen.register_shape({
+    name = "ns_vl_caves:layer_3_horizontal_spaghetti",
     noise_params = {
         offset = -0.3,
         scale = 0.7,
@@ -81,12 +127,30 @@ ns_cavegen.register_shape({
         lacunarity = 3.0,
         flags = "eased",
     },
+    y_max = -2250,
+    y_min = -3000,
     connectivity_point = 83,
     verticality_point = 5,
 })
-
 ns_cavegen.register_shape({
-    name = "ns_vl_caves:sideways_spaghetti",
+    name = "ns_vl_caves:layer_3_open_space",
+    noise_params = {
+        offset = 0.75,
+        scale = 0.3,
+        spread = { x = 100, y = 100, z = 100 },
+        seed = 333078,
+        octaves = 1,
+        persistence = 0.1,
+        lacunarity = 10.0,
+        flags = "",
+    },
+    y_max = -2250,
+    y_min = -2800,
+    connectivity_point = 100,
+    verticality_point = 100,
+})
+ns_cavegen.register_shape({
+    name = "ns_vl_caves:layer_3_sideways_spaghetti",
     noise_params = {
         offset = -0.3,
         scale = 0.7,
@@ -97,10 +161,31 @@ ns_cavegen.register_shape({
         lacunarity = 3.0,
         flags = "eased",
     },
+    y_min = -2250,
+    y_max = -3000,
     connectivity_point = 82,
     verticality_point = 4,
 })
 
+-----------------------------------------------------------
+-----------------------------------------------------------
+
+-- ns_cavegen.register_shape({
+--     name = "ns_vl_caves:bubbles",
+--     noise_params = {
+--         offset = 0.2,
+--         scale = 0.6,
+--         spread = { x = 100, y = 100, z = 100 },
+--         seed = 248039,
+--         octaves = 2,
+--         persistence = 0.6,
+--         lacunarity = 2.0,
+--         flags = "eased"
+--     },
+--     connectivity_point = 10,
+--     verticality_point = 20,
+-- })
+
 -- BIOMES
 
 -- ns_cavegen.register_biome({