diff --git a/data/json/itemgroups/Clothing_Gear/gear.json b/data/json/itemgroups/Clothing_Gear/gear.json
index c28bb995d7ed2..faf76bdef6b63 100644
--- a/data/json/itemgroups/Clothing_Gear/gear.json
+++ b/data/json/itemgroups/Clothing_Gear/gear.json
@@ -191,7 +191,7 @@
       { "item": "cordless_drill", "prob": 30 },
       { "item": "rope_30", "prob": 50 },
       { "item": "pliers", "prob": 50 },
-      { "item": "laptop", "prob": 70 },
+      { "group": "new_laptops", "prob": 70 },
       { "item": "cable", "prob": 40 },
       { "item": "manual_traps_mil", "prob": 80 },
       { "group": "gear_eod_light_or_heavy", "prob": 100 }
@@ -255,8 +255,7 @@
       [ "hammer_sledge_engineer", 5 ],
       [ "hammer_sledge_heavy", 1 ],
       [ "shovel", 20 ],
-      { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 20, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" },
+      { "group": "civilian_phones", "prob": 20 },
       [ "airhorn", 5 ],
       [ "boltcutters", 5 ],
       [ "tacvest", 10 ],
diff --git a/data/json/itemgroups/Clothing_Gear/gear_civilian.json b/data/json/itemgroups/Clothing_Gear/gear_civilian.json
index 2e0fb8c0fe06a..f3c9dab2793dc 100644
--- a/data/json/itemgroups/Clothing_Gear/gear_civilian.json
+++ b/data/json/itemgroups/Clothing_Gear/gear_civilian.json
@@ -7,8 +7,7 @@
     "//": "Small common items carried in a person's pockets, purse, etc. Wallets at roughly 50%.",
     "items": [
       { "group": "wallets", "prob": 1600 },
-      { "item": "cell_phone", "prob": 26, "charges": [ 0, 300 ] },
-      { "item": "smart_phone", "prob": 204, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" },
+      { "group": "civilian_phones", "prob": 204 },
       { "prob": 250, "group": "cig_box_cigarette_1_20" },
       { "item": "lighter", "prob": 50, "charges": [ 0, -1 ] },
       { "item": "small_lighter", "prob": 25, "charges": [ 0, -1 ] },
@@ -44,10 +43,10 @@
       { "item": "camera_pro", "prob": 1, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "container-item": "camera_bag", "prob": 4, "charges": [ 0, 150 ] },
       [ "camera_bag", 10 ],
-      { "item": "eink_tablet_pc", "prob": 30, "charges": [ 0, 100 ], "contents-group": "civilian_einktablet_efiles" },
-      { "item": "laptop", "prob": 15, "charges": [ 0, 500 ], "contents-group": "civilian_laptop_efiles" },
-      [ "memory_card", 50 ],
-      [ "usb_drive", 50 ],
+      { "group": "civilian_eink_tablet_pcs", "prob": 30 },
+      { "group": "civilian_laptops", "prob": 15 },
+      { "group": "civilian_memory_cards", "prob": 50 },
+      { "group": "civilian_usb_drives", "prob": 50 },
       { "item": "mp3", "prob": 20, "charges": [ 0, 100 ] },
       { "item": "portable_game", "prob": 50, "charges": [ 0, 100 ] },
       { "item": "vibrator", "prob": 5, "charges": [ 0, 100 ] },
@@ -114,7 +113,7 @@
       [ "pockknife", 14 ],
       [ "knife_swissarmy", 10 ],
       [ "teleumbrella", 2 ],
-      [ "usb_drive", 10 ],
+      { "group": "civilian_usb_drives", "prob": 10 },
       { "group": "writing_utensils", "prob": 40 },
       { "group": "child_schoolbag_1", "prob": 500 },
       { "group": "child_schoolbag_2", "prob": 150 },
@@ -161,7 +160,7 @@
       [ "knife_swissarmy", 10 ],
       [ "umbrella", 5 ],
       [ "teleumbrella", 2 ],
-      [ "usb_drive", 10 ],
+      { "group": "civilian_usb_drives", "prob": 10 },
       { "group": "writing_utensils", "prob": 40 },
       { "group": "child_schoolbag_1", "prob": 500 },
       { "group": "child_schoolbag_2", "prob": 150 },
@@ -302,7 +301,7 @@
       [ "onion_rings", 10 ],
       [ "mintpatties", 20 ],
       { "item": "electrohack", "prob": 3, "charges": [ 0, 100 ] },
-      [ "usb_drive", 5 ],
+      { "group": "civilian_usb_drives", "prob": 5 },
       { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "file", 10 ],
       [ "manual_computer", 20 ],
diff --git a/data/json/itemgroups/Labs/labs_common.json b/data/json/itemgroups/Labs/labs_common.json
index 87cc00356816a..e1c0be0646db7 100644
--- a/data/json/itemgroups/Labs/labs_common.json
+++ b/data/json/itemgroups/Labs/labs_common.json
@@ -61,7 +61,7 @@
         "distribution": [ { "item": "camera", "prob": 70, "charges": [ 0, 50 ] }, { "item": "camera_pro", "prob": 30, "charges": [ 0, 50 ] } ],
         "prob": 10
       },
-      { "item": "memory_card", "prob": 15, "count": [ 2, 8 ] },
+      { "group": "used_memory_cards", "prob": 15, "count": [ 2, 4 ], "contents-group": "efiles_science" },
       { "item": "badge_doctor", "prob": 5, "count": [ 1, 2 ] },
       { "item": "wrapped_rad_badge", "prob": 7, "count": [ 1, 3 ] },
       { "item": "plastic_chunk", "prob": 30, "count": [ 1, 3 ] },
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
index 949118a91a0cd..b990c8c78ab0f 100644
--- a/data/json/itemgroups/Locations_MapExtras/locations.json
+++ b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -161,7 +161,7 @@
       [ "mask_dust", 65 ],
       [ "glasses_safety", 40 ],
       [ "vacutainer", 10 ],
-      [ "usb_drive", 5 ],
+      { "group": "used_usb_drives", "prob": 5, "contents-group": "efiles_medical" },
       [ "recipe_elfa", 1 ],
       [ "recipe_medicalmut", 2 ],
       [ "disinfectant", 35 ],
@@ -211,7 +211,7 @@
       { "item": "mp3", "prob": 8, "charges": [ 0, 100 ] },
       { "item": "portable_game", "prob": 10, "charges": [ 0, 100 ] },
       { "item": "game_watch", "prob": 2, "charges": [ 0, 100 ] },
-      { "item": "laptop", "prob": 5, "charges": [ 0, 500 ], "contents-group": "civilian_laptop_efiles" },
+      { "group": "civilian_laptops", "prob": 5 },
       [ "fish_bowl", 1 ],
       { "group": "box_of_contact_lens_any", "prob": 15 },
       { "item": "transition_contacts", "prob": 1, "count": 6 },
@@ -663,13 +663,13 @@
     "id": "recycle_electronic",
     "type": "item_group",
     "items": [
-      [ "usb_drive", 45 ],
+      { "group": "used_usb_drives", "prob": 45, "contents-group": "efiles_scrap" },
+      { "group": "used_memory_cards", "prob": 80, "contents-group": "efiles_scrap" },
       { "item": "two_way_radio", "prob": 30, "charges": [ 0, 15 ] },
       [ "transponder", 25 ],
       [ "receiver", 25 ],
       [ "small_lcd_screen", 10 ],
       [ "large_lcd_screen", 10 ],
-      [ "memory_card", 80 ],
       { "item": "radiocontrol", "prob": 15, "charges": [ 0, 25 ] },
       { "item": "radio_car", "prob": 15, "charges": [ 0, 25 ] },
       [ "RAM", 45 ],
@@ -677,7 +677,7 @@
       [ "power_supply", 25 ],
       [ "processor", 25 ],
       { "item": "mp3", "prob": 20, "charges": [ 0, 15 ] },
-      { "item": "laptop", "prob": 20, "charges": [ 0, 500 ] },
+      { "group": "used_laptops", "prob": 20, "contents-group": "efiles_scrap" },
       { "item": "hotplate", "prob": 20 },
       { "item": "flashlight", "prob": 30, "charges": [ 0, 10 ] },
       { "item": "coffeemaker", "prob": 20 },
@@ -929,12 +929,11 @@
       { "item": "matches", "prob": 60, "charges": [ 0, 20 ] },
       { "item": "ref_matches", "prob": 60, "charges": [ 0, 32 ] },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
-      { "item": "laptop", "prob": 20, "charges": [ 0, 500 ] },
       [ "atomic_light", 1 ],
-      { "item": "eink_tablet_pc", "prob": 1, "charges": [ 0, 100 ] },
-      [ "memory_card", 5 ],
-      { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 35, "charges": [ 0, -1 ] },
+      { "group": "civilian_memory_cards", "prob": 5 },
+      { "group": "civilian_phones", "prob": 35 },
+      { "group": "civilian_eink_tablet_pcs", "prob": 1 },
+      { "group": "civilian_laptops", "prob": 20 },
       [ "cotton_patchwork", 1 ],
       [ "claw_bar", 3 ],
       [ "crowbar", 18 ],
@@ -1257,7 +1256,7 @@
       { "item": "wearable_light", "prob": 15, "charges": [ 0, 100 ] },
       [ "ear_plugs", 50 ],
       { "item": "extinguisher", "prob": 20, "charges": 100 },
-      { "item": "laptop", "prob": 20, "charges": [ 0, 500 ] },
+      { "group": "used_laptops", "prob": 20, "contents-group": "SUS_efiles_sewage" },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
       { "item": "water_purifier", "prob": 5 },
       [ "flyer", 10 ],
@@ -1649,8 +1648,8 @@
       { "item": "mag_traps", "prob": 10 },
       { "item": "mp3", "prob": 9, "charges": [ 0, 100 ] },
       { "item": "cell_phone", "prob": 80, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 10, "charges": [ 0, -1 ] },
-      { "item": "eink_tablet_pc", "prob": 5, "charges": [ 0, 100 ] },
+      { "group": "civilian_phones", "prob": 10 },
+      { "group": "used_eink_tablet_pcs", "prob": 5, "contents-group": "efiles_contraband" },
       { "item": "camera", "prob": 3, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "prob": 1, "charges": [ 0, 150 ] },
       { "item": "gold_watch", "prob": 3 },
@@ -1933,14 +1932,14 @@
       [ "recipe_labchem", 1 ],
       [ "textbook_anarch", 1 ],
       [ "recipe_caseless", 1 ],
-      { "item": "laptop", "prob": 30, "charges": [ 0, 500 ] },
+      { "group": "used_laptops", "prob": 30, "contents-group": "civilian_laptop_efiles" },
       [ "atomic_light", 3 ],
       [ "atomic_lamp", 3 ],
       { "item": "smart_lamp", "prob": 5, "charges": [ 0, 100 ] },
-      { "item": "cell_phone", "prob": 7, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 54, "charges": [ 0, 150 ] },
-      { "item": "eink_tablet_pc", "prob": 15, "charges": [ 0, 100 ] },
-      [ "memory_card", 40 ],
+      { "group": "civilian_phones", "prob": 61 },
+      { "group": "civilian_eink_tablet_pcs", "prob": 15 },
+      { "group": "civilian_memory_cards", "prob": 40 },
+      { "group": "civilian_usb_drives", "prob": 8 },
       [ "memory_card_science", 10 ],
       [ "standard_template_construct", 5 ],
       [ "standard_template_construct_combat_exoskeleton", 5 ],
@@ -1964,7 +1963,6 @@
       { "item": "portable_game", "prob": 8, "charges": [ 0, 100 ] },
       { "item": "game_watch", "prob": 2, "charges": [ 0, 50 ] },
       { "item": "vibrator", "prob": 6, "charges": [ 0, 100 ] },
-      [ "usb_drive", 8 ],
       [ "firecracker_pack", 1 ],
       [ "firecracker", 1 ],
       [ "fried_seeds", 10 ],
@@ -2028,7 +2026,7 @@
       [ "file", 20 ],
       [ "howto_computer", 20 ],
       [ "manual_fabrication", 30 ],
-      [ "usb_drive", 5 ],
+      { "group": "used_usb_drives", "prob": 5, "contents-group": "efiles_school" },
       { "group": "book_mag_tech", "prob": 70 },
       { "group": "book_mag_gen", "prob": 150 },
       { "group": "book_mag_interests", "prob": 20 },
@@ -2221,7 +2219,7 @@
       { "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
       [ "bubblewrap", 50 ],
       [ "instant_coffee", 15 ],
-      [ "usb_drive", 5 ],
+      { "group": "new_usb_drives", "prob": 5 },
       { "item": "usb_drive", "contents-item": "software_useless", "prob": 10 },
       { "item": "usb_drive", "contents-item": "software_electronics_reference", "prob": 2 },
       [ "umbrella", 5 ],
@@ -2288,7 +2286,7 @@
       { "group": "toy_robot_kit", "prob": 1 },
       { "group": "toy_engine_kit", "prob": 1 },
       { "item": "instant_coffee", "prob": 15 },
-      { "item": "usb_drive", "prob": 15 },
+      { "group": "used_usb_drives", "prob": 15, "contents-group": "SUS_efiles_office" },
       { "item": "coat_rain", "prob": 50 },
       { "item": "hood_rain", "prob": 10 },
       { "item": "poncho", "prob": 15 },
diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
index 56984a91f965e..1af1bfd8e1335 100644
--- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
+++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -228,10 +228,10 @@
       [ "silver_watch", 20 ],
       [ "sf_watch", 7 ],
       [ "platinum_watch", 1 ],
-      { "item": "smart_phone", "prob": 31, "charges": [ 0, -1 ] },
+      { "group": "civilian_phones", "prob": 31 },
       { "item": "goggles_nv", "prob": 1, "charges": [ 0, 100 ] },
       { "item": "goggles_ir", "prob": 1, "charges": [ 0, 100 ] },
-      { "item": "eink_tablet_pc", "prob": 12, "charges": [ 0, 100 ] },
+      { "group": "civilian_eink_tablet_pcs", "prob": 12 },
       { "item": "camera_pro", "prob": 5, "charges": [ 0, 150 ] },
       { "item": "portable_game", "prob": 8, "charges": [ 0, 100 ] },
       [ "knife_rm42", 1 ],
@@ -453,7 +453,7 @@
       [ "elec_jackhammer", 1 ],
       [ "pickaxe", 1 ],
       [ "bracelet_friendship", 1 ],
-      [ "usb_drive", 5 ],
+      { "group": "civilian_usb_drives", "prob": 5 },
       [ "cot", 40 ],
       [ "rollmat", 40 ],
       [ "tent_kit", 17 ],
@@ -738,7 +738,7 @@
       [ "radio", 20 ],
       [ "geiger_off", 8 ],
       [ "rad_monitor", 2 ],
-      [ "usb_drive", 5 ],
+      { "group": "civilian_usb_drives", "prob": 5 },
       [ "canteen", 15 ],
       [ "2lcanteen", 10 ],
       [ "camelbak", 5 ],
@@ -1288,8 +1288,7 @@
       [ "pie_maple", 70 ],
       [ "pork_beans", 15 ],
       [ "glazed_tenderloin", 5 ],
-      { "item": "cell_phone", "prob": 1, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 3, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" },
+      { "group": "civilian_phones", "prob": 4 },
       [ "glass", 40 ],
       [ "spoon", 25 ],
       [ "fork", 25 ],
@@ -1723,7 +1722,7 @@
     "//": "For s_electronics shops",
     "ammo": 75,
     "magazine": 100,
-    "items": [ [ "eink_tablet_pc", 60 ], [ "laptop", 75 ] ]
+    "items": [ { "group": "new_laptops", "prob": 75 }, { "group": "new_eink_tablet_pcs", "prob": 60 } ]
   },
   {
     "id": "elecsto_entapl",
@@ -1741,8 +1740,7 @@
     "magazine": 100,
     "items": [
       { "item": "portable_game", "prob": 65, "charges": 100 },
-      { "item": "cell_phone", "prob": 11, "charges": 150 },
-      { "item": "smart_phone", "prob": 85, "charges": 120 },
+      { "group": "new_phones", "prob": 11 },
       { "item": "waterproof_smart_phone_case", "prob": 40 },
       { "item": "mp3", "prob": 45, "charges": 100 },
       { "group": "toy_radio_car", "prob": 35 },
@@ -1810,7 +1808,7 @@
     "//": "For s_electronics shops",
     "ammo": 75,
     "magazine": 100,
-    "items": [ [ "television", 50 ], [ "eink_tablet_pc", 50 ], [ "stereo", 30 ], [ "microwave", 40 ] ]
+    "items": [ [ "television", 50 ], { "group": "new_eink_tablet_pcs", "prob": 50 }, [ "stereo", 30 ], [ "microwave", 40 ] ]
   },
   {
     "id": "elecsto_books",
@@ -1830,12 +1828,9 @@
     "type": "item_group",
     "//": "For s_electronics shops",
     "items": [
-      [ "usb_drive", 65 ],
-      [ "memory_card", 95 ],
-      { "item": "usb_drive", "contents-item": "software_useless", "prob": 25 },
-      { "item": "usb_drive", "contents-item": "software_math", "prob": 15 },
-      { "item": "usb_drive", "contents-item": "software_medical", "prob": 5 },
-      { "item": "usb_drive", "contents-item": "software_hacking", "prob": 1 }
+      { "group": "new_usb_drives", "prob": 65 },
+      { "group": "new_memory_cards", "prob": 95 },
+      { "group": "new_usb_drives", "prob": 25, "contents-group": "efiles_software" }
     ]
   },
   {
@@ -1903,7 +1898,7 @@
       [ "eyedrops", 20 ],
       [ "mag_electronics", 20 ],
       [ "ecig", 20 ],
-      [ "usb_drive", 20 ]
+      { "group": "new_usb_drives", "prob": 20 }
     ]
   },
   {
diff --git a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json
index 982ec776ad2a4..2448bc31aa9c7 100644
--- a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json
+++ b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json
@@ -160,8 +160,7 @@
       [ "crackpipe", 10 ],
       { "item": "weed", "prob": 10, "count": [ 1, 5 ] },
       [ "joint", 10 ],
-      { "item": "cell_phone", "prob": 3, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 17, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" },
+      { "group": "civilian_phones", "prob": 20 },
       { "item": "camera", "prob": 15, "charges": [ 0, 150 ] },
       { "item": "camera", "container-item": "camera_bag", "prob": 5, "charges": [ 0, 150 ] },
       [ "camera_bag", 10 ],
@@ -213,8 +212,7 @@
       { "prob": 20, "group": "cig_box_cigarette_1_20" },
       { "item": "weed", "prob": 10, "count": [ 1, 5 ] },
       [ "joint", 10 ],
-      { "item": "cell_phone", "prob": 6, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 44, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" }
+      { "group": "civilian_phones", "prob": 50 }
     ]
   },
   {
@@ -256,8 +254,7 @@
       { "prob": 20, "group": "cig_box_cigarette_1_20" },
       { "item": "weed", "prob": 10, "count": [ 1, 5 ] },
       [ "joint", 10 ],
-      { "item": "cell_phone", "prob": 6, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 44, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" }
+      { "group": "civilian_phones", "prob": 50 }
     ]
   }
 ]
diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
index 768fcf2a4070f..de5ff15efd4c0 100644
--- a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
+++ b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
@@ -263,13 +263,12 @@
       [ "antenna", 25 ],
       { "group": "ammo_any_batteries_full", "prob": 50 },
       { "item": "mp3", "prob": 30, "charges": 100 },
-      [ "usb_drive", 10 ],
+      { "group": "new_phones", "prob": 90 },
+      { "group": "new_usb_drives", "prob": 10 },
+      { "group": "new_memory_cards", "prob": 10 },
       [ "manual_electronics", 20 ],
       [ "cable", 60 ],
-      { "item": "cell_phone", "prob": 30, "charges": 150 },
-      { "item": "smart_phone", "prob": 90, "charges": 120 },
       [ "wristwatch", 60 ],
-      [ "memory_card", 10 ],
       [ "fitness_band", 5 ]
     ]
   },
diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
index dea2aa48875f6..bb3845857a1b5 100644
--- a/data/json/itemgroups/Locations_MapExtras/mansion.json
+++ b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -1215,8 +1215,7 @@
       [ "bandana", 10 ],
       { "item": "mp3", "prob": 6, "charges": [ 0, 100 ] },
       { "item": "portable_game", "prob": 5, "charges": [ 0, 100 ] },
-      { "item": "cell_phone", "prob": 1, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 5, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" },
+      { "group": "civilian_phones", "prob": 6 },
       [ "phonebook", 5 ],
       [ "hairpin", 5 ],
       { "group": "tinware", "prob": 5 },
diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
index 05c7c662b6cb1..69d7eca293802 100644
--- a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
+++ b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
@@ -257,9 +257,10 @@
       { "item": "transponder", "prob": 5 },
       { "item": "receiver", "prob": 10 },
       { "item": "antenna", "prob": 18 },
-      { "item": "laptop", "prob": 20, "charges": [ 0, 500 ], "contents-group": "civilian_laptop_efiles" },
-      { "item": "eink_tablet_pc", "prob": 8, "charges": [ 0, 500 ], "contents-group": "civilian_einktablet_efiles" },
-      { "item": "memory_card", "prob": 5 },
+      { "group": "civilian_laptops", "prob": 20 },
+      { "group": "civilian_eink_tablet_pcs", "prob": 8 },
+      { "group": "civilian_memory_cards", "prob": 5 },
+      { "group": "civilian_usb_drives", "prob": 15 },
       { "item": "camera", "prob": 3, "charges": [ 0, 150 ] },
       { "item": "camera", "container-item": "camera_bag", "prob": 2, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "prob": 1, "charges": [ 0, 150 ] },
@@ -278,7 +279,6 @@
       { "item": "mp3", "prob": 6, "charges": [ 0, 100 ] },
       { "item": "solar_cell", "prob": 5 },
       { "item": "flyer", "prob": 10 },
-      { "item": "usb_drive", "prob": 15 },
       { "item": "lsd", "prob": 1, "count": [ 1, 5 ] },
       { "item": "gum", "prob": 20, "count": [ 1, 10 ] },
       { "item": "caff_gum", "prob": 8, "count": [ 1, 10 ] },
diff --git a/data/json/itemgroups/SUS/combos.json b/data/json/itemgroups/SUS/combos.json
index e19a41426dc06..50e23047707f1 100644
--- a/data/json/itemgroups/SUS/combos.json
+++ b/data/json/itemgroups/SUS/combos.json
@@ -22,8 +22,8 @@
       { "group": "wallets_science", "prob": 15 },
       [ "badge_doctor", 2 ],
       [ "lanyard", 15 ],
-      { "item": "smart_phone", "prob": 80, "charges": [ 0, 120 ] },
-      [ "memory_card", 30 ],
+      { "group": "civilian_phones", "prob": 80 },
+      { "group": "civilian_memory_cards", "prob": 30 },
       [ "mask_dust", 30 ],
       { "group": "box_of_contact_lens_any", "prob": 16 },
       { "group": "clothing_glasses", "prob": 65 },
diff --git a/data/json/itemgroups/SUS/office.json b/data/json/itemgroups/SUS/office.json
index b4528bb8c5411..e271ddad5c065 100644
--- a/data/json/itemgroups/SUS/office.json
+++ b/data/json/itemgroups/SUS/office.json
@@ -6,11 +6,11 @@
     "//2": "This group is for an office desk containing documents and electronics for work and some desk clutter.",
     "subtype": "collection",
     "entries": [
-      { "item": "eink_tablet_pc", "prob": 20, "charges": [ 0, 100 ], "contents-group": "edevice_work" },
-      { "item": "laptop", "prob": 60, "charges": [ 0, 500 ], "contents-group": "edevice_work" },
+      { "group": "used_eink_tablet_pcs", "prob": 20, "contents-group": "SUS_efiles_office" },
+      { "group": "used_laptops", "prob": 60, "contents-group": "SUS_efiles_office" },
+      { "group": "used_usb_drives", "prob": 50, "contents-group": "SUS_efiles_office" },
+      { "group": "used_memory_cards", "prob": 30, "contents-group": "SUS_efiles_office" },
       { "item": "battery_charger", "prob": 80 },
-      { "item": "usb_drive", "prob": 50 },
-      { "item": "memory_card", "count": [ 1, 3 ], "prob": 30 },
       { "item": "file", "count": [ 1, 8 ], "prob": 50 },
       { "item": "paper", "count": [ 2, 9 ], "prob": 60 },
       { "group": "pens", "count": [ 1, 10 ], "prob": 95, "charges": [ 0, 100 ] },
@@ -34,7 +34,7 @@
       { "item": "file", "count": [ 1, 15 ], "prob": 95 },
       { "item": "paper", "count": [ 2, 30 ], "prob": 80 },
       { "item": "book_binder", "prob": 80 },
-      { "item": "memory_card", "count": [ 1, 5 ], "prob": 30 }
+      { "group": "used_memory_cards", "count": [ 1, 2 ], "prob": 30, "contents-group": "SUS_efiles_office" }
     ]
   },
   {
@@ -63,5 +63,17 @@
       { "item": "detergent", "count": [ 1, 2 ], "prob": 80 },
       { "item": "paper", "count": [ 1, 2 ], "prob": 90 }
     ]
+  },
+  {
+    "id": "SUS_efiles_office",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "group": "textbooks", "prob": 40, "count": [ 1, 2 ] },
+      { "item": "efile_lore", "prob": 30, "count": 1 },
+      { "item": "efile_map", "prob": 10, "count": 1 },
+      { "item": "efile_recipes", "prob": 80, "count": 1 },
+      { "item": "efile_junk", "prob": 100, "count": [ 6, 12 ] }
+    ]
   }
 ]
diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json
index 8520131f4444f..dd5b714cfb16e 100644
--- a/data/json/itemgroups/books.json
+++ b/data/json/itemgroups/books.json
@@ -459,8 +459,7 @@
       { "item": "textbook_anarch", "prob": 1 },
       { "item": "book_pneumatics", "prob": 1 },
       { "item": "cookbook_human", "prob": 1 },
-      { "item": "theater_props", "prob": 1 },
-      { "item": "survnote", "prob": 1 }
+      { "item": "theater_props", "prob": 1 }
     ]
   },
   {
@@ -552,8 +551,7 @@
       { "item": "survival_book", "prob": 2 },
       { "item": "textbook_arthropod", "prob": 2 },
       { "item": "basic_chemistry", "prob": 30 },
-      { "item": "dnd_handbook", "prob": 2 },
-      { "item": "survnote", "prob": 3 }
+      { "item": "dnd_handbook", "prob": 2 }
     ]
   },
   {
diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
index 37c8e2f9ea1ac..84012f1311eb8 100644
--- a/data/json/itemgroups/collections_domestic.json
+++ b/data/json/itemgroups/collections_domestic.json
@@ -274,8 +274,7 @@
       { "item": "water", "prob": 10, "container-item": "glass" },
       { "group": "glass_of_wine", "prob": 10 },
       { "item": "gummy_vitamins", "prob": 10, "count": [ 1, 10 ] },
-      { "item": "cell_phone", "prob": 2, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 12, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" },
+      { "group": "civilian_phones", "prob": 12, "charges": [ 0, -1 ] },
       [ "eyedrops", 10 ],
       [ "steroid_eyedrops", 5 ],
       [ "holy_symbol", 5 ],
@@ -596,10 +595,8 @@
       { "item": "portable_game", "prob": 8, "charges": [ 0, 100 ] },
       { "item": "game_watch", "prob": 2, "charges": [ 0, 50 ] },
       { "item": "deck_of_cards", "prob": 2 },
-      { "item": "usb_drive", "prob": 15 },
       { "group": "alcohol", "prob": 163 },
-      { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 36, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" },
+      { "group": "civilian_phones", "prob": 36 },
       { "item": "waterproof_smart_phone_case", "prob": 5 },
       { "item": "wristwatch", "prob": 15 },
       { "item": "pocketwatch", "prob": 5 },
@@ -607,10 +604,11 @@
       { "item": "teleumbrella", "prob": 20 },
       { "item": "fish_bowl", "prob": 1 },
       { "item": "lsd", "prob": 1, "count": [ 1, 5 ] },
-      { "item": "laptop", "prob": 10, "charges": [ 0, 500 ], "contents-group": "civilian_laptop_efiles" },
+      { "group": "civilian_laptops", "prob": 10 },
       { "item": "file", "prob": 5 },
-      { "item": "eink_tablet_pc", "prob": 2, "charges": [ 0, 100 ], "contents-group": "civilian_einktablet_efiles" },
-      { "item": "memory_card", "prob": 4 },
+      { "group": "civilian_eink_tablet_pcs", "prob": 2 },
+      { "group": "civilian_usb_drives", "prob": 15 },
+      { "group": "civilian_memory_cards", "prob": 4 },
       { "item": "camera", "prob": 1, "charges": [ 0, 150 ] },
       { "item": "camera", "container-item": "camera_bag", "prob": 2, "charges": [ 0, 150 ] },
       { "item": "camera_bag", "prob": 3 },
@@ -1130,14 +1128,14 @@
       { "group": "kids_books", "prob": 70 },
       { "item": "tailor_portfolio", "prob": 1 },
       { "item": "recipe_augs", "prob": 1 },
-      { "item": "laptop", "prob": 10, "charges": [ 0, 500 ], "contents-group": "civilian_laptop_efiles" },
+      { "group": "civilian_laptops", "prob": 10 },
       { "item": "atomic_light", "prob": 2 },
       { "item": "atomic_lamp", "prob": 2 },
-      { "item": "cell_phone", "prob": 6, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 40, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" },
-      { "item": "eink_tablet_pc", "prob": 2, "charges": [ 0, 100 ], "contents-group": "civilian_einktablet_efiles" },
+      { "group": "civilian_phones", "prob": 40 },
+      { "group": "civilian_eink_tablet_pcs", "prob": 2 },
+      { "group": "civilian_memory_cards", "prob": 4 },
+      { "group": "civilian_usb_drives", "prob": 15 },
       { "item": "smart_lamp", "prob": 2, "charges": [ 0, 100 ] },
-      { "item": "memory_card", "prob": 4 },
       { "item": "lighter", "prob": 60, "charges": [ 0, 100 ] },
       { "item": "ref_lighter", "prob": 2, "charges": [ 0, 50 ] },
       { "item": "matches", "prob": 60, "charges": [ 1, 20 ] },
@@ -1156,7 +1154,6 @@
       { "item": "portable_game", "prob": 8, "charges": [ 0, 100 ] },
       { "item": "game_watch", "prob": 2, "charges": [ 0, 50 ] },
       { "item": "deck_of_cards", "prob": 2 },
-      { "item": "usb_drive", "prob": 15 },
       { "item": "firecracker_pack", "prob": 5 },
       { "item": "firecracker", "prob": 5 },
       { "prob": 30, "group": "fried_seeds_bag_plastic_4" },
diff --git a/data/json/itemgroups/efiles.json b/data/json/itemgroups/efiles.json
index 79f8ff7f62add..c87fceb81aa1a 100644
--- a/data/json/itemgroups/efiles.json
+++ b/data/json/itemgroups/efiles.json
@@ -1,14 +1,103 @@
 [
   {
-    "id": "edevice_work",
+    "id": "efiles_science",
     "type": "item_group",
     "subtype": "collection",
     "entries": [
       { "group": "textbooks", "prob": 40, "count": [ 1, 2 ] },
-      { "item": "efile_lore", "prob": 30, "count": 1 },
-      { "item": "efile_map", "prob": 10, "count": 1 },
-      { "item": "efile_recipes", "prob": 80, "count": 1 },
-      { "item": "efile_junk", "prob": 100, "count": [ 6, 12 ] }
+      { "group": "lab_bookshelves", "prob": 60, "count": [ 1, 3 ] },
+      { "item": "software_hacking", "prob": 20 },
+      { "item": "software_electronics_reference", "prob": 20 },
+      { "item": "efile_lore", "prob": 60 },
+      { "item": "efile_map", "prob": 10 },
+      { "item": "efile_recipes_science", "prob": 80 },
+      { "item": "efile_junk", "prob": 100, "count": [ 12, 24 ] }
+    ]
+  },
+  {
+    "id": "efiles_software",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "item": "software_useless", "prob": 25 },
+      { "item": "software_math", "prob": 15 },
+      { "item": "software_medical", "prob": 5 },
+      { "item": "software_hacking", "prob": 1 }
+    ]
+  },
+  {
+    "id": "efiles_medical",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "group": "doctors_books", "prob": 40, "count": [ 1, 2 ] },
+      { "item": "software_medical", "prob": 20 },
+      { "item": "record_patient", "prob": 80 },
+      { "item": "efile_lore", "prob": 60 },
+      { "item": "efile_map", "prob": 10 },
+      { "item": "efile_recipes_science", "prob": 80 },
+      { "item": "efile_junk", "prob": 100, "count": [ 12, 24 ] }
+    ]
+  },
+  {
+    "id": "SUS_efiles_sewage",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "group": "textbooks", "prob": 40, "count": [ 1, 2 ] },
+      { "item": "decoy_elfa", "prob": 100 },
+      { "item": "efile_lore", "prob": 10 },
+      { "item": "efile_map", "prob": 10 },
+      { "item": "efile_recipes", "prob": 80 },
+      { "item": "efile_junk", "prob": 100, "count": [ 12, 24 ] }
+    ]
+  },
+  {
+    "id": "efiles_scrap",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "item": "software_hacking", "prob": 1 },
+      { "item": "efile_lore", "prob": 10 },
+      { "item": "efile_map", "prob": 5 },
+      { "item": "efile_recipes", "prob": 5 },
+      { "item": "efile_junk", "prob": 100, "count": [ 24, 36 ] }
+    ]
+  },
+  {
+    "id": "efiles_school",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "group": "book_school", "prob": 80, "count": [ 1, 3 ] },
+      { "item": "efile_map", "prob": 10 },
+      { "item": "efile_recipes", "prob": 5 },
+      { "item": "efile_junk", "prob": 100, "count": [ 24, 36 ] }
+    ]
+  },
+  {
+    "id": "efiles_contraband",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "group": "book_manual_combat", "prob": 25 },
+      { "item": "software_hacking", "prob": 25 },
+      { "item": "efile_lore", "prob": 70 },
+      { "item": "efile_map", "prob": 5 },
+      { "item": "efile_recipes", "prob": 50 },
+      { "item": "efile_junk", "prob": 100, "count": [ 24, 36 ] }
+    ]
+  },
+  {
+    "id": "civilian_portable_efiles",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "item": "efile_lore", "prob": 20 },
+      { "group": "novels", "prob": 50 },
+      { "group": "literature", "prob": 50 },
+      { "item": "photo_album", "prob": 25, "count": [ 1, 5 ] },
+      { "item": "efile_recipes", "prob": 25 }
     ]
   },
   {
@@ -16,11 +105,11 @@
     "type": "item_group",
     "subtype": "collection",
     "entries": [
-      { "item": "efile_map", "prob": 75, "count": 1 },
-      { "item": "efile_lore", "prob": 50, "count": 1 },
-      { "group": "novels", "prob": 50, "count": 1 },
-      { "group": "literature", "prob": 50, "count": 1 },
-      { "item": "efile_recipes", "prob": 25, "count": 1 }
+      { "item": "efile_map", "prob": 75 },
+      { "item": "efile_lore", "prob": 50 },
+      { "group": "novels", "prob": 50, "count": [ 1, 3 ] },
+      { "group": "literature", "prob": 50, "count": [ 1, 3 ] },
+      { "item": "efile_recipes", "prob": 25 }
     ]
   },
   {
@@ -28,11 +117,12 @@
     "type": "item_group",
     "subtype": "collection",
     "entries": [
-      { "item": "efile_map", "prob": 20, "count": 1 },
-      { "item": "efile_lore", "prob": 60, "count": 1 },
-      { "group": "novels", "prob": 50, "count": 1 },
-      { "group": "literature", "prob": 50, "count": 1 },
-      { "item": "efile_recipes", "prob": 40, "count": 1 }
+      { "item": "efile_map", "prob": 20 },
+      { "item": "efile_lore", "prob": 60 },
+      { "group": "novels", "prob": 50, "count": [ 1, 3 ] },
+      { "group": "literature", "prob": 50, "count": [ 1, 3 ] },
+      { "item": "efile_recipes", "prob": 40 },
+      { "item": "software_useless", "prob": 20 }
     ]
   },
   {
@@ -40,11 +130,11 @@
     "type": "item_group",
     "subtype": "collection",
     "entries": [
-      { "item": "efile_map", "prob": 20, "count": 1 },
-      { "item": "efile_lore", "prob": 20, "count": 1 },
-      { "group": "novels", "prob": 50, "count": 1 },
-      { "group": "literature", "prob": 50, "count": 1 },
-      { "item": "efile_recipes", "prob": 15, "count": 1 }
+      { "item": "efile_map", "prob": 20 },
+      { "item": "efile_lore", "prob": 20 },
+      { "group": "novels", "prob": 50, "count": [ 1, 3 ] },
+      { "group": "literature", "prob": 50, "count": [ 1, 3 ] },
+      { "item": "efile_recipes", "prob": 15 }
     ]
   }
 ]
