diff --git a/common/src/generated/resources/data/cookingforblockheads/recipes/crafting_book.json b/common/src/generated/resources/data/cookingforblockheads/recipes/crafting_book.json
index 21cb68a3..5f6d7972 100644
--- a/common/src/generated/resources/data/cookingforblockheads/recipes/crafting_book.json
+++ b/common/src/generated/resources/data/cookingforblockheads/recipes/crafting_book.json
@@ -9,7 +9,7 @@
       "item": "minecraft:crafting_table"
     },
     "D": {
-      "tag": "c:gems/diamonds"
+      "tag": "c:gems/diamond"
     }
   },
   "pattern": [
diff --git a/common/src/generated/resources/data/cookingforblockheads/tags/blocks/connectors.json b/common/src/generated/resources/data/cookingforblockheads/tags/blocks/connectors.json
deleted file mode 100644
index 9eeb4913..00000000
--- a/common/src/generated/resources/data/cookingforblockheads/tags/blocks/connectors.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "values": [
-    "cookingforblockheads:connector",
-    "cookingforblockheads:white_connector",
-    "cookingforblockheads:orange_connector",
-    "cookingforblockheads:magenta_connector",
-    "cookingforblockheads:light_blue_connector",
-    "cookingforblockheads:yellow_connector",
-    "cookingforblockheads:lime_connector",
-    "cookingforblockheads:pink_connector",
-    "cookingforblockheads:gray_connector",
-    "cookingforblockheads:light_gray_connector",
-    "cookingforblockheads:cyan_connector",
-    "cookingforblockheads:purple_connector",
-    "cookingforblockheads:blue_connector",
-    "cookingforblockheads:brown_connector",
-    "cookingforblockheads:green_connector",
-    "cookingforblockheads:red_connector",
-    "cookingforblockheads:black_connector"
-  ]
-}
\ No newline at end of file
diff --git a/common/src/generated/resources/data/cookingforblockheads/tags/blocks/dyed_connectors.json b/common/src/generated/resources/data/cookingforblockheads/tags/blocks/dyed_connectors.json
deleted file mode 100644
index 6444b3dc..00000000
--- a/common/src/generated/resources/data/cookingforblockheads/tags/blocks/dyed_connectors.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "values": [
-    "cookingforblockheads:white_connector",
-    "cookingforblockheads:orange_connector",
-    "cookingforblockheads:magenta_connector",
-    "cookingforblockheads:light_blue_connector",
-    "cookingforblockheads:yellow_connector",
-    "cookingforblockheads:lime_connector",
-    "cookingforblockheads:pink_connector",
-    "cookingforblockheads:gray_connector",
-    "cookingforblockheads:light_gray_connector",
-    "cookingforblockheads:cyan_connector",
-    "cookingforblockheads:purple_connector",
-    "cookingforblockheads:blue_connector",
-    "cookingforblockheads:brown_connector",
-    "cookingforblockheads:green_connector",
-    "cookingforblockheads:red_connector",
-    "cookingforblockheads:black_connector"
-  ]
-}
\ No newline at end of file
diff --git a/common/src/generated/resources/data/cookingforblockheads/tags/blocks/dyed_ovens.json b/common/src/generated/resources/data/cookingforblockheads/tags/blocks/dyed_ovens.json
deleted file mode 100644
index cd0a8c84..00000000
--- a/common/src/generated/resources/data/cookingforblockheads/tags/blocks/dyed_ovens.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "values": [
-    "cookingforblockheads:orange_oven",
-    "cookingforblockheads:magenta_oven",
-    "cookingforblockheads:light_blue_oven",
-    "cookingforblockheads:yellow_oven",
-    "cookingforblockheads:lime_oven",
-    "cookingforblockheads:pink_oven",
-    "cookingforblockheads:gray_oven",
-    "cookingforblockheads:light_gray_oven",
-    "cookingforblockheads:cyan_oven",
-    "cookingforblockheads:purple_oven",
-    "cookingforblockheads:blue_oven",
-    "cookingforblockheads:brown_oven",
-    "cookingforblockheads:green_oven",
-    "cookingforblockheads:red_oven",
-    "cookingforblockheads:black_oven"
-  ]
-}
\ No newline at end of file
diff --git a/common/src/generated/resources/data/cookingforblockheads/tags/blocks/ovens.json b/common/src/generated/resources/data/cookingforblockheads/tags/blocks/ovens.json
deleted file mode 100644
index 281819bb..00000000
--- a/common/src/generated/resources/data/cookingforblockheads/tags/blocks/ovens.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "values": [
-    "cookingforblockheads:white_oven",
-    "cookingforblockheads:orange_oven",
-    "cookingforblockheads:magenta_oven",
-    "cookingforblockheads:light_blue_oven",
-    "cookingforblockheads:yellow_oven",
-    "cookingforblockheads:lime_oven",
-    "cookingforblockheads:pink_oven",
-    "cookingforblockheads:gray_oven",
-    "cookingforblockheads:light_gray_oven",
-    "cookingforblockheads:cyan_oven",
-    "cookingforblockheads:purple_oven",
-    "cookingforblockheads:blue_oven",
-    "cookingforblockheads:brown_oven",
-    "cookingforblockheads:green_oven",
-    "cookingforblockheads:red_oven",
-    "cookingforblockheads:black_oven"
-  ]
-}
\ No newline at end of file
diff --git a/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModRecipeProvider.java b/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModRecipeProvider.java
index 5880cfad..38ab6985 100644
--- a/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModRecipeProvider.java
+++ b/fabric/src/main/java/net/blay09/mods/cookingforblockheads/fabric/datagen/ModRecipeProvider.java
@@ -7,9 +7,11 @@
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
 import net.minecraft.core.HolderLookup;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.data.recipes.RecipeCategory;
 import net.minecraft.data.recipes.RecipeOutput;
 import net.minecraft.data.recipes.ShapedRecipeBuilder;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.DyeColor;
@@ -258,7 +260,7 @@ public void buildRecipes(RecipeOutput exporter) {
                 .pattern(" D ")
                 .pattern("CBC")
                 .pattern(" D ")
-                .define('D', BalmItemTags.DIAMONDS)
+                .define('D', TagKey.create(Registries.ITEM, new ResourceLocation("c", "gems/diamond")))
                 .define('C', Blocks.CRAFTING_TABLE)
                 .define('B', ModItems.recipeBook)
                 .unlockedBy("has_recipe_book", has(ModItems.recipeBook))