diff --git a/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java
index c543293d..93042d9b 100644
--- a/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java
+++ b/src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java
@@ -36,14 +36,14 @@ public class CrystalSubblocksMaterial {
         polished = EndBlocks.registerBlock(name + "_polished", new LitBaseBlock(material));
         tiles = EndBlocks.registerBlock(name + "_tiles", new LitBaseBlock(material));
         pillar = EndBlocks.registerBlock(name + "_pillar", new LitPillarBlock(material));
-        stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock(source));
-        slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock(source));
-        wall = EndBlocks.registerBlock(name + "_wall", new BaseWallBlock(source));
+        stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock.Stone(source));
+        slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock.Stone(source));
+        wall = EndBlocks.registerBlock(name + "_wall", new BaseWallBlock.Stone(source));
         pedestal = EndBlocks.registerBlock(name + "_pedestal", new EndPedestal(source));
         bricks = EndBlocks.registerBlock(name + "_bricks", new LitBaseBlock(material));
-        brick_stairs = EndBlocks.registerBlock(name + "_bricks_stairs", new BaseStairsBlock(bricks));
-        brick_slab = EndBlocks.registerBlock(name + "_bricks_slab", new BaseSlabBlock(bricks));
-        brick_wall = EndBlocks.registerBlock(name + "_bricks_wall", new BaseWallBlock(bricks));
+        brick_stairs = EndBlocks.registerBlock(name + "_bricks_stairs", new BaseStairsBlock.Stone(bricks));
+        brick_slab = EndBlocks.registerBlock(name + "_bricks_slab", new BaseSlabBlock.Stone(bricks));
+        brick_wall = EndBlocks.registerBlock(name + "_bricks_wall", new BaseWallBlock.Stone(bricks));
 
         // Recipes //
         BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_bricks"), bricks)
diff --git a/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java
index 4c8d1f04..8ee14391 100644
--- a/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java
+++ b/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java
@@ -182,17 +182,17 @@ public class MetalMaterial {
             TagManager.ITEMS.add(alloyingOre, ore.asItem(), rawOre);
         }
 
-        block = EndBlocks.registerBlock(name + "_block", new BaseBlock(settings));
-        tile = EndBlocks.registerBlock(name + "_tile", new BaseBlock(settings));
-        stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock(tile));
-        slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock(tile));
-        door = EndBlocks.registerBlock(name + "_door", new BaseDoorBlock(block, BlockSetType.IRON));
-        trapdoor = EndBlocks.registerBlock(name + "_trapdoor", new BaseTrapdoorBlock(block, BlockSetType.IRON));
+        block = EndBlocks.registerBlock(name + "_block", new BaseBlock.Metal(settings));
+        tile = EndBlocks.registerBlock(name + "_tile", new BaseBlock.Metal(settings));
+        stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock.Metal(tile));
+        slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock.Metal(tile));
+        door = EndBlocks.registerBlock(name + "_door", new BaseDoorBlock.Metal(block, BlockSetType.IRON));
+        trapdoor = EndBlocks.registerBlock(name + "_trapdoor", new BaseTrapdoorBlock.Metal(block, BlockSetType.IRON));
         bars = EndBlocks.registerBlock(name + "_bars", new BaseMetalBarsBlock(block));
         chain = EndBlocks.registerBlock(name + "_chain", new BaseChainBlock(block.defaultMaterialColor()));
         pressurePlate = EndBlocks.registerBlock(
                 name + "_plate",
-                new WoodenPressurePlateBlock(block, BlockSetType.IRON)
+                new BasePressurePlateBlock.Wood(block, BlockSetType.IRON)
         );
 
         chandelier = EndBlocks.registerBlock(name + "_chandelier", new ChandelierBlock(block));
