diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java
index dd98387..6d73b0f 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java
@@ -27,7 +27,7 @@ public class DefensiveLaserBlock extends EnergyProviderBlock {
     public static final BooleanProperty POWERED = Properties.POWERED;
 
     public DefensiveLaserBlock() {
-        super(FabricBlockSettings.of(Material.GLASS, MaterialColor.BLACK).sounds(BlockSoundGroup.GLASS).requiresTool().strength(50.0F, 1200.0F).nonOpaque().allowsSpawning((state, world, pos, type) -> false).solidBlock((state, world, pos) -> false).suffocates((state, world, pos) -> false).lightLevel(state -> state.get(POWERED) ? 7 : 0));
+        super(FabricBlockSettings.of(Material.STONE, MaterialColor.BLACK).sounds(BlockSoundGroup.GLASS).requiresTool().strength(50.0F, 1200.0F).nonOpaque().allowsSpawning((state, world, pos, type) -> false).solidBlock((state, world, pos) -> false).suffocates((state, world, pos) -> false).lightLevel(state -> state.get(POWERED) ? 7 : 0));
         setDefaultState(getDefaultState().with(POWERED, false));
     }
 
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/EnergonLightBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/EnergonLightBlock.java
index a21e64a..d23c6e3 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/EnergonLightBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/EnergonLightBlock.java
@@ -19,7 +19,7 @@ public class EnergonLightBlock extends EnergyProviderBlock {
     public static final BooleanProperty POWERED = Properties.POWERED;
 
     public EnergonLightBlock() {
-        super(FabricBlockSettings.of(Material.GLASS).sounds(BlockSoundGroup.GLASS).nonOpaque().lightLevel(state -> state.get(POWERED) ? 15 : 0).strength(0.3f));
+        super(FabricBlockSettings.of(Material.REDSTONE_LAMP).sounds(BlockSoundGroup.GLASS).nonOpaque().lightLevel(state -> state.get(POWERED) ? 15 : 0).strength(0.3f));
         setDefaultState(getDefaultState().with(POWERED, false));
     }
 
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/SolarPanelBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/SolarPanelBlock.java
index dac00bf..02479d7 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/SolarPanelBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/SolarPanelBlock.java
@@ -4,6 +4,7 @@ import com.thebrokenrail.energonrelics.block.entity.SolarPanelBlockEntity;
 import com.thebrokenrail.energonrelics.block.util.energy.EnergyProviderBlock;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.Material;
+import net.minecraft.block.MaterialColor;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.sound.BlockSoundGroup;
@@ -12,7 +13,7 @@ import java.util.function.Function;
 
 public class SolarPanelBlock extends EnergyProviderBlock {
     public SolarPanelBlock() {
-        super(FabricBlockSettings.of(Material.GLASS).sounds(BlockSoundGroup.GLASS).requiresTool().strength(1.5f, 6.0f));
+        super(FabricBlockSettings.of(Material.STONE, MaterialColor.BLUE_TERRACOTTA).sounds(BlockSoundGroup.GLASS).requiresTool().strength(1.5f, 6.0f));
     }
 
     @Override
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/ThermalCasingBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/ThermalCasingBlock.java
index 9e2c3ea..acaeffc 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/ThermalCasingBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/ThermalCasingBlock.java
@@ -3,9 +3,10 @@ package com.thebrokenrail.energonrelics.block;
 import com.thebrokenrail.energonrelics.block.util.SimpleBlock;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.Material;
+import net.minecraft.block.MaterialColor;
 
 public class ThermalCasingBlock extends SimpleBlock {
     public ThermalCasingBlock() {
-        super(FabricBlockSettings.of(Material.STONE).requiresTool().strength(1.5f, 6.0f));
+        super(FabricBlockSettings.of(Material.STONE, MaterialColor.YELLOW_TERRACOTTA).requiresTool().strength(1.5f, 6.0f));
     }
 }
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/ThermalGlassBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/ThermalGlassBlock.java
index 7d4f841..32e092e 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/ThermalGlassBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/ThermalGlassBlock.java
@@ -6,12 +6,14 @@ import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Material;
+import net.minecraft.block.MaterialColor;
+import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
 
 public class ThermalGlassBlock extends SimpleBlock {
     public ThermalGlassBlock() {
-        super(FabricBlockSettings.of(Material.STONE).requiresTool().strength(1.5f, 6.0f).nonOpaque().allowsSpawning((state, world, pos, type) -> false).solidBlock((state, world, pos) -> false).suffocates((state, world, pos) -> false));
+        super(FabricBlockSettings.of(Material.STONE, MaterialColor.YELLOW_TERRACOTTA).sounds(BlockSoundGroup.GLASS).requiresTool().strength(1.5f, 6.0f).nonOpaque().allowsSpawning((state, world, pos, type) -> false).solidBlock((state, world, pos) -> false).suffocates((state, world, pos) -> false));
     }
 
     @Override
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/battery/ActiveBatteryControllerBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/battery/ActiveBatteryControllerBlock.java
index 1789be4..cc101f3 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/battery/ActiveBatteryControllerBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/battery/ActiveBatteryControllerBlock.java
@@ -1,14 +1,18 @@
 package com.thebrokenrail.energonrelics.block.battery;
 
 import com.thebrokenrail.energonrelics.block.entity.battery.ActiveBatteryControllerBlockEntity;
+import com.thebrokenrail.energonrelics.block.util.energy.FacingEnergyProviderBlock;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.Material;
+import net.minecraft.block.MaterialColor;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
 
 import java.util.function.Function;
 
-public class ActiveBatteryControllerBlock extends PassiveBatteryControllerBlock {
+public class ActiveBatteryControllerBlock extends FacingEnergyProviderBlock {
     public ActiveBatteryControllerBlock() {
-        super();
+        super(FabricBlockSettings.of(Material.STONE, MaterialColor.ORANGE_TERRACOTTA).requiresTool().strength(1.5f, 6.0f));
     }
 
     @Override
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/battery/BatteryCoreBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/battery/BatteryCoreBlock.java
index 9623b82..5575c1e 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/battery/BatteryCoreBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/battery/BatteryCoreBlock.java
@@ -4,6 +4,7 @@ import com.thebrokenrail.energonrelics.block.entity.battery.BatteryCoreBlockEnti
 import com.thebrokenrail.energonrelics.block.util.SimpleBlockWithEntity;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.Material;
+import net.minecraft.block.MaterialColor;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
 
@@ -11,7 +12,7 @@ import java.util.function.Function;
 
 public class BatteryCoreBlock extends SimpleBlockWithEntity {
     public BatteryCoreBlock() {
-        super(FabricBlockSettings.of(Material.STONE).requiresTool().strength(1.5f, 6.0f));
+        super(FabricBlockSettings.of(Material.STONE, MaterialColor.RED_TERRACOTTA).requiresTool().strength(1.5f, 6.0f));
     }
 
     @Override
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/battery/PassiveBatteryControllerBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/battery/PassiveBatteryControllerBlock.java
index 65c8131..9f3d2fb 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/battery/PassiveBatteryControllerBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/battery/PassiveBatteryControllerBlock.java
@@ -4,6 +4,7 @@ import com.thebrokenrail.energonrelics.block.entity.battery.PassiveBatteryContro
 import com.thebrokenrail.energonrelics.block.util.energy.FacingEnergyProviderBlock;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.Material;
+import net.minecraft.block.MaterialColor;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
 
@@ -11,7 +12,7 @@ import java.util.function.Function;
 
 public class PassiveBatteryControllerBlock extends FacingEnergyProviderBlock {
     public PassiveBatteryControllerBlock() {
-        super(FabricBlockSettings.of(Material.STONE).requiresTool().strength(1.5f, 6.0f));
+        super(FabricBlockSettings.of(Material.STONE, MaterialColor.RED_TERRACOTTA).requiresTool().strength(1.5f, 6.0f));
     }
 
     @Override
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/reactor/ReactorControllerBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/reactor/ReactorControllerBlock.java
index 4d381cd..23ca580 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/reactor/ReactorControllerBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/reactor/ReactorControllerBlock.java
@@ -1,9 +1,12 @@
 package com.thebrokenrail.energonrelics.block.reactor;
 
-import com.thebrokenrail.energonrelics.block.battery.PassiveBatteryControllerBlock;
 import com.thebrokenrail.energonrelics.block.entity.reactor.ReactorControllerBlockEntity;
+import com.thebrokenrail.energonrelics.block.util.energy.FacingEnergyProviderBlock;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.Material;
+import net.minecraft.block.MaterialColor;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.item.ItemPlacementContext;
@@ -19,11 +22,11 @@ import java.util.Random;
 import java.util.function.Function;
 
 @SuppressWarnings("deprecation")
-public class ReactorControllerBlock extends PassiveBatteryControllerBlock {
+public class ReactorControllerBlock extends FacingEnergyProviderBlock {
     public static final BooleanProperty POWERED = Properties.POWERED;
 
     public ReactorControllerBlock() {
-        super();
+        super(FabricBlockSettings.of(Material.STONE, MaterialColor.PURPLE_TERRACOTTA).requiresTool().strength(1.5f, 6.0f));
         setDefaultState(getDefaultState().with(POWERED, false));
     }
 
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/reactor/ReactorCoreBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/reactor/ReactorCoreBlock.java
index cfaecf8..caad085 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/reactor/ReactorCoreBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/reactor/ReactorCoreBlock.java
@@ -4,6 +4,7 @@ import com.thebrokenrail.energonrelics.block.entity.reactor.ReactorCoreBlockEnti
 import com.thebrokenrail.energonrelics.block.util.SimpleBlockWithEntity;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.Material;
+import net.minecraft.block.MaterialColor;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
 
@@ -11,7 +12,7 @@ import java.util.function.Function;
 
 public class ReactorCoreBlock extends SimpleBlockWithEntity {
     public ReactorCoreBlock() {
-        super(FabricBlockSettings.of(Material.STONE).requiresTool().strength(1.5f, 6.0f));
+        super(FabricBlockSettings.of(Material.STONE, MaterialColor.PURPLE_TERRACOTTA).requiresTool().strength(1.5f, 6.0f));
     }
 
     @Override
diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/reactor/ReactorInputBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/reactor/ReactorInputBlock.java
index 0fb2c1f..5ed751f 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/block/reactor/ReactorInputBlock.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/block/reactor/ReactorInputBlock.java
@@ -6,6 +6,7 @@ import com.thebrokenrail.energonrelics.block.util.SimpleBlockWithEntity;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Material;
+import net.minecraft.block.MaterialColor;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.entity.player.PlayerEntity;
@@ -23,7 +24,7 @@ import java.util.function.Function;
 
 public class ReactorInputBlock extends SimpleBlockWithEntity {
     public ReactorInputBlock() {
-        super(FabricBlockSettings.of(Material.STONE).requiresTool().strength(1.5f, 6.0f));
+        super(FabricBlockSettings.of(Material.STONE, MaterialColor.YELLOW_TERRACOTTA).requiresTool().strength(1.5f, 6.0f));
     }
 
     @Override