diff --git a/src/main/resources/data/minecolonies/tags/items/blacksmith_ingredient.json b/src/main/resources/data/minecolonies/tags/items/blacksmith_ingredient.json
index 5d341ba2424..6a45f42fe9f 100644
--- a/src/main/resources/data/minecolonies/tags/items/blacksmith_ingredient.json
+++ b/src/main/resources/data/minecolonies/tags/items/blacksmith_ingredient.json
@@ -1,4 +1,7 @@
 {
-  "replace": false,
-  "values": []
-}
+    "replace" : false,
+    "values" : [
+      "#forge:nuggets",
+      "#forge:ingots"
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecolonies/tags/items/blacksmith_ingredient_excluded.json b/src/main/resources/data/minecolonies/tags/items/blacksmith_ingredient_excluded.json
index 5d341ba2424..aa9f837fb4f 100644
--- a/src/main/resources/data/minecolonies/tags/items/blacksmith_ingredient_excluded.json
+++ b/src/main/resources/data/minecolonies/tags/items/blacksmith_ingredient_excluded.json
@@ -1,4 +1,9 @@
 {
-  "replace": false,
-  "values": []
-}
+    "replace": false,
+    "values": [
+        "#minecolonies:mechanic_ingredient",
+        "#forge:fruits",
+        "#forge:crops",
+        "#minecolonies:dyer_ingredient"
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecolonies/tags/items/blacksmith_product.json b/src/main/resources/data/minecolonies/tags/items/blacksmith_product.json
index b0c268edd02..32ae2cc51d4 100644
--- a/src/main/resources/data/minecolonies/tags/items/blacksmith_product.json
+++ b/src/main/resources/data/minecolonies/tags/items/blacksmith_product.json
@@ -2,6 +2,7 @@
   "replace" : false,
   "values" : [
     "#forge:nuggets",
-    "#forge:ingots"
+    "#forge:ingots",
+    "minecraft:shears"
   ]
 }
diff --git a/src/main/resources/data/minecolonies/tags/items/blacksmith_product_excluded.json b/src/main/resources/data/minecolonies/tags/items/blacksmith_product_excluded.json
index 5d341ba2424..de29b9ea789 100644
--- a/src/main/resources/data/minecolonies/tags/items/blacksmith_product_excluded.json
+++ b/src/main/resources/data/minecolonies/tags/items/blacksmith_product_excluded.json
@@ -1,4 +1,8 @@
 {
-  "replace": false,
-  "values": []
-}
+    "replace": false,
+    "values": [
+        "#minecolonies:mechanic_product",
+        "#minecolonies:dyer_product",
+        "minecraft:firework_star"
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecolonies/tags/items/mechanic_product.json b/src/main/resources/data/minecolonies/tags/items/mechanic_product.json
index 69ca1b78b15..f93c0902c63 100644
--- a/src/main/resources/data/minecolonies/tags/items/mechanic_product.json
+++ b/src/main/resources/data/minecolonies/tags/items/mechanic_product.json
@@ -1,12 +1,14 @@
 {
-  "replace": false,
-  "values": [
-    "minecraft:blue_ice",
-    "minecraft:enchanting_table",
-    "minecraft:jack_o_lantern",
-    "minecraft:lantern",
-    "minecraft:packed_ice",
-    "#minecraft:rails",
-    "#forge:storage_blocks"
-  ]
-}
+    "replace": false,
+    "values": [
+      "minecraft:blue_ice",
+      "minecraft:enchanting_table",
+      "minecraft:torch",
+      "minecraft:jack_o_lantern",
+      "minecraft:lantern",
+      "minecraft:packed_ice",
+      "minecraft:tripwire_hook",
+      "#minecraft:rails",
+      "#forge:storage_blocks"
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecolonies/tags/items/stonemason_ingredient.json b/src/main/resources/data/minecolonies/tags/items/stonemason_ingredient.json
index 5d341ba2424..75997b105d3 100644
--- a/src/main/resources/data/minecolonies/tags/items/stonemason_ingredient.json
+++ b/src/main/resources/data/minecolonies/tags/items/stonemason_ingredient.json
@@ -1,4 +1,9 @@
 {
-  "replace": false,
-  "values": []
-}
+    "replace": false,
+    "values": [
+        "#forge:stone",
+        "#forge:cobblestone",
+        "#forge:end_stones",
+        "minecraft:nether_brick"
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecolonies/tags/items/stonemason_ingredient_excluded.json b/src/main/resources/data/minecolonies/tags/items/stonemason_ingredient_excluded.json
index 8207f7b86d6..3ee41ec1117 100644
--- a/src/main/resources/data/minecolonies/tags/items/stonemason_ingredient_excluded.json
+++ b/src/main/resources/data/minecolonies/tags/items/stonemason_ingredient_excluded.json
@@ -1,8 +1,9 @@
 {
-  "replace": false,
-  "values": [
-    "#minecraft:logs",
-    "#minecraft:planks",
-    "minecraft:stick"
-  ]
-}
+    "replace": false,
+    "values": [
+        "#minecraft:logs",
+        "#minecraft:planks",
+        "minecraft:stick",
+        "#minecolonies:mechanic_ingredient"
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecolonies/tags/items/stonemason_product.json b/src/main/resources/data/minecolonies/tags/items/stonemason_product.json
index 1995ae8bd9e..3f04fdd7b34 100644
--- a/src/main/resources/data/minecolonies/tags/items/stonemason_product.json
+++ b/src/main/resources/data/minecolonies/tags/items/stonemason_product.json
@@ -8,6 +8,7 @@
     "#minecraft:stairs",
     "#minecraft:walls",
     "minecraft:bricks",
+    "minecraft:furnace",
     "minecraft:nether_bricks",
     "minecraft:flower_pot",
     "#forge:sandstone"
diff --git a/src/main/resources/data/minecolonies/tags/items/stonemason_product_excluded.json b/src/main/resources/data/minecolonies/tags/items/stonemason_product_excluded.json
index 5d341ba2424..b89b337ef4d 100644
--- a/src/main/resources/data/minecolonies/tags/items/stonemason_product_excluded.json
+++ b/src/main/resources/data/minecolonies/tags/items/stonemason_product_excluded.json
@@ -1,4 +1,6 @@
 {
-  "replace": false,
-  "values": []
-}
+    "replace": false,
+    "values": [
+        "#minecolonies:mechanic_product"
+    ]
+}
\ No newline at end of file