diff --git a/core/armor_system.py b/core/armor_system.py
index 91ff914..599b5b4 100644
--- a/core/armor_system.py
+++ b/core/armor_system.py
@@ -749,46 +749,46 @@ def create_ghost_set() -> ArmorSet:
             protection=ProtectionProfile(impact=Decimal("2"), cut=Decimal("2"), stab=Decimal("2"), burn=Decimal("5"), cold=Decimal("5")),
             weight=Decimal("0.3"),
         ),
-        ArmorSlot.CHEST: ArmorPiece(
+        ArmorSlot.TORSO: ArmorPiece(
             name="Ghost Harness",
             item_id="ghost_harness",
-            slot=ArmorSlot.CHEST,
+            slot=ArmorSlot.TORSO,
             set_name="Ghost",
             durability=ghost_durability,
             protection=ProtectionProfile(impact=Decimal("4"), cut=Decimal("4"), stab=Decimal("4"), burn=Decimal("8"), cold=Decimal("8")),
             weight=Decimal("0.7"),
         ),
-        ArmorSlot.LEFT_ARM: ArmorPiece(
+        ArmorSlot.ARMS: ArmorPiece(
             name="Ghost Arm Guards (L)",
             item_id="ghost_arm_l",
-            slot=ArmorSlot.LEFT_ARM,
+            slot=ArmorSlot.ARMS,
             set_name="Ghost",
             durability=ghost_durability,
             protection=ProtectionProfile(impact=Decimal("2"), cut=Decimal("2"), stab=Decimal("2"), burn=Decimal("5"), cold=Decimal("5")),
             weight=Decimal("0.3"),
         ),
-        ArmorSlot.RIGHT_ARM: ArmorPiece(
+        ArmorSlot.ARMS: ArmorPiece(
             name="Ghost Arm Guards (R)",
             item_id="ghost_arm_r",
-            slot=ArmorSlot.RIGHT_ARM,
+            slot=ArmorSlot.ARMS,
             set_name="Ghost",
             durability=ghost_durability,
             protection=ProtectionProfile(impact=Decimal("2"), cut=Decimal("2"), stab=Decimal("2"), burn=Decimal("5"), cold=Decimal("5")),
             weight=Decimal("0.3"),
         ),
-        ArmorSlot.LEFT_HAND: ArmorPiece(
+        ArmorSlot.HANDS: ArmorPiece(
             name="Ghost Gloves (L)",
             item_id="ghost_gloves_l",
-            slot=ArmorSlot.LEFT_HAND,
+            slot=ArmorSlot.HANDS,
             set_name="Ghost",
             durability=ghost_durability,
             protection=ProtectionProfile(impact=Decimal("1"), cut=Decimal("1"), stab=Decimal("1"), burn=Decimal("3"), cold=Decimal("3")),
             weight=Decimal("0.2"),
         ),
-        ArmorSlot.RIGHT_HAND: ArmorPiece(
+        ArmorSlot.HANDS: ArmorPiece(
             name="Ghost Gloves (R)",
             item_id="ghost_gloves_r",
-            slot=ArmorSlot.RIGHT_HAND,
+            slot=ArmorSlot.HANDS,
             set_name="Ghost",
             durability=ghost_durability,
             protection=ProtectionProfile(impact=Decimal("1"), cut=Decimal("1"), stab=Decimal("1"), burn=Decimal("3"), cold=Decimal("3")),
@@ -826,46 +826,46 @@ def create_shogun_set() -> ArmorSet:
             protection=ProtectionProfile(impact=Decimal("5"), cut=Decimal("4"), stab=Decimal("3"), burn=Decimal("2"), cold=Decimal("2")),
             weight=Decimal("0.8"),
         ),
-        ArmorSlot.CHEST: ArmorPiece(
+        ArmorSlot.TORSO: ArmorPiece(
             name="Shogun Harness",
             item_id="shogun_harness",
-            slot=ArmorSlot.CHEST,
+            slot=ArmorSlot.TORSO,
             set_name="Shogun",
             durability=shogun_durability,
             protection=ProtectionProfile(impact=Decimal("8"), cut=Decimal("6"), stab=Decimal("5"), burn=Decimal("4"), cold=Decimal("4")),
             weight=Decimal("1.5"),
         ),
-        ArmorSlot.LEFT_ARM: ArmorPiece(
+        ArmorSlot.ARMS: ArmorPiece(
             name="Shogun Arm Guards (L)",
             item_id="shogun_arm_l",
-            slot=ArmorSlot.LEFT_ARM,
+            slot=ArmorSlot.ARMS,
             set_name="Shogun",
             durability=shogun_durability,
             protection=ProtectionProfile(impact=Decimal("5"), cut=Decimal("4"), stab=Decimal("3"), burn=Decimal("2"), cold=Decimal("2")),
             weight=Decimal("0.8"),
         ),
-        ArmorSlot.RIGHT_ARM: ArmorPiece(
+        ArmorSlot.ARMS: ArmorPiece(
             name="Shogun Arm Guards (R)",
             item_id="shogun_arm_r",
-            slot=ArmorSlot.RIGHT_ARM,
+            slot=ArmorSlot.ARMS,
             set_name="Shogun",
             durability=shogun_durability,
             protection=ProtectionProfile(impact=Decimal("5"), cut=Decimal("4"), stab=Decimal("3"), burn=Decimal("2"), cold=Decimal("2")),
             weight=Decimal("0.8"),
         ),
-        ArmorSlot.LEFT_HAND: ArmorPiece(
+        ArmorSlot.HANDS: ArmorPiece(
             name="Shogun Gloves (L)",
             item_id="shogun_gloves_l",
-            slot=ArmorSlot.LEFT_HAND,
+            slot=ArmorSlot.HANDS,
             set_name="Shogun",
             durability=shogun_durability,
             protection=ProtectionProfile(impact=Decimal("3"), cut=Decimal("2"), stab=Decimal("2"), burn=Decimal("1"), cold=Decimal("1")),
             weight=Decimal("0.4"),
         ),
-        ArmorSlot.RIGHT_HAND: ArmorPiece(
+        ArmorSlot.HANDS: ArmorPiece(
             name="Shogun Gloves (R)",
             item_id="shogun_gloves_r",
-            slot=ArmorSlot.RIGHT_HAND,
+            slot=ArmorSlot.HANDS,
             set_name="Shogun",
             durability=shogun_durability,
             protection=ProtectionProfile(impact=Decimal("3"), cut=Decimal("2"), stab=Decimal("2"), burn=Decimal("1"), cold=Decimal("1")),
@@ -902,46 +902,46 @@ def create_vigilante_set() -> ArmorSet:
             protection=ProtectionProfile(impact=Decimal("3"), cut=Decimal("2"), stab=Decimal("2")),
             weight=Decimal("0.4"),
         ),
-        ArmorSlot.CHEST: ArmorPiece(
+        ArmorSlot.TORSO: ArmorPiece(
             name="Vigilante Harness",
             item_id="vigilante_harness",
-            slot=ArmorSlot.CHEST,
+            slot=ArmorSlot.TORSO,
             set_name="Vigilante",
             durability=vigilante_durability,
             protection=ProtectionProfile(impact=Decimal("6"), cut=Decimal("5"), stab=Decimal("4")),
             weight=Decimal("1.0"),
         ),
-        ArmorSlot.LEFT_ARM: ArmorPiece(
+        ArmorSlot.ARMS: ArmorPiece(
             name="Vigilante Arm Guards (L)",
             item_id="vigilante_arm_l",
-            slot=ArmorSlot.LEFT_ARM,
+            slot=ArmorSlot.ARMS,
             set_name="Vigilante",
             durability=vigilante_durability,
             protection=ProtectionProfile(impact=Decimal("3"), cut=Decimal("2"), stab=Decimal("2")),
             weight=Decimal("0.4"),
         ),
-        ArmorSlot.RIGHT_ARM: ArmorPiece(
+        ArmorSlot.ARMS: ArmorPiece(
             name="Vigilante Arm Guards (R)",
             item_id="vigilante_arm_r",
-            slot=ArmorSlot.RIGHT_ARM,
+            slot=ArmorSlot.ARMS,
             set_name="Vigilante",
             durability=vigilante_durability,
             protection=ProtectionProfile(impact=Decimal("3"), cut=Decimal("2"), stab=Decimal("2")),
             weight=Decimal("0.4"),
         ),
-        ArmorSlot.LEFT_HAND: ArmorPiece(
+        ArmorSlot.HANDS: ArmorPiece(
             name="Vigilante Gloves (L)",
             item_id="vigilante_gloves_l",
-            slot=ArmorSlot.LEFT_HAND,
+            slot=ArmorSlot.HANDS,
             set_name="Vigilante",
             durability=vigilante_durability,
             protection=ProtectionProfile(impact=Decimal("2"), cut=Decimal("1"), stab=Decimal("1")),
             weight=Decimal("0.2"),
         ),
-        ArmorSlot.RIGHT_HAND: ArmorPiece(
+        ArmorSlot.HANDS: ArmorPiece(
             name="Vigilante Gloves (R)",
             item_id="vigilante_gloves_r",
-            slot=ArmorSlot.RIGHT_HAND,
+            slot=ArmorSlot.HANDS,
             set_name="Vigilante",
             durability=vigilante_durability,
             protection=ProtectionProfile(impact=Decimal("2"), cut=Decimal("1"), stab=Decimal("1")),
@@ -978,46 +978,46 @@ def create_hermes_set() -> ArmorSet:
             protection=ProtectionProfile(impact=Decimal("3"), cut=Decimal("3"), stab=Decimal("2"), penetration=Decimal("3")),
             weight=Decimal("0.5"),
         ),
-        ArmorSlot.CHEST: ArmorPiece(
+        ArmorSlot.TORSO: ArmorPiece(
             name="Hermes Harness",
             item_id="hermes_harness",
-            slot=ArmorSlot.CHEST,
+            slot=ArmorSlot.TORSO,
             set_name="Hermes",
             decay_per_hp=hermes_economy,
             protection=ProtectionProfile(impact=Decimal("10"), cut=Decimal("8"), stab=Decimal("7"), penetration=Decimal("5")),
             weight=Decimal("1.2"),
         ),
-        ArmorSlot.LEFT_ARM: ArmorPiece(
+        ArmorSlot.ARMS: ArmorPiece(
             name="Hermes Arm Guards (L)",
             item_id="hermes_arm_l",
-            slot=ArmorSlot.LEFT_ARM,
+            slot=ArmorSlot.ARMS,
             set_name="Hermes",
             decay_per_hp=hermes_economy,
             protection=ProtectionProfile(impact=Decimal("4"), cut=Decimal("4"), stab=Decimal("3"), penetration=Decimal("2")),
             weight=Decimal("0.5"),
         ),
-        ArmorSlot.RIGHT_ARM: ArmorPiece(
+        ArmorSlot.ARMS: ArmorPiece(
             name="Hermes Arm Guards (R)",
             item_id="hermes_arm_r",
-            slot=ArmorSlot.RIGHT_ARM,
+            slot=ArmorSlot.ARMS,
             set_name="Hermes",
             decay_per_hp=hermes_economy,
             protection=ProtectionProfile(impact=Decimal("4"), cut=Decimal("4"), stab=Decimal("3"), penetration=Decimal("2")),
             weight=Decimal("0.5"),
         ),
-        ArmorSlot.LEFT_HAND: ArmorPiece(
+        ArmorSlot.HANDS: ArmorPiece(
             name="Hermes Gloves (L)",
             item_id="hermes_gloves_l",
-            slot=ArmorSlot.LEFT_HAND,
+            slot=ArmorSlot.HANDS,
             set_name="Hermes",
             decay_per_hp=hermes_economy,
             protection=ProtectionProfile(impact=Decimal("2"), cut=Decimal("2"), stab=Decimal("1"), penetration=Decimal("1")),
             weight=Decimal("0.25"),
         ),
-        ArmorSlot.RIGHT_HAND: ArmorPiece(
+        ArmorSlot.HANDS: ArmorPiece(
             name="Hermes Gloves (R)",
             item_id="hermes_gloves_r",
-            slot=ArmorSlot.RIGHT_HAND,
+            slot=ArmorSlot.HANDS,
             set_name="Hermes",
             decay_per_hp=hermes_economy,
             protection=ProtectionProfile(impact=Decimal("2"), cut=Decimal("2"), stab=Decimal("1"), penetration=Decimal("1")),
@@ -1055,46 +1055,46 @@ def create_pixie_set() -> ArmorSet:
             protection=ProtectionProfile(impact=Decimal("1"), cut=Decimal("1"), stab=Decimal("1")),
             weight=Decimal("0.2"),
         ),
-        ArmorSlot.CHEST: ArmorPiece(
+        ArmorSlot.TORSO: ArmorPiece(
             name="Pixie Harness",
             item_id="pixie_harness",
-            slot=ArmorSlot.CHEST,
+            slot=ArmorSlot.TORSO,
             set_name="Pixie",
             decay_per_hp=pixie_economy,
             protection=ProtectionProfile(impact=Decimal("4"), cut=Decimal("3"), stab=Decimal("2")),
             weight=Decimal("0.5"),
         ),
-        ArmorSlot.LEFT_ARM: ArmorPiece(
+        ArmorSlot.ARMS: ArmorPiece(
             name="Pixie Arm Guards (L)",
             item_id="pixie_arm_l",
-            slot=ArmorSlot.LEFT_ARM,
+            slot=ArmorSlot.ARMS,
             set_name="Pixie",
             decay_per_hp=pixie_economy,
             protection=ProtectionProfile(impact=Decimal("1"), cut=Decimal("1"), stab=Decimal("1")),
             weight=Decimal("0.2"),
         ),
-        ArmorSlot.RIGHT_ARM: ArmorPiece(
+        ArmorSlot.ARMS: ArmorPiece(
             name="Pixie Arm Guards (R)",
             item_id="pixie_arm_r",
-            slot=ArmorSlot.RIGHT_ARM,
+            slot=ArmorSlot.ARMS,
             set_name="Pixie",
             decay_per_hp=pixie_economy,
             protection=ProtectionProfile(impact=Decimal("1"), cut=Decimal("1"), stab=Decimal("1")),
             weight=Decimal("0.2"),
         ),
-        ArmorSlot.LEFT_HAND: ArmorPiece(
+        ArmorSlot.HANDS: ArmorPiece(
             name="Pixie Gloves (L)",
             item_id="pixie_gloves_l",
-            slot=ArmorSlot.LEFT_HAND,
+            slot=ArmorSlot.HANDS,
             set_name="Pixie",
             decay_per_hp=pixie_economy,
             protection=ProtectionProfile(impact=Decimal("1"), cut=Decimal("1")),
             weight=Decimal("0.1"),
         ),
-        ArmorSlot.RIGHT_HAND: ArmorPiece(
+        ArmorSlot.HANDS: ArmorPiece(
             name="Pixie Gloves (R)",
             item_id="pixie_gloves_r",
-            slot=ArmorSlot.RIGHT_HAND,
+            slot=ArmorSlot.HANDS,
             set_name="Pixie",
             decay_per_hp=pixie_economy,
             protection=ProtectionProfile(impact=Decimal("1"), cut=Decimal("1")),