diff --git a/data/json/itemgroups/electronics.json b/data/json/itemgroups/electronics.json
index db29622596684..2688ae242e713 100644
--- a/data/json/itemgroups/electronics.json
+++ b/data/json/itemgroups/electronics.json
@@ -32,13 +32,12 @@
       [ "small_lcd_screen", 20 ],
       { "item": "polycarbonate_sheet", "prob": 39 },
       [ "battery_ups", 15 ],
-      { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 31, "charges": [ 0, -1 ] },
+      { "group": "new_phones", "prob": 31 },
       { "item": "waterproof_smart_phone_case", "prob": 11 },
-      { "item": "eink_tablet_pc", "prob": 8, "charges": [ 0, 100 ] },
-      { "item": "laptop", "prob": 20, "charges": [ 0, 500 ] },
+      { "group": "new_eink_tablet_pcs", "prob": 8 },
+      { "group": "new_laptops", "prob": 20 },
+      { "group": "new_memory_cards", "prob": 20 },
       { "item": "smart_lamp", "prob": 5, "charges": [ 0, 100 ] },
-      [ "memory_card", 20 ],
       { "item": "camera", "prob": 5, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "prob": 2, "charges": [ 0, 150 ] },
       [ "cable", 30 ],
@@ -48,8 +47,8 @@
       { "item": "hotplate", "prob": 10 },
       { "item": "hotplate_induction", "prob": 3 },
       { "item": "UPS_OFF", "prob": 5, "charges": [ 0, 1000 ] },
