diff --git a/src/main/java/voltaic/common/block/BlockCustomGlass.java b/src/main/java/voltaic/common/block/BlockCustomGlass.java
index 6aaf4dc..a57c7f1 100644
--- a/src/main/java/voltaic/common/block/BlockCustomGlass.java
+++ b/src/main/java/voltaic/common/block/BlockCustomGlass.java
@@ -13,11 +13,12 @@
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
+import voltaic.common.block.states.VoltaicMaterials;
 
 public class BlockCustomGlass extends Block {
 
     public BlockCustomGlass(float hardness, float resistance) {
-        super(Blocks.GLASS.properties().requiresCorrectToolForDrops().strength(hardness, resistance).isRedstoneConductor((x, y, z) -> false).noOcclusion());
+        super(VoltaicMaterials.glass().requiresCorrectToolForDrops().strength(hardness, resistance).isRedstoneConductor((x, y, z) -> false).noOcclusion());
     }
 
     @Override
diff --git a/src/main/java/voltaic/common/block/BlockMultiSubnode.java b/src/main/java/voltaic/common/block/BlockMultiSubnode.java
index 0bd2294..7bb04b0 100644
--- a/src/main/java/voltaic/common/block/BlockMultiSubnode.java
+++ b/src/main/java/voltaic/common/block/BlockMultiSubnode.java
@@ -22,13 +22,14 @@
 import net.neoforged.api.distmarker.OnlyIn;
 import voltaic.api.multiblock.subnodebased.TileMultiSubnode;
 import voltaic.api.multiblock.subnodebased.child.IMultiblockChildBlock;
+import voltaic.common.block.states.VoltaicMaterials;
 import voltaic.prefab.block.GenericEntityBlock;
 import voltaic.prefab.tile.GenericTile;
 
 public class BlockMultiSubnode extends GenericEntityBlock implements IMultiblockChildBlock {
 
     public BlockMultiSubnode() {
-        super(Blocks.GLASS.properties().strength(3.5F).sound(SoundType.METAL).isRedstoneConductor((a, b, c) -> false).noOcclusion());
+        super(VoltaicMaterials.glass().strength(3.5F).sound(SoundType.METAL).isRedstoneConductor((a, b, c) -> false).noOcclusion());
     }
 
     @Override
diff --git a/src/main/java/voltaic/prefab/block/GenericMachineBlock.java b/src/main/java/voltaic/prefab/block/GenericMachineBlock.java
index fe64ae8..6a5e090 100644
--- a/src/main/java/voltaic/prefab/block/GenericMachineBlock.java
+++ b/src/main/java/voltaic/prefab/block/GenericMachineBlock.java
@@ -24,6 +24,7 @@
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import voltaic.common.block.states.VoltaicBlockStates;
+import voltaic.common.block.states.VoltaicMaterials;
 import voltaic.common.block.voxelshapes.VoxelShapeProvider;
 
 public class GenericMachineBlock extends GenericEntityBlockWaterloggable {
@@ -34,7 +35,7 @@ public class GenericMachineBlock extends GenericEntityBlockWaterloggable {
     public static HashMap<BlockPos, LivingEntity> IPLAYERSTORABLE_MAP = new HashMap<>();
 
     public GenericMachineBlock(BlockEntitySupplier<BlockEntity> blockEntitySupplier, VoxelShapeProvider provider) {
-        super(Blocks.IRON_BLOCK.properties().strength(3.5F).sound(SoundType.METAL).noOcclusion().requiresCorrectToolForDrops());
+        super(VoltaicMaterials.metal().strength(3.5F).sound(SoundType.METAL).noOcclusion().requiresCorrectToolForDrops());
         registerDefaultState(stateDefinition.any().setValue(VoltaicBlockStates.FACING, Direction.NORTH));
         this.blockEntitySupplier = blockEntitySupplier;
         this.shapeProvider = provider;