diff --git a/assets/common/items/crafting_ing/modular/damage/axe/ornate.ron b/assets/common/items/crafting_ing/modular/damage/axe/ornate.ron
index 8516cfcf47..e1eba9e46b 100644
--- a/assets/common/items/crafting_ing/modular/damage/axe/ornate.ron
+++ b/assets/common/items/crafting_ing/modular/damage/axe/ornate.ron
@@ -9,9 +9,9 @@ ItemDef(
             power: 0.9,
             effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.5,
+            crit_chance: 0.2,
             range: 1.0,
-            energy_efficiency: 0.8,
+            energy_efficiency: 2.0,
             buff_strength: 0.8,
         ),
         hand_restriction: None,
diff --git a/assets/common/items/crafting_ing/modular/damage/axe/poleaxe.ron b/assets/common/items/crafting_ing/modular/damage/axe/poleaxe.ron
index 0367a0d749..d79383f4db 100644
--- a/assets/common/items/crafting_ing/modular/damage/axe/poleaxe.ron
+++ b/assets/common/items/crafting_ing/modular/damage/axe/poleaxe.ron
@@ -6,13 +6,13 @@ ItemDef(
         modkind: Damage,
         stats: (
             equip_time_secs: 0.25,
-            power: 1.0,
-            effect_power: 0.9,
+            power: 0.9,
+            effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.2,
+            crit_chance: 0.4,
             range: 1.5,
-            energy_efficiency: 0.9,
-            buff_strength: 0.9,
+            energy_efficiency: 0.8,
+            buff_strength: 0.8,
         ),
         hand_restriction: Some(Two),
         weapon_name: "Poleaxe",
diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/maul.ron b/assets/common/items/crafting_ing/modular/damage/hammer/maul.ron
index 7082152b25..f93aac13bf 100644
--- a/assets/common/items/crafting_ing/modular/damage/hammer/maul.ron
+++ b/assets/common/items/crafting_ing/modular/damage/hammer/maul.ron
@@ -6,13 +6,13 @@ ItemDef(
         modkind: Damage,
         stats: (
             equip_time_secs: 0.25,
-            power: 1.0,
-            effect_power: 0.9,
+            power: 0.9,
+            effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.2,
+            crit_chance: 0.4,
             range: 1.5,
-            energy_efficiency: 0.9,
-            buff_strength: 0.9,
+            energy_efficiency: 0.8,
+            buff_strength: 0.8,
         ),
         hand_restriction: Some(Two),
         weapon_name: "Maul",
diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/ornate.ron b/assets/common/items/crafting_ing/modular/damage/hammer/ornate.ron
index 78cebc68a1..19326c58d2 100644
--- a/assets/common/items/crafting_ing/modular/damage/hammer/ornate.ron
+++ b/assets/common/items/crafting_ing/modular/damage/hammer/ornate.ron
@@ -9,9 +9,9 @@ ItemDef(
             power: 0.9,
             effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.5,
+            crit_chance: 0.2,
             range: 1.0,
-            energy_efficiency: 0.8,
+            energy_efficiency: 2.0,
             buff_strength: 0.8,
         ),
         hand_restriction: None,
diff --git a/assets/common/items/crafting_ing/modular/damage/sword/ornate.ron b/assets/common/items/crafting_ing/modular/damage/sword/ornate.ron
index a732805a06..bd7cdd7ff4 100644
--- a/assets/common/items/crafting_ing/modular/damage/sword/ornate.ron
+++ b/assets/common/items/crafting_ing/modular/damage/sword/ornate.ron
@@ -9,9 +9,9 @@ ItemDef(
             power: 0.9,
             effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.5,
+            crit_chance: 0.2,
             range: 1.0,
-            energy_efficiency: 0.8,
+            energy_efficiency: 2.0,
             buff_strength: 0.8,
         ),
         hand_restriction: None,
diff --git a/assets/common/items/crafting_ing/modular/damage/sword/zweihander.ron b/assets/common/items/crafting_ing/modular/damage/sword/zweihander.ron
index 2ef7c03b11..740bf89e7d 100644
--- a/assets/common/items/crafting_ing/modular/damage/sword/zweihander.ron
+++ b/assets/common/items/crafting_ing/modular/damage/sword/zweihander.ron
@@ -6,13 +6,13 @@ ItemDef(
         modkind: Damage,
         stats: (
             equip_time_secs: 0.25,
-            power: 1.0,
-            effect_power: 0.9,
+            power: 0.9,
+            effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.2,
+            crit_chance: 0.4,
             range: 1.5,
-            energy_efficiency: 0.9,
-            buff_strength: 0.9,
+            energy_efficiency: 0.8,
+            buff_strength: 0.8,
         ),
         hand_restriction: Some(Two),
         weapon_name: "Zweihander",
diff --git a/assets/common/items/crafting_ing/modular/held/bow/longbow.ron b/assets/common/items/crafting_ing/modular/held/bow/longbow.ron
index 6908bdb117..38ad05e4bb 100644
--- a/assets/common/items/crafting_ing/modular/held/bow/longbow.ron
+++ b/assets/common/items/crafting_ing/modular/held/bow/longbow.ron
@@ -6,13 +6,13 @@ ItemDef(
         modkind: Held,
         stats: (
             equip_time_secs: 0.25,
-            power: 1.0,
-            effect_power: 0.9,
+            power: 0.9,
+            effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.2,
+            crit_chance: 0.4,
             range: 1.5,
-            energy_efficiency: 0.9,
-            buff_strength: 0.9,
+            energy_efficiency: 0.8,
+            buff_strength: 0.8,
         ),
         hand_restriction: Some(Two),
         weapon_name: "Longbow",
diff --git a/assets/common/items/crafting_ing/modular/held/bow/ornate.ron b/assets/common/items/crafting_ing/modular/held/bow/ornate.ron
index 45e6f7357e..bc565c46f6 100644
--- a/assets/common/items/crafting_ing/modular/held/bow/ornate.ron
+++ b/assets/common/items/crafting_ing/modular/held/bow/ornate.ron
@@ -9,9 +9,9 @@ ItemDef(
             power: 0.9,
             effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.5,
+            crit_chance: 0.2,
             range: 1.0,
-            energy_efficiency: 0.8,
+            energy_efficiency: 2.0,
             buff_strength: 0.8,
         ),
         hand_restriction: Some(Two),
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 b313679f3f..d045e4eed3 100644
--- a/assets/common/items/crafting_ing/modular/held/sceptre/arbor.ron
+++ b/assets/common/items/crafting_ing/modular/held/sceptre/arbor.ron
@@ -6,13 +6,13 @@ ItemDef(
         modkind: Held,
         stats: (
             equip_time_secs: 0.25,
-            power: 1.0,
-            effect_power: 0.9,
+            power: 0.9,
+            effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.2,
+            crit_chance: 0.4,
             range: 1.5,
-            energy_efficiency: 0.9,
-            buff_strength: 0.9,
+            energy_efficiency: 0.8,
+            buff_strength: 0.8,
         ),
         hand_restriction: Some(Two),
         weapon_name: "Arbor",
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 04e3504cbe..53432085d7 100644
--- a/assets/common/items/crafting_ing/modular/held/sceptre/ornate.ron
+++ b/assets/common/items/crafting_ing/modular/held/sceptre/ornate.ron
@@ -9,9 +9,9 @@ ItemDef(
             power: 0.9,
             effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.5,
+            crit_chance: 0.2,
             range: 1.0,
-            energy_efficiency: 0.8,
+            energy_efficiency: 2.0,
             buff_strength: 0.8,
         ),
         hand_restriction: Some(Two),
diff --git a/assets/common/items/crafting_ing/modular/held/staff/longpole.ron b/assets/common/items/crafting_ing/modular/held/staff/longpole.ron
index 7b49cca5cb..8180e5ffdb 100644
--- a/assets/common/items/crafting_ing/modular/held/staff/longpole.ron
+++ b/assets/common/items/crafting_ing/modular/held/staff/longpole.ron
@@ -6,13 +6,13 @@ ItemDef(
         modkind: Held,
         stats: (
             equip_time_secs: 0.25,
-            power: 1.0,
-            effect_power: 0.9,
+            power: 0.9,
+            effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.2,
+            crit_chance: 0.4,
             range: 1.5,
-            energy_efficiency: 0.9,
-            buff_strength: 0.9,
+            energy_efficiency: 0.8,
+            buff_strength: 0.8,
         ),
         hand_restriction: Some(Two),
         weapon_name: "Long Pole",
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 7b05470824..e48b57baaf 100644
--- a/assets/common/items/crafting_ing/modular/held/staff/ornate.ron
+++ b/assets/common/items/crafting_ing/modular/held/staff/ornate.ron
@@ -9,9 +9,9 @@ ItemDef(
             power: 0.9,
             effect_power: 0.8,
             speed: 0.9,
-            crit_chance: 0.5,
+            crit_chance: 0.2,
             range: 1.0,
-            energy_efficiency: 0.8,
+            energy_efficiency: 2.0,
             buff_strength: 0.8,
         ),
         hand_restriction: Some(Two),
diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron
index f953c11299..5008d734f5 100644
--- a/assets/server/manifests/kits.ron
+++ b/assets/server/manifests/kits.ron
@@ -123,12 +123,7 @@
         ("common.items.armor.mail.orichalcum.shoulder", 1),
 
         // Weapons
-        ("common.items.weapons.sword.bloodsteel-0", 1),
-        ("common.items.weapons.axe.bloodsteel_axe-0", 1),
-        ("common.items.weapons.hammer.runic_hammer", 1),
-        ("common.items.weapons.bow.eldwood-0", 1),
-        ("common.items.weapons.staff.ruby_rod", 1),
-        ("common.items.weapons.sceptre.emerald", 1),
+        // TODO: Make modular weapons load from this
 
         // Potion Kit
         ("common.items.consumable.potion_med", 100),
@@ -162,12 +157,7 @@
         ("common.items.armor.mail.bloodsteel.shoulder", 1),
 
         // Weapons
-        ("common.items.weapons.sword.cobalt-0", 1),
-        ("common.items.weapons.axe.cobalt_axe-0", 1),
-        ("common.items.weapons.hammer.cobalt_hammer-0", 1),
-        ("common.items.weapons.bow.frostwood-0", 1),
-        ("common.items.weapons.staff.frostwood_torch", 1),
-        ("common.items.weapons.sceptre.fork0", 1),
+        // TODO: Make modular weapons load from this
 
         // Potion Kit
         ("common.items.consumable.potion_med", 100),
@@ -201,12 +191,7 @@
         ("common.items.armor.mail.cobalt.shoulder", 1),
 
         // Weapons
-        ("common.items.weapons.sword.steel-0", 1),
-        ("common.items.weapons.axe.steel_axe-0", 1),
-        ("common.items.weapons.hammer.steel_hammer-0", 1),
-        ("common.items.weapons.bow.metal-0", 1),
-        ("common.items.weapons.staff.flamethrower_0", 1),
-        ("common.items.weapons.sceptre.coralline_cane", 1),
+        // TODO: Make modular weapons load from this
 
         // Potion Kit
         ("common.items.consumable.potion_med", 100),
@@ -240,13 +225,8 @@
         ("common.items.armor.mail.steel.shoulder", 1),
 
         // Weapons
-        ("common.items.weapons.sword.iron-0", 1),
-        ("common.items.weapons.axe.iron_axe-0", 1),
-        ("common.items.weapons.hammer.iron_hammer-0", 1),
-        ("common.items.weapons.bow.hardwood-0", 1),
-        ("common.items.weapons.staff.heated_arm", 1),
-        ("common.items.weapons.sceptre.druids_arbor", 1),
-        
+        // TODO: Make modular weapons load from this
+
         // Potion Kit
         ("common.items.consumable.potion_med", 100),
     ],
@@ -279,13 +259,8 @@
         ("common.items.armor.mail.iron.shoulder", 1),
 
         // Weapons
-        ("common.items.weapons.sword.bronze-0", 1),
-        ("common.items.weapons.axe.bronze_axe-0", 1),
-        ("common.items.weapons.hammer.bronze_hammer-0", 1),
-        ("common.items.weapons.bow.bone-0", 1),
-        ("common.items.weapons.staff.bone_staff", 1),
-        ("common.items.weapons.sceptre.divine_gohei", 1),
-        
+        // TODO: Make modular weapons load from this
+
         // Potion Kit
         ("common.items.consumable.potion_minor", 100),
     ],
@@ -318,12 +293,7 @@
         ("common.items.armor.mail.bronze.shoulder", 1),
 
         // weapons
-        ("common.items.weapons.sword.stone-0", 1),
-        ("common.items.weapons.axe_1h.stone-0", 2),
-        ("common.items.weapons.hammer.stone_hammer-0", 1),
-        ("common.items.weapons.bow.wood-0", 1),
-        ("common.items.weapons.staff.bent_fuse", 1),
-        ("common.items.weapons.sceptre.divine_gohei", 1),
+        // TODO: Make modular weapons load from this
 
         // potion kit
         ("common.items.consumable.potion_minor", 100),
@@ -336,7 +306,6 @@
         ("common.items.armor.ferocious.shoulder",1),
         ("common.items.armor.ferocious.belt",1),
         ("common.items.armor.ferocious.back",1),
-        ("common.items.weapons.sword.bloodsteel-1",1),
     ],
     "cultist": [
         ("common.items.armor.cultist.chest",1),
diff --git a/server/src/migrations/V44__modular-weapons.sql b/server/src/migrations/V44__modular-weapons.sql
index 20c7b0207f..78d4184ed7 100644
--- a/server/src/migrations/V44__modular-weapons.sql
+++ b/server/src/migrations/V44__modular-weapons.sql
@@ -111,7 +111,7 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe.steel_axe-6', '
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe.steel_axe-6', 'common.items.crafting_ing.modular.held.axe.long', 103, 101);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe.steel_axe-6', 'common.items.mineral.ingot.steel', 104, 102);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bloodsteel-0', 'common.items.weapons.modular.sword', 105, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bloodsteel-0', 'common.items.crafting_ing.modular.damage.sword.longsword', 106, 105);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bloodsteel-0', 'common.items.crafting_ing.modular.damage.sword.ornate', 106, 105);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bloodsteel-0', 'common.items.crafting_ing.modular.held.sword.one-handed', 107, 105);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bloodsteel-0', 'common.items.mineral.ingot.bloodsteel', 108, 106);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bloodsteel-1', 'common.items.weapons.modular.sword', 109, NULL);
@@ -119,11 +119,11 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bloodsteel
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bloodsteel-1', 'common.items.crafting_ing.modular.held.sword.one-handed', 111, 109);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bloodsteel-1', 'common.items.mineral.ingot.bloodsteel', 112, 110);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bloodsteel-2', 'common.items.weapons.modular.sword', 113, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bloodsteel-2', 'common.items.crafting_ing.modular.damage.sword.longsword', 114, 113);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bloodsteel-2', 'common.items.crafting_ing.modular.damage.sword.sawblade', 114, 113);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bloodsteel-2', 'common.items.crafting_ing.modular.held.sword.one-handed', 115, 113);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bloodsteel-2', 'common.items.mineral.ingot.bloodsteel', 116, 114);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bronze-0', 'common.items.weapons.modular.sword', 117, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bronze-0', 'common.items.crafting_ing.modular.damage.sword.longsword', 118, 117);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bronze-0', 'common.items.crafting_ing.modular.damage.sword.katana', 118, 117);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bronze-0', 'common.items.crafting_ing.modular.held.sword.one-handed', 119, 117);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bronze-0', 'common.items.mineral.ingot.bronze', 120, 118);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bronze-1', 'common.items.weapons.modular.sword', 121, NULL);
@@ -131,7 +131,7 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bronze-1',
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bronze-1', 'common.items.crafting_ing.modular.held.sword.one-handed', 123, 121);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bronze-1', 'common.items.mineral.ingot.bronze', 124, 122);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bronze-2', 'common.items.weapons.modular.sword', 125, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bronze-2', 'common.items.crafting_ing.modular.damage.sword.longsword', 126, 125);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bronze-2', 'common.items.crafting_ing.modular.damage.sword.sawblade', 126, 125);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bronze-2', 'common.items.crafting_ing.modular.held.sword.one-handed', 127, 125);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.bronze-2', 'common.items.mineral.ingot.bronze', 128, 126);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-0', 'common.items.weapons.modular.sword', 129, NULL);
@@ -139,31 +139,31 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-0',
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-0', 'common.items.crafting_ing.modular.held.sword.one-handed', 131, 129);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-0', 'common.items.mineral.ingot.cobalt', 132, 130);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-1', 'common.items.weapons.modular.sword', 133, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-1', 'common.items.crafting_ing.modular.damage.sword.longsword', 134, 133);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-1', 'common.items.crafting_ing.modular.damage.sword.ornate', 134, 133);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-1', 'common.items.crafting_ing.modular.held.sword.one-handed', 135, 133);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-1', 'common.items.mineral.ingot.cobalt', 136, 134);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-2', 'common.items.weapons.modular.sword', 137, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-2', 'common.items.crafting_ing.modular.damage.sword.longsword', 138, 137);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-2', 'common.items.crafting_ing.modular.damage.sword.sabre', 138, 137);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-2', 'common.items.crafting_ing.modular.held.sword.one-handed', 139, 137);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-2', 'common.items.mineral.ingot.cobalt', 140, 138);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-3', 'common.items.weapons.modular.sword', 141, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-3', 'common.items.crafting_ing.modular.damage.sword.longsword', 142, 141);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-3', 'common.items.crafting_ing.modular.damage.sword.sawblade', 142, 141);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-3', 'common.items.crafting_ing.modular.held.sword.one-handed', 143, 141);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.cobalt-3', 'common.items.mineral.ingot.cobalt', 144, 142);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-0', 'common.items.weapons.modular.sword', 145, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-0', 'common.items.crafting_ing.modular.damage.sword.longsword', 146, 145);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-0', 'common.items.crafting_ing.modular.damage.sword.sawblade', 146, 145);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-0', 'common.items.crafting_ing.modular.held.sword.one-handed', 147, 145);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-0', 'common.items.mineral.ingot.iron', 148, 146);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-1', 'common.items.weapons.modular.sword', 149, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-1', 'common.items.crafting_ing.modular.damage.sword.longsword', 150, 149);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-1', 'common.items.crafting_ing.modular.damage.sword.katana', 150, 149);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-1', 'common.items.crafting_ing.modular.held.sword.one-handed', 151, 149);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-1', 'common.items.mineral.ingot.iron', 152, 150);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-2', 'common.items.weapons.modular.sword', 153, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-2', 'common.items.crafting_ing.modular.damage.sword.longsword', 154, 153);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-2', 'common.items.crafting_ing.modular.damage.sword.sabre', 154, 153);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-2', 'common.items.crafting_ing.modular.held.sword.one-handed', 155, 153);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-2', 'common.items.mineral.ingot.iron', 156, 154);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-3', 'common.items.weapons.modular.sword', 157, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-3', 'common.items.crafting_ing.modular.damage.sword.longsword', 158, 157);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-3', 'common.items.crafting_ing.modular.damage.sword.ornate', 158, 157);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-3', 'common.items.crafting_ing.modular.held.sword.one-handed', 159, 157);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-3', 'common.items.mineral.ingot.iron', 160, 158);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.iron-4', 'common.items.weapons.modular.sword', 161, NULL);
@@ -175,7 +175,7 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.obsidian-0
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.obsidian-0', 'common.items.crafting_ing.modular.held.sword.one-handed', 167, 165);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.obsidian-0', 'common.items.mineral.ingot.bloodsteel', 168, 166);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.orichalcum-0', 'common.items.weapons.modular.sword', 169, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.orichalcum-0', 'common.items.crafting_ing.modular.damage.sword.longsword', 170, 169);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.orichalcum-0', 'common.items.crafting_ing.modular.damage.sword.sabre', 170, 169);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.orichalcum-0', 'common.items.crafting_ing.modular.held.sword.one-handed', 171, 169);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.orichalcum-0', 'common.items.mineral.ingot.orichalcum', 172, 170);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.orichalcum-1', 'common.items.weapons.modular.sword', 173, NULL);
@@ -183,19 +183,19 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.orichalcum
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.orichalcum-1', 'common.items.crafting_ing.modular.held.sword.one-handed', 175, 173);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.orichalcum-1', 'common.items.mineral.ingot.orichalcum', 176, 174);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-0', 'common.items.weapons.modular.sword', 177, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-0', 'common.items.crafting_ing.modular.damage.sword.longsword', 178, 177);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-0', 'common.items.crafting_ing.modular.damage.sword.sabre', 178, 177);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-0', 'common.items.crafting_ing.modular.held.sword.one-handed', 179, 177);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-0', 'common.items.mineral.ingot.steel', 180, 178);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-1', 'common.items.weapons.modular.sword', 181, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-1', 'common.items.crafting_ing.modular.damage.sword.longsword', 182, 181);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-1', 'common.items.crafting_ing.modular.damage.sword.sabre', 182, 181);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-1', 'common.items.crafting_ing.modular.held.sword.one-handed', 183, 181);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-1', 'common.items.mineral.ingot.steel', 184, 182);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-2', 'common.items.weapons.modular.sword', 185, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-2', 'common.items.crafting_ing.modular.damage.sword.longsword', 186, 185);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-2', 'common.items.crafting_ing.modular.damage.sword.ornate', 186, 185);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-2', 'common.items.crafting_ing.modular.held.sword.one-handed', 187, 185);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-2', 'common.items.mineral.ingot.steel', 188, 186);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-3', 'common.items.weapons.modular.sword', 189, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-3', 'common.items.crafting_ing.modular.damage.sword.longsword', 190, 189);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-3', 'common.items.crafting_ing.modular.damage.sword.katana', 190, 189);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-3', 'common.items.crafting_ing.modular.held.sword.one-handed', 191, 189);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword_1h.steel-3', 'common.items.mineral.ingot.steel', 192, 190);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.sword.bloodsteel-0', 'common.items.weapons.modular.sword', 193, NULL);
@@ -663,15 +663,15 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-4', 'commo
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-4', 'common.items.crafting_ing.modular.held.bow.shortbow', 655, 653);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.bow.wood-4', 'common.items.log.wood', 656, 655);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bloodsteel-0', 'common.items.weapons.modular.hammer', 657, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bloodsteel-0', 'common.items.crafting_ing.modular.damage.hammer.hammer', 658, 657);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bloodsteel-0', 'common.items.crafting_ing.modular.damage.hammer.spikedmace', 658, 657);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bloodsteel-0', 'common.items.crafting_ing.modular.held.hammer.short', 659, 657);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bloodsteel-0', 'common.items.mineral.ingot.bloodsteel', 660, 658);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bloodsteel-1', 'common.items.weapons.modular.hammer', 661, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bloodsteel-1', 'common.items.crafting_ing.modular.damage.hammer.hammer', 662, 661);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bloodsteel-1', 'common.items.crafting_ing.modular.damage.hammer.warhammer', 662, 661);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bloodsteel-1', 'common.items.crafting_ing.modular.held.hammer.short', 663, 661);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bloodsteel-1', 'common.items.mineral.ingot.bloodsteel', 664, 662);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bronze-0', 'common.items.weapons.modular.hammer', 665, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bronze-0', 'common.items.crafting_ing.modular.damage.hammer.hammer', 666, 665);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bronze-0', 'common.items.crafting_ing.modular.damage.hammer.warhammer', 666, 665);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bronze-0', 'common.items.crafting_ing.modular.held.hammer.short', 667, 665);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bronze-0', 'common.items.mineral.ingot.bronze', 668, 666);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bronze-1', 'common.items.weapons.modular.hammer', 669, NULL);
@@ -679,7 +679,7 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bronze-1'
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bronze-1', 'common.items.crafting_ing.modular.held.hammer.short', 671, 669);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.bronze-1', 'common.items.mineral.ingot.bronze', 672, 670);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.cobalt-0', 'common.items.weapons.modular.hammer', 673, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.cobalt-0', 'common.items.crafting_ing.modular.damage.hammer.hammer', 674, 673);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.cobalt-0', 'common.items.crafting_ing.modular.damage.hammer.ornate', 674, 673);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.cobalt-0', 'common.items.crafting_ing.modular.held.hammer.short', 675, 673);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.cobalt-0', 'common.items.mineral.ingot.cobalt', 676, 674);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.cobalt-1', 'common.items.weapons.modular.hammer', 677, NULL);
@@ -687,7 +687,7 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.cobalt-1'
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.cobalt-1', 'common.items.crafting_ing.modular.held.hammer.short', 679, 677);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.cobalt-1', 'common.items.mineral.ingot.cobalt', 680, 678);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.iron-0', 'common.items.weapons.modular.hammer', 681, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.iron-0', 'common.items.crafting_ing.modular.damage.hammer.hammer', 682, 681);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.iron-0', 'common.items.crafting_ing.modular.damage.hammer.warhammer', 682, 681);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.iron-0', 'common.items.crafting_ing.modular.held.hammer.short', 683, 681);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.iron-0', 'common.items.mineral.ingot.iron', 684, 682);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.iron-1', 'common.items.weapons.modular.hammer', 685, NULL);
@@ -695,15 +695,15 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.iron-1',
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.iron-1', 'common.items.crafting_ing.modular.held.hammer.short', 687, 685);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.iron-1', 'common.items.mineral.ingot.iron', 688, 686);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.iron-2', 'common.items.weapons.modular.hammer', 689, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.iron-2', 'common.items.crafting_ing.modular.damage.hammer.hammer', 690, 689);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.iron-2', 'common.items.crafting_ing.modular.damage.hammer.spikedmace', 690, 689);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.iron-2', 'common.items.crafting_ing.modular.held.hammer.short', 691, 689);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.iron-2', 'common.items.mineral.ingot.iron', 692, 690);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.orichalcum-0', 'common.items.weapons.modular.hammer', 693, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.orichalcum-0', 'common.items.crafting_ing.modular.damage.hammer.hammer', 694, 693);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.orichalcum-0', 'common.items.crafting_ing.modular.damage.hammer.ornate', 694, 693);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.orichalcum-0', 'common.items.crafting_ing.modular.held.hammer.short', 695, 693);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.orichalcum-0', 'common.items.mineral.ingot.orichalcum', 696, 694);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.steel-0', 'common.items.weapons.modular.hammer', 697, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.steel-0', 'common.items.crafting_ing.modular.damage.hammer.hammer', 698, 697);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.steel-0', 'common.items.crafting_ing.modular.damage.hammer.warhammer', 698, 697);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.steel-0', 'common.items.crafting_ing.modular.held.hammer.short', 699, 697);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.steel-0', 'common.items.mineral.ingot.steel', 700, 698);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.steel-1', 'common.items.weapons.modular.hammer', 701, NULL);
@@ -711,11 +711,11 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.steel-1',
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.steel-1', 'common.items.crafting_ing.modular.held.hammer.short', 703, 701);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.steel-1', 'common.items.mineral.ingot.steel', 704, 702);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.steel-2', 'common.items.weapons.modular.hammer', 705, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.steel-2', 'common.items.crafting_ing.modular.damage.hammer.hammer', 706, 705);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.steel-2', 'common.items.crafting_ing.modular.damage.hammer.ornate', 706, 705);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.steel-2', 'common.items.crafting_ing.modular.held.hammer.short', 707, 705);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.steel-2', 'common.items.mineral.ingot.steel', 708, 706);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.stone-0', 'common.items.weapons.modular.hammer', 709, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.stone-0', 'common.items.crafting_ing.modular.damage.hammer.hammer', 710, 709);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.stone-0', 'common.items.crafting_ing.modular.damage.hammer.spikedmace', 710, 709);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.stone-0', 'common.items.crafting_ing.modular.held.hammer.short', 711, 709);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.stone-0', 'common.items.mineral.ingot.bronze', 712, 710);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.stone-1', 'common.items.weapons.modular.hammer', 713, NULL);
@@ -731,7 +731,7 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.wood-1',
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.wood-1', 'common.items.crafting_ing.modular.held.hammer.short', 723, 721);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.hammer_1h.wood-1', 'common.items.mineral.ingot.bronze', 724, 722);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.bloodsteel-0', 'common.items.weapons.modular.axe', 725, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.bloodsteel-0', 'common.items.crafting_ing.modular.damage.axe.axe', 726, 725);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.bloodsteel-0', 'common.items.crafting_ing.modular.damage.axe.jagged', 726, 725);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.bloodsteel-0', 'common.items.crafting_ing.modular.held.axe.short', 727, 725);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.bloodsteel-0', 'common.items.mineral.ingot.bloodsteel', 728, 726);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.bloodsteel-1', 'common.items.weapons.modular.axe', 729, NULL);
@@ -743,7 +743,7 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.bronze-0', '
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.bronze-0', 'common.items.crafting_ing.modular.held.axe.short', 735, 733);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.bronze-0', 'common.items.mineral.ingot.bronze', 736, 734);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.bronze-1', 'common.items.weapons.modular.axe', 737, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.bronze-1', 'common.items.crafting_ing.modular.damage.axe.axe', 738, 737);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.bronze-1', 'common.items.crafting_ing.modular.damage.axe.battleaxe', 738, 737);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.bronze-1', 'common.items.crafting_ing.modular.held.axe.short', 739, 737);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.bronze-1', 'common.items.mineral.ingot.bronze', 740, 738);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.cobalt-0', 'common.items.weapons.modular.axe', 741, NULL);
@@ -751,19 +751,19 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.cobalt-0', '
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.cobalt-0', 'common.items.crafting_ing.modular.held.axe.short', 743, 741);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.cobalt-0', 'common.items.mineral.ingot.cobalt', 744, 742);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.cobalt-1', 'common.items.weapons.modular.axe', 745, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.cobalt-1', 'common.items.crafting_ing.modular.damage.axe.axe', 746, 745);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.cobalt-1', 'common.items.crafting_ing.modular.damage.axe.ornate', 746, 745);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.cobalt-1', 'common.items.crafting_ing.modular.held.axe.short', 747, 745);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.cobalt-1', 'common.items.mineral.ingot.cobalt', 748, 746);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-0', 'common.items.weapons.modular.axe', 749, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-0', 'common.items.crafting_ing.modular.damage.axe.axe', 750, 749);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-0', 'common.items.crafting_ing.modular.damage.axe.battleaxe', 750, 749);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-0', 'common.items.crafting_ing.modular.held.axe.short', 751, 749);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-0', 'common.items.mineral.ingot.iron', 752, 750);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-1', 'common.items.weapons.modular.axe', 753, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-1', 'common.items.crafting_ing.modular.damage.axe.axe', 754, 753);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-1', 'common.items.crafting_ing.modular.damage.axe.ornate', 754, 753);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-1', 'common.items.crafting_ing.modular.held.axe.short', 755, 753);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-1', 'common.items.mineral.ingot.iron', 756, 754);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-2', 'common.items.weapons.modular.axe', 757, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-2', 'common.items.crafting_ing.modular.damage.axe.axe', 758, 757);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-2', 'common.items.crafting_ing.modular.damage.axe.jagged', 758, 757);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-2', 'common.items.crafting_ing.modular.held.axe.short', 759, 757);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-2', 'common.items.mineral.ingot.iron', 760, 758);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-3', 'common.items.weapons.modular.axe', 761, NULL);
@@ -771,7 +771,7 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-3', 'co
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-3', 'common.items.crafting_ing.modular.held.axe.short', 763, 761);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.iron-3', 'common.items.mineral.ingot.iron', 764, 762);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.orichalcum-0', 'common.items.weapons.modular.axe', 765, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.orichalcum-0', 'common.items.crafting_ing.modular.damage.axe.axe', 766, 765);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.orichalcum-0', 'common.items.crafting_ing.modular.damage.axe.ornate', 766, 765);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.orichalcum-0', 'common.items.crafting_ing.modular.held.axe.short', 767, 765);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.orichalcum-0', 'common.items.mineral.ingot.orichalcum', 768, 766);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.steel-0', 'common.items.weapons.modular.axe', 769, NULL);
@@ -779,11 +779,11 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.steel-0', 'c
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.steel-0', 'common.items.crafting_ing.modular.held.axe.short', 771, 769);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.steel-0', 'common.items.mineral.ingot.steel', 772, 770);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.steel-1', 'common.items.weapons.modular.axe', 773, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.steel-1', 'common.items.crafting_ing.modular.damage.axe.axe', 774, 773);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.steel-1', 'common.items.crafting_ing.modular.damage.axe.jagged', 774, 773);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.steel-1', 'common.items.crafting_ing.modular.held.axe.short', 775, 773);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.steel-1', 'common.items.mineral.ingot.steel', 776, 774);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.steel-2', 'common.items.weapons.modular.axe', 777, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.steel-2', 'common.items.crafting_ing.modular.damage.axe.axe', 778, 777);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.steel-2', 'common.items.crafting_ing.modular.damage.axe.battleaxe', 778, 777);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.steel-2', 'common.items.crafting_ing.modular.held.axe.short', 779, 777);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.steel-2', 'common.items.mineral.ingot.steel', 780, 778);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.stone-0', 'common.items.weapons.modular.axe', 781, NULL);
@@ -791,11 +791,11 @@ INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.stone-0', 'c
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.stone-0', 'common.items.crafting_ing.modular.held.axe.short', 783, 781);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.stone-0', 'common.items.mineral.ingot.bronze', 784, 782);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.stone-1', 'common.items.weapons.modular.axe', 785, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.stone-1', 'common.items.crafting_ing.modular.damage.axe.axe', 786, 785);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.stone-1', 'common.items.crafting_ing.modular.damage.axe.battleaxe', 786, 785);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.stone-1', 'common.items.crafting_ing.modular.held.axe.short', 787, 785);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.stone-1', 'common.items.mineral.ingot.bronze', 788, 786);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.wood-0', 'common.items.weapons.modular.axe', 789, NULL);
-INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.wood-0', 'common.items.crafting_ing.modular.damage.axe.axe', 790, 789);
+INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.wood-0', 'common.items.crafting_ing.modular.damage.axe.battleaxe', 790, 789);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.wood-0', 'common.items.crafting_ing.modular.held.axe.short', 791, 789);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.wood-0', 'common.items.mineral.ingot.bronze', 792, 790);
 INSERT INTO _temp_modular_items VALUES('common.items.weapons.axe_1h.wood-1', 'common.items.weapons.modular.axe', 793, NULL);