-      [ "usb_drive", 5 ],
-      { "item": "usb_drive", "contents-item": "software_useless", "prob": 10 },
+      { "group": "new_usb_drives", "prob": 15 },
+      { "group": "used_usb_drives", "prob": 10, "contents-item": "software_useless" },
       { "item": "vac_sealer", "prob": 10 },
       { "group": "toy_radio_car", "prob": 3 },
       { "group": "toy_makerspace_kit", "prob": 1 },
@@ -98,16 +97,16 @@
       [ "receiver", 10 ],
       [ "transponder", 5 ],
       { "item": "tazer", "prob": 3, "charges": [ 0, 500 ] },
-      [ "usb_drive", 5 ],
       [ "manual_electronics", 20 ],
       [ "recipe_augs", 4 ],
       [ "cable", 60 ],
       { "item": "vac_sealer", "prob": 10 },
-      { "item": "smart_phone", "prob": 50, "charges": [ 0, -1 ] },
-      { "item": "eink_tablet_pc", "prob": 15, "charges": [ 0, 100 ] },
-      { "item": "laptop", "prob": 30, "charges": [ 0, 500 ] },
+      { "group": "new_phones", "prob": 50 },
+      { "group": "new_eink_tablet_pcs", "prob": 15 },
+      { "group": "new_laptops", "prob": 30 },
+      { "group": "new_usb_drives", "prob": 5 },
+      { "group": "new_memory_cards", "prob": 40 },
       { "item": "smart_lamp", "prob": 10, "charges": [ 0, 100 ] },
