diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json
index f2d8b38c2673..9d81d65ca4bc 100644
--- a/data/json/items/armor/ammo_pouch.json
+++ b/data/json/items/armor/ammo_pouch.json
@@ -78,7 +78,7 @@
     "id": "ammo_satchel",
     "type": "ARMOR",
     "name": { "str": "magazine satchel" },
-    "description": "A fabric ammo bag worn at the waist which is capable of holding a single magazine or speedloader close at hand, of nearly any size.",
+    "description": "A fabric ammo bag worn at the waist which is capable of holding two magazines or speedloader close at hand, of nearly any size.",
     "weight": "180 g",
     "volume": "500 ml",
     "price": "20 USD",
@@ -89,7 +89,7 @@
     "color": "dark_gray",
     "covers": [ "torso" ],
     "coverage": 20,
-    "encumbrance": 4,
+    "max_encumbrance": 4,
     "material_thickness": 2,
     "use_action": {
       "type": "holster",
@@ -97,17 +97,18 @@
       "holster_msg": "You stash your %s.",
       "min_volume": "250 ml",
       "max_volume": "2 L",
+      "multi": 2,
       "draw_cost": 40,
       "flags": [ "MAG_COMPACT", "MAG_BULKY", "SPEEDLOADER" ]
     },
     "valid_mods": [ "resized_large" ],
-    "flags": [ "WATER_FRIENDLY", "WAIST" ]
+    "flags": [ "WATER_FRIENDLY", "WAIST", "COMPACT" ]
   },
   {
     "id": "chestpouch",
     "type": "ARMOR",
     "name": { "str": "chest magazine pouch", "str_pl": "chest magazine pouches" },
-    "description": "A fabric ammo pouch that can be strapped to your chest which is capable of holding a single magazine or speedloader close at hand.",
+    "description": "A fabric ammo pouch that can be strapped to your chest which is capable of holding two magazines or speedloader close at hand.",
     "weight": "140 g",
     "volume": "250 ml",
     "price": "1250 cent",
@@ -130,7 +131,7 @@
       "flags": [ "MAG_COMPACT", "SPEEDLOADER" ]
     },
     "valid_mods": [ "resized_large" ],
-    "flags": [ "WATER_FRIENDLY", "BELTED" ]
+    "flags": [ "WATER_FRIENDLY", "BELTED", "COMPACT" ]
   },
   {
     "id": "chestrig",
@@ -159,7 +160,7 @@
       "flags": [ "MAG_COMPACT", "SPEEDLOADER" ]
     },
     "valid_mods": [ "resized_large" ],
-    "flags": [ "WATER_FRIENDLY", "BELTED" ]
+    "flags": [ "WATER_FRIENDLY", "BELTED", "COMPACT" ]
   },
   {
     "id": "javelin_bag",
@@ -206,7 +207,7 @@
     "color": "dark_gray",
     "covers": [ "foot_either" ],
     "coverage": 5,
-    "encumbrance": 1,
+    "max_encumbrance": 2,
     "material_thickness": 2,
     "use_action": {
       "type": "holster",
@@ -217,7 +218,7 @@
       "draw_cost": 40,
       "flags": [ "MAG_COMPACT", "SPEEDLOADER" ]
     },
-    "flags": [ "WATER_FRIENDLY", "BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ]
+    "flags": [ "WATER_FRIENDLY", "BELTED", "OVERSIZE", "ALLOWS_NATURAL_ATTACKS", "COMPACT" ]
   },
   {
     "type": "ARMOR",
@@ -234,6 +235,7 @@
     "looks_like": "ammo_satchel",
     "color": "dark_gray",
     "covers": [ "leg_either" ],
+    "max_encumbrance": 4,
     "coverage": 15,
     "material_thickness": 2,
     "use_action": {
@@ -246,7 +248,7 @@
       "draw_cost": 40,
       "flags": [ "MAG_COMPACT", "SPEEDLOADER" ]
     },
-    "flags": [ "WATER_FRIENDLY", "OVERSIZE", "BELTED" ]
+    "flags": [ "WATER_FRIENDLY", "OVERSIZE", "BELTED", "COMPACT" ]
   },
   {
     "id": "modularvest",
@@ -490,7 +492,7 @@
     "color": "dark_gray",
     "covers": [ "torso" ],
     "coverage": 20,
-    "encumbrance": 2,
+    "max_encumbrance": 4,
     "material_thickness": 2,
     "storage": "3 L",
     "use_action": {
@@ -504,7 +506,7 @@
       "flags": [ "MAG_COMPACT", "MAG_BULKY" ]
     },
     "valid_mods": [ "resized_large" ],
-    "flags": [ "WATER_FRIENDLY", "WAIST" ]
+    "flags": [ "WATER_FRIENDLY", "WAIST", "COMPACT" ]
   },
   {
     "id": "xlkevlar",
diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json
index 641d25393fce..33738f2ebde2 100644
--- a/data/json/recipes/armor/storage.json
+++ b/data/json/recipes/armor/storage.json
@@ -22,8 +22,8 @@
     "skills_required": [ "gun", 1 ],
     "time": "1 h 20 m",
     "autolearn": true,
-    "qualities": [ { "id": "SEW", "level": 1 } ],
-    "components": [ [ [ "fabric_hides_any", 8, "LIST" ], [ "fabric_standard", 8, "LIST" ] ], [ [ "filament", 10, "LIST" ] ] ]
+    "using": [ [ "sewing_standard", 10 ] ],
+    "components": [ [ [ "fabric_standard", 8, "LIST" ] ] ]
   },
   {
     "result": "stone_pouch",
@@ -48,12 +48,8 @@
     "skills_required": [ "gun", 1 ],
     "time": "25 m",
     "autolearn": true,
-    "qualities": [ { "id": "SEW", "level": 1 } ],
-    "components": [
-      [ [ "fabric_hides_any", 5, "LIST" ], [ "fabric_standard", 5, "LIST" ] ],
-      [ [ "chestpouch", 4 ], [ "legpouch_large", 2 ] ],
-      [ [ "filament", 20, "LIST" ] ]
-    ]
+    "using": [ [ "sewing_standard", 20 ] ],
+    "components": [ [ [ "fabric_hides_any", 15, "LIST" ] ] ]
   },
   {
     "result": "axe_ring",
@@ -307,8 +303,8 @@
     "skills_required": [ "gun", 1 ],
     "time": "1 h 18 m",
     "autolearn": true,
-    "qualities": [ { "id": "SEW", "level": 1 } ],
-    "components": [ [ [ "fabric_standard", 4, "LIST" ], [ "fabric_hides_any", 4, "LIST" ] ], [ [ "filament", 5, "LIST" ] ] ]
+    "using": [ [ "sewing_standard", 5 ] ],
+    "components": [ [ [ "fabric_standard", 4, "LIST" ] ] ]
   },
   {
     "result": "tacvest",
@@ -322,12 +318,7 @@
     "autolearn": true,
     "using": [ [ "sewing_standard", 25 ] ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "mold_plastic", -1 ] ] ],
