diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/data/ItemRegistryDiff.java b/src/main/java/de/florianmichael/viafabricplus/fixes/data/ItemRegistryDiff.java
index 885c21b1..7af1e7ee 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/data/ItemRegistryDiff.java
+++ b/src/main/java/de/florianmichael/viafabricplus/fixes/data/ItemRegistryDiff.java
@@ -48,6 +48,49 @@ public class ItemRegistryDiff {
     public static final List<Item> EXTENDED_CLASSIC_ITEMS = new ArrayList<>();
 
     static {
+        ITEM_DIFF.put(PALE_OAK_PLANKS, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_SAPLING, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_LOG, andNewer(v1_21_2));
+        ITEM_DIFF.put(STRIPPED_PALE_OAK_LOG, andNewer(v1_21_2));
+        ITEM_DIFF.put(STRIPPED_PALE_OAK_WOOD, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_WOOD, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_LEAVES, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_MOSS_CARPET, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_HANGING_MOSS, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_MOSS_BLOCK, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_SLAB, andNewer(v1_21_2));
+        ITEM_DIFF.put(CREAKING_HEART, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_FENCE, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_STAIRS, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_BUTTON, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_PRESSURE_PLATE, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_DOOR, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_TRAPDOOR, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_FENCE_GATE, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_BOAT, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_CHEST_BOAT, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_SIGN, andNewer(v1_21_2));
+        ITEM_DIFF.put(PALE_OAK_HANGING_SIGN, andNewer(v1_21_2));
+        ITEM_DIFF.put(WHITE_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(ORANGE_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(MAGENTA_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(LIGHT_BLUE_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(YELLOW_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(LIME_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(PINK_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(GRAY_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(LIGHT_GRAY_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(CYAN_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(PURPLE_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(BLUE_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(BROWN_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(GREEN_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(RED_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(BLACK_BUNDLE, andNewer(v1_21_2));
+        ITEM_DIFF.put(CREAKING_SPAWN_EGG, andNewer(v1_21_2));
+        ITEM_DIFF.put(FIELD_MASONED_BANNER_PATTERN, andNewer(v1_21_2));
+        ITEM_DIFF.put(BORDURE_INDENTED_BANNER_PATTERN, andNewer(v1_21_2));
+
         ITEM_DIFF.put(MUSIC_DISC_CREATOR_MUSIC_BOX, andNewer(v1_21));
         ITEM_DIFF.put(MUSIC_DISC_CREATOR, andNewer(v1_21));
         ITEM_DIFF.put(MUSIC_DISC_PRECIPICE, andNewer(v1_21));
diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/ViaFabricPlusProtocol.java b/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/ViaFabricPlusProtocol.java
index 5fa12ba6..415bf863 100644
--- a/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/ViaFabricPlusProtocol.java
+++ b/src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/ViaFabricPlusProtocol.java
@@ -29,6 +29,8 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPackets1_20_5;
 import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundPackets1_21;
+import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
+import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPackets1_21_2;
 import com.viaversion.viaversion.util.Key;
 import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
 import net.minecraft.network.packet.BrandCustomPayload;
@@ -119,11 +121,11 @@ public class ViaFabricPlusProtocol extends AbstractSimpleProtocol {
     }
 
     public static ServerboundPacketType getSetCreativeModeSlot() {
-        return ServerboundPackets1_20_5.SET_CREATIVE_MODE_SLOT;
+        return ServerboundPackets1_21_2.SET_CREATIVE_MODE_SLOT;
     }
 
     public static ClientboundPacketType getCustomPayload() {
-        return ClientboundPackets1_21.CUSTOM_PAYLOAD;
+        return ClientboundPackets1_21_2.CUSTOM_PAYLOAD;
     }
 
     @FunctionalInterface