diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json
index dbada3fa834d6..75d8f7bd027a0 100644
--- a/data/json/items/armor/ammo_pouch.json
+++ b/data/json/items/armor/ammo_pouch.json
@@ -181,7 +181,7 @@
     "id": "xl_chestrig",
     "type": "ARMOR",
     "copy-from": "chestrig",
-    "name": { "str": "oversize chestrig" },
+    "name": { "str": "XL chest rig" },
     "description": "Popularized during the Vietnam War, chest rigs like these are typically plain, barebones affairs consisting of three or more pouches in a row, with straps to secure them on your chest.  This one can hold four magazines in its pouches and fits larger-than-human forms.",
     "proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
     "flags": [ "WATER_FRIENDLY", "WAIST", "OVERSIZE" ]
@@ -463,7 +463,7 @@
     "id": "xl_tacvest",
     "type": "ARMOR",
     "copy-from": "tacvest",
-    "name": { "str": "oversize tac vest" },
+    "name": { "str": "XL tac vest" },
     "description": "This light vest is meant to carry your gear and ammunition comfortably distributed about your torso.  They are popular amongst law enforcement, but less so than combination tactical vests incorporating Kevlar.  Oversized and easy to don, this vest can hold four magazines close at hand in its many pouches.",
     "proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
     "flags": [ "WATER_FRIENDLY", "WAIST", "OVERSIZE" ]
diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json
index 9497b1819ee18..b94ed7f1e39b9 100644
--- a/data/json/items/armor/arms_armor.json
+++ b/data/json/items/armor/arms_armor.json
@@ -104,7 +104,7 @@
   {
     "id": "xl_armguard_hard",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized hard arm guards", "str_pl": "pairs of oversized hard arm guards" },
+    "name": { "str": "pair of XL hard arm guards", "str_pl": "pairs of XL hard arm guards" },
     "description": "A pair of neoprene arm sleeves covered with molded plastic sheaths.  Epic sized.",
     "weight": "550 g",
     "volume": "4 L",
@@ -137,7 +137,7 @@
   {
     "id": "xl_armguard_larmor",
     "type": "ARMOR",
-    "name": { "str": "pair of gigantic leather arm guards", "str_pl": "pairs of gigantic leather arm guards" },
+    "name": { "str": "pair of XL leather arm guards", "str_pl": "pairs of XL leather arm guards" },
     "description": "A pair of gigantic leather arm guards.  Heavy but comfortable.",
     "weight": "730 g",
     "volume": "3 L",
@@ -169,7 +169,7 @@
   {
     "id": "xl_armguard_lightplate",
     "type": "ARMOR",
-    "name": { "str": "pair of huge steel arm guards", "str_pl": "pairs of huge steel arm guards" },
+    "name": { "str": "pair of XL steel arm guards", "str_pl": "pairs of XL steel arm guards" },
     "description": "A full assembly of medieval arm protection, made for Jotun.  Rerebraces, couters, and vambraces, with leather straps to secure each piece and connect it as part of a set.",
     "weight": "3243 g",
     "volume": "7 L",
@@ -201,7 +201,7 @@
   {
     "id": "xl_armguard_metal",
     "type": "ARMOR",
-    "name": { "str": "pair of oversize metal arm guards", "str_pl": "pairs of oversize metal arm guards" },
+    "name": { "str": "pair of XL metal arm guards", "str_pl": "pairs of XL metal arm guards" },
     "description": "A pair of arm guards hammered out from metal.  Perfect for the Post-Apocalyptic Warrior look.  Larger than average.",
     "weight": "1380 g",
     "volume": "3250 ml",
@@ -257,7 +257,7 @@
   {
     "id": "xl_armguard_scrap",
     "type": "ARMOR",
-    "name": { "str": "pair of XL scrap armguards", "str_pl": "pairs of XL scrap armguards" },
+    "name": { "str": "pair of XL scrap arm guards", "str_pl": "pairs of XL scrap arm guards" },
     "description": "A pair of oversized arm guards made from scraps of metal secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.",
     "weight": "3412 g",
     "volume": "6 L",
diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
index 93f9c65e094a4..afe0588a83ffc 100644
--- a/data/json/items/armor/boots.json
+++ b/data/json/items/armor/boots.json
@@ -45,8 +45,9 @@
   {
     "id": "xl_boots",
     "type": "ARMOR",
-    "name": { "str": "pair of oversize boots", "str_pl": "pairs of oversize boots" },
+    "name": { "str": "pair of XL boots", "str_pl": "pairs of XL boots" },
     "copy-from": "boots",
+    "proportional": { "weight": 1.25, "volume": 1.25 },
     "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
   },
   {
@@ -120,8 +121,9 @@
   {
     "id": "xl_boots_chitin",
     "type": "ARMOR",
-    "name": { "str": "pair of oversize chitin boots", "str_pl": "pairs of oversized chitin boots" },
+    "name": { "str": "pair of XL chitinous boots", "str_pl": "pairs of XL chitinous boots" },
     "copy-from": "boots_chitin",
+    "proportional": { "weight": 1.25, "volume": 1.25 },
     "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
   },
   {
@@ -138,8 +140,9 @@
   {
     "id": "xl_boots_acidchitin",
     "type": "ARMOR",
-    "name": { "str": "pair of oversize biosilicified boots", "str_pl": "pairs of oversize biosilicified boots" },
+    "name": { "str": "pair of XL biosilicified chitin boots", "str_pl": "pairs of XL biosilicified chitin boots" },
     "copy-from": "boots_acidchitin",
+    "proportional": { "weight": 1.25, "volume": 1.25 },
     "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
   },
   {
@@ -235,8 +238,9 @@
   {
     "id": "xl_boots_fsurvivor",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized fireproof survivorboots", "str_pl": "pairs of oversized fireproof survivorboots" },
+    "name": { "str": "pair of XL survivor fireboots", "str_pl": "pairs of XL survivor fireboots" },
     "copy-from": "boots_fsurvivor",
+    "proportional": { "weight": 1.5, "volume": 1.5 },
     "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
   },
   {
@@ -265,8 +269,9 @@
   {
     "id": "xl_boots_fur",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized fur boots", "str_pl": "pairs of oversized fur boots" },
+    "name": { "str": "pair of XL fur boots", "str_pl": "pairs of XL fur boots" },
     "copy-from": "boots_fur",
+    "proportional": { "weight": 1.15, "volume": 1.15 },
     "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
   },
   {
@@ -344,8 +349,9 @@
   {
     "id": "xl_boots_hsurvivor",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized heavy survivorboots", "str_pl": "pairs of oversized heavy survivorboots" },
+    "name": { "str": "pair of XL heavy survivor boots", "str_pl": "pairs of XL heavy survivor boots" },
     "copy-from": "boots_hsurvivor",
+    "proportional": { "weight": 1.2, "volume": 1.2 },
     "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
   },
   {
@@ -375,8 +381,9 @@
   {
     "id": "xl_boots_larmor",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized leather armor boots", "str_pl": "pairs of oversized leather armor boots" },
+    "name": { "str": "pair of XL leather armor boots", "str_pl": "pairs of XL leather armor boots" },
     "copy-from": "boots_larmor",
+    "proportional": { "weight": 1.3, "volume": 1.3 },
     "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
   },
   {
@@ -406,8 +413,9 @@
   {
     "id": "xl_boots_lsurvivor",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized light survivor boots", "str_pl": "pairs of oversized light survivor boots" },
+    "name": { "str": "pair of XL light survivor boots", "str_pl": "pairs of XL light survivor boots" },
     "copy-from": "boots_lsurvivor",
+    "proportional": { "weight": 1.4, "volume": 1.4 },
     "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
   },
   {
@@ -437,8 +445,9 @@
   {
     "id": "xl_boots_plate",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized armored boots", "str_pl": "pairs of oversized armored boots" },
+    "name": { "str": "pair of XL armored boots", "str_pl": "pairs of XL armored boots" },
     "copy-from": "boots_plate",
+    "proportional": { "weight": 1.25, "volume": 1.25 },
     "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
   },
   {
@@ -490,8 +499,9 @@
   {
     "id": "xl_boots_scrap",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized scrap boots", "str_pl": "pairs of oversized scrap boots" },
+    "name": { "str": "pair of XL scrap boots", "str_pl": "pairs of XL scrap boots" },
     "copy-from": "boots_scrap",
+    "proportional": { "weight": 1.3, "volume": 1.3 },
     "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
   },
   {
@@ -584,8 +594,9 @@
   {
     "id": "xl_boots_winter",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized winter boots", "str_pl": "pairs of oversized winter boots" },
+    "name": { "str": "pair of XL winter boots", "str_pl": "pairs of XL winter boots" },
     "copy-from": "boots_winter",
+    "proportional": { "weight": 1.3, "volume": 1.3 },
     "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE" ]
   },
   {
@@ -615,8 +626,9 @@
   {
     "id": "xl_boots_wsurvivor",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized winter survivor boots", "str_pl": "pairs of oversized winter survivor boots" },
+    "name": { "str": "pair of XL winter survivor boots", "str_pl": "pairs of XL winter survivor boots" },
     "copy-from": "boots_larmor",
+    "proportional": { "weight": 1.3, "volume": 1.3 },
     "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
   },
   {
@@ -1336,8 +1348,9 @@
   {
     "id": "xl_chainmail_feet",
     "type": "ARMOR",
-    "name": { "str": "pair of oversize chainmail chausses", "str_pl": "pairs of oversize chainmail chausses" },
+    "name": { "str": "pair of XL chainmail chausses", "str_pl": "pairs of XL chainmail chausses" },
     "copy-from": "chainmail_feet",
+    "proportional": { "weight": 2, "volume": 2 },
     "flags": [ "VARSIZE", "OVERSIZE" ]
   },
   {
diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json
index 2cfefb69a9c0f..6f5eface84d41 100644
--- a/data/json/items/armor/gloves.json
+++ b/data/json/items/armor/gloves.json
@@ -68,8 +68,9 @@
   {
     "id": "xl_chainmail_hands",
     "type": "ARMOR",
-    "name": { "str": "pair of oversize chainmail gloves", "str_pl": "pairs of oversize chainmail gloves" },
+    "name": { "str": "pair of XL chainmail gloves", "str_pl": "pairs of XL chainmail gloves" },
     "copy-from": "chainmail_hands",
+    "proportional": { "weight": 1.5, "volume": 1.5 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
   },
   {
@@ -123,8 +124,9 @@
   {
     "id": "xl_gauntlets_chitin",
     "type": "ARMOR",
-    "name": { "str": "pair of oversize chitinous gauntlets", "str_pl": "pairs of oversize chitinous gauntlets" },
+    "name": { "str": "pair of XL chitinous gauntlets", "str_pl": "pairs of XL chitinous gauntlets" },
     "copy-from": "gauntlets_chitin",
+    "proportional": { "weight": 1.5, "volume": 1.5 },
     "flags": [ "STURDY", "OVERSIZE" ]
   },
   {
@@ -142,11 +144,9 @@
   {
     "id": "xl_gauntlets_acidchitin",
     "type": "ARMOR",
-    "name": {
-      "str": "pair of oversize biosilicified chitin gauntlets",
-      "str_pl": "pairs of oversize biosilicified chitin gauntlets"
-    },
+    "name": { "str": "pair of XL biosilicified chitin gauntlets", "str_pl": "pairs of XL biosilicified chitin gauntlets" },
     "copy-from": "gauntlets_acidchitin",
+    "proportional": { "weight": 1.5, "volume": 1.5 },
     "flags": [ "STURDY", "OVERSIZE" ]
   },
   {
@@ -220,8 +220,9 @@
   {
     "id": "xl_gauntlets_larmor",
     "type": "ARMOR",
-    "name": { "str": "pair of oversize leather armor gauntlets", "str_pl": "pairs of oversize leather armor gauntlets" },
+    "name": { "str": "pair of XL leather armor gauntlets", "str_pl": "pairs of XL leather armor gauntlets" },
     "copy-from": "gauntlets_larmor",
+    "proportional": { "weight": 1.5, "volume": 1.5 },
     "flags": [ "VARSIZE", "STURDY", "ALLOWS_NATURAL_ATTACKS", "OVERSIZE" ]
   },
   {
@@ -312,8 +313,9 @@
   {
     "id": "xl_gloves_fsurvivor",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized survivor firegloves", "str_pl": "pairs of oversized survivor firegloves" },
+    "name": { "str": "pair of XL survivor firegloves", "str_pl": "pairs of XL survivor firegloves" },
     "copy-from": "gloves_fsurvivor",
+    "proportional": { "weight": 1.5, "volume": 1.5 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "WATERPROOF" ]
   },
   {
@@ -339,8 +341,9 @@
   {
     "id": "xl_gloves_fur",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized fur gloves", "str_pl": "pairs of oversized fur gloves" },
+    "name": { "str": "pair of XL fur gloves", "str_pl": "pairs of XL fur gloves" },
     "copy-from": "gloves_fur",
+    "proportional": { "weight": 1.6, "volume": 1.6 },
     "flags": [ "WATERPROOF" ]
   },
   {
@@ -369,8 +372,9 @@
   {
     "id": "xl_gloves_hsurvivor",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized heavy survivor gloves", "str_pl": "pairs of oversized heavy survivor gloves" },
+    "name": { "str": "pair of XL heavy survivor gloves", "str_pl": "pairs of XL heavy survivor gloves" },
     "copy-from": "gloves_hsurvivor",
+    "proportional": { "weight": 1.5, "volume": 1.5 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "WATERPROOF" ]
   },
   {
@@ -419,8 +423,9 @@
   {
     "id": "xl_gloves_leather",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized leather gloves", "str_pl": "pairs of oversized leather gloves" },
+    "name": { "str": "pair of XL leather gloves", "str_pl": "pairs of XL leather gloves" },
     "copy-from": "gloves_leather",
+    "proportional": { "weight": 1.5, "volume": 1.5 },
     "flags": [ "VARSIZE", "OVERSIZE", "WATERPROOF" ]
   },
   {
@@ -447,8 +452,9 @@
   {
     "id": "xl_gloves_light",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized light cotton gloves", "str_pl": "pairs of oversized light cotton gloves" },
+    "name": { "str": "pair of XL light gloves", "str_pl": "pairs of XL light gloves" },
     "copy-from": "gloves_light",
+    "proportional": { "weight": 1.5, "volume": 1.5 },
     "flags": [ "VARSIZE", "OVERSIZE", "WATER_FRIENDLY" ]
   },
   {
@@ -475,8 +481,9 @@
   {
     "id": "xl_gloves_liner",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized glove liner", "str_pl": "pairs of oversized glove liner" },
+    "name": { "str": "pair of XL glove liners", "str_pl": "pairs of XL glove liners" },
     "copy-from": "gloves_liner",
+    "proportional": { "weight": 2, "volume": 2 },
     "flags": [ "SKINTIGHT", "OVERSIZE", "WATER_FRIENDLY" ]
   },
   {
@@ -505,8 +512,9 @@
   {
     "id": "xl_gloves_lsurvivor",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized light survivor gloves", "str_pl": "pairs of oversized light survivor gloves" },
+    "name": { "str": "pair of XL light survivor gloves", "str_pl": "pairs of XL light survivor gloves" },
     "copy-from": "gloves_lsurvivor",
+    "proportional": { "weight": 1.5, "volume": 1.5 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "WATERPROOF" ]
   },
   {
@@ -535,11 +543,9 @@
   {
     "id": "xl_gloves_survivor_fingerless",
     "type": "ARMOR",
-    "name": {
-      "str": "pair of oversized survivor gloves without fingers",
-      "str_pl": "pairs of oversized survivor gloves without fingers"
-    },
+    "name": { "str": "pair of XL fingerless survivor gloves", "str_pl": "pairs of XL fingerless survivor gloves" },
     "copy-from": "gloves_survivor_fingerless",
+    "proportional": { "weight": 1.5, "volume": 1.5 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "WATERPROOF", "ALLOWS_NATURAL_ATTACKS" ]
   },
   {
@@ -591,8 +597,9 @@
   {
     "id": "xl_gloves_plate",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized armored gauntlets", "str_pl": "pairs of oversized armored gauntlets" },
+    "name": { "str": "pair of XL armored gauntlets", "str_pl": "pairs of XL armored gauntlets" },
     "copy-from": "gloves_plate",
+    "proportional": { "weight": 1.5, "volume": 1.5 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
   },
   {
@@ -709,8 +716,9 @@
   {
     "id": "xl_gloves_wool",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized wool gloves", "str_pl": "pairs of oversized wool gloves" },
+    "name": { "str": "pair of XL wool gloves", "str_pl": "pairs of XL wool gloves" },
     "copy-from": "gloves_wool",
+    "proportional": { "weight": 1.4, "volume": 1.4 },
     "flags": [ "OVERSIZE" ]
   },
   {
@@ -867,8 +875,9 @@
   {
     "id": "xl_gloves_wsurvivor",
     "type": "ARMOR",
-    "name": { "str": "pair of oversized winter survivor gloves", "str_pl": "pairs of oversized winter survivor gloves" },
+    "name": { "str": "pair of XL winter survivor gloves", "str_pl": "pairs of XL winter survivor gloves" },
     "copy-from": "gloves_wsurvivor",
+    "proportional": { "weight": 1.5, "volume": 1.5 },
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OVERSIZE" ]
   },
   {
diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json
index d05cd077fbbd5..d1bf6d58d4a5b 100644
--- a/data/json/items/armor/helmets.json
+++ b/data/json/items/armor/helmets.json
@@ -201,7 +201,7 @@
     "id": "xl_helmet_barbute",
     "type": "ARMOR",
     "copy-from": "helmet_barbute",
-    "name": { "str": "oversized barbute helm" },
+    "name": { "str": "XL barbute helm" },
     "description": "A medieval helmet that provides excellent protection for the head, with a Y shaped opening for the face.  This one is ogre sized.",
     "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
@@ -258,7 +258,7 @@
     "id": "xl_helmet_chitin",
     "type": "ARMOR",
     "copy-from": "helmet_chitin",
-    "name": { "str": "oversized chitinous helm" },
+    "name": { "str": "XL chitinous helmet" },
     "description": "A helmet made from giant insects for giant humanoids.",
     "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 },
     "flags": [ "WATERPROOF", "STURDY", "OVERSIZE" ]
@@ -290,7 +290,7 @@
     "id": "xl_helmet_conical",
     "type": "ARMOR",
     "copy-from": "helmet_conical",
-    "name": { "str": "oversized conical helm" },
+    "name": { "str": "XL conical helm" },
     "description": "A helmet made for a giant Mongolian warrior from a pulp novel.",
     "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
@@ -311,7 +311,7 @@
     "id": "xl_helmet_acidchitin",
     "type": "ARMOR",
     "copy-from": "helmet_acidchitin",
-    "name": { "str": "oversized biosilicified chitin helmet" },
+    "name": { "str": "XL biosilicified chitin helmet" },
     "description": "A helmet made from giant acidic insects for giant humanoids.",
     "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 },
     "flags": [ "WATERPROOF", "STURDY", "OVERSIZE" ]
@@ -432,7 +432,7 @@
     "id": "xl_helmet_larmor",
     "type": "ARMOR",
     "copy-from": "helmet_larmor",
-    "name": { "str": "oversized leather armor helmet" },
+    "name": { "str": "XL leather armor helmet" },
     "description": "A thick leather helmet that provides excellent protection for the head.  This one is quite large.",
     "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 },
     "flags": [ "VARSIZE", "WATER_FRIENDLY", "STURDY", "OVERSIZE" ]
@@ -559,7 +559,7 @@
     "id": "xl_helmet_nasal",
     "type": "ARMOR",
     "copy-from": "helmet_nasal",
-    "name": { "str": "oversized nasal helm" },
+    "name": { "str": "XL nasal helm" },
     "description": "An early medieval helmet with a projection guarding the nose, to better protect the face without obstructing vision.  Proper Jotunn gear, unlike the stereotypical horned helm.",
     "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
@@ -600,7 +600,7 @@
     "id": "helmet_plate",
     "type": "ARMOR",
     "category": "armor",
-    "name": { "str": "great helm", "str_pl": "great helmets" },
+    "name": { "str": "great helm" },
     "description": "A medieval helmet that provides excellent protection to the entire head, at the cost of great encumbrance.",
     "weight": "2175 g",
     "volume": "2750 ml",
@@ -626,7 +626,7 @@
     "id": "xl_helmet_plate",
     "type": "ARMOR",
     "copy-from": "helmet_plate",
-    "name": { "str": "gigantic great helm", "str_pl": "gigantic great helmets" },
+    "name": { "str": "XL great helm" },
     "description": "A medieval helmet that provides excellent protection to the entire head, at the cost of great encumbrance.  Larger than average.",
     "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 },
     "flags": [ "VARSIZE", "HELMET_COMPAT", "OVERSIZE" ]
@@ -658,7 +658,7 @@
     "id": "xl_helmet_scavenger",
     "type": "ARMOR",
     "copy-from": "helmet_scavenger",
-    "name": { "str": "scavenger cowl" },
+    "name": { "str": "XL scavenger cowl" },
     "description": "A sturdy protective cowl extending down to the neck, fitted with a respirator and eye protection.  For oversized dangerous scavenging ventures.",
     "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 },
     "flags": [ "VARSIZE", "STURDY", "WATERPROOF", "SUN_GLASSES", "OVERSIZE" ]
@@ -692,8 +692,8 @@
     "id": "xl_helmet_scrap",
     "type": "ARMOR",
     "copy-from": "helmet_scrap",
-    "name": { "str": "extra large scrap helmet" },
-    "description": "A oversized helmet made from scraps of metal secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.",
+    "name": { "str": "XL scrap helmet" },
+    "description": "An oversized helmet made from scraps of metal secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.",
     "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 },
     "flags": [ "OUTER", "OVERSIZE" ]
   },
@@ -774,7 +774,7 @@
     "id": "xl_helmet_corinthian",
     "type": "ARMOR",
     "copy-from": "helmet_corinthian",
-    "name": { "str": "Corinthian helm" },
+    "name": { "str": "XL Corinthian helm" },
     "description": "An ancient Greek bronze helmet that provides excellent protection for the head, with slits for the eyes and mouth.  Of godlike proportions.",
     "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json
index 5ae5f7130ffaa..34e972531c45e 100644
--- a/data/json/items/armor/holster.json
+++ b/data/json/items/armor/holster.json
@@ -368,7 +368,7 @@
     "id": "xl_survivor_vest",
     "type": "ARMOR",
     "copy-from": "survivor_vest",
-    "name": { "str_sp": "XL survivor vest" },
+    "name": { "str": "XL survivor harness", "str_pl": "XL survivor harnesses" },
     "description": "A custom-built light harness covered with pouches and including an integral tactical sling for a small rifle or other such weapon.  Durable and carefully crafted to be comfortable to wear and fitting the largest forms.  Activate to holster/draw your weapon.",
     "proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
     "flags": [ "WATER_FRIENDLY", "WAIST", "STURDY", "OVERSIZE" ]
diff --git a/data/json/items/armor/hoods.json b/data/json/items/armor/hoods.json
index d4bd6aaa53e8e..1ae95133866c0 100644
--- a/data/json/items/armor/hoods.json
+++ b/data/json/items/armor/hoods.json
@@ -47,7 +47,7 @@
     "id": "xl_chainmail_hood",
     "type": "ARMOR",
     "copy-from": "chainmail_hood",
-    "name": { "str": "oversize chainmail coif" },
+    "name": { "str": "XL chainmail coif" },
     "description": "A customized chainmail hood.  Can be worn comfortably under helmets.  Comes in size XL.",
     "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "HELMET_COMPAT" ]
@@ -80,7 +80,7 @@
     "id": "xl_hood_fsurvivor",
     "type": "ARMOR",
     "copy-from": "hood_fsurvivor",
-    "name": { "str": "oversize survivor firehood" },
+    "name": { "str": "XL survivor firehood" },
     "description": "A customized armored Nomex and Kevlar hood, very strong and durable.  Made in Muspelheim.",
     "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "HELMET_COMPAT", "OUTER", "WATERPROOF" ]
@@ -113,7 +113,7 @@
     "id": "xl_hood_lsurvivor",
     "type": "ARMOR",
     "copy-from": "hood_lsurvivor",
-    "name": { "str": "oversize light survivor hood" },
+    "name": { "str": "XL light survivor hood" },
     "description": "A customized and oversized armored cloth and Kevlar hood, very light and durable.",
     "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "HELMET_COMPAT", "OUTER", "WATERPROOF" ]
@@ -191,7 +191,7 @@
     "id": "xl_hood_wsurvivor",
     "type": "ARMOR",
     "copy-from": "hood_wsurvivor",
-    "name": { "str": "oversize winter survivor hood" },
+    "name": { "str": "XL winter survivor hood" },
     "description": "A customized and oversized armored fur and Kevlar hood, very warm and durable.",
     "proportional": { "weight": 1.25, "volume": 1.3, "price": 1.25 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "HELMET_COMPAT", "OUTER", "WATERPROOF" ]
diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
index e02d2db764f5a..51ab2d6a49d35 100644
--- a/data/json/items/armor/legs_armor.json
+++ b/data/json/items/armor/legs_armor.json
@@ -80,7 +80,7 @@
     "id": "xl_chainmail_legs",
     "type": "ARMOR",
     "copy-from": "chainmail_legs",
-    "name": { "str": "gigantic chainmail leggings", "str_pl": "pairs of gigantic chainmail leggings" },
+    "name": { "str": "XL chainmail leggings", "str_pl": "pairs of XL chainmail leggings" },
     "description": "Customized chainmail legs for the largest of transhumans.  Their straps keep everything in place, and the lack of toes and heels allows them to work perfectly well with footwear.",
     "proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
@@ -189,7 +189,7 @@
     "id": "xl_legguard_bronze",
     "type": "ARMOR",
     "copy-from": "legguard_bronze",
-    "name": { "str": "gigantic bronze greaves", "str_pl": "pairs of gigantic bronze greaves" },
+    "name": { "str": "XL bronze greaves", "str_pl": "pairs of XL bronze greaves" },
     "description": "A pair of gigantic bronze leg guards with a simple leather lining.",
     "proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
     "flags": [ "BELTED", "STURDY", "OVERSIZE" ]
@@ -243,7 +243,7 @@
     "id": "xl_legguard_lightplate",
     "type": "ARMOR",
     "copy-from": "legguard_lightplate",
-    "name": { "str": "pair of huge steel leg guards", "str_pl": "pairs of huge steel leg guards" },
+    "name": { "str": "pair of XL steel leg guards", "str_pl": "pairs of XL steel leg guards" },
     "description": "A full assembly of medieval leg protection for the largest of knights.  Cuisses, poleyns, and greaves, with leather straps to secure each piece and connect it as part of a set.",
     "proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
     "flags": [ "BELTED", "STURDY", "OVERSIZE", "VARSIZE" ]
@@ -275,7 +275,7 @@
     "type": "ARMOR",
     "copy-from": "legguard_metal",
     "name": { "str": "pair of XL iron greaves", "str_pl": "pairs of XL iron greaves" },
-    "description": "A pair of extra larger iron leg guards with a simple leather lining.",
+    "description": "A pair of extra large iron leg guards with a simple leather lining.",
     "proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
     "flags": [ "BELTED", "WATER_FRIENDLY", "OVERSIZE" ]
   },
@@ -328,7 +328,7 @@
     "id": "xl_legguard_scrap",
     "type": "ARMOR",
     "copy-from": "legguard_scrap",
-    "name": { "str": "pair of gigantic scrap leg guards", "str_pl": "pairs of gigantic scrap leg guards" },
+    "name": { "str": "pair of XL scrap leg guards", "str_pl": "pairs of XL scrap leg guards" },
     "description": "A pair of leg guards made from scraps of metal secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.  You look like a trash giant.",
     "proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
     "flags": [ "BELTED", "OVERSIZE" ]
@@ -368,7 +368,7 @@
     "id": "xl_lsurvivor_pants",
     "type": "ARMOR",
     "copy-from": "lsurvivor_pants",
-    "name": { "str_sp": "xl light survivor cargo pants" },
+    "name": { "str_sp": "XL light survivor cargo pants" },
     "description": "Lightweight, Kevlar armored cargo pants designed to hold as much as possible.  Strong and mostly waterproof and sized for larger than average.",
     "proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "RAINPROOF", "STURDY", "OVERSIZE" ]
diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index 0138fb05403cd..0d0f15f958de4 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -105,7 +105,7 @@
   {
     "id": "xl_armor_chitin",
     "type": "ARMOR",
-    "name": { "str": "oversized chitinous armor" },
+    "name": { "str": "XL chitinous armor" },
     "copy-from": "armor_chitin",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "STURDY", "OVERSIZE" ]
@@ -127,7 +127,7 @@
   {
     "id": "xl_armor_acidchitin",
     "type": "ARMOR",
-    "name": { "str": "oversized chitin armor" },
+    "name": { "str": "XL biosilicified chitin armor" },
     "copy-from": "armor_acidchitin",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "STURDY", "OVERSIZE" ]
@@ -164,7 +164,7 @@
   {
     "id": "xl_armor_farmor",
     "type": "ARMOR",
-    "name": { "str": "oversized fur armor" },
+    "name": { "str": "XL fur body armor" },
     "copy-from": "armor_farmor",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "STURDY", "OVERSIZE" ]
@@ -201,7 +201,7 @@
   {
     "id": "xl_armor_larmor",
     "type": "ARMOR",
-    "name": { "str": "oversized leather armor" },
+    "name": { "str": "XL leather body armor" },
     "copy-from": "armor_larmor",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "POCKETS", "STURDY", "OVERSIZE" ]
@@ -212,7 +212,7 @@
     "category": "armor",
     "name": { "str": "plate armor" },
     "description": "A suit of Gothic plate armor.",
-    "weight": "11000 g",
+    "weight": "11 kg",
     "volume": "17500 ml",
     "price": 60000,
     "price_postapoc": 12000,
@@ -232,7 +232,7 @@
   {
     "id": "xl_armor_lightplate",
     "type": "ARMOR",
-    "name": { "str": "oversized light plate armor" },
+    "name": { "str": "XL plate armor" },
     "copy-from": "armor_lightplate",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "OUTER", "STURDY", "OVERSIZE" ]
@@ -344,7 +344,7 @@
   {
     "id": "xl_armor_plarmor",
     "type": "ARMOR",
-    "name": { "str": "oversized plated leather armor" },
+    "name": { "str": "XL plated leather armor" },
     "copy-from": "armor_plarmor",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "POCKETS", "STURDY", "OVERSIZE" ]
@@ -355,7 +355,7 @@
     "category": "armor",
     "name": { "str": "ornamental plate armor" },
     "description": "An extremely heavy suit of ornamental armor.",
-    "weight": "18000 g",
+    "weight": "18 kg",
     "volume": "30 L",
     "price": 780000,
     "price_postapoc": 6000,
@@ -375,7 +375,7 @@
   {
     "id": "xl_armor_plate",
     "type": "ARMOR",
-    "name": { "str": "oversized ornamental plate armor" },
+    "name": { "str": "XL ornamental plate armor" },
     "copy-from": "armor_plate",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "OUTER", "FANCY", "OVERSIZE" ]
@@ -537,7 +537,7 @@
   {
     "id": "xl_chainmail_hauberk",
     "type": "ARMOR",
-    "name": { "str": "oversized chainmail hauberk" },
+    "name": { "str": "XL chainmail hauberk" },
     "copy-from": "chainmail_hauberk",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
@@ -567,7 +567,7 @@
   {
     "id": "xl_chainmail_suit",
     "type": "ARMOR",
-    "name": { "str": "oversized chainmail armor" },
+    "name": { "str": "XL chainmail armor" },
     "copy-from": "chainmail_suit",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "HELMET_COMPAT" ]
@@ -638,7 +638,7 @@
   {
     "id": "xl_entry_suit",
     "type": "ARMOR",
-    "name": { "str": "oversized entry suit" },
+    "name": { "str": "XL entry suit" },
     "copy-from": "entry_suit",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "GAS_PROOF", "STURDY", "OVERSIZE" ]
@@ -680,7 +680,7 @@
   {
     "id": "xl_fsurvivor_suit",
     "type": "ARMOR",
-    "name": { "str": "oversized fire survivor suit" },
+    "name": { "str": "XL survivor firesuit" },
     "copy-from": "fsurvivor_suit",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "POCKETS", "STURDY", "OVERSIZE" ]
@@ -710,7 +710,7 @@
   {
     "id": "xl_gambeson",
     "type": "ARMOR",
-    "name": { "str": "oversized gambeson" },
+    "name": { "str": "XL gambeson" },
     "copy-from": "gambeson",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
@@ -830,7 +830,7 @@
   {
     "id": "xl_nomex_suit",
     "type": "ARMOR",
-    "name": { "str": "XL nomex suit" },
+    "name": { "str": "XL flame-resistant suit" },
     "copy-from": "nomex_suit",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "WATER_FRIENDLY", "SKINTIGHT", "STURDY", "OVERSIZE" ]
@@ -1042,7 +1042,7 @@
   {
     "id": "xl_wsurvivor_suit",
     "type": "ARMOR",
-    "name": { "str": "oversized winter survivor suit" },
+    "name": { "str": "XL winter survivor suit" },
     "copy-from": "wsurvivor_suit",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY", "OVERSIZE" ]
diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
index ad529f01539cb..9fc16e015bba0 100644
--- a/data/json/items/armor/torso_armor.json
+++ b/data/json/items/armor/torso_armor.json
@@ -84,7 +84,7 @@
   {
     "id": "xl_armor_lorica",
     "type": "ARMOR",
-    "name": { "str_sp": "oversized lorica segmentata" },
+    "name": { "str_sp": "XL lorica segmentata" },
     "copy-from": "armor_lorica",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
     "flags": [ "VARSIZE", "STURDY", "OVERSIZE", "OUTER" ]
diff --git a/data/json/recipes/armor/arms.json b/data/json/recipes/armor/arms.json
index 4d5dc9f0b94ef..b1b5fbe1e5a50 100644
--- a/data/json/recipes/armor/arms.json
+++ b/data/json/recipes/armor/arms.json
@@ -60,6 +60,7 @@
     "result": "xl_armguard_chitin",
     "type": "recipe",
     "copy-from": "armguard_chitin",
+    "time": "520 m",
     "byproducts": [ [ "scrap_leather", 100 ] ],
     "using": [ [ "armor_chitin", 4 ], [ "tailoring_leather_small", 3 ] ]
   },
@@ -88,6 +89,7 @@
     "result": "xl_armguard_acidchitin",
     "type": "recipe",
     "copy-from": "armguard_acidchitin",
+    "time": "520 m",
     "byproducts": [ [ "scrap_leather", 100 ] ],
     "using": [ [ "armor_acidchitin", 4 ], [ "tailoring_leather_small", 3 ] ]
   },
@@ -110,7 +112,7 @@
     "result": "xl_armguard_hard",
     "type": "recipe",
     "copy-from": "armguard_hard",
-    "time": "260 m",
+    "time": "390 m",
     "book_learn": [ [ "textbook_tailor", 3 ], [ "manual_tailor", 4 ], [ "tailor_portfolio", 3 ] ],
     "byproducts": [ [ "scrap_neoprene", 67 ] ],
     "using": [ [ "plastic_molding", 3 ], [ "tailoring_neoprene_patchwork", 3 ] ]
@@ -188,7 +190,9 @@
     "copy-from": "armguard_metal",
     "time": "45 m",
     "using": [ [ "cordage", 2 ] ],
-    "components": [ [ [ "sheet_metal_small", 6 ] ] ]
+    "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 } ],
+    "components": [ [ [ "sheet_metal_small", 6 ] ] ],
+    "proficiencies": [ { "proficiency": "prof_armorsmithing", "fail_multiplier": 1 }, { "proficiency": "prof_articulation" } ]
   },
   {
     "result": "armguard_paper",
@@ -224,7 +228,9 @@
     "copy-from": "armguard_scrap",
     "time": "45 m",
     "using": [ [ "cordage", 2 ] ],
-    "components": [ [ [ "scrap", 80 ] ] ]
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "components": [ [ [ "scrap", 80 ] ] ],
+    "proficiencies": [ { "proficiency": "prof_armorsmithing", "fail_multiplier": 1 }, { "proficiency": "prof_articulation" } ]
   },
   {
     "result": "armguard_soft",
diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index 628d4a6ef7545..6b8c7402354f3 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -64,6 +64,7 @@
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "copy-from": "boots_chitin",
+    "qualities": [ { "id": "CUT_FINE", "level": 1 } ],
     "using": [ [ "armor_chitin", 23 ], [ "strap_small", 6 ], [ "clasps", 2 ] ],
     "time": "15 h"
   },
@@ -94,6 +95,7 @@
     "activity_level": "LIGHT_EXERCISE",
     "copy-from": "boots_acidchitin",
     "using": [ [ "armor_acidchitin", 23 ], [ "strap_small", 6 ], [ "clasps", 2 ] ],
+    "qualities": [ { "id": "CUT_FINE", "level": 1 } ],
     "time": "19 h"
   },
   {
@@ -303,7 +305,9 @@
     "activity_level": "LIGHT_EXERCISE",
     "copy-from": "boots_plate",
     "using": [ [ "blacksmithing_standard", 37 ], [ "steel_standard", 10 ], [ "tailoring_leather_small", 20 ] ],
-    "time": "13 h"
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "time": "13 h",
+    "tools": [ [ [ "swage", -1 ] ] ]
   },
   {
     "result": "boots_scrap",
@@ -324,7 +328,7 @@
       { "proficiency": "prof_metalworking" },
       { "proficiency": "prof_articulation" }
     ],
-    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
     "components": [ [ [ "scrap", 50 ] ] ]
   },
   {
@@ -334,6 +338,7 @@
     "copy-from": "boots_scrap",
     "using": [ [ "strap_small", 4 ] ],
     "time": "1 h",
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
     "components": [ [ [ "scrap", 65 ] ] ]
   },
   {
diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json
index 4af7b0a686663..ba6c9c2a7b282 100644
--- a/data/json/recipes/armor/hands.json
+++ b/data/json/recipes/armor/hands.json
@@ -25,7 +25,8 @@
     "type": "recipe",
     "copy-from": "gauntlets_chitin",
     "time": "13 h",
-    "using": [ [ "armor_chitin", 12 ], [ "strap_small", 2 ], [ "clasps", 2 ] ]
+    "using": [ [ "armor_chitin", 12 ], [ "strap_small", 2 ], [ "clasps", 2 ] ],
+    "qualities": [ { "id": "CUT_FINE", "level": 1 } ]
   },
   {
     "result": "gauntlets_acidchitin",
@@ -54,7 +55,9 @@
     "type": "recipe",
     "copy-from": "gauntlets_acidchitin",
     "time": "17 h",
-    "using": [ [ "armor_acidchitin", 12 ], [ "strap_small", 2 ], [ "clasps", 2 ] ]
+    "using": [ [ "armor_acidchitin", 12 ], [ "strap_small", 2 ], [ "clasps", 2 ] ],
+    "qualities": [ { "id": "CUT_FINE", "level": 1 } ],
+    "components": [ [ [ "cordage_superior", 2, "LIST" ] ] ]
   },
   {
     "result": "gauntlets_larmor",
@@ -372,8 +375,9 @@
     "result": "xl_gloves_survivor_fingerless",
     "type": "recipe",
     "copy-from": "gloves_survivor_fingerless",
-    "time": "30 m",
-    "components": [ [ [ "gloves_lsurvivor", 1 ] ] ]
+    "time": "40 m",
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "xl_gloves_lsurvivor", 1 ] ] ]
   },
   {
     "result": "gloves_plate",
@@ -407,7 +411,9 @@
     "type": "recipe",
     "copy-from": "gloves_plate",
     "time": "10 h",
-    "using": [ [ "blacksmithing_standard", 30 ], [ "steel_standard", 9 ], [ "clasps", 2 ], [ "strap_small", 2 ] ]
+    "using": [ [ "blacksmithing_standard", 30 ], [ "steel_standard", 9 ], [ "clasps", 2 ], [ "strap_small", 2 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ]
   },
   {
     "result": "gloves_survivor",
@@ -537,7 +543,6 @@
     "time": "20 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 50 ], [ "tailoring_fur_small", 4 ], [ "tailoring_kevlar_fabric", 1 ] ],
-    "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ],
     "proficiencies": [
       { "proficiency": "prof_closures_waterproofing" },
       { "proficiency": "prof_polymerworking" },
diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json
index e0f000108434d..67dcbe307a6a4 100644
--- a/data/json/recipes/armor/head.json
+++ b/data/json/recipes/armor/head.json
@@ -471,6 +471,8 @@
     "copy-from": "helmet_barbute",
     "time": "16 h",
     "using": [ [ "blacksmithing_standard", 50 ], [ "steel_standard", 15 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
     "components": [ [ [ "fur", 6 ], [ "leather", 5 ] ] ]
   },
   {
@@ -526,6 +528,8 @@
     "copy-from": "helmet_conical",
     "time": "17 h",
     "using": [ [ "sewing_standard", 23 ], [ "blacksmithing_standard", 11 ], [ "steel_standard", 3 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
     "components": [ [ [ "fur", 6 ], [ "tanned_pelt", 1 ] ] ]
   },
   {
@@ -553,6 +557,7 @@
     "type": "recipe",
     "copy-from": "helmet_acidchitin",
     "time": "5 h",
+    "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
     "components": [ [ [ "cordage_superior", 2, "LIST" ] ], [ [ "acidchitin_piece", 17 ] ] ]
   },
   {
@@ -582,6 +587,8 @@
     "copy-from": "helmet_galea",
     "time": "17 h",
     "using": [ [ "blacksmithing_standard", 12 ], [ "steel_standard", 3 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
     "components": [ [ [ "fur", 5 ], [ "leather", 5 ] ] ]
   },
   {
@@ -611,6 +618,8 @@
     "copy-from": "helmet_kabuto",
     "time": "14 h",
     "using": [ [ "blacksmithing_standard", 63 ], [ "steel_standard", 16 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
     "components": [ [ [ "fur", 20 ], [ "tanned_pelt", 3 ], [ "leather", 20 ], [ "tanned_hide", 3 ] ], [ [ "rag", 7 ] ] ]
   },
   {
@@ -666,6 +675,8 @@
     "copy-from": "helmet_nasal",
     "time": "10 h",
     "using": [ [ "blacksmithing_standard", 4 ], [ "steel_standard", 1 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
     "components": [ [ [ "fur", 5 ], [ "leather", 5 ] ] ]
   },
   {
@@ -729,6 +740,8 @@
     "copy-from": "helmet_plate",
     "time": "13 h",
     "using": [ [ "blacksmithing_standard", 76 ], [ "steel_standard", 21 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
     "components": [ [ [ "fur", 6 ], [ "leather", 6 ] ] ]
   },
   {
@@ -788,8 +801,9 @@
     "result": "xl_helmet_scrap",
     "type": "recipe",
     "copy-from": "helmet_scrap",
-    "time": "13 h",
+    "time": "2 h 15 m",
     "using": [ [ "cordage", 2 ] ],
+    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
     "components": [ [ [ "scrap", 45 ] ] ]
   },
   {
@@ -819,6 +833,7 @@
     "copy-from": "hood_fsurvivor",
     "time": "8 h",
     "using": [ [ "sewing_standard", 55 ] ],
+    "tools": [ [ [ "welder", 28 ], [ "welder_crude", 43 ], [ "soldering_iron", 43 ], [ "toolset", 43 ] ] ],
     "components": [ [ [ "nomex", 10 ] ], [ [ "sheet_kevlar_layered", 6 ] ], [ [ "nomex_hood", 1 ] ], [ [ "duct_tape", 150 ] ] ]
   },
   {
@@ -874,6 +889,7 @@
     "copy-from": "hood_lsurvivor",
     "time": "8 h",
     "using": [ [ "sewing_standard", 60 ] ],
+    "tools": [ [ [ "welder", 28 ], [ "welder_crude", 43 ], [ "soldering_iron", 43 ], [ "toolset", 43 ] ] ],
     "components": [
       [ [ "rag", 10 ] ],
       [ [ "sheet_kevlar_layered", 6 ] ],
@@ -959,6 +975,7 @@
     "copy-from": "hood_wsurvivor",
     "time": "8 h",
     "using": [ [ "sewing_standard", 60 ] ],
+    "tools": [ [ [ "welder", 28 ], [ "welder_crude", 43 ], [ "soldering_iron", 43 ], [ "toolset", 43 ] ] ],
     "components": [
       [ [ "fur", 10 ], [ "tanned_pelt", 2 ] ],
       [ [ "rag", 4 ] ],
@@ -976,7 +993,7 @@
     "skill_used": "tailor",
     "difficulty": 6,
     "skills_required": [ "fabrication", 4 ],
-    "time": "6 h",
+    "time": "8 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 80 ] ],
     "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ],
diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json
index 86cb9867dfe7a..753a08f0244ad 100644
--- a/data/json/recipes/armor/legs.json
+++ b/data/json/recipes/armor/legs.json
@@ -292,7 +292,9 @@
     "type": "recipe",
     "copy-from": "legguard_lightplate",
     "time": "5 h",
-    "using": [ [ "blacksmithing_standard", 42 ], [ "steel_standard", 9 ], [ "strap_small", 4 ], [ "clasps", 4 ] ]
+    "using": [ [ "blacksmithing_standard", 42 ], [ "steel_standard", 9 ], [ "strap_small", 5 ], [ "clasps", 5 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ]
   },
   {
     "result": "legguard_metal",
@@ -314,7 +316,8 @@
     "type": "recipe",
     "copy-from": "legguard_metal",
     "time": "2 h",
-    "using": [ [ "steel_tiny", 6 ], [ "strap_large", 2 ], [ "clasps", 4 ] ]
+    "using": [ [ "steel_tiny", 6 ], [ "strap_large", 3 ], [ "clasps", 6 ] ],
+    "qualities": [ { "id": "HAMMER", "level": 2 } ]
   },
   {
     "result": "legguard_paper",
@@ -339,7 +342,7 @@
     "time": "40 m",
     "autolearn": true,
     "book_learn": [ [ "recipe_melee", 2 ] ],
-    "using": [ [ "strap_large", 2 ] ],
+    "using": [ [ "strap_large", 3 ] ],
     "proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_articulation" } ],
     "qualities": [ { "id": "HAMMER", "level": 1 } ],
     "components": [ [ [ "scrap", 60 ] ] ]
@@ -349,7 +352,8 @@
     "type": "recipe",
     "copy-from": "legguard_scrap",
     "time": "2 h",
-    "using": [ [ "strap_large", 2 ] ],
+    "using": [ [ "strap_large", 3 ] ],
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
     "components": [ [ [ "scrap", 90 ] ] ]
   },
   {
diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json
index f8557cfd718fc..f6347e6805742 100644
--- a/data/json/recipes/armor/suit.json
+++ b/data/json/recipes/armor/suit.json
@@ -111,8 +111,9 @@
     "result": "xl_armor_chitin",
     "type": "recipe",
     "copy-from": "armor_chitin",
-    "time": "3 h",
+    "time": "9 h",
     "using": [ [ "cordage", 3 ] ],
+    "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ],
     "components": [ [ [ "chitin_piece", 96 ] ] ]
   },
   {
@@ -141,8 +142,9 @@
     "result": "xl_armor_acidchitin",
     "type": "recipe",
     "copy-from": "armor_acidchitin",
-    "time": "5 h",
+    "time": "11 h",
     "using": [ [ "cordage", 3 ] ],
+    "qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 }, { "id": "LEATHER_AWL", "level": 1 } ],
     "components": [ [ [ "acidchitin_piece", 96 ] ] ]
   },
   {
@@ -164,8 +166,9 @@
     "result": "xl_armor_farmor",
     "type": "recipe",
     "copy-from": "armor_farmor",
-    "time": "5 h",
+    "time": "10 h",
     "using": [ [ "sewing_standard", 96 ] ],
+    "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ],
     "components": [ [ [ "fur", 72 ], [ "tanned_pelt", 12 ] ] ]
   },
   {
@@ -187,8 +190,9 @@
     "result": "xl_armor_larmor",
     "type": "recipe",
     "copy-from": "armor_larmor",
-    "time": "5 h",
+    "time": "11 h",
     "using": [ [ "sewing_standard", 76 ] ],
+    "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ],
     "components": [ [ [ "leather", 42 ], [ "tanned_hide", 7 ], [ "fur", 42 ], [ "tanned_pelt", 7 ] ] ]
   },
   {
@@ -220,6 +224,8 @@
     "copy-from": "armor_lightplate",
     "time": "14 h",
     "using": [ [ "blacksmithing_standard", 110 ], [ "steel_standard", 32 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ],
     "components": [ [ [ "fur", 32 ], [ "tanned_pelt", 5 ], [ "leather", 32 ], [ "tanned_hide", 5 ] ] ]
   },
   {
@@ -245,9 +251,21 @@
   {
     "result": "xl_armor_lightplate",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "id_suffix": "assembly",
-    "time": "20 m",
-    "using": [ [ "blacksmithing_standard", 110 ], [ "steel_standard", 32 ] ],
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_SUIT",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "time": "30 m",
+    "reversible": true,
+    "autolearn": true,
+    "flags": [ "NO_RESIZE" ],
+    "proficiencies": [
+      { "proficiency": "prof_closures", "fail_multiplier": 1 },
+      { "proficiency": "prof_armorsmithing", "fail_multiplier": 1 },
+      { "proficiency": "prof_articulation", "fail_multiplier": 1 }
+    ],
     "components": [ [ [ "xl_cuirass_lightplate", 1 ] ], [ [ "xl_armguard_lightplate", 1 ] ], [ [ "xl_legguard_lightplate", 1 ] ] ]
   },
   {
@@ -279,6 +297,8 @@
     "copy-from": "armor_lorica",
     "time": "10 h",
     "using": [ [ "forging_standard", 7 ], [ "steel_standard", 7 ] ],
+    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ],
     "components": [ [ [ "fur", 18 ], [ "tanned_pelt", 3 ], [ "leather", 18 ], [ "tanned_hide", 3 ] ] ]
   },
   {
@@ -390,8 +410,10 @@
     "result": "xl_armor_plate",
     "type": "recipe",
     "copy-from": "armor_plate",
-    "time": "3 h",
+    "time": "13 h",
     "using": [ [ "blacksmithing_standard", 160 ], [ "steel_standard", 45 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ],
     "components": [ [ [ "fur", 24 ], [ "tanned_pelt", 5 ], [ "leather", 24 ], [ "tanned_hide", 5 ] ] ]
   },
   {
@@ -488,7 +510,7 @@
     "subcategory": "CSC_ARMOR_SUIT",
     "skill_used": "tailor",
     "difficulty": 2,
-    "time": "1h 45m",
+    "time": "1 h 45 m",
     "reversible": true,
     "autolearn": true,
     "flags": [ "NO_RESIZE" ],
@@ -499,7 +521,7 @@
     "result": "xl_chainmail_hauberk",
     "type": "recipe",
     "copy-from": "chainmail_hauberk",
-    "time": "20 m",
+    "time": "2 h 15 m",
     "components": [
       [ [ "xl_chainmail_vest", 1 ] ],
       [ [ "xl_chainmail_arms", 1 ] ],
@@ -515,7 +537,7 @@
     "subcategory": "CSC_ARMOR_SUIT",
     "skill_used": "tailor",
     "difficulty": 3,
-    "time": "1h 50m",
+    "time": "1 h 50 m",
     "reversible": true,
     "autolearn": true,
     "flags": [ "NO_RESIZE" ],
@@ -532,7 +554,7 @@
     "result": "xl_chainmail_suit",
     "type": "recipe",
     "copy-from": "chainmail_suit",
-    "time": "20 m",
+    "time": "2 h 15 m",
     "components": [
       [ [ "xl_chainmail_hood", 1 ] ],
       [ [ "xl_chainmail_vest", 1 ] ],
@@ -569,10 +591,14 @@
     "subcategory": "CSC_ARMOR_SUIT",
     "skill_used": "tailor",
     "difficulty": 3,
-    "time": "2 m",
+    "time": "10 m",
     "reversible": true,
     "autolearn": true,
     "flags": [ "NO_RESIZE" ],
+    "proficiencies": [
+      { "proficiency": "prof_closures", "fail_multiplier": 1 },
+      { "proficiency": "prof_chain_armour", "fail_multiplier": 1 }
+    ],
     "components": [ [ [ "xl_chainmail_hood", 1 ] ], [ [ "xl_chainmail_hauberk", 1 ] ] ]
   },
   {
@@ -691,7 +717,7 @@
     "result": "xl_entry_suit",
     "type": "recipe",
     "copy-from": "entry_suit",
-    "time": "3 h",
+    "time": "10 h",
     "using": [ [ "sewing_standard", 300 ] ],
     "tools": [ [ [ "welder", 45 ], [ "welder_crude", 90 ], [ "soldering_iron", 90 ], [ "toolset", 90 ] ] ],
     "components": [
@@ -744,12 +770,12 @@
     "result": "xl_fsurvivor_suit",
     "type": "recipe",
     "copy-from": "fsurvivor_suit",
-    "time": "3 h",
+    "time": "18 h",
     "using": [ [ "sewing_standard", 300 ] ],
     "tools": [ [ [ "welder", 45 ], [ "welder_crude", 90 ], [ "soldering_iron", 90 ], [ "toolset", 90 ] ] ],
     "components": [
       [ [ "rag", 8 ] ],
-      [ [ "nomex_suit", 2 ], [ "entry_suit", 2 ], [ "nomex", 40 ] ],
+      [ [ "xl_nomex_suit", 1 ], [ "xl_entry_suit", 1 ] ],
       [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ],
       [
         [ "tacvest", 1 ],
@@ -784,7 +810,7 @@
     "result": "xl_gambeson",
     "type": "recipe",
     "copy-from": "gambeson",
-    "time": "2 h",
+    "time": "10 h",
     "using": [ [ "sewing_standard", 45 ] ],
     "components": [ [ [ "rag", 62 ] ] ]
   },
@@ -962,11 +988,11 @@
     "result": "xl_lsurvivor_suit",
     "type": "recipe",
     "copy-from": "lsurvivor_suit",
-    "time": "5 h",
+    "time": "12 h",
     "using": [ [ "sewing_standard", 150 ] ],
     "tools": [ [ [ "welder", 36 ], [ "welder_crude", 58 ], [ "soldering_iron", 58 ], [ "toolset", 58 ] ] ],
     "components": [
-      [ [ "rag", 30 ] ],
+      [ [ "rag", 45 ] ],
       [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ],
       [
         [ "tacvest", 1 ],
@@ -1005,7 +1031,7 @@
     "result": "xl_nomex_suit",
     "copy-from": "nomex_suit",
     "type": "recipe",
-    "time": "2 h",
+    "time": "10 h",
     "using": [ [ "sewing_standard", 80 ] ],
     "components": [ [ [ "nomex", 36 ] ] ]
   },
@@ -1234,9 +1260,10 @@
   {
     "result": "xl_wsurvivor_suit",
     "copy-from": "wsurvivor_suit",
-    "time": "8 h",
+    "time": "18 h",
     "type": "recipe",
     "using": [ [ "sewing_standard", 300 ] ],
+    "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ],
     "tools": [ [ [ "welder", 56 ], [ "welder_crude", 104 ], [ "soldering_iron", 104 ], [ "toolset", 104 ] ] ],
     "components": [
       [ [ "rag", 20 ] ],
diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json
index 7fba21d779e25..11ac1b9a6e9eb 100644
--- a/data/json/recipes/armor/torso.json
+++ b/data/json/recipes/armor/torso.json
@@ -318,6 +318,8 @@
     "copy-from": "cuirass_lightplate",
     "time": "12 h",
     "using": [ [ "blacksmithing_standard", 44 ], [ "steel_standard", 10 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ],
     "components": [ [ [ "fur", 12 ], [ "tanned_pelt", 2 ], [ "leather", 12 ], [ "tanned_hide", 2 ] ] ]
   },
   {
@@ -345,6 +347,7 @@
     "copy-from": "cuirass_scrap",
     "time": "6 h",
     "using": [ [ "cordage", 3 ] ],
+    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
     "components": [ [ [ "scrap", 120 ] ] ]
   },
   {
@@ -498,11 +501,11 @@
     "result": "xl_duster_survivor",
     "type": "recipe",
     "copy-from": "duster_survivor",
-    "time": "12 h",
+    "time": "15 h",
     "using": [ [ "sewing_standard", 175 ] ],
     "components": [
       [ [ "coat_rain", 2 ] ],
-      [ [ "duster", 2 ], [ "jacket_army", 1 ] ],
+      [ [ "jacket_army", 2 ], [ "xl_duster", 1 ] ],
       [ [ "kevlar", 2 ], [ "ballistic_vest_empty", 2 ], [ "sheet_kevlar_layered", 32 ] ],
       [ [ "rag", 26 ] ],
       [