diff --git a/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java b/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java
index 1515c2e..b73eb49 100644
--- a/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java
+++ b/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java
@@ -7,16 +7,19 @@ import net.minecraft.enchantment.Enchantments;
 import net.minecraft.item.*;
 import net.minecraft.potion.PotionUtil;
 import net.minecraft.potion.Potions;
+import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.tag.InstrumentTags;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 import net.minecraft.village.raid.Raid;
 import org.spongepowered.asm.mixin.*;
+import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
 
-import java.util.EnumSet;
-import java.util.Set;
+import java.util.*;
 
 import static me.theclashfruit.cc.ClutteredCreative.LOGGER;
 import static net.minecraft.item.ItemGroups.*;
@@ -24,7 +27,7 @@ import static net.minecraft.item.ItemGroups.*;
 @Mixin(ItemGroups.class)
 public class ItemGroupsMixin {
 
-    @Shadow
+    @Invoker("register")
     private static RegistryKey<ItemGroup> register(String id) {
         throw new AssertionError();
     }
@@ -32,21 +35,19 @@ public class ItemGroupsMixin {
     @Unique
     private static final RegistryKey<ItemGroup> BUILDING_BLOCKS = register("building_blocks");
     @Unique
-    private static final RegistryKey<ItemGroup> DECORATION = register("decoration");
+    private static final RegistryKey<ItemGroup> DECORATION = register("natural_blocks");
     @Unique
-    private static final RegistryKey<ItemGroup> REDSTONE = register("redstone");
+    private static final RegistryKey<ItemGroup> REDSTONE = register("redstone_blocks");
     @Unique
-    private static final RegistryKey<ItemGroup> TRANSPORTATION = register("transportation");
+    private static final RegistryKey<ItemGroup> TRANSPORTATION = register("functional_blocks");
     @Unique
-    private static final RegistryKey<ItemGroup> MISC = register("misc");
+    private static final RegistryKey<ItemGroup> MISC = register("ingredients");
     @Unique
-    private static final RegistryKey<ItemGroup> FOOD = register("food");
+    private static final RegistryKey<ItemGroup> FOOD = register("food_and_drinks");
     @Unique
-    private static final RegistryKey<ItemGroup> TOOLS = register("tools");
+    private static final RegistryKey<ItemGroup> TOOLS = register("tools_and_utilities");
     @Unique
-    private static final RegistryKey<ItemGroup> COMBAT = register("combat");
-    @Unique
-    private static final RegistryKey<ItemGroup> BREWING = register("brewing");
+    private static final RegistryKey<ItemGroup> BREWING = register("spawn_eggs");
 
     @Unique
     private static final ItemGroup hotbarGroup = ItemGroup
@@ -632,6 +633,7 @@ public class ItemGroupsMixin {
                     content.add(Items.BIG_DRIPLEAF);
                     content.add(Items.SMALL_DRIPLEAF);
                     content.add(Items.BAMBOO);
+                    content.add(Items.BAMBOO_MOSAIC);
 
                     content.add(Items.TORCH);
 
@@ -659,6 +661,7 @@ public class ItemGroupsMixin {
                     content.add(Items.DARK_OAK_FENCE);
                     content.add(Items.MANGROVE_FENCE);
                     content.add(Items.CHERRY_FENCE);
+                    content.add(Items.BAMBOO_FENCE);
                     content.add(Items.CRIMSON_FENCE);
                     content.add(Items.WARPED_FENCE);
 
@@ -834,6 +837,7 @@ public class ItemGroupsMixin {
                     content.add(Items.ACACIA_SIGN);
                     content.add(Items.DARK_OAK_SIGN);
                     content.add(Items.MANGROVE_SIGN);
+                    content.add(Items.BAMBOO_SIGN);
                     content.add(Items.CHERRY_SIGN);
                     content.add(Items.CRIMSON_SIGN);
                     content.add(Items.WARPED_SIGN);
@@ -846,6 +850,7 @@ public class ItemGroupsMixin {
                     content.add(Items.DARK_OAK_HANGING_SIGN);
                     content.add(Items.MANGROVE_HANGING_SIGN);
                     content.add(Items.CHERRY_HANGING_SIGN);
+                    content.add(Items.BAMBOO_HANGING_SIGN);
                     content.add(Items.CRIMSON_HANGING_SIGN);
                     content.add(Items.WARPED_HANGING_SIGN);
 
@@ -1005,6 +1010,7 @@ public class ItemGroupsMixin {
                     content.add(Items.DARK_OAK_BUTTON);
                     content.add(Items.MANGROVE_BUTTON);
                     content.add(Items.CHERRY_BUTTON);
+                    content.add(Items.BAMBOO_BUTTON);
                     content.add(Items.CRIMSON_BUTTON);
                     content.add(Items.WARPED_BUTTON);
 
@@ -1020,6 +1026,7 @@ public class ItemGroupsMixin {
                     content.add(Items.DARK_OAK_PRESSURE_PLATE);
                     content.add(Items.MANGROVE_PRESSURE_PLATE);
                     content.add(Items.CHERRY_PRESSURE_PLATE);
+                    content.add(Items.BAMBOO_PRESSURE_PLATE);
                     content.add(Items.CRIMSON_PRESSURE_PLATE);
                     content.add(Items.WARPED_PRESSURE_PLATE);
 
@@ -1032,6 +1039,7 @@ public class ItemGroupsMixin {
                     content.add(Items.DARK_OAK_DOOR);
                     content.add(Items.MANGROVE_DOOR);
                     content.add(Items.CHERRY_DOOR);
+                    content.add(Items.BAMBOO_DOOR);
                     content.add(Items.CRIMSON_DOOR);
                     content.add(Items.WARPED_DOOR);
 
@@ -1044,6 +1052,7 @@ public class ItemGroupsMixin {
                     content.add(Items.DARK_OAK_TRAPDOOR);
                     content.add(Items.MANGROVE_TRAPDOOR);
                     content.add(Items.CHERRY_TRAPDOOR);
+                    content.add(Items.BAMBOO_TRAPDOOR);
                     content.add(Items.CRIMSON_TRAPDOOR);
                     content.add(Items.WARPED_TRAPDOOR);
 
@@ -1055,6 +1064,7 @@ public class ItemGroupsMixin {
                     content.add(Items.DARK_OAK_FENCE_GATE);
                     content.add(Items.MANGROVE_FENCE_GATE);
                     content.add(Items.CHERRY_FENCE_GATE);
+                    content.add(Items.BAMBOO_FENCE_GATE);
                     content.add(Items.CRIMSON_FENCE_GATE);
                     content.add(Items.WARPED_FENCE_GATE);
                 })
@@ -1104,6 +1114,8 @@ public class ItemGroupsMixin {
                     content.add(Items.MANGROVE_CHEST_BOAT);
                     content.add(Items.CHERRY_BOAT);
                     content.add(Items.CHERRY_CHEST_BOAT);
+                    content.add(Items.BAMBOO_RAFT);
+                    content.add(Items.BAMBOO_CHEST_RAFT);
                 })
                 .build()
         );