diff --git a/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java
index aa4b02fd..0687add0 100644
--- a/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java
+++ b/src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java
@@ -55,22 +55,22 @@ public class StoneMaterial {
         stone = EndBlocks.registerBlock(name, new BaseBlock(material));
         polished = EndBlocks.registerBlock(name + "_polished", new BaseBlock(material));
         tiles = EndBlocks.registerBlock(name + "_tiles", new BaseBlock(material));
-        pillar = EndBlocks.registerBlock(name + "_pillar", new BaseRotatedPillarBlock(material));
-        stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock(stone));
-        slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock(stone));
-        wall = EndBlocks.registerBlock(name + "_wall", new BaseWallBlock(stone));
-        button = EndBlocks.registerBlock(name + "_button", new BaseStoneButtonBlock(stone, BlockSetType.STONE));
+        pillar = EndBlocks.registerBlock(name + "_pillar", new BaseRotatedPillarBlock.Stone(material));
+        stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock.Stone(stone));
+        slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock.Stone(stone));
+        wall = EndBlocks.registerBlock(name + "_wall", new BaseWallBlock.Stone(stone));
+        button = EndBlocks.registerBlock(name + "_button", new BaseButtonBlock.Stone(stone, BlockSetType.STONE));
         pressurePlate = EndBlocks.registerBlock(
                 name + "_plate",
-                new StonePressurePlateBlock(stone, BlockSetType.STONE)
+                new BasePressurePlateBlock.Stone(stone, BlockSetType.STONE)
         );
         pedestal = EndBlocks.registerBlock(name + "_pedestal", new EndPedestal(stone));
         lantern = EndBlocks.registerBlock(name + "_lantern", new StoneLanternBlock(stone));
 
         bricks = EndBlocks.registerBlock(name + "_bricks", new BaseBlock(material));
-        brickStairs = EndBlocks.registerBlock(name + "_bricks_stairs", new BaseStairsBlock(bricks));
-        brickSlab = EndBlocks.registerBlock(name + "_bricks_slab", new BaseSlabBlock(bricks));
-        brickWall = EndBlocks.registerBlock(name + "_bricks_wall", new BaseWallBlock(bricks));
+        brickStairs = EndBlocks.registerBlock(name + "_bricks_stairs", new BaseStairsBlock.Stone(bricks));
+        brickSlab = EndBlocks.registerBlock(name + "_bricks_slab", new BaseSlabBlock.Stone(bricks));
+        brickWall = EndBlocks.registerBlock(name + "_bricks_wall", new BaseWallBlock.Stone(bricks));
         furnace = EndBlocks.registerBlock(name + "_furnace", new BaseFurnaceBlock(bricks));
         flowerPot = EndBlocks.registerBlock(name + "_flower_pot", new FlowerPotBlock(bricks));
 
diff --git a/src/main/java/org/betterx/betterend/registry/EndBlocks.java b/src/main/java/org/betterx/betterend/registry/EndBlocks.java
index e72aee0e..3c538b1b 100644
--- a/src/main/java/org/betterx/betterend/registry/EndBlocks.java
+++ b/src/main/java/org/betterx/betterend/registry/EndBlocks.java
@@ -142,16 +142,16 @@ public class EndBlocks {
     );
     public static final Block DRAGON_BONE_BLOCK = registerBlock(
             "dragon_bone_block",
-            new BaseRotatedPillarBlock(Blocks.BONE_BLOCK),
+            new BaseRotatedPillarBlock.Wood(Blocks.BONE_BLOCK, false),
             EndTags.BONEMEAL_TARGET_DRAGON_BONE
     );
     public static final Block DRAGON_BONE_STAIRS = registerBlock(
             "dragon_bone_stairs",
-            new BaseStairsBlock(DRAGON_BONE_BLOCK)
+            new BaseStairsBlock.Wood(DRAGON_BONE_BLOCK)
     );
     public static final Block DRAGON_BONE_SLAB = registerBlock(
             "dragon_bone_slab",
-            new BaseSlabBlock(DRAGON_BONE_BLOCK)
+            new BaseSlabBlock.Wood(DRAGON_BONE_BLOCK)
     );
     public static final Block MOSSY_DRAGON_BONE = registerBlock(
             "mossy_dragon_bone",
@@ -505,11 +505,11 @@ public class EndBlocks {
     public static final Block NEON_CACTUS_BLOCK = registerBlock("neon_cactus_block", new NeonCactusBlock());
     public static final Block NEON_CACTUS_BLOCK_STAIRS = registerBlock(
             "neon_cactus_stairs",
-            new BaseStairsBlock(NEON_CACTUS_BLOCK)
+            new BaseStairsBlock.Wood(NEON_CACTUS_BLOCK)
     );
     public static final Block NEON_CACTUS_BLOCK_SLAB = registerBlock(
             "neon_cactus_slab",
-            new BaseSlabBlock(NEON_CACTUS_BLOCK)
+            new BaseSlabBlock.Wood(NEON_CACTUS_BLOCK)
     );
 
     // Crops