diff --git a/MST_Extra/items/armor.json b/MST_Extra/items/armor.json
index 8acf13f..09e41f0 100644
--- a/MST_Extra/items/armor.json
+++ b/MST_Extra/items/armor.json
@@ -33,7 +33,7 @@
     "covers": [ "TORSO" ],
     "coverage": 30,
     "encumbrance": 12,
-    "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "8 L", "max_contains_weight": "16 kg", "moves": 300 } ],
+    "storage": "8 L",
     "material_thickness": 2,
     "flags": [ "BELTED", "WATER_FRIENDLY" ]
   },
@@ -52,16 +52,14 @@
     "covers": [ "LEG_EITHER" ],
     "coverage": 7,
     "material_thickness": 1,
-    "pocket_data": [
-      {
-        "holster": true,
-        "max_contains_volume": "750 ml",
-        "max_contains_weight": "2 kg",
-        "moves": 3,
-        "flag_restriction": [ "SHEATH_KNIFE" ]
-      }
-    ],
-    "use_action": { "type": "holster", "holster_prompt": "Sheath knife", "holster_msg": "You sheath your %s" },
+    "use_action": {
+      "type": "holster",
+      "holster_prompt": "Sheath knife",
+      "holster_msg": "You sheath your %s",
+      "max_volume": "750 ml",
+      "draw_cost": 3,
+      "flags": [ "SHEATH_KNIFE" ]
+    },
     "flags": [ "WAIST", "OVERSIZE", "WATER_FRIENDLY" ]
   },
   {
diff --git a/MST_Extra/items/containers.json b/MST_Extra/items/containers.json
index 7f34370..430144d 100644
--- a/MST_Extra/items/containers.json
+++ b/MST_Extra/items/containers.json
@@ -1,8 +1,8 @@
 [
   {
     "id": "canteen_birchbark",
-    "type": "GENERIC",
-    "category": "container",
+    "type": "CONTAINER",
+    "category": "other",
     "name": "birchbark canteen",
     "description": "A small container make from pieces of birchbark stitched together, sealed with pitch or similar material.  Holds 1.5 liters and has a simple carry strap.",
     "weight": "853 g",
@@ -13,22 +13,16 @@
     "material": "wood",
     "symbol": ")",
     "color": "light_gray",
-	"pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "watertight": true,
-        "rigid": true,
-        "max_contains_volume": "1500 ml",
-        "max_contains_weight": "3 kg"
-      }
-    ],
+    "contains": "1500 ml",
+    "seals": true,
+    "watertight": true,
     "armor_data": { "covers": [ "LEG_EITHER" ], "coverage": 5, "encumbrance": 5, "material_thickness": 1 },
     "flags": [ "WAIST" ]
   },
   {
     "id": "jar_clay",
-    "type": "GENERIC",
-    "category": "container",
+    "type": "CONTAINER",
+    "category": "other",
     "name": "clay jar",
     "description": "A half-liter clay jar, glazed for waterproofing with a tight-fitting wooden stopper.",
     "weight": "150 g",
@@ -37,37 +31,23 @@
     "material": "clay",
     "symbol": ")",
     "color": "brown",
-	"pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "watertight": true,
-        "rigid": true,
-        "max_contains_volume": "500 ml",
-        "max_contains_weight": "1 kg"
-      }
-    ],
+    "contains": "500 ml",
+    "seals": true,
+    "watertight": true,
     "unseals_into": "null",
     "qualities": [ [ "CONTAIN", 1 ], [ "BOIL", 1 ] ]
   },
   {
     "id": "jar_clay_sealed",
     "copy-from": "jar_clay",
-    "type": "GENERIC",
-	"category": "container",
+    "type": "CONTAINER",
+    "category": "other",
     "name": "sealed clay jar",
     "description": "A half-liter clay jar, glazed for waterproofing with a tight-fitting wooden stopper.  Sealed tightly with wax, to preserve contents from rot.",
     "symbol": ")",
     "color": "brown",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "rigid": true,
-        "watertight": true,
-        "max_contains_volume": "500 ml",
-        "max_contains_weight": "1 kg",
-        "sealed_data": { "spoil_multiplier": 0.0 }
-      }
-    ],
+    "seals": false,
+    "preserves": true,
     "unseals_into": "jar_clay"
   },
   {
@@ -82,15 +62,8 @@
     "material": "wood",
     "symbol": ")",
     "color": "brown",
-	"pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "watertight": true,
-        "rigid": true,
-        "max_contains_volume": "7 L",
-        "max_contains_weight": "14 kg"
-      }
-    ],
+    "contains": "7 L",
+    "watertight": true,
     "qualities": [ [ "CONTAIN", 1 ] ]
   }
 ]
