diff --git a/TerraForgedMod/src/main/resources/data/terraforged/features/trees/dark_oak.json b/TerraForgedMod/src/main/resources/data/terraforged/features/trees/dark_oak.json
index 5c82c0e..ba8f1c2 100644
--- a/TerraForgedMod/src/main/resources/data/terraforged/features/trees/dark_oak.json
+++ b/TerraForgedMod/src/main/resources/data/terraforged/features/trees/dark_oak.json
@@ -17,73 +17,13 @@
         "config": {
           "features": [
             {
-              "name": "minecraft:huge_brown_mushroom",
-              "config": {
-                "cap_provider": {
-                  "type": "minecraft:simple_state_provider",
-                  "state": {
-                    "Name": "minecraft:brown_mushroom_block",
-                    "Properties": {
-                      "east": "true",
-                      "south": "true",
-                      "north": "true",
-                      "west": "true",
-                      "up": "true",
-                      "down": "false"
-                    }
-                  }
-                },
-                "stem_provider": {
-                  "type": "minecraft:simple_state_provider",
-                  "state": {
-                    "Name": "minecraft:mushroom_stem",
-                    "Properties": {
-                      "east": "true",
-                      "south": "true",
-                      "north": "true",
-                      "west": "true",
-                      "up": "false",
-                      "down": "false"
-                    }
-                  }
-                },
-                "foliage_radius": 3
-              },
+              "name": "terraforged:brown_mushroom",
+              "config": {},
               "chance": 0.025
             },
             {
-              "name": "minecraft:huge_red_mushroom",
-              "config": {
-                "cap_provider": {
-                  "type": "minecraft:simple_state_provider",
-                  "state": {
-                    "Name": "minecraft:red_mushroom_block",
-                    "Properties": {
-                      "east": "true",
-                      "south": "true",
-                      "north": "true",
-                      "west": "true",
-                      "up": "true",
-                      "down": "false"
-                    }
-                  }
-                },
-                "stem_provider": {
-                  "type": "minecraft:simple_state_provider",
-                  "state": {
-                    "Name": "minecraft:mushroom_stem",
-                    "Properties": {
-                      "east": "true",
-                      "south": "true",
-                      "north": "true",
-                      "west": "true",
-                      "up": "false",
-                      "down": "false"
-                    }
-                  }
-                },
-                "foliage_radius": 2
-              },
+              "name": "terraforged:red_mushroom",
+              "config": {},
               "chance": 0.05
             },
             {
diff --git a/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_1.nbt b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_1.nbt
new file mode 100644
index 0000000..08257a8
Binary files /dev/null and b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_1.nbt differ
diff --git a/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_2.nbt b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_2.nbt
new file mode 100644
index 0000000..48cc4db
Binary files /dev/null and b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_2.nbt differ
diff --git a/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_3.nbt b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_3.nbt
new file mode 100644
index 0000000..7385cf3
Binary files /dev/null and b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_3.nbt differ
diff --git a/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_4.nbt b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_4.nbt
new file mode 100644
index 0000000..b3f6430
Binary files /dev/null and b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_4.nbt differ
diff --git a/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_5.nbt b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_5.nbt
new file mode 100644
index 0000000..e741a4e
Binary files /dev/null and b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_5.nbt differ
diff --git a/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_7.nbt b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_7.nbt
new file mode 100644
index 0000000..2d3a9e4
Binary files /dev/null and b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_mushroom_7.nbt differ
diff --git a/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_musroom_6.nbt b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_musroom_6.nbt
new file mode 100644
index 0000000..7e39414
Binary files /dev/null and b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/brown/brown_musroom_6.nbt differ
diff --git a/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_1.nbt b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_1.nbt
new file mode 100644
index 0000000..811c3ad
Binary files /dev/null and b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_1.nbt differ
diff --git a/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_2.nbt b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_2.nbt
new file mode 100644
index 0000000..5ac6bc5
Binary files /dev/null and b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_2.nbt differ
diff --git a/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_3.nbt b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_3.nbt
new file mode 100644
index 0000000..80c3b2f
Binary files /dev/null and b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_3.nbt differ
diff --git a/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_4.nbt b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_4.nbt
new file mode 100644
index 0000000..f4ee702
Binary files /dev/null and b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_4.nbt differ
diff --git a/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_5.nbt b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_5.nbt
new file mode 100644
index 0000000..d4e55b1
Binary files /dev/null and b/TerraForgedMod/src/main/resources/data/terraforged/structures/mushrooms/red/red_mushroom_5.nbt differ
diff --git a/TerraForgedMod/src/main/resources/data/terraforged/templates/trees/brown_mushroom.json b/TerraForgedMod/src/main/resources/data/terraforged/templates/trees/brown_mushroom.json
new file mode 100644
index 0000000..430485a
--- /dev/null
+++ b/TerraForgedMod/src/main/resources/data/terraforged/templates/trees/brown_mushroom.json
@@ -0,0 +1,8 @@
+{
+  "type": "tree",
+  "base": 0,
+  "name": "terraforged:brown_mushroom",
+  "paths": [
+    "terraforged:mushrooms/brown"
+  ]
+}
\ No newline at end of file
diff --git a/TerraForgedMod/src/main/resources/data/terraforged/templates/trees/red_mushroom.json b/TerraForgedMod/src/main/resources/data/terraforged/templates/trees/red_mushroom.json
new file mode 100644
index 0000000..6e7882b
--- /dev/null
+++ b/TerraForgedMod/src/main/resources/data/terraforged/templates/trees/red_mushroom.json
@@ -0,0 +1,8 @@
+{
+  "type": "tree",
+  "base": 0,
+  "name": "terraforged:red_mushroom",
+  "paths": [
+    "terraforged:mushrooms/red"
+  ]
+}
\ No newline at end of file