diff --git a/assets/common/items/armor/druid/druid.ron b/assets/common/items/armor/druid/pants.ron
similarity index 100%
rename from assets/common/items/armor/druid/druid.ron
rename to assets/common/items/armor/druid/pants.ron
diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs
index 828a59bae4..232e828758 100644
--- a/common/src/bin/csv_export/main.rs
+++ b/common/src/bin/csv_export/main.rs
@@ -5,7 +5,7 @@ use structopt::StructOpt;
 
 use comp::item::{
     armor::{ArmorKind, Protection},
-    tool::{Hands, Tool, ToolKind},
+    tool::{Hands, MaterialStatManifest, Tool, ToolKind},
     ItemKind,
 };
 use veloren_common::comp;
@@ -80,15 +80,17 @@ fn weapon_stats() -> Result<(), Box<dyn Error>> {
         "Description",
     ])?;
 
+    let msm = MaterialStatManifest::default();
+
     for item in comp::item::Item::new_from_asset_glob("common.items.weapons.*")
         .expect("Failed to iterate over item folders!")
     {
         match item.kind() {
             comp::item::ItemKind::Tool(tool) => {
-                let power = tool.base_power(&[]).to_string();
-                let poise_strength = tool.base_poise_strength(&[]).to_string();
-                let speed = tool.base_speed(&[]).to_string();
-                let equip_time = tool.equip_time(&[]).subsec_millis().to_string();
+                let power = tool.base_power(&msm, &[]).to_string();
+                let poise_strength = tool.base_poise_strength(&msm, &[]).to_string();
+                let speed = tool.base_speed(&msm, &[]).to_string();
+                let equip_time = tool.equip_time(&msm, &[]).subsec_millis().to_string();
                 let kind = get_tool_kind(&tool.kind);
                 let hands = get_tool_hands(&tool);
 
@@ -115,14 +117,15 @@ fn weapon_stats() -> Result<(), Box<dyn Error>> {
 
 fn get_tool_kind(kind: &ToolKind) -> String {
     match kind {
-        ToolKind::Sword => "Sword".to_string(),
-        ToolKind::Axe => "Axe".to_string(),
-        ToolKind::Hammer => "Hammer".to_string(),
-        ToolKind::Bow => "Bow".to_string(),
+        ToolKind::Sword | ToolKind::SwordSimple => "Sword".to_string(),
+        ToolKind::Axe | ToolKind::AxeSimple => "Axe".to_string(),
+        ToolKind::Hammer | ToolKind::HammerSimple => "Hammer".to_string(),
+        ToolKind::Bow | ToolKind::BowSimple => "Bow".to_string(),
         ToolKind::Dagger => "Dagger".to_string(),
-        ToolKind::Staff => "Staff".to_string(),
+        ToolKind::Staff | ToolKind::StaffSimple => "Staff".to_string(),
         ToolKind::Sceptre => "Sceptre".to_string(),
         ToolKind::Shield => "Shield".to_string(),
+        ToolKind::Spear => "Spear".to_string(),
         ToolKind::Debug => "Debug".to_string(),
         ToolKind::Farming => "Farming".to_string(),
         ToolKind::Unique(_) => "Unique".to_string(),
diff --git a/server/src/migrations/2021-03-01-053817_armor-reorganization/down.sql b/server/src/migrations/2021-03-01-053817_armor-reorganization/down.sql
new file mode 100644
index 0000000000..291a97c5ce
--- /dev/null
+++ b/server/src/migrations/2021-03-01-053817_armor-reorganization/down.sql
@@ -0,0 +1 @@
+-- This file should undo anything in `up.sql`
\ No newline at end of file
diff --git a/server/src/migrations/2021-03-01-053817_armor-reorganization/up.sql b/server/src/migrations/2021-03-01-053817_armor-reorganization/up.sql
new file mode 100644
index 0000000000..d829868d03
--- /dev/null
+++ b/server/src/migrations/2021-03-01-053817_armor-reorganization/up.sql
@@ -0,0 +1,336 @@
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.back.admin' WHERE item_definition_id = 'common.items.armor.back.admin';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.back.backpack' WHERE item_definition_id = 'common.items.armor.back.backpack_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.back.dungeon_purple' WHERE item_definition_id = 'common.items.armor.back.dungeon_purple-0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.back' WHERE item_definition_id = 'common.items.armor.back.leather_adventurer';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.back.short_0' WHERE item_definition_id = 'common.items.armor.back.short_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.back.short_1' WHERE item_definition_id = 'common.items.armor.back.short_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.velorite_mage.back' WHERE item_definition_id = 'common.items.armor.back.velorite_mage_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.back' WHERE item_definition_id = 'common.items.armor.back.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.back' WHERE item_definition_id = 'common.items.armor.back.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.assassin.belt' WHERE item_definition_id = 'common.items.armor.belt.assassin';
+UPDATE item
+SET item_definition_id = 'common.items.armor.bonerattler.belt' WHERE item_definition_id = 'common.items.armor.belt.bonerattler';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_blue.belt' WHERE item_definition_id = 'common.items.armor.belt.cloth_blue_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_green.belt' WHERE item_definition_id = 'common.items.armor.belt.cloth_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_purple.belt' WHERE item_definition_id = 'common.items.armor.belt.cloth_purple_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.belt' WHERE item_definition_id = 'common.items.armor.belt.cultist_belt';
+UPDATE item
+SET item_definition_id = 'common.items.armor.druid.belt' WHERE item_definition_id = 'common.items.armor.belt.druid';
+UPDATE item
+SET item_definition_id = 'common.items.armor.swift.belt' WHERE item_definition_id = 'common.items.armor.belt.leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather.belt' WHERE item_definition_id = 'common.items.armor.belt.leather_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.belt' WHERE item_definition_id = 'common.items.armor.belt.leather_adventurer';
+UPDATE item
+SET item_definition_id = 'common.items.armor.plate.belt' WHERE item_definition_id = 'common.items.armor.belt.plate_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather_plate.belt' WHERE item_definition_id = 'common.items.armor.belt.plate_leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.steel.belt' WHERE item_definition_id = 'common.items.armor.belt.steel_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.tarasque.belt' WHERE item_definition_id = 'common.items.armor.belt.tarasque';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigs.belt' WHERE item_definition_id = 'common.items.armor.belt.twig';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigflowers.belt' WHERE item_definition_id = 'common.items.armor.belt.twigsflowers';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigsleaves.belt' WHERE item_definition_id = 'common.items.armor.belt.twigsleaves';
+UPDATE item
+SET item_definition_id = 'common.items.armor.velorite_mage.belt' WHERE item_definition_id = 'common.items.armor.belt.velorite_mage_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.belt' WHERE item_definition_id = 'common.items.armor.belt.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.belt' WHERE item_definition_id = 'common.items.armor.belt.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.assassin.chest' WHERE item_definition_id = 'common.items.armor.chest.assassin';
+UPDATE item
+SET item_definition_id = 'common.items.armor.bonerattler.chest' WHERE item_definition_id = 'common.items.armor.chest.bonerattler';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_blue.chest' WHERE item_definition_id = 'common.items.armor.chest.cloth_blue_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_green.chest' WHERE item_definition_id = 'common.items.armor.chest.cloth_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_purple.chest' WHERE item_definition_id = 'common.items.armor.chest.cloth_purple_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.chest' WHERE item_definition_id = 'common.items.armor.chest.cultist_chest_blue';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.chest' WHERE item_definition_id = 'common.items.armor.chest.cultist_chest_purple';
+UPDATE item
+SET item_definition_id = 'common.items.armor.druid.chest' WHERE item_definition_id = 'common.items.armor.chest.druid';
+UPDATE item
+SET item_definition_id = 'common.items.armor.swift.chest' WHERE item_definition_id = 'common.items.armor.chest.leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather.chest' WHERE item_definition_id = 'common.items.armor.chest.leather_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.chest' WHERE item_definition_id = 'common.items.armor.chest.leather_adventurer';
+UPDATE item
+SET item_definition_id = 'common.items.armor.plate.chest' WHERE item_definition_id = 'common.items.armor.chest.plate_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather_plate.chest' WHERE item_definition_id = 'common.items.armor.chest.plate_leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.rugged.chest' WHERE item_definition_id = 'common.items.armor.chest.rugged';
+UPDATE item
+SET item_definition_id = 'common.items.armor.steel.chest' WHERE item_definition_id = 'common.items.armor.chest.steel_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.tarasque.chest' WHERE item_definition_id = 'common.items.armor.chest.tarasque';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigs.chest' WHERE item_definition_id = 'common.items.armor.chest.twig';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigflowers.chest' WHERE item_definition_id = 'common.items.armor.chest.twigsflowers';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigsleaves.chest' WHERE item_definition_id = 'common.items.armor.chest.twigsleaves';
+UPDATE item
+SET item_definition_id = 'common.items.armor.velorite_mage.chest' WHERE item_definition_id = 'common.items.armor.chest.velorite_mage_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.chest' WHERE item_definition_id = 'common.items.armor.chest.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.chest' WHERE item_definition_id = 'common.items.armor.chest.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_green_0' WHERE item_definition_id = 'common.items.armor.chest.worker_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_green_1' WHERE item_definition_id = 'common.items.armor.chest.worker_green_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_orange_0' WHERE item_definition_id = 'common.items.armor.chest.worker_orange_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_orange_1' WHERE item_definition_id = 'common.items.armor.chest.worker_orange_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_purple_0' WHERE item_definition_id = 'common.items.armor.chest.worker_purple_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_purple_1' WHERE item_definition_id = 'common.items.armor.chest.worker_purple_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_red_0' WHERE item_definition_id = 'common.items.armor.chest.worker_red_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_red_1' WHERE item_definition_id = 'common.items.armor.chest.worker_red_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_yellow_0' WHERE item_definition_id = 'common.items.armor.chest.worker_yellow_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.chest.worker_yellow_1' WHERE item_definition_id = 'common.items.armor.chest.worker_yellow_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.assassin.foot' WHERE item_definition_id = 'common.items.armor.foot.assassin';
+UPDATE item
+SET item_definition_id = 'common.items.armor.bonerattler.foot' WHERE item_definition_id = 'common.items.armor.foot.bonerattler';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_blue.foot' WHERE item_definition_id = 'common.items.armor.foot.cloth_blue_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_green.foot' WHERE item_definition_id = 'common.items.armor.foot.cloth_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_purple.foot' WHERE item_definition_id = 'common.items.armor.foot.cloth_purple_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.foot' WHERE item_definition_id = 'common.items.armor.foot.cultist_boots';
+UPDATE item
+SET item_definition_id = 'common.items.armor.druid.foot' WHERE item_definition_id = 'common.items.armor.foot.druid';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.foot.jackalope_slippers' WHERE item_definition_id = 'common.items.armor.foot.jackalope_slippers';
+UPDATE item
+SET item_definition_id = 'common.items.armor.swift.foot' WHERE item_definition_id = 'common.items.armor.foot.leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather.foot' WHERE item_definition_id = 'common.items.armor.foot.leather_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.foot' WHERE item_definition_id = 'common.items.armor.foot.leather_adventurer';
+UPDATE item
+SET item_definition_id = 'common.items.armor.plate.foot' WHERE item_definition_id = 'common.items.armor.foot.plate_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather_plate.foot' WHERE item_definition_id = 'common.items.armor.foot.plate_leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.foot.sandals' WHERE item_definition_id = 'common.items.armor.foot.sandals_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.steel.foot' WHERE item_definition_id = 'common.items.armor.foot.steel_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.tarasque.foot' WHERE item_definition_id = 'common.items.armor.foot.tarasque';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigs.foot' WHERE item_definition_id = 'common.items.armor.foot.twig';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigflowers.foot' WHERE item_definition_id = 'common.items.armor.foot.twigsflowers';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigsleaves.foot' WHERE item_definition_id = 'common.items.armor.foot.twigsleaves';
+UPDATE item
+SET item_definition_id = 'common.items.armor.velorite_mage.foot' WHERE item_definition_id = 'common.items.armor.foot.velorite_mage_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.foot' WHERE item_definition_id = 'common.items.armor.foot.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.foot' WHERE item_definition_id = 'common.items.armor.foot.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.assassin.hand' WHERE item_definition_id = 'common.items.armor.hand.assassin';
+UPDATE item
+SET item_definition_id = 'common.items.armor.bonerattler.hand' WHERE item_definition_id = 'common.items.armor.hand.bonerattler';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_blue.hand' WHERE item_definition_id = 'common.items.armor.hand.cloth_blue_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_green.hand' WHERE item_definition_id = 'common.items.armor.hand.cloth_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_purple.hand' WHERE item_definition_id = 'common.items.armor.hand.cloth_purple_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.hand' WHERE item_definition_id = 'common.items.armor.hand.cultist_hands_blue';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.hand' WHERE item_definition_id = 'common.items.armor.hand.cultist_hands_purple';
+UPDATE item
+SET item_definition_id = 'common.items.armor.druid.hand' WHERE item_definition_id = 'common.items.armor.hand.druid';
+UPDATE item
+SET item_definition_id = 'common.items.armor.swift.hand' WHERE item_definition_id = 'common.items.armor.hand.leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather.hand' WHERE item_definition_id = 'common.items.armor.hand.leather_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.hand' WHERE item_definition_id = 'common.items.armor.hand.leather_adventurer';
+UPDATE item
+SET item_definition_id = 'common.items.armor.plate.hand' WHERE item_definition_id = 'common.items.armor.hand.plate_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather_plate.hand' WHERE item_definition_id = 'common.items.armor.hand.plate_leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.steel.hand' WHERE item_definition_id = 'common.items.armor.hand.steel_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.tarasque.hand' WHERE item_definition_id = 'common.items.armor.hand.tarasque';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigs.hand' WHERE item_definition_id = 'common.items.armor.hand.twig';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigflowers.hand' WHERE item_definition_id = 'common.items.armor.hand.twigsflowers';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigsleaves.hand' WHERE item_definition_id = 'common.items.armor.hand.twigsleaves';
+UPDATE item
+SET item_definition_id = 'common.items.armor.velorite_mage.hand' WHERE item_definition_id = 'common.items.armor.hand.velorite_mage_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.hand' WHERE item_definition_id = 'common.items.armor.hand.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.hand' WHERE item_definition_id = 'common.items.armor.hand.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.assassin.head' WHERE item_definition_id = 'common.items.armor.head.assa_mask_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.swift.head' WHERE item_definition_id = 'common.items.armor.head.leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.head' WHERE item_definition_id = 'common.items.armor.head.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.head' WHERE item_definition_id = 'common.items.armor.head.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.neck.plain_0' WHERE item_definition_id = 'common.items.armor.neck.neck_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.neck.plain_1' WHERE item_definition_id = 'common.items.armor.neck.neck_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.neck.shell' WHERE item_definition_id = 'common.items.armor.neck.neck_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.assassin.pants' WHERE item_definition_id = 'common.items.armor.pants.assassin';
+UPDATE item
+SET item_definition_id = 'common.items.armor.bonerattler.pants' WHERE item_definition_id = 'common.items.armor.pants.bonerattler';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_blue.pants' WHERE item_definition_id = 'common.items.armor.pants.cloth_blue_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_green.pants' WHERE item_definition_id = 'common.items.armor.pants.cloth_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_purple.pants' WHERE item_definition_id = 'common.items.armor.pants.cloth_purple_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.pants' WHERE item_definition_id = 'common.items.armor.pants.cultist_legs_blue';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.pants' WHERE item_definition_id = 'common.items.armor.pants.cultist_legs_purple';
+UPDATE item
+SET item_definition_id = 'common.items.armor.druid.pants' WHERE item_definition_id = 'common.items.armor.pants.druid';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.pants.hunting' WHERE item_definition_id = 'common.items.armor.pants.hunting';
+UPDATE item
+SET item_definition_id = 'common.items.armor.swift.pants' WHERE item_definition_id = 'common.items.armor.pants.leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather.pants' WHERE item_definition_id = 'common.items.armor.pants.leather_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.pants' WHERE item_definition_id = 'common.items.armor.pants.leather_adventurer';
+UPDATE item
+SET item_definition_id = 'common.items.armor.plate.pants' WHERE item_definition_id = 'common.items.armor.pants.plate_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather_plate.pants' WHERE item_definition_id = 'common.items.armor.pants.plate_leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.rugged.pants' WHERE item_definition_id = 'common.items.armor.pants.rugged';
+UPDATE item
+SET item_definition_id = 'common.items.armor.steel.pants' WHERE item_definition_id = 'common.items.armor.pants.steel_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.tarasque.pants' WHERE item_definition_id = 'common.items.armor.pants.tarasque';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigs.pants' WHERE item_definition_id = 'common.items.armor.pants.twig';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigflowers.pants' WHERE item_definition_id = 'common.items.armor.pants.twigsflowers';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigsleaves.pants' WHERE item_definition_id = 'common.items.armor.pants.twigsleaves';
+UPDATE item
+SET item_definition_id = 'common.items.armor.velorite_mage.pants' WHERE item_definition_id = 'common.items.armor.pants.velorite_mage_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.pants' WHERE item_definition_id = 'common.items.armor.pants.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.pants' WHERE item_definition_id = 'common.items.armor.pants.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.pants.worker_blue' WHERE item_definition_id = 'common.items.armor.pants.worker_blue_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.ring.scratched' WHERE item_definition_id = 'common.items.armor.ring.ring_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.ring.gold' WHERE item_definition_id = 'common.items.armor.ring.ring_gold_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.ring.skull' WHERE item_definition_id = 'common.items.armor.ring.ring_purp_high_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.assassin.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.assassin';
+UPDATE item
+SET item_definition_id = 'common.items.armor.bonerattler.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.bonerattler';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_blue.shoulder_0' WHERE item_definition_id = 'common.items.armor.shoulder.cloth_blue_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_blue.shoulder_1' WHERE item_definition_id = 'common.items.armor.shoulder.cloth_blue_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_green.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.cloth_green_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cloth_purple.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.cloth_purple_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.cultist_shoulder_blue';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.cultist_shoulder_purple';
+UPDATE item
+SET item_definition_id = 'common.items.armor.druid.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.druidshoulder';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.shoulder.iron_spikes' WHERE item_definition_id = 'common.items.armor.shoulder.iron_spikes';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.shoulder.leather_3' WHERE item_definition_id = 'common.items.armor.shoulder.leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.swift.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.leather_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.leather_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.agile.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.leather_adventurer';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.shoulder.leather_iron_0' WHERE item_definition_id = 'common.items.armor.shoulder.leather_iron_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.shoulder.leather_iron_1' WHERE item_definition_id = 'common.items.armor.shoulder.leather_iron_1';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.shoulder.leather_iron_2' WHERE item_definition_id = 'common.items.armor.shoulder.leather_iron_2';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.shoulder.leather_iron_3' WHERE item_definition_id = 'common.items.armor.shoulder.leather_iron_3';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.shoulder.leather_strip' WHERE item_definition_id = 'common.items.armor.shoulder.leather_strips';
+UPDATE item
+SET item_definition_id = 'common.items.armor.plate.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.plate_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.leather_plate.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.plate_leather_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.steel.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.steel_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.tarasque.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.tarasque';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigs.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.twigs';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigflowers.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.twigsflowers';
+UPDATE item
+SET item_definition_id = 'common.items.armor.twigsleaves.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.twigsleaves';
+UPDATE item
+SET item_definition_id = 'common.items.armor.velorite_mage.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.velorite_mage_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlock.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.warlock';
+UPDATE item
+SET item_definition_id = 'common.items.armor.warlord.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.warlord';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.tabard.admin' WHERE item_definition_id = 'common.items.armor.tabard.admin';
\ No newline at end of file