diff --git a/MST_Extra/items/item_overrides.json b/MST_Extra/items/item_overrides.json
index 6bd69e9..d46b1eb 100644
--- a/MST_Extra/items/item_overrides.json
+++ b/MST_Extra/items/item_overrides.json
@@ -40,14 +40,15 @@
     "type": "ARMOR",
     "copy-from": "javelin_bag",
     "name": "javelin bag",
-    "pocket_data": [
-      {
-        "ammo_restriction": {
-          "javelin": 4
-        },
-        "moves": 25
-      }
-    ]
+    "use_action": {
+      "type": "holster",
+      "holster_prompt": "Stash javelins",
+      "holster_msg": "You stash your %s.",
+      "multi": 10,
+      "max_volume": "500 ml",
+      "draw_cost": 30,
+      "flags": [ "JAVELIN" ]
+    }
   },
   {
     "id": "char_purifier",
@@ -77,7 +78,7 @@
     "type": "AMMO",
     "name": "rubber slug",
     "ammo_type": "pebble",
-    "damage": { "damage_type": "bullet", "amount": 2 },
+    "damage": { "damage_type": "stab", "amount": 2 },
     "range": 10,
     "dispersion": 7,
     "extend": { "effects": [ "BEANBAG", "NEVER_MISFIRES", "NON-FOULING", "RECOVER_2" ] }
@@ -121,7 +122,7 @@
     "type": "AMMO",
     "name": "limestone",
     "ammo_type": "pebble",
-    "damage": { "damage_type": "bullet", "amount": 2 },
+    "damage": { "damage_type": "stab", "amount": 2 },
     "range": 10,
     "dispersion": 14,
     "extend": { "effects": [ "NEVER_MISFIRES", "NON-FOULING" ] }
diff --git a/MST_Extra/items/tool_armor.json b/MST_Extra/items/tool_armor.json
index e42c349..b4524f6 100644
--- a/MST_Extra/items/tool_armor.json
+++ b/MST_Extra/items/tool_armor.json
@@ -59,10 +59,9 @@
     "material_thickness": 2,
     "environmental_protection": 1,
     "environmental_protection_with_filter": 10,
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gasfilter_m": 100 } } ],
     "max_charges": 100,
     "ammo": "gasfilter_m",
     "use_action": "GASMASK",
-    "flags": [ "OUTER", "HELMET_COMPAT", "NO_UNLOAD", "NO_RELOAD" ]
+    "flags": [ "OUTER", "HELMET_COMPAT" ]
   }
 ]
diff --git a/MST_Extra/items/tools.json b/MST_Extra/items/tools.json
index 09f7e60..b85a6f1 100644
--- a/MST_Extra/items/tools.json
+++ b/MST_Extra/items/tools.json
@@ -191,7 +191,6 @@
     "price": 800,
     "material": [ "clay" ],
     "color": "brown",
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "watertight": true, "ammo_restriction": { "lamp_oil": 250 } } ],
     "initial_charges": 250,
     "max_charges": 250,
     "use_action": {
@@ -226,7 +225,6 @@
     "description": "This is a small ceramic fire pot, with a lid and small holes for controlled airflow.  It can nurture a smoldering ember for a long time, to start fires without modern tools.",
     "material": "clay",
     "color": "brown",
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "tinder": 100 } } ],
     "use_action": {
       "target": "tinderbox_clay_on",
       "msg": "You light the tinder.",
@@ -290,7 +288,6 @@
     "symbol": ";",
     "color": "light_gray",
     "ammo": "pitch_wood",
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "pitch_wood": 100 } } ],
     "max_charges": 100,
     "charges_per_use": 1,
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 11 ], [ "SAW_W", 1 ] ],
diff --git a/MST_Extra/obsolete.json b/MST_Extra/obsolete.json
index 3555745..d53c9f3 100644
--- a/MST_Extra/obsolete.json
+++ b/MST_Extra/obsolete.json
@@ -79,8 +79,8 @@
   },
   {
     "id": "foil_alum",
-    "type": "GENERIC",
-    "category": "container",
+    "type": "CONTAINER",
+    "category": "other",
     "name": "aluminum foil wrap",
     "//": "Dummied out way back when.",
     "description": "A half crumpled sheet of aluminum foil, used for cooking and baking.",
@@ -92,15 +92,7 @@
     "material": "aluminum",
     "symbol": ",",
     "color": "light_gray",
-	"pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "sealed_data": { "spoil_multiplier": 1.0 },
-        "max_contains_volume": "2500 ml",
-        "max_contains_weight": "5 kg",
-		"moves": 400
-      }
-    ],
+    "contains": "2500 ml",
     "qualities": [ [ "COOK", 1 ] ]
   },
   {