diff --git a/src/main/java/dev/micle/totemofreviving/TotemOfReviving.java b/src/main/java/dev/micle/totemofreviving/TotemOfReviving.java
index f038785..e60f80a 100644
--- a/src/main/java/dev/micle/totemofreviving/TotemOfReviving.java
+++ b/src/main/java/dev/micle/totemofreviving/TotemOfReviving.java
@@ -3,8 +3,6 @@ package dev.micle.totemofreviving;
 import dev.micle.totemofreviving.proxy.IProxy;
 import dev.micle.totemofreviving.proxy.Proxy;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModContainer;
 import net.minecraftforge.fml.ModList;
@@ -15,7 +13,6 @@ import java.util.Optional;
 @Mod(TotemOfReviving.MOD_ID)
 public final class TotemOfReviving {
 	public static final String MOD_ID = "totemofreviving";
-	public static CreativeModeTab CREATIVE_TAB = CreativeModeTabs.getDefaultTab();
 
 	private static IProxy proxy;
 
diff --git a/src/main/java/dev/micle/totemofreviving/event/common/OnCreativeModeTabRegisterEventHandler.java b/src/main/java/dev/micle/totemofreviving/event/common/OnCreativeModeTabRegisterEventHandler.java
deleted file mode 100644
index 7e874ae..0000000
--- a/src/main/java/dev/micle/totemofreviving/event/common/OnCreativeModeTabRegisterEventHandler.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package dev.micle.totemofreviving.event.common;
-
-import dev.micle.totemofreviving.TotemOfReviving;
-import dev.micle.totemofreviving.setup.ModItems;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.event.CreativeModeTabEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-
-@Mod.EventBusSubscriber(modid = TotemOfReviving.MOD_ID)
-public class OnCreativeModeTabRegisterEventHandler {
-    @SubscribeEvent
-    public static void creativeModeTabRegisterEvent(CreativeModeTabEvent.Register event) {
-        System.out.println("HERE!");
-        TotemOfReviving.CREATIVE_TAB = event.registerCreativeModeTab(
-                TotemOfReviving.createResourceLocation("creative_mode_tab_main"), builder -> builder
-                        .icon(() -> new ItemStack(ModItems.STRAW_TOTEM.get()))
-                        .title(Component.translatable(String.format("tabs.%s.main_tab", TotemOfReviving.MOD_ID)))
-                        .displayItems((featureFlags, output) -> {
-                            output.accept(ModItems.STRAW_TOTEM.get());
-                            output.accept(ModItems.IRON_TOTEM.get());
-                            output.accept(ModItems.DIAMOND_TOTEM.get());
-                            output.accept(ModItems.NETHERITE_TOTEM.get());
-
-                            output.accept(ModItems.STRAW_CHARGE.get());
-                            output.accept(ModItems.IRON_CHARGE.get());
-                            output.accept(ModItems.DIAMOND_CHARGE.get());
-                            output.accept(ModItems.NETHERITE_CHARGE.get());
-                        })
-        );
-    }
-}
diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java b/src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java
index c2bdeef..05087dd 100644
--- a/src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java
+++ b/src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java
@@ -1,6 +1,5 @@
 package dev.micle.totemofreviving.item.charge;
 
-import dev.micle.totemofreviving.setup.Config;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.Item;
diff --git a/src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java b/src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java
new file mode 100644
index 0000000..e71fbf3
--- /dev/null
+++ b/src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java
@@ -0,0 +1,28 @@
+package dev.micle.totemofreviving.setup;
+
+import dev.micle.totemofreviving.TotemOfReviving;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraftforge.registries.RegistryObject;
+
+public class ModCreativeModeTabs {
+    public static RegistryObject<CreativeModeTab> MAIN = Registration.CREATIVE_MODE_TABS.register("Main",
+            () -> CreativeModeTab.builder()
+                    .title(Component.translatable(String.format("itemGroup.%s.main", TotemOfReviving.MOD_ID)))
+                    .icon(ModItems.STRAW_TOTEM.get()::getDefaultInstance)
+                    .displayItems((itemDisplayParameters, output) -> {
+                        output.accept(ModItems.STRAW_TOTEM.get());
+                        output.accept(ModItems.IRON_TOTEM.get());
+                        output.accept(ModItems.DIAMOND_TOTEM.get());
+                        output.accept(ModItems.NETHERITE_TOTEM.get());
+
+                        output.accept(ModItems.STRAW_CHARGE.get());
+                        output.accept(ModItems.IRON_CHARGE.get());
+                        output.accept(ModItems.DIAMOND_CHARGE.get());
+                        output.accept(ModItems.NETHERITE_CHARGE.get());
+                    })
+                    .build()
+    );
+
+    public static void register() {}
+}
diff --git a/src/main/java/dev/micle/totemofreviving/setup/Registration.java b/src/main/java/dev/micle/totemofreviving/setup/Registration.java
index 3dcd1c3..0940c46 100644
--- a/src/main/java/dev/micle/totemofreviving/setup/Registration.java
+++ b/src/main/java/dev/micle/totemofreviving/setup/Registration.java
@@ -1,7 +1,8 @@
 package dev.micle.totemofreviving.setup;
 
 import dev.micle.totemofreviving.TotemOfReviving;
-import dev.micle.totemofreviving.event.common.OnCreativeModeTabRegisterEventHandler;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -13,12 +14,16 @@ public class Registration {
     public static final DeferredRegister<Item> ITEMS =
             DeferredRegister.create(ForgeRegistries.ITEMS, TotemOfReviving.MOD_ID);
 
+    public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS =
+            DeferredRegister.create(Registries.CREATIVE_MODE_TAB, TotemOfReviving.MOD_ID);
+
     public static void register() {
         IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
 
         ITEMS.register(modEventBus);
         ModItems.register();
 
-        modEventBus.register(OnCreativeModeTabRegisterEventHandler.class);
+        CREATIVE_MODE_TABS.register(modEventBus);
+        ModCreativeModeTabs.register();
     }
 }
diff --git a/src/main/resources/assets/totemofreviving/lang/en_us.json b/src/main/resources/assets/totemofreviving/lang/en_us.json
index 6ffda43..58ea6bf 100644
--- a/src/main/resources/assets/totemofreviving/lang/en_us.json
+++ b/src/main/resources/assets/totemofreviving/lang/en_us.json
@@ -1,5 +1,5 @@
 {
-  "tabs.totemofreviving.main_tab": "Micle's Totem of Reviving",
+  "itemGroup.totemofreviving.main": "Micle's Totem of Reviving",
   "item.totemofreviving.straw_totem": "Straw totem of reviving",
   "item.totemofreviving.iron_totem": "Iron totem of reviving",
   "item.totemofreviving.diamond_totem": "Diamond totem of reviving",