diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/CandleInAJar.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/CandleInAJar.java
index ebffa5d..c6d544a 100644
--- a/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/CandleInAJar.java
+++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/CandleInAJar.java
@@ -17,7 +17,7 @@ public class CandleInAJar extends Item {
     public CandleInAJar() {
         super(new Properties().stacksTo(1));
         if (Platform.LOADER.isModLoaded("shimmer")) {
-            CreativeTabRegistry.setCreativeTab(CommonRegistration.LIGHTS_TAB, HLItems.CANDLE_IN_A_JAR);
+            CreativeTabRegistry.setCreativeTab(CommonRegistration.LIGHTS_TAB, () -> this);
         }
     }
 
diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/LighterTool.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/LighterTool.java
index 1eaab9d..27708e5 100644
--- a/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/LighterTool.java
+++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/LighterTool.java
@@ -13,7 +13,7 @@ public class LighterTool extends Item {
 
     public LighterTool() {
         super(new Properties().stacksTo(1)/*.tab(CommonRegistration.LIGHTS_TAB)*/.durability(20));
-        CreativeTabRegistry.setCreativeTab(CommonRegistration.LIGHTS_TAB, HLItems.TORCH_TOOL);
+        CreativeTabRegistry.setCreativeTab(CommonRegistration.LIGHTS_TAB, () -> this);
     }
 
     @Override
diff --git a/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/WirelessBattery.java b/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/WirelessBattery.java
index b7faa0d..fe18b80 100644
--- a/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/WirelessBattery.java
+++ b/Common/src/main/java/me/hypherionmc/hyperlighting/common/items/WirelessBattery.java
@@ -25,7 +25,7 @@ public class WirelessBattery extends Item implements SwitchModule {
 
     public WirelessBattery() {
         super(new Properties().stacksTo(1));
-        CreativeTabRegistry.setCreativeTab(CommonRegistration.MACHINES_TAB, HLItems.WIRELESS_BATTERY);
+        CreativeTabRegistry.setCreativeTab(CommonRegistration.MACHINES_TAB, () -> this);
     }
 
     @Override