diff --git a/assets/common/items/crafting_ing/animal_misc/elegant_crest.ron b/assets/common/items/crafting_ing/animal_misc/elegant_crest.ron
new file mode 100644
index 0000000000..92a1211b9d
--- /dev/null
+++ b/assets/common/items/crafting_ing/animal_misc/elegant_crest.ron
@@ -0,0 +1,11 @@
+ItemDef(
+    name: Direct("Elegant Crest"),
+    description: "A flawless crest from some majestic creature.",
+    kind: Ingredient(
+        kind: "ElegantCrest",
+        // Descriptor not needed
+        descriptor: "",
+    ),
+    quality: Direct(Common),
+    tags: [],
+)
\ No newline at end of file
diff --git a/assets/common/items/crafting_ing/animal_misc/long_tusk.ron b/assets/common/items/crafting_ing/animal_misc/long_tusk.ron
new file mode 100644
index 0000000000..796e2f4a6c
--- /dev/null
+++ b/assets/common/items/crafting_ing/animal_misc/long_tusk.ron
@@ -0,0 +1,11 @@
+ItemDef(
+    name: Direct("Long Tusk"),
+    description: "A pointy tusk from some beast.",
+    kind: Ingredient(
+        kind: "LongTusk",
+        // Descriptor not needed
+        descriptor: "",
+    ),
+    quality: Direct(Common),
+    tags: [],
+)
\ No newline at end of file
diff --git a/assets/common/items/crafting_ing/animal_misc/strong_pincer.ron b/assets/common/items/crafting_ing/animal_misc/strong_pincer.ron
new file mode 100644
index 0000000000..c7da271a6c
--- /dev/null
+++ b/assets/common/items/crafting_ing/animal_misc/strong_pincer.ron
@@ -0,0 +1,11 @@
+ItemDef(
+    name: Direct("Strong Pincer"),
+    description: "The pincer of some creature, it is very tough.",
+    kind: Ingredient(
+        kind: "StrongPincer",
+        // Descriptor not needed
+        descriptor: "",
+    ),
+    quality: Direct(Common),
+    tags: [],
+)
\ No newline at end of file
diff --git a/assets/common/items/crafting_ing/modular/held/bow/bow.ron b/assets/common/items/crafting_ing/modular/damage/bow/bow.ron
similarity index 77%
rename from assets/common/items/crafting_ing/modular/held/bow/bow.ron
rename to assets/common/items/crafting_ing/modular/damage/bow/bow.ron
index 277be0fa0b..863dc9b7a2 100644
--- a/assets/common/items/crafting_ing/modular/held/bow/bow.ron
+++ b/assets/common/items/crafting_ing/modular/damage/bow/bow.ron
@@ -1,9 +1,9 @@
 ItemDef(
-    name: Component("Bow Grip"),
+    name: Component("Bow Limbs"),
     description: "",
     kind: ModularComponent((
         toolkind: Bow,
-        modkind: Held,
+        modkind: Damage,
         stats: (
             equip_time_secs: 0.25,
             power: 1.0,
@@ -19,7 +19,7 @@ ItemDef(
     )),
     quality: Modular,
     tags: [
-        ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
+        ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/held/bow/composite.ron b/assets/common/items/crafting_ing/modular/damage/bow/composite.ron
similarity index 77%
rename from assets/common/items/crafting_ing/modular/held/bow/composite.ron
rename to assets/common/items/crafting_ing/modular/damage/bow/composite.ron
index 350ba8fde7..603848d296 100644
--- a/assets/common/items/crafting_ing/modular/held/bow/composite.ron
+++ b/assets/common/items/crafting_ing/modular/damage/bow/composite.ron
@@ -1,9 +1,9 @@
 ItemDef(
-    name: Component("Composite Bow Grip"),
+    name: Component("Composite Bow Limbs"),
     description: "",
     kind: ModularComponent((
         toolkind: Bow,
-        modkind: Held,
+        modkind: Damage,
         stats: (
             equip_time_secs: 0.25,
             power: 0.9,
@@ -19,7 +19,7 @@ ItemDef(
     )),
     quality: Modular,
     tags: [
-        ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
+        ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/held/bow/greatbow.ron b/assets/common/items/crafting_ing/modular/damage/bow/greatbow.ron
similarity index 77%
rename from assets/common/items/crafting_ing/modular/held/bow/greatbow.ron
rename to assets/common/items/crafting_ing/modular/damage/bow/greatbow.ron
index 1b8a77da57..89348044f6 100644
--- a/assets/common/items/crafting_ing/modular/held/bow/greatbow.ron
+++ b/assets/common/items/crafting_ing/modular/damage/bow/greatbow.ron
@@ -1,9 +1,9 @@
 ItemDef(
-    name: Component("Greatbow Grip"),
+    name: Component("Greatbow Limbs"),
     description: "",
     kind: ModularComponent((
         toolkind: Bow,
-        modkind: Held,
+        modkind: Damage,
         stats: (
             equip_time_secs: 0.25,
             power: 0.9,
@@ -19,7 +19,7 @@ ItemDef(
     )),
     quality: Modular,
     tags: [
-        ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
+        ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/held/bow/longbow.ron b/assets/common/items/crafting_ing/modular/damage/bow/longbow.ron
similarity index 77%
rename from assets/common/items/crafting_ing/modular/held/bow/longbow.ron
rename to assets/common/items/crafting_ing/modular/damage/bow/longbow.ron
index 38ad05e4bb..b9613def99 100644
--- a/assets/common/items/crafting_ing/modular/held/bow/longbow.ron
+++ b/assets/common/items/crafting_ing/modular/damage/bow/longbow.ron
@@ -1,9 +1,9 @@
 ItemDef(
-    name: Component("Longbow Grip"),
+    name: Component("Longbow Limbs"),
     description: "",
     kind: ModularComponent((
         toolkind: Bow,
-        modkind: Held,
+        modkind: Damage,
         stats: (
             equip_time_secs: 0.25,
             power: 0.9,
@@ -19,7 +19,7 @@ ItemDef(
     )),
     quality: Modular,
     tags: [
-        ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
+        ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/held/bow/ornate.ron b/assets/common/items/crafting_ing/modular/damage/bow/ornate.ron
similarity index 77%
rename from assets/common/items/crafting_ing/modular/held/bow/ornate.ron
rename to assets/common/items/crafting_ing/modular/damage/bow/ornate.ron
index bc565c46f6..a9cca999c2 100644
--- a/assets/common/items/crafting_ing/modular/held/bow/ornate.ron
+++ b/assets/common/items/crafting_ing/modular/damage/bow/ornate.ron
@@ -1,9 +1,9 @@
 ItemDef(
-    name: Component("Ornate Bow Grip"),
+    name: Component("Ornate Bow Limbs"),
     description: "",
     kind: ModularComponent((
         toolkind: Bow,
-        modkind: Held,
+        modkind: Damage,
         stats: (
             equip_time_secs: 0.25,
             power: 0.9,
@@ -19,7 +19,7 @@ ItemDef(
     )),
     quality: Modular,
     tags: [
-        ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
+        ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/held/bow/shortbow.ron b/assets/common/items/crafting_ing/modular/damage/bow/shortbow.ron
similarity index 77%
rename from assets/common/items/crafting_ing/modular/held/bow/shortbow.ron
rename to assets/common/items/crafting_ing/modular/damage/bow/shortbow.ron
index c6d74d3c09..b138b35f38 100644
--- a/assets/common/items/crafting_ing/modular/held/bow/shortbow.ron
+++ b/assets/common/items/crafting_ing/modular/damage/bow/shortbow.ron
@@ -1,9 +1,9 @@
 ItemDef(
-    name: Component("Shortbow Grip"),
+    name: Component("Shortbow Limbs"),
     description: "",
     kind: ModularComponent((
         toolkind: Bow,
-        modkind: Held,
+        modkind: Damage,
         stats: (
             equip_time_secs: 0.25,
             power: 0.9,
@@ -19,7 +19,7 @@ ItemDef(
     )),
     quality: Modular,
     tags: [
-        ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
+        ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/held/bow/warbow.ron b/assets/common/items/crafting_ing/modular/damage/bow/warbow.ron
similarity index 77%
rename from assets/common/items/crafting_ing/modular/held/bow/warbow.ron
rename to assets/common/items/crafting_ing/modular/damage/bow/warbow.ron
index 881c27b429..e7e023c6a6 100644
--- a/assets/common/items/crafting_ing/modular/held/bow/warbow.ron
+++ b/assets/common/items/crafting_ing/modular/damage/bow/warbow.ron
@@ -1,9 +1,9 @@
 ItemDef(
-    name: Component("Warbow Grip"),
+    name: Component("Warbow Limbs"),
     description: "",
     kind: ModularComponent((
         toolkind: Bow,
-        modkind: Held,
+        modkind: Damage,
         stats: (
             equip_time_secs: 0.25,
             power: 1.5,
@@ -19,7 +19,7 @@ ItemDef(
     )),
     quality: Modular,
     tags: [
-        ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
+        ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/damage/bow/wide.ron b/assets/common/items/crafting_ing/modular/held/bow/large.ron
similarity index 77%
rename from assets/common/items/crafting_ing/modular/damage/bow/wide.ron
rename to assets/common/items/crafting_ing/modular/held/bow/large.ron
index 7b4fd11e20..9e401f385f 100644
--- a/assets/common/items/crafting_ing/modular/damage/bow/wide.ron
+++ b/assets/common/items/crafting_ing/modular/held/bow/large.ron
@@ -1,9 +1,9 @@
 ItemDef(
-    name: Component("Wide Bow Limbs"),
+    name: Component("Large Bow Grip"),
     description: "",
     kind: ModularComponent((
         toolkind: Bow,
-        modkind: Damage,
+        modkind: Held,
         stats: (
             equip_time_secs: 1.0,
             power: 1.5,
@@ -19,7 +19,7 @@ ItemDef(
     )),
     quality: Direct(Common),
     tags: [
-        ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
+        ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/damage/bow/medium.ron b/assets/common/items/crafting_ing/modular/held/bow/medium.ron
similarity index 83%
rename from assets/common/items/crafting_ing/modular/damage/bow/medium.ron
rename to assets/common/items/crafting_ing/modular/held/bow/medium.ron
index 059c8b416a..f33906ab5c 100644
--- a/assets/common/items/crafting_ing/modular/damage/bow/medium.ron
+++ b/assets/common/items/crafting_ing/modular/held/bow/medium.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "",
     kind: ModularComponent((
         toolkind: Bow,
-        modkind: Damage,
+        modkind: Held,
         stats: (
             equip_time_secs: 1.0,
             power: 1.0,
@@ -19,6 +19,6 @@ ItemDef(
     )),
     quality: Direct(Common),
     tags: [
-        ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
+        ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
     ],
 )
diff --git a/assets/common/items/crafting_ing/modular/damage/bow/narrow.ron b/assets/common/items/crafting_ing/modular/held/bow/small.ron
similarity index 77%
rename from assets/common/items/crafting_ing/modular/damage/bow/narrow.ron
rename to assets/common/items/crafting_ing/modular/held/bow/small.ron
index 1ef572fbcc..dc4f90c4a3 100644
--- a/assets/common/items/crafting_ing/modular/damage/bow/narrow.ron
+++ b/assets/common/items/crafting_ing/modular/held/bow/small.ron
@@ -1,9 +1,9 @@
 ItemDef(
-    name: Component("Narrow Bow Limbs"),
+    name: Component("Small Bow Grip"),
     description: "",
     kind: ModularComponent((
         toolkind: Bow,
-        modkind: Damage,
+        modkind: Held,
         stats: (
             equip_time_secs: 1.0,
             power: 0.7,
@@ -19,7 +19,7 @@ ItemDef(
     )),
     quality: Direct(Common),
     tags: [
-        ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
+        ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/held/staff/ornate.ron b/assets/common/items/crafting_ing/modular/held/staff/ornate.ron
index e48b57baaf..598143ca6b 100644
--- a/assets/common/items/crafting_ing/modular/held/staff/ornate.ron
+++ b/assets/common/items/crafting_ing/modular/held/staff/ornate.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Orante Staff Shaft"),
+    name: Component("Ornate Staff Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Staff,
diff --git a/assets/common/items/mineral/ingot/copper.ron b/assets/common/items/mineral/ingot/copper.ron
index a10bcb6b3d..a68d6a8812 100644
--- a/assets/common/items/mineral/ingot/copper.ron
+++ b/assets/common/items/mineral/ingot/copper.ron
@@ -6,5 +6,5 @@ ItemDef(
         descriptor: "Copper",
     ),
     quality: Direct(Low),
-    tags: [MaterialKind(Metal)],
+    tags: [],
 )
diff --git a/assets/common/items/mineral/ingot/gold.ron b/assets/common/items/mineral/ingot/gold.ron
index 694424e34b..0fa4cd92c7 100644
--- a/assets/common/items/mineral/ingot/gold.ron
+++ b/assets/common/items/mineral/ingot/gold.ron
@@ -6,5 +6,5 @@ ItemDef(
         descriptor: "Golden",
     ),
     quality: Direct(Epic),
-    tags: [MaterialKind(Metal)],
+    tags: [],
 )
\ No newline at end of file
diff --git a/assets/common/items/mineral/ingot/silver.ron b/assets/common/items/mineral/ingot/silver.ron
index 340f8ef60e..6b911b7976 100644
--- a/assets/common/items/mineral/ingot/silver.ron
+++ b/assets/common/items/mineral/ingot/silver.ron
@@ -6,5 +6,5 @@ ItemDef(
         descriptor: "Silver",
     ),
     quality: Direct(Epic),
-    tags: [MaterialKind(Metal)],
+    tags: [],
 )
\ No newline at end of file
diff --git a/assets/common/items/mineral/ingot/tin.ron b/assets/common/items/mineral/ingot/tin.ron
index f158dd33ad..28953e7b9d 100644
--- a/assets/common/items/mineral/ingot/tin.ron
+++ b/assets/common/items/mineral/ingot/tin.ron
@@ -6,5 +6,5 @@ ItemDef(
         descriptor: "Tin",
     ),
     quality: Direct(Common),
-    tags: [MaterialKind(Metal)],
+    tags: [],
 )
diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron
index 46690f4c90..e42c0dafd0 100644
--- a/assets/common/recipe_book.ron
+++ b/assets/common/recipe_book.ron
@@ -1877,6 +1877,7 @@
         output: ("common.items.crafting_ing.modular.damage.sword.longsword", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -1885,6 +1886,8 @@
         output: ("common.items.crafting_ing.modular.damage.sword.sawblade", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -1893,6 +1896,8 @@
         output: ("common.items.crafting_ing.modular.damage.sword.katana", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.claw"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -1901,6 +1906,8 @@
         output: ("common.items.crafting_ing.modular.damage.sword.zweihander", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -1909,6 +1916,8 @@
         output: ("common.items.crafting_ing.modular.damage.sword.sabre", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -1917,6 +1926,8 @@
         output: ("common.items.crafting_ing.modular.damage.sword.greatsword", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -1925,6 +1936,8 @@
         output: ("common.items.crafting_ing.modular.damage.sword.ornate", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -1934,6 +1947,7 @@
         output: ("common.items.crafting_ing.modular.held.sword.one-handed", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 1, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -1942,6 +1956,7 @@
         output: ("common.items.crafting_ing.modular.held.sword.two-handed", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 1, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -1950,6 +1965,7 @@
         output: ("common.items.crafting_ing.modular.held.sword.hand-and-half", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 1, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -1959,6 +1975,7 @@
         output: ("common.items.crafting_ing.modular.damage.hammer.hammer", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -1967,6 +1984,8 @@
         output: ("common.items.crafting_ing.modular.damage.hammer.spikedmace", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -1975,6 +1994,8 @@
         output: ("common.items.crafting_ing.modular.damage.hammer.warhammer", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.claw"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -1983,6 +2004,8 @@
         output: ("common.items.crafting_ing.modular.damage.hammer.maul", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -1991,6 +2014,8 @@
         output: ("common.items.crafting_ing.modular.damage.hammer.greatmace", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -1999,6 +2024,8 @@
         output: ("common.items.crafting_ing.modular.damage.hammer.greathammer", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -2007,6 +2034,8 @@
         output: ("common.items.crafting_ing.modular.damage.hammer.ornate", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -2016,6 +2045,7 @@
         output: ("common.items.crafting_ing.modular.held.hammer.short", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2024,6 +2054,7 @@
         output: ("common.items.crafting_ing.modular.held.hammer.long", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2032,6 +2063,7 @@
         output: ("common.items.crafting_ing.modular.held.hammer.medium", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2041,6 +2073,8 @@
         output: ("common.items.crafting_ing.modular.damage.axe.axe", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -2049,6 +2083,7 @@
         output: ("common.items.crafting_ing.modular.damage.axe.jagged", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -2057,6 +2092,8 @@
         output: ("common.items.crafting_ing.modular.damage.axe.battleaxe", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.claw"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -2065,6 +2102,8 @@
         output: ("common.items.crafting_ing.modular.damage.axe.poleaxe", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -2073,6 +2112,8 @@
         output: ("common.items.crafting_ing.modular.damage.axe.labrys", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -2081,6 +2122,8 @@
         output: ("common.items.crafting_ing.modular.damage.axe.greataxe", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -2089,6 +2132,8 @@
         output: ("common.items.crafting_ing.modular.damage.axe.ornate", 1),
         inputs: [
             (TagSameItem(MaterialKind(Metal)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, false),
+            (Item("common.items.tool.craftsman_hammer"), 0, false),
         ],
         craft_sprite: Some(Anvil),
         is_recycling: false,
@@ -2098,6 +2143,7 @@
         output: ("common.items.crafting_ing.modular.held.axe.short", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2106,6 +2152,7 @@
         output: ("common.items.crafting_ing.modular.held.axe.long", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2114,88 +2161,105 @@
         output: ("common.items.crafting_ing.modular.held.axe.medium", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
-    ),
-/// MODULAR WEAPONS/BOWS/HELD COMPONENTS
-    "bow grip": (
-        output: ("common.items.crafting_ing.modular.held.bow.bow", 1),
-        inputs: [
-            (TagSameItem(MaterialKind(Wood)), 5, true),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
-    ),
-    "composite bow grip": (
-        output: ("common.items.crafting_ing.modular.held.bow.composite", 1),
-        inputs: [
-            (TagSameItem(MaterialKind(Wood)), 5, true),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
-    ),
-    "greatbow grip": (
-        output: ("common.items.crafting_ing.modular.held.bow.greatbow", 1),
-        inputs: [
-            (TagSameItem(MaterialKind(Wood)), 5, true),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
-    ),
-    "longbow grip": (
-        output: ("common.items.crafting_ing.modular.held.bow.longbow", 1),
-        inputs: [
-            (TagSameItem(MaterialKind(Wood)), 5, true),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
-    ),
-    "orante bow grip": (
-        output: ("common.items.crafting_ing.modular.held.bow.ornate", 1),
-        inputs: [
-            (TagSameItem(MaterialKind(Wood)), 5, true),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
-    ),
-    "shortbow grip": (
-        output: ("common.items.crafting_ing.modular.held.bow.shortbow", 1),
-        inputs: [
-            (TagSameItem(MaterialKind(Wood)), 5, true),
-        ],
-        craft_sprite: Some(CraftingBench),
-        is_recycling: false,
-    ),
-    "warbow grip": (
-        output: ("common.items.crafting_ing.modular.held.bow.warbow", 1),
-        inputs: [
-            (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
 /// MODULAR WEAPONS/BOWS/DAMAGE COMPONENTS
-    "medium bow limbs": (
-        output: ("common.items.crafting_ing.modular.damage.bow.medium", 1),
+    "bow limbs": (
+        output: ("common.items.crafting_ing.modular.damage.bow.bow", 1),
         inputs: [
-            (Item("common.items.log.wood"), 1, false),
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.sticky_thread"), 3, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
-    "narrow bow limbs": (
-        output: ("common.items.crafting_ing.modular.damage.bow.narrow", 1),
+    "composite bow limbs": (
+        output: ("common.items.crafting_ing.modular.damage.bow.composite", 1),
         inputs: [
-            (Item("common.items.log.wood"), 1, false),
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, false),
+            (Item("common.items.crafting_ing.sticky_thread"), 3, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
-    "wide bow limbs": (
-        output: ("common.items.crafting_ing.modular.damage.bow.wide", 1),
+    "greatbow limbs": (
+        output: ("common.items.crafting_ing.modular.damage.bow.greatbow", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1, false),
+            (Item("common.items.crafting_ing.sticky_thread"), 3, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "longbow limbs": (
+        output: ("common.items.crafting_ing.modular.damage.bow.longbow", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, false),
+            (Item("common.items.crafting_ing.sticky_thread"), 3, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "ornate bow limbs": (
+        output: ("common.items.crafting_ing.modular.damage.bow.ornate", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, false),
+            (Item("common.items.crafting_ing.sticky_thread"), 3, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "shortbow limbs": (
+        output: ("common.items.crafting_ing.modular.damage.bow.shortbow", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.claw"), 1, false),
+            (Item("common.items.crafting_ing.sticky_thread"), 3, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "warbow limbs": (
+        output: ("common.items.crafting_ing.modular.damage.bow.warbow", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, false),
+            (Item("common.items.crafting_ing.sticky_thread"), 3, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+/// MODULAR WEAPONS/BOWS/HELD COMPONENTS
+    "medium bow grip": (
+        output: ("common.items.crafting_ing.modular.held.bow.medium", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 1, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "small bow grip": (
+        output: ("common.items.crafting_ing.modular.held.bow.small", 1),
+        inputs: [
+            (Item("common.items.log.wood"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 1, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "large bow grip": (
+        output: ("common.items.crafting_ing.modular.held.bow.large", 1),
+        inputs: [
+            (Item("common.items.log.wood"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 1, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2205,6 +2269,8 @@
         output: ("common.items.crafting_ing.modular.held.staff.brand", 1),
         inputs: [
             (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.claw"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2213,6 +2279,8 @@
         output: ("common.items.crafting_ing.modular.held.staff.grandstaff", 1),
         inputs: [
             (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2221,6 +2289,8 @@
         output: ("common.items.crafting_ing.modular.held.staff.longpole", 1),
         inputs: [
             (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2229,6 +2299,8 @@
         output: ("common.items.crafting_ing.modular.held.staff.ornate", 1),
         inputs: [
             (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2237,6 +2309,8 @@
         output: ("common.items.crafting_ing.modular.held.staff.pole", 1),
         inputs: [
             (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2245,6 +2319,8 @@
         output: ("common.items.crafting_ing.modular.held.staff.rod", 1),
         inputs: [
             (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2253,6 +2329,7 @@
         output: ("common.items.crafting_ing.modular.held.staff.staff", 1),
         inputs: [
             (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2262,6 +2339,7 @@
         output: ("common.items.crafting_ing.modular.damage.staff.large", 1),
         inputs: [
             (Item("common.items.mineral.gem.ruby"), 1, false),
+            (Item("common.items.mineral.ore.veloritefrag"), 3, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2270,6 +2348,7 @@
         output: ("common.items.crafting_ing.modular.damage.staff.medium", 1),
         inputs: [
             (Item("common.items.mineral.gem.ruby"), 1, false),
+            (Item("common.items.mineral.ore.veloritefrag"), 3, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2278,6 +2357,7 @@
         output: ("common.items.crafting_ing.modular.damage.staff.small", 1),
         inputs: [
             (Item("common.items.mineral.gem.ruby"), 1, false),
+            (Item("common.items.mineral.ore.veloritefrag"), 3, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2287,6 +2367,8 @@
         output: ("common.items.crafting_ing.modular.held.sceptre.arbor", 1),
         inputs: [
             (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2295,6 +2377,8 @@
         output: ("common.items.crafting_ing.modular.held.sceptre.cane", 1),
         inputs: [
             (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2303,6 +2387,8 @@
         output: ("common.items.crafting_ing.modular.held.sceptre.crook", 1),
         inputs: [
             (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2311,6 +2397,8 @@
         output: ("common.items.crafting_ing.modular.held.sceptre.crozier", 1),
         inputs: [
             (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.claw"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2319,14 +2407,18 @@
         output: ("common.items.crafting_ing.modular.held.sceptre.grandsceptre", 1),
         inputs: [
             (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.large_horn"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
-    "orante sceptre shaft": (
+    "ornate sceptre shaft": (
         output: ("common.items.crafting_ing.modular.held.sceptre.ornate", 1),
         inputs: [
             (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, false),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2335,6 +2427,7 @@
         output: ("common.items.crafting_ing.modular.held.sceptre.sceptre", 1),
         inputs: [
             (TagSameItem(MaterialKind(Wood)), 5, true),
+            (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2344,6 +2437,7 @@
         output: ("common.items.crafting_ing.modular.damage.sceptre.large", 1),
         inputs: [
             (Item("common.items.mineral.gem.emerald"), 1, false),
+            (Item("common.items.mineral.ore.veloritefrag"), 3, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2352,6 +2446,7 @@
         output: ("common.items.crafting_ing.modular.damage.sceptre.medium", 1),
         inputs: [
             (Item("common.items.mineral.gem.emerald"), 1, false),
+            (Item("common.items.mineral.ore.veloritefrag"), 3, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
@@ -2360,6 +2455,7 @@
         output: ("common.items.crafting_ing.modular.damage.sceptre.small", 1),
         inputs: [
             (Item("common.items.mineral.gem.emerald"), 1, false),
+            (Item("common.items.mineral.ore.veloritefrag"), 3, false),
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
diff --git a/common/src/comp/inventory/item/modular.rs b/common/src/comp/inventory/item/modular.rs
index d63e15eeb4..3299d7b14c 100644
--- a/common/src/comp/inventory/item/modular.rs
+++ b/common/src/comp/inventory/item/modular.rs
@@ -30,8 +30,8 @@ impl ModularComponentKind {
     /// material component
     fn main_component(tool: ToolKind) -> Self {
         match tool {
-            ToolKind::Sword | ToolKind::Axe | ToolKind::Hammer => Self::Damage,
-            ToolKind::Bow | ToolKind::Staff | ToolKind::Sceptre => Self::Held,
+            ToolKind::Sword | ToolKind::Axe | ToolKind::Hammer | ToolKind::Bow => Self::Damage,
+            ToolKind::Staff | ToolKind::Sceptre => Self::Held,
             _ => unreachable!(),
         }
     }
diff --git a/server/src/migrations/V44__modular_weapons.sql b/server/src/migrations/V44__modular_weapons.sql
index 05404310b1..3b2ef63e31 100644
--- a/server/src/migrations/V44__modular_weapons.sql
+++ b/server/src/migrations/V44__modular_weapons.sql
@@ -552,116 +552,116 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer.wood_hammer-
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer.wood_hammer-0', 'common.items.crafting_ing.modular.held.hammer.long', 543, 541, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer.wood_hammer-0', 'common.items.mineral.ingot.bronze', 544, 542, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-0', 'common.items.weapons.modular.bow', 545, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-0', 'common.items.crafting_ing.modular.damage.bow.medium', 546, 545, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-0', 'common.items.crafting_ing.modular.held.bow.bow', 547, 545, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-0', 'common.items.crafting_ing.modular.held.bow.medium', 546, 545, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-0', 'common.items.crafting_ing.modular.damage.bow.bow', 547, 545, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-0', 'common.items.log.bamboo', 548, 547, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-1', 'common.items.weapons.modular.bow', 549, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-1', 'common.items.crafting_ing.modular.damage.bow.medium', 550, 549, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-1', 'common.items.crafting_ing.modular.held.bow.greatbow', 551, 549, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-1', 'common.items.crafting_ing.modular.held.bow.medium', 550, 549, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-1', 'common.items.crafting_ing.modular.damage.bow.greatbow', 551, 549, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-1', 'common.items.log.bamboo', 552, 551, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-2', 'common.items.weapons.modular.bow', 553, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-2', 'common.items.crafting_ing.modular.damage.bow.medium', 554, 553, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-2', 'common.items.crafting_ing.modular.held.bow.ornate', 555, 553, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-2', 'common.items.crafting_ing.modular.held.bow.medium', 554, 553, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-2', 'common.items.crafting_ing.modular.damage.bow.ornate', 555, 553, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-2', 'common.items.log.bamboo', 556, 555, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-3', 'common.items.weapons.modular.bow', 557, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-3', 'common.items.crafting_ing.modular.damage.bow.medium', 558, 557, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-3', 'common.items.crafting_ing.modular.held.bow.composite', 559, 557, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-3', 'common.items.crafting_ing.modular.held.bow.medium', 558, 557, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-3', 'common.items.crafting_ing.modular.damage.bow.composite', 559, 557, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.bone-3', 'common.items.log.bamboo', 560, 559, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-0', 'common.items.weapons.modular.bow', 561, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-0', 'common.items.crafting_ing.modular.damage.bow.medium', 562, 561, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-0', 'common.items.crafting_ing.modular.held.bow.bow', 563, 561, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-0', 'common.items.crafting_ing.modular.held.bow.medium', 562, 561, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-0', 'common.items.crafting_ing.modular.damage.bow.bow', 563, 561, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-0', 'common.items.log.eldwood', 564, 563, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-1', 'common.items.weapons.modular.bow', 565, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-1', 'common.items.crafting_ing.modular.damage.bow.medium', 566, 565, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-1', 'common.items.crafting_ing.modular.held.bow.warbow', 567, 565, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-1', 'common.items.crafting_ing.modular.held.bow.medium', 566, 565, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-1', 'common.items.crafting_ing.modular.damage.bow.warbow', 567, 565, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-1', 'common.items.log.eldwood', 568, 567, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-2', 'common.items.weapons.modular.bow', 569, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-2', 'common.items.crafting_ing.modular.damage.bow.medium', 570, 569, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-2', 'common.items.crafting_ing.modular.held.bow.composite', 571, 569, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-2', 'common.items.crafting_ing.modular.held.bow.medium', 570, 569, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-2', 'common.items.crafting_ing.modular.damage.bow.composite', 571, 569, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.eldwood-2', 'common.items.log.eldwood', 572, 571, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-0', 'common.items.weapons.modular.bow', 573, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-0', 'common.items.crafting_ing.modular.damage.bow.medium', 574, 573, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-0', 'common.items.crafting_ing.modular.held.bow.greatbow', 575, 573, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-0', 'common.items.crafting_ing.modular.held.bow.medium', 574, 573, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-0', 'common.items.crafting_ing.modular.damage.bow.greatbow', 575, 573, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-0', 'common.items.log.frostwood', 576, 575, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-1', 'common.items.weapons.modular.bow', 577, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-1', 'common.items.crafting_ing.modular.damage.bow.medium', 578, 577, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-1', 'common.items.crafting_ing.modular.held.bow.bow', 579, 577, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-1', 'common.items.crafting_ing.modular.held.bow.medium', 578, 577, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-1', 'common.items.crafting_ing.modular.damage.bow.bow', 579, 577, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-1', 'common.items.log.frostwood', 580, 579, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-2', 'common.items.weapons.modular.bow', 581, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-2', 'common.items.crafting_ing.modular.damage.bow.medium', 582, 581, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-2', 'common.items.crafting_ing.modular.held.bow.warbow', 583, 581, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-2', 'common.items.crafting_ing.modular.held.bow.medium', 582, 581, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-2', 'common.items.crafting_ing.modular.damage.bow.warbow', 583, 581, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.frostwood-2', 'common.items.log.frostwood', 584, 583, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-0', 'common.items.weapons.modular.bow', 585, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-0', 'common.items.crafting_ing.modular.damage.bow.medium', 586, 585, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-0', 'common.items.crafting_ing.modular.held.bow.warbow', 587, 585, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-0', 'common.items.crafting_ing.modular.held.bow.medium', 586, 585, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-0', 'common.items.crafting_ing.modular.damage.bow.warbow', 587, 585, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-0', 'common.items.log.hardwood', 588, 587, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-1', 'common.items.weapons.modular.bow', 589, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-1', 'common.items.crafting_ing.modular.damage.bow.medium', 590, 589, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-1', 'common.items.crafting_ing.modular.held.bow.composite', 591, 589, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-1', 'common.items.crafting_ing.modular.held.bow.medium', 590, 589, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-1', 'common.items.crafting_ing.modular.damage.bow.composite', 591, 589, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-1', 'common.items.log.hardwood', 592, 591, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-2', 'common.items.weapons.modular.bow', 593, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-2', 'common.items.crafting_ing.modular.damage.bow.medium', 594, 593, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-2', 'common.items.crafting_ing.modular.held.bow.ornate', 595, 593, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-2', 'common.items.crafting_ing.modular.held.bow.medium', 594, 593, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-2', 'common.items.crafting_ing.modular.damage.bow.ornate', 595, 593, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-2', 'common.items.log.hardwood', 596, 595, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-3', 'common.items.weapons.modular.bow', 597, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-3', 'common.items.crafting_ing.modular.damage.bow.medium', 598, 597, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-3', 'common.items.crafting_ing.modular.held.bow.bow', 599, 597, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-3', 'common.items.crafting_ing.modular.held.bow.medium', 598, 597, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-3', 'common.items.crafting_ing.modular.damage.bow.bow', 599, 597, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-3', 'common.items.log.hardwood', 600, 599, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-4', 'common.items.weapons.modular.bow', 601, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-4', 'common.items.crafting_ing.modular.damage.bow.medium', 602, 601, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-4', 'common.items.crafting_ing.modular.held.bow.longbow', 603, 601, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-4', 'common.items.crafting_ing.modular.held.bow.medium', 602, 601, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-4', 'common.items.crafting_ing.modular.damage.bow.longbow', 603, 601, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-4', 'common.items.log.hardwood', 604, 603, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-5', 'common.items.weapons.modular.bow', 605, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-5', 'common.items.crafting_ing.modular.damage.bow.medium', 606, 605, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-5', 'common.items.crafting_ing.modular.held.bow.greatbow', 607, 605, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-5', 'common.items.crafting_ing.modular.held.bow.medium', 606, 605, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-5', 'common.items.crafting_ing.modular.damage.bow.greatbow', 607, 605, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.hardwood-5', 'common.items.log.hardwood', 608, 607, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-0', 'common.items.weapons.modular.bow', 609, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-0', 'common.items.crafting_ing.modular.damage.bow.medium', 610, 609, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-0', 'common.items.crafting_ing.modular.held.bow.greatbow', 611, 609, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-0', 'common.items.crafting_ing.modular.held.bow.medium', 610, 609, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-0', 'common.items.crafting_ing.modular.damage.bow.greatbow', 611, 609, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-0', 'common.items.log.ironwood', 612, 611, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-1', 'common.items.weapons.modular.bow', 613, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-1', 'common.items.crafting_ing.modular.damage.bow.medium', 614, 613, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-1', 'common.items.crafting_ing.modular.held.bow.composite', 615, 613, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-1', 'common.items.crafting_ing.modular.held.bow.medium', 614, 613, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-1', 'common.items.crafting_ing.modular.damage.bow.composite', 615, 613, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-1', 'common.items.log.ironwood', 616, 615, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-2', 'common.items.weapons.modular.bow', 617, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-2', 'common.items.crafting_ing.modular.damage.bow.medium', 618, 617, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-2', 'common.items.crafting_ing.modular.held.bow.bow', 619, 617, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-2', 'common.items.crafting_ing.modular.held.bow.medium', 618, 617, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-2', 'common.items.crafting_ing.modular.damage.bow.bow', 619, 617, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-2', 'common.items.log.ironwood', 620, 619, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-3', 'common.items.weapons.modular.bow', 621, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-3', 'common.items.crafting_ing.modular.damage.bow.medium', 622, 621, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-3', 'common.items.crafting_ing.modular.held.bow.warbow', 623, 621, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-3', 'common.items.crafting_ing.modular.held.bow.medium', 622, 621, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-3', 'common.items.crafting_ing.modular.damage.bow.warbow', 623, 621, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-3', 'common.items.log.ironwood', 624, 623, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-4', 'common.items.weapons.modular.bow', 625, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-4', 'common.items.crafting_ing.modular.damage.bow.medium', 626, 625, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-4', 'common.items.crafting_ing.modular.held.bow.longbow', 627, 625, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-4', 'common.items.crafting_ing.modular.held.bow.medium', 626, 625, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-4', 'common.items.crafting_ing.modular.damage.bow.longbow', 627, 625, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.metal-4', 'common.items.log.ironwood', 628, 627, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.rawwood-0', 'common.items.weapons.modular.bow', 629, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.rawwood-0', 'common.items.crafting_ing.modular.damage.bow.medium', 630, 629, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.rawwood-0', 'common.items.crafting_ing.modular.held.bow.greatbow', 631, 629, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.rawwood-0', 'common.items.crafting_ing.modular.held.bow.medium', 630, 629, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.rawwood-0', 'common.items.crafting_ing.modular.damage.bow.greatbow', 631, 629, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.rawwood-0', 'common.items.log.wood', 632, 631, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.rawwood-1', 'common.items.weapons.modular.bow', 633, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.rawwood-1', 'common.items.crafting_ing.modular.damage.bow.medium', 634, 633, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.rawwood-1', 'common.items.crafting_ing.modular.held.bow.longbow', 635, 633, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.rawwood-1', 'common.items.crafting_ing.modular.held.bow.medium', 634, 633, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.rawwood-1', 'common.items.crafting_ing.modular.damage.bow.longbow', 635, 633, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.rawwood-1', 'common.items.log.wood', 636, 635, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-0', 'common.items.weapons.modular.bow', 637, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-0', 'common.items.crafting_ing.modular.damage.bow.medium', 638, 637, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-0', 'common.items.crafting_ing.modular.held.bow.shortbow', 639, 637, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-0', 'common.items.crafting_ing.modular.held.bow.medium', 638, 637, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-0', 'common.items.crafting_ing.modular.damage.bow.shortbow', 639, 637, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-0', 'common.items.log.wood', 640, 639, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-1', 'common.items.weapons.modular.bow', 641, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-1', 'common.items.crafting_ing.modular.damage.bow.medium', 642, 641, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-1', 'common.items.crafting_ing.modular.held.bow.bow', 643, 641, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-1', 'common.items.crafting_ing.modular.held.bow.medium', 642, 641, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-1', 'common.items.crafting_ing.modular.damage.bow.bow', 643, 641, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-1', 'common.items.log.wood', 644, 643, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-2', 'common.items.weapons.modular.bow', 645, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-2', 'common.items.crafting_ing.modular.damage.bow.medium', 646, 645, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-2', 'common.items.crafting_ing.modular.held.bow.warbow', 647, 645, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-2', 'common.items.crafting_ing.modular.held.bow.medium', 646, 645, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-2', 'common.items.crafting_ing.modular.damage.bow.warbow', 647, 645, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-2', 'common.items.log.wood', 648, 647, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-3', 'common.items.weapons.modular.bow', 649, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-3', 'common.items.crafting_ing.modular.damage.bow.medium', 650, 649, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-3', 'common.items.crafting_ing.modular.held.bow.longbow', 651, 649, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-3', 'common.items.crafting_ing.modular.held.bow.medium', 650, 649, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-3', 'common.items.crafting_ing.modular.damage.bow.longbow', 651, 649, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-3', 'common.items.log.wood', 652, 651, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-4', 'common.items.weapons.modular.bow', 653, NULL, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-4', 'common.items.crafting_ing.modular.damage.bow.medium', 654, 653, 0);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-4', 'common.items.crafting_ing.modular.held.bow.shortbow', 655, 653, 1);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-4', 'common.items.crafting_ing.modular.held.bow.medium', 654, 653, 0);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-4', 'common.items.crafting_ing.modular.damage.bow.shortbow', 655, 653, 1);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-4', 'common.items.log.wood', 656, 655, 0);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bloodsteel-0', 'common.items.weapons.modular.hammer', 657, NULL, NULL);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bloodsteel-0', 'common.items.crafting_ing.modular.damage.hammer.spikedmace', 658, 657, 0);