-    "components": [
-      [ [ "rag", 20 ] ],
-      [ [ "ragpouch", 2 ], [ "leather_pouch", 2 ] ],
-      [ [ "chestpouch", 4 ], [ "legpouch_large", 2 ], [ "chestrig", 1 ] ],
-      [ [ "plastic_chunk", 2 ] ]
-    ]
+    "components": [ [ [ "fabric_standard", 40, "LIST" ] ], [ [ "plastic_chunk", 2 ] ] ]
   },
   {
     "result": "duffelbag",
@@ -481,8 +472,8 @@
     "skills_required": [ "survival", 1 ],
     "time": "10 m",
     "autolearn": true,
-    "qualities": [ { "id": "SEW", "level": 1 } ],
-    "components": [ [ [ "fabric_standard", 6, "LIST" ], [ "fabric_hides_any", 6, "LIST" ] ], [ [ "filament", 10, "LIST" ] ] ]
+    "using": [ [ "sewing_standard", 10 ] ],
+    "components": [ [ [ "fabric_standard", 6, "LIST" ] ] ]
   },
   {
     "result": "legpouch",
@@ -492,10 +483,10 @@
     "skill_used": "tailor",
     "difficulty": 3,
     "skills_required": [ "gun", 1 ],
-    "time": "1 h 8 m",
+    "time": "15 m",
     "autolearn": true,
-    "qualities": [ { "id": "SEW", "level": 1 } ],
-    "components": [ [ [ "fabric_standard", 3, "LIST" ], [ "fabric_hides_any", 3, "LIST" ] ], [ [ "filament", 5, "LIST" ] ] ]
+    "using": [ [ "sewing_standard", 8 ] ],
+    "components": [ [ [ "fabric_standard", 6, "LIST" ] ] ]
   },
   {
     "result": "legpouch_large",
@@ -505,14 +496,10 @@
     "skill_used": "tailor",
     "difficulty": 3,
     "skills_required": [ "gun", 1 ],
-    "time": "1 h 16 m",
+    "time": "20 m",
     "autolearn": true,
-    "qualities": [ { "id": "SEW", "level": 1 } ],
-    "components": [
-      [ [ "fabric_standard", 6, "LIST" ], [ "fabric_hides_any", 6, "LIST" ] ],
-      [ [ "chestpouch", 2 ] ],
-      [ [ "filament", 8, "LIST" ] ]
-    ]
+    "using": [ [ "sewing_standard", 15 ] ],
+    "components": [ [ [ "fabric_standard", 13, "LIST" ] ] ]
   },
   {
     "result": "legrig",
@@ -649,8 +636,8 @@
     "skill_used": "tailor",
     "time": "10 m",
     "autolearn": true,
-    "qualities": [ { "id": "SEW", "level": 1 } ],
-    "components": [ [ [ "rag", 6 ] ], [ [ "filament", 10, "LIST" ] ] ]
+    "using": [ [ "sewing_standard", 10 ] ],
+    "components": [ [ [ "fabric_standard", 8, "LIST" ] ] ]
   },
   {
     "result": "scabbard",