-      [ "memory_card", 40 ],
       { "item": "camera", "prob": 15, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "prob": 5, "charges": [ 0, 150 ] },
       [ "wristwatch", 15 ],
@@ -124,6 +123,106 @@
       { "item": "fog_machine", "prob": 1, "charges": [ 0, 500 ] }
     ]
   },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "new_usb_drives",
+    "//": "new_X e-devices are for brand-new or freshly issued e-devices, usually empty",
+    "items": [ "usb_drive" ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "used_usb_drives",
+    "//": "used_X e-devices are for e-devices that have previous use and should have contents",
+    "items": [ [ "usb_drive", 5 ], [ "usb_drive_older", 1 ] ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "civilian_usb_drives",
+    "//": "these civilian_X e-devices are pre-loaded with general files to avoid repetition; if you want more specific contents, give used_X a contents-group in its own entry",
+    "items": [
+      { "item": "usb_drive", "prob": 5, "contents-group": "civilian_portable_efiles" },
+      { "item": "usb_drive_older", "prob": 1, "contents-group": "civilian_portable_efiles" }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "new_memory_cards",
+    "items": [ { "item": "memory_card" } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "used_memory_cards",
+    "items": [ [ "memory_card", 5 ], [ "memory_card_older", 1 ] ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "civilian_memory_cards",
+    "items": [
+      { "item": "memory_card", "prob": 5, "contents-group": "civilian_portable_efiles" },
+      { "item": "memory_card", "prob": 1, "contents-group": "civilian_portable_efiles" }
+    ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "new_laptops",
+    "items": [ { "item": "laptop", "charges": 200 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "used_laptops",
+    "items": [ { "item": "laptop", "charges": [ 0, -1 ] } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "civilian_laptops",
+    "items": [ { "item": "laptop", "charges": [ 0, -1 ], "contents-group": "civilian_laptop_efiles" } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "new_eink_tablet_pcs",
+    "items": [ { "item": "eink_tablet_pc", "charges": 100 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "used_eink_tablet_pcs",
+    "items": [ { "item": "eink_tablet_pc", "charges": [ 0, -1 ] } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "civilian_eink_tablet_pcs",
+    "items": [ { "item": "eink_tablet_pc", "charges": [ 0, -1 ], "contents-group": "civilian_einktablet_efiles" } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "new_phones",
+    "items": [ { "group": "new_phones_case", "prob": 10 }, { "group": "new_phones_no_case", "prob": 90 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "new_phones_case",
+    "container-item": "waterproof_smart_phone_case",
+    "items": [ { "item": "smart_phone", "charges": 100 } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "distribution",
+    "id": "new_phones_no_case",
+    "items": [ { "item": "cell_phone", "prob": 1, "charges": 100 }, { "item": "smart_phone", "prob": 17, "charges": 100 } ]
+  },
   {
     "type": "item_group",
     "subtype": "distribution",
@@ -137,7 +236,7 @@
     "container-item": "waterproof_smart_phone_case",
     "items": [
       { "item": "smart_phone", "prob": 17, "charges": [ 0, 15 ], "contents-group": "civilian_smartphone_efiles" },
-      { "item": "smart_phone", "prob": 1, "charges": 130, "contents-group": "civilian_smartphone_efiles" }
+      { "item": "smart_phone", "prob": 1, "charges": 100, "contents-group": "civilian_smartphone_efiles" }
     ]
   },
   {
@@ -146,9 +245,9 @@
     "id": "civilian_phones_no_case",
     "items": [
       { "item": "cell_phone", "prob": 2, "charges": [ 0, 15 ] },
-      { "item": "cell_phone", "prob": 1, "charges": 150 },
+      { "item": "cell_phone", "prob": 1, "charges": 100 },
       { "item": "smart_phone", "prob": 17, "charges": [ 0, 15 ], "contents-group": "civilian_smartphone_efiles" },
-      { "item": "smart_phone", "prob": 1, "charges": 130, "contents-group": "civilian_smartphone_efiles" }
+      { "item": "smart_phone", "prob": 1, "charges": 100, "contents-group": "civilian_smartphone_efiles" }
     ]
   },
   {
diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json
index d3f53420ab39c..90d5ce26eed55 100644
--- a/data/json/itemgroups/misc.json
+++ b/data/json/itemgroups/misc.json
@@ -229,7 +229,7 @@
       { "item": "coin_quarter", "prob": 5 },
       { "item": "RPG_die", "prob": 5 },
       { "item": "metal_RPG_die", "prob": 1 },
-      { "item": "memory_card", "count": [ 1, 5 ], "prob": 30 }
+      { "group": "civilian_memory_cards", "count": [ 1, 2 ], "prob": 30 }
     ]
   },
   {
diff --git a/data/json/itemgroups/roof.json b/data/json/itemgroups/roof.json
index 75e761ba5726b..e8ce9327034d5 100644
--- a/data/json/itemgroups/roof.json
+++ b/data/json/itemgroups/roof.json
@@ -60,7 +60,7 @@
       { "item": "matches", "prob": 60, "charges": [ 0, 20 ] },
       [ "syringe", 8 ],
       [ "hairpin", 1 ],
-      { "item": "usb_drive", "contents-item": "software_hacking", "prob": 5 },
+      { "group": "used_usb_drives", "prob": 5, "contents-item": "efiles_contraband" },
       [ "news_regional", 8 ],
       [ "jug_plastic", 10 ],
       { "item": "spray_can", "prob": 50, "charges": [ 0, 4 ] },
diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json
index 9720b89bff816..b8b8ce077e232 100644
--- a/data/json/itemgroups/science_and_tech.json
+++ b/data/json/itemgroups/science_and_tech.json
@@ -19,10 +19,9 @@
       { "prob": 5, "group": "prussian_blue_bottle_plastic_pill_supplement_1_10" },
       { "item": "chem_ethanol", "prob": 10, "charges": [ 250, -1 ] },
       [ "cleansuit", 5 ],
-      { "item": "laptop", "prob": 10, "charges": [ 0, 500 ] },
-      { "item": "eink_tablet_pc", "prob": 20, "charges": [ 0, 100 ] },
-      [ "memory_card", 50 ],
-      [ "memory_card_science", 5 ],
+      { "group": "used_laptops", "prob": 10, "contents-group": "efiles_science" },
+      { "group": "used_eink_tablet_pcs", "prob": 20, "contents-group": "efiles_science" },
+      { "group": "used_memory_cards", "prob": 50, "contents-group": "efiles_science" },
       [ "standard_template_construct", 5 ],
       [ "standard_template_construct_combat_exoskeleton", 5 ],
       { "item": "camera", "prob": 2, "charges": [ 0, 150 ] },
@@ -82,10 +81,8 @@
       { "item": "UPS_OFF", "prob": 8, "charges": [ 0, 1000 ] },
       { "item": "tazer", "prob": 3, "charges": [ 0, 500 ] },
       { "item": "plasma", "prob": 8, "charges": [ 1, 25 ] },
-      [ "usb_drive", 5 ],
       [ "wrapped_rad_badge", 15 ],
-      { "item": "usb_drive", "contents-item": "software_electronics_reference", "prob": 10 },
-      { "item": "usb_drive", "contents-item": "software_useless", "prob": 10 },
+      { "group": "used_usb_drives", "prob": 25, "contents-group": "efiles_science" },
       [ "canteen", 15 ],
       [ "2lcanteen", 10 ],
       [ "camelbak", 5 ],
@@ -175,7 +172,7 @@
         "collection": [ { "item": "ref_lighter_butane" }, { "item": "butane_can", "charges": [ 200, 400 ] } ],
         "prob": 5
       },
-      { "item": "usb_drive", "contents-item": "software_medical", "prob": 10 },
+      { "group": "used_usb_drives", "prob": 10, "contents-item": "software_medical" },
       [ "funnel", 50 ],
       [ "jar_glass_sealed", 20 ],
       [ "jar_3l_glass_sealed", 15 ],
@@ -460,11 +457,11 @@
       [ "goggles_welding", 70 ],
       [ "textbook_atomic_lab", 7 ],
       [ "recipe_lab_elec", 15 ],
-      { "item": "usb_drive", "contents-item": "software_electronics_reference", "prob": 2 },
+      { "group": "used_usb_drives", "prob": 2, "contents-item": "software_electronics_reference" },
+      { "group": "new_usb_drives", "prob": 5 },
       [ "recipe_lab_cvd", 8 ],
       [ "teleporter", 10 ],
-      { "prob": 5, "group": "antiparasitic_bottle_plastic_pill_prescription_1_10" },
-      [ "usb_drive", 5 ]
+      { "prob": 5, "group": "antiparasitic_bottle_plastic_pill_prescription_1_10" }
     ]
   },
   {
diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json
index cbd7eb70d54d9..2568b508c53d7 100644
--- a/data/json/itemgroups/supplies.json
+++ b/data/json/itemgroups/supplies.json
@@ -749,15 +749,14 @@
     "type": "item_group",
     "items": [
       [ "file", 99 ],
-      { "item": "laptop", "prob": 2, "charges": [ 0, 500 ] },
+      { "group": "used_laptops", "prob": 2, "contents-group": "SUS_efiles_office" },
       { "item": "paper", "prob": 60, "count": [ 20, 50 ] },
       { "item": "inhaler", "prob": 1, "charges": [ 10, 100 ] },
       [ "mbag", 2 ],
       [ "mop", 3 ],
       [ "mop_folded", 2 ],
       [ "rubber_band", 5 ],
-      { "item": "cell_phone", "prob": 3, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 18, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" },
+      { "group": "civilian_phones", "prob": 21 },
       { "item": "duct_tape", "prob": 5, "charges": [ 50, 200 ] },
       { "group": "superglue", "prob": 5 },
       { "group": "ammo_pocket_batteries", "prob": 5 },
@@ -805,9 +804,9 @@
       [ "rubber_band", 15 ],
       { "group": "ammo_pocket_batteries_full", "prob": 10 },
       { "item": "flashlight", "prob": 7, "charges": [ 0, 300 ] },
-      { "item": "laptop", "prob": 7, "charges": [ 0, 500 ] },
-      { "item": "eink_tablet_pc", "prob": 7, "charges": [ 0, 100 ] },
-      [ "usb_drive", 5 ],
+      { "group": "used_laptops", "prob": 7, "contents-group": "SUS_efiles_office" },
+      { "group": "used_eink_tablet_pcs", "prob": 7, "contents-group": "SUS_efiles_office" },
+      { "group": "used_usb_drives", "prob": 5, "contents-group": "SUS_efiles_office" },
       { "item": "cash_card", "prob": 5, "charges": [ 0, 50000 ] },
       [ "record_accounting", 1 ],
       [ "money_strap_twenty", 1 ]
diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
index b2553c08b26b1..a2a092cc5c82a 100644
--- a/data/json/itemgroups/tools.json
+++ b/data/json/itemgroups/tools.json
@@ -818,7 +818,7 @@
   {
     "type": "item_group",
     "id": "tools_robotics",
-    "//": "tools and equipment you might find on robotics laboratories.",
+    "//": "tools and equipment you might find on robotics laboratories, like LIXA or Hub01",
     "items": [
       [ "recipe_lab_elec", 4 ],
       { "item": "UPS_OFF", "prob": 6, "charges": [ 0, 1000 ] },
@@ -827,7 +827,7 @@
       { "item": "smart_lamp", "prob": 2, "charges": [ 0, 100 ] },
       [ "bot_manhack", 2 ],
       [ "teleporter", 1 ],
-      { "item": "laptop", "prob": 4, "charges": [ 0, 500 ] },
+      { "group": "used_laptops", "prob": 4, "contents-group": "efiles_science" },
       { "item": "plut_cell", "prob": 4, "charges": [ 1, 5 ] },
       { "group": "superglue", "prob": 30 },
       [ "pliers", 10 ],
diff --git a/data/json/itemgroups/trash_and_debris.json b/data/json/itemgroups/trash_and_debris.json
index f5768ff7aea7a..55b093ba40444 100644
--- a/data/json/itemgroups/trash_and_debris.json
+++ b/data/json/itemgroups/trash_and_debris.json
@@ -222,7 +222,7 @@
       [ "sheet_kevlar_layered", 1 ],
       [ "ceramic_armor", 1 ],
       [ "leather", 1 ],
-      { "item": "usb_drive", "contents-item": "software_hacking", "prob": 10 },
+      { "group": "used_usb_drives", "prob": 10, "contents-group": "efiles_scrap" },
       [ "news_regional", 8 ],
       { "group": "newspaper", "prob": 10 },
       [ "file", 5 ],
diff --git a/data/json/items/software.json b/data/json/items/software.json
index 2ee6823711f31..1c9d85ee935cc 100644
--- a/data/json/items/software.json
+++ b/data/json/items/software.json
@@ -188,7 +188,7 @@
     }
   },
   {
-    "id": "efile_recipes_chemical",
+    "id": "efile_recipes_science",
     "copy-from": "abstract_efile_recipes",
     "type": "GENERIC",
     "symbol": "o",
@@ -199,8 +199,24 @@
       "data_chance": 1,
       "recipes_chance": 1,
       "recipes_amount": 3,
-      "recipes_categories": [ "CC_CHEM" ],
-      "recipes_level_min": 6
+      "recipes_categories": [ "CC_CHEM", "CC_ELECTRONIC" ],
+      "recipes_level_min": 5
+    }
+  },
+  {
+    "id": "efile_recipes_medical",
+    "copy-from": "abstract_efile_recipes",
+    "type": "GENERIC",
+    "symbol": "o",
+    "name": "medical recipe catalog",
+    "use_action": [ "VIEW_RECIPES" ],
+    "ememory_size": "4 MB",
+    "memory_card": {
+      "data_chance": 1,
+      "recipes_chance": 1,
+      "recipes_amount": 3,
+      "recipes_categories": [ "CSC_CHEM_DRUGS", "CSC_OTHER_MEDICAL" ],
+      "recipes_level_min": 3
     }
   },
   {
diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json
index 1fce08013a19b..93a656e0bd8c3 100644
--- a/data/json/items/tool/electronics.json
+++ b/data/json/items/tool/electronics.json
@@ -299,6 +299,23 @@
     ],
     "//": "Based on https://www.amazon.com/dp/B015CH1PJU"
   },
+  {
+    "id": "usb_drive_older",
+    "copy-from": "usb_drive",
+    "type": "TOOL",
+    "name": { "str": "older USB drive" },
+    "description": "A USB thumb drive.  Maybe a decade out of date, but still useful for holding electronic data.",
+    "pocket_data": [
+      {
+        "pocket_type": "E_FILE_STORAGE",
+        "rigid": true,
+        "max_contains_volume": "1 ml",
+        "max_contains_weight": "1 g",
+        "weight_multiplier": 0.0,
+        "ememory_max": "32 GB"
+      }
+    ]
+  },
   {
     "id": "portable_hard_drive",
     "copy-from": "abstract_usb_drive",
@@ -346,6 +363,23 @@
       }
     ]
   },
+  {
+    "id": "memory_card_older",
+    "copy-from": "memory_card",
+    "type": "TOOL",
+    "name": { "str": "older memory card" },
+    "description": "A memory card.  Maybe a decade out of date, but can still be used to store data.",
+    "pocket_data": [
+      {
+        "pocket_type": "E_FILE_STORAGE",
+        "rigid": true,
+        "max_contains_volume": "1 ml",
+        "max_contains_weight": "1 g",
+        "weight_multiplier": 0.0,
+        "ememory_max": "16 GB"
+      }
+    ]
+  },
   {
     "type": "GENERIC",
     "id": "memory_card_unread",