diff --git a/assets/common/items/crafting_ing/modular/damage/bow/medium.ron b/assets/common/items/crafting_ing/modular/damage/bow/medium.ron
index 5684066974..059c8b416a 100644
--- a/assets/common/items/crafting_ing/modular/damage/bow/medium.ron
+++ b/assets/common/items/crafting_ing/modular/damage/bow/medium.ron
@@ -3,7 +3,7 @@ ItemDef(
     description: "",
     kind: ModularComponent((
         toolkind: Bow,
-        modkind: Held,
+        modkind: Damage,
         stats: (
             equip_time_secs: 1.0,
             power: 1.0,
@@ -19,6 +19,6 @@ ItemDef(
     )),
     quality: Direct(Common),
     tags: [
-        ModularComponent((toolkind: Bow, modkind: Held, hands: Two)),
+        ModularComponent((toolkind: Bow, modkind: Damage, hands: Two)),
     ],
-)
\ No newline at end of file
+)
diff --git a/assets/common/items/crafting_ing/modular/held/sceptre/arbor.ron b/assets/common/items/crafting_ing/modular/held/sceptre/arbor.ron
index 74cc041b68..b313679f3f 100644
--- a/assets/common/items/crafting_ing/modular/held/sceptre/arbor.ron
+++ b/assets/common/items/crafting_ing/modular/held/sceptre/arbor.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Arbor Grip"),
+    name: Component("Arbor Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Sceptre,
diff --git a/assets/common/items/crafting_ing/modular/held/sceptre/cane.ron b/assets/common/items/crafting_ing/modular/held/sceptre/cane.ron
index 4c7aa4cef8..ba702cdc53 100644
--- a/assets/common/items/crafting_ing/modular/held/sceptre/cane.ron
+++ b/assets/common/items/crafting_ing/modular/held/sceptre/cane.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Cane Grip"),
+    name: Component("Cane Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Sceptre,
diff --git a/assets/common/items/crafting_ing/modular/held/sceptre/crook.ron b/assets/common/items/crafting_ing/modular/held/sceptre/crook.ron
index ea05486f79..40e1edfefa 100644
--- a/assets/common/items/crafting_ing/modular/held/sceptre/crook.ron
+++ b/assets/common/items/crafting_ing/modular/held/sceptre/crook.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Crook Grip"),
+    name: Component("Crook Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Sceptre,
diff --git a/assets/common/items/crafting_ing/modular/held/sceptre/crozier.ron b/assets/common/items/crafting_ing/modular/held/sceptre/crozier.ron
index 0233915142..5a2d9d269a 100644
--- a/assets/common/items/crafting_ing/modular/held/sceptre/crozier.ron
+++ b/assets/common/items/crafting_ing/modular/held/sceptre/crozier.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Crozier Grip"),
+    name: Component("Crozier Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Sceptre,
diff --git a/assets/common/items/crafting_ing/modular/held/sceptre/grandsceptre.ron b/assets/common/items/crafting_ing/modular/held/sceptre/grandsceptre.ron
index 5270834a30..8a169546cb 100644
--- a/assets/common/items/crafting_ing/modular/held/sceptre/grandsceptre.ron
+++ b/assets/common/items/crafting_ing/modular/held/sceptre/grandsceptre.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Grandsceptre Grip"),
+    name: Component("Grandsceptre Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Sceptre,
diff --git a/assets/common/items/crafting_ing/modular/held/sceptre/ornate.ron b/assets/common/items/crafting_ing/modular/held/sceptre/ornate.ron
index 347a9e6153..04e3504cbe 100644
--- a/assets/common/items/crafting_ing/modular/held/sceptre/ornate.ron
+++ b/assets/common/items/crafting_ing/modular/held/sceptre/ornate.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Ornate Sceptre Grip"),
+    name: Component("Ornate Sceptre Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Sceptre,
diff --git a/assets/common/items/crafting_ing/modular/held/sceptre/sceptre.ron b/assets/common/items/crafting_ing/modular/held/sceptre/sceptre.ron
index 0def817728..35d0657e68 100644
--- a/assets/common/items/crafting_ing/modular/held/sceptre/sceptre.ron
+++ b/assets/common/items/crafting_ing/modular/held/sceptre/sceptre.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Sceptre Grip"),
+    name: Component("Sceptre Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Sceptre,
diff --git a/assets/common/items/crafting_ing/modular/held/staff/brand.ron b/assets/common/items/crafting_ing/modular/held/staff/brand.ron
index 6ec1b6fa6d..deedfebb91 100644
--- a/assets/common/items/crafting_ing/modular/held/staff/brand.ron
+++ b/assets/common/items/crafting_ing/modular/held/staff/brand.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Brand Grip"),
+    name: Component("Brand Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Staff,
diff --git a/assets/common/items/crafting_ing/modular/held/staff/greatstaff.ron b/assets/common/items/crafting_ing/modular/held/staff/grandstaff.ron
similarity index 87%
rename from assets/common/items/crafting_ing/modular/held/staff/greatstaff.ron
rename to assets/common/items/crafting_ing/modular/held/staff/grandstaff.ron
index c730acdb83..ccdd67027d 100644
--- a/assets/common/items/crafting_ing/modular/held/staff/greatstaff.ron
+++ b/assets/common/items/crafting_ing/modular/held/staff/grandstaff.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Greatstaff Grip"),
+    name: Component("Grandstaff Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Staff,
@@ -15,7 +15,7 @@ ItemDef(
             buff_strength: 0.8,
         ),
         hand_restriction: Some(Two),
-        weapon_name: "Greatstaff",
+        weapon_name: "Grandstaff",
     )),
     quality: Modular,
     tags: [
diff --git a/assets/common/items/crafting_ing/modular/held/staff/longstaff.ron b/assets/common/items/crafting_ing/modular/held/staff/longpole.ron
similarity index 87%
rename from assets/common/items/crafting_ing/modular/held/staff/longstaff.ron
rename to assets/common/items/crafting_ing/modular/held/staff/longpole.ron
index fd66e83cb0..7b49cca5cb 100644
--- a/assets/common/items/crafting_ing/modular/held/staff/longstaff.ron
+++ b/assets/common/items/crafting_ing/modular/held/staff/longpole.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Long Staff Piece"),
+    name: Component("Long Pole Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Staff,
@@ -15,11 +15,10 @@ ItemDef(
             buff_strength: 0.9,
         ),
         hand_restriction: Some(Two),
-        weapon_name: "Long Staff",
+        weapon_name: "Long Pole",
     )),
     quality: Modular,
     tags: [
         ModularComponent((toolkind: Staff, modkind: Held, hands: Two)),
     ],
 )
-
diff --git a/assets/common/items/crafting_ing/modular/held/staff/orante.ron b/assets/common/items/crafting_ing/modular/held/staff/ornate.ron
similarity index 92%
rename from assets/common/items/crafting_ing/modular/held/staff/orante.ron
rename to assets/common/items/crafting_ing/modular/held/staff/ornate.ron
index 15d2132bcd..7b05470824 100644
--- a/assets/common/items/crafting_ing/modular/held/staff/orante.ron
+++ b/assets/common/items/crafting_ing/modular/held/staff/ornate.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Orante Staff Grip"),
+    name: Component("Orante Staff Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Staff,
diff --git a/assets/common/items/crafting_ing/modular/held/staff/pole.ron b/assets/common/items/crafting_ing/modular/held/staff/pole.ron
index f3c3c3cc19..2517442cfd 100644
--- a/assets/common/items/crafting_ing/modular/held/staff/pole.ron
+++ b/assets/common/items/crafting_ing/modular/held/staff/pole.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Pole Grip"),
+    name: Component("Pole Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Staff,
diff --git a/assets/common/items/crafting_ing/modular/held/staff/rod.ron b/assets/common/items/crafting_ing/modular/held/staff/rod.ron
index 1e3215bec6..0be6cc6a06 100644
--- a/assets/common/items/crafting_ing/modular/held/staff/rod.ron
+++ b/assets/common/items/crafting_ing/modular/held/staff/rod.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Rod Grip"),
+    name: Component("Rod Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Staff,
diff --git a/assets/common/items/crafting_ing/modular/held/staff/staff.ron b/assets/common/items/crafting_ing/modular/held/staff/staff.ron
index 7bf51f38f1..2dab9010cd 100644
--- a/assets/common/items/crafting_ing/modular/held/staff/staff.ron
+++ b/assets/common/items/crafting_ing/modular/held/staff/staff.ron
@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Staff Grip"),
+    name: Component("Staff Shaft"),
     description: "",
     kind: ModularComponent((
         toolkind: Staff,
diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron
index b2543765b7..ba7388afcd 100644
--- a/assets/common/recipe_book.ron
+++ b/assets/common/recipe_book.ron
@@ -2144,4 +2144,250 @@
         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),
+        ],
+        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),
+        inputs: [
+            (Item("common.items.log.wood"), 1, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "narrow bow limbs": (
+        output: ("common.items.crafting_ing.modular.damage.bow.narrow", 1),
+        inputs: [
+            (Item("common.items.log.wood"), 1, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "wide bow limbs": (
+        output: ("common.items.crafting_ing.modular.damage.bow.wide", 1),
+        inputs: [
+            (Item("common.items.log.wood"), 1, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+/// MODULAR WEAPONS/FIRE STAFFS/HELD COMPONENTS
+    "brand shaft": (
+        output: ("common.items.crafting_ing.modular.held.staff.brand", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "grandstaff shaft": (
+        output: ("common.items.crafting_ing.modular.held.staff.grandstaff", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "longpole shaft": (
+        output: ("common.items.crafting_ing.modular.held.staff.longpole", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "ornate staff shaft": (
+        output: ("common.items.crafting_ing.modular.held.staff.ornate", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "pole shaft": (
+        output: ("common.items.crafting_ing.modular.held.staff.pole", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "rod shaft": (
+        output: ("common.items.crafting_ing.modular.held.staff.rod", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "staff shaft": (
+        output: ("common.items.crafting_ing.modular.held.staff.staff", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+/// MODULAR WEAPONS/FIRE STAFFS/DAMAGE COMPONENTS
+    "large fire core": (
+        output: ("common.items.crafting_ing.modular.damage.staff.large", 1),
+        inputs: [
+            (Item("common.items.mineral.gem.ruby"), 1, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "medium fire core": (
+        output: ("common.items.crafting_ing.modular.damage.staff.medium", 1),
+        inputs: [
+            (Item("common.items.mineral.gem.ruby"), 1, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "small fire core": (
+        output: ("common.items.crafting_ing.modular.damage.staff.small", 1),
+        inputs: [
+            (Item("common.items.mineral.gem.ruby"), 1, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+/// MODULAR WEAPONS/NATURE SCEPTRES/HELD COMPONENTS
+    "arbor shaft": (
+        output: ("common.items.crafting_ing.modular.held.sceptre.arbor", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "cane shaft": (
+        output: ("common.items.crafting_ing.modular.held.sceptre.cane", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "crook shaft": (
+        output: ("common.items.crafting_ing.modular.held.sceptre.crook", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "crozier shaft": (
+        output: ("common.items.crafting_ing.modular.held.sceptre.crozier", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "grandsceptre shaft": (
+        output: ("common.items.crafting_ing.modular.held.sceptre.grandsceptre", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "orante sceptre shaft": (
+        output: ("common.items.crafting_ing.modular.held.sceptre.ornate", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "sceptre shaft": (
+        output: ("common.items.crafting_ing.modular.held.sceptre.sceptre", 1),
+        inputs: [
+            (TagSameItem(MaterialKind(Wood)), 5, true),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+/// MODULAR WEAPONS/NATURE SCEPTRES/DAMAGE COMPONENTS
+    "large nature core": (
+        output: ("common.items.crafting_ing.modular.damage.sceptre.large", 1),
+        inputs: [
+            (Item("common.items.mineral.gem.emerald"), 1, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "medium nature core": (
+        output: ("common.items.crafting_ing.modular.damage.sceptre.medium", 1),
+        inputs: [
+            (Item("common.items.mineral.gem.emerald"), 1, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "small nature core": (
+        output: ("common.items.crafting_ing.modular.damage.sceptre.small", 1),
+        inputs: [
+            (Item("common.items.mineral.gem.emerald"), 1, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
 }