diff --git a/exports/amberelec.json b/exports/amberelec.json
index 8d9057bb..49449027 100644
--- a/exports/amberelec.json
+++ b/exports/amberelec.json
@@ -10,7 +10,7 @@
   "counts": {
     "kept": 440,
     "added": 69,
-    "not_added": 2001,
+    "not_added": 2002,
     "not_kept": 0
   },
   "changes": [
diff --git a/exports/batocera.json b/exports/batocera.json
index ba4494d1..cf6d3eaf 100644
--- a/exports/batocera.json
+++ b/exports/batocera.json
@@ -10,7 +10,7 @@
   "counts": {
     "kept": 692,
     "added": 138,
-    "not_added": 1786,
+    "not_added": 1780,
     "not_kept": 0
   },
   "changes": [
@@ -1571,7 +1571,7 @@
   "hashes_cleared": [],
   "requirements_corrected": 0,
   "withheld": [],
-  "found_by_content": 115,
+  "found_by_content": 114,
   "removal_candidates": [
     {
       "system": "pc60",
diff --git a/exports/emudeck.json b/exports/emudeck.json
index 2cb3ec8e..a970a396 100644
--- a/exports/emudeck.json
+++ b/exports/emudeck.json
@@ -10,7 +10,7 @@
   "counts": {
     "kept": 170,
     "added": 0,
-    "not_added": 2750,
+    "not_added": 2745,
     "not_kept": 0
   },
   "changes": [],
@@ -21,7 +21,7 @@
   "hashes_cleared": [],
   "requirements_corrected": 0,
   "withheld": [],
-  "found_by_content": 118,
+  "found_by_content": 107,
   "removal_candidates": [
     {
       "system": "sony-playstation",
diff --git a/exports/emuelec.json b/exports/emuelec.json
index e3fddbae..25e4cdf5 100644
--- a/exports/emuelec.json
+++ b/exports/emuelec.json
@@ -10,7 +10,7 @@
   "counts": {
     "kept": 590,
     "added": 39,
-    "not_added": 1116,
+    "not_added": 1117,
     "not_kept": 0
   },
   "changes": [
diff --git a/exports/knulli.json b/exports/knulli.json
index cc147aa4..026f2435 100644
--- a/exports/knulli.json
+++ b/exports/knulli.json
@@ -10,7 +10,7 @@
   "counts": {
     "kept": 566,
     "added": 122,
-    "not_added": 1871,
+    "not_added": 1868,
     "not_kept": 0
   },
   "changes": [
@@ -1405,7 +1405,7 @@
   "hashes_cleared": [],
   "requirements_corrected": 0,
   "withheld": [],
-  "found_by_content": 115,
+  "found_by_content": 114,
   "removal_candidates": [
     {
       "system": "atarist",
diff --git a/exports/lakka.json b/exports/lakka.json
index fc48a862..a1e732fa 100644
--- a/exports/lakka.json
+++ b/exports/lakka.json
@@ -10,7 +10,7 @@
   "counts": {
     "kept": 516,
     "added": 141,
-    "not_added": 1214,
+    "not_added": 1207,
     "not_kept": 0
   },
   "changes": [
@@ -2910,7 +2910,7 @@
   ],
   "requirements_corrected": 0,
   "withheld": [],
-  "found_by_content": 108,
+  "found_by_content": 97,
   "removal_candidates": [
     {
       "system": "Dinothawr",
diff --git a/exports/recalbox.json b/exports/recalbox.json
index 945fc602..3297c413 100644
--- a/exports/recalbox.json
+++ b/exports/recalbox.json
@@ -11,7 +11,7 @@
   "counts": {
     "kept": 357,
     "added": 86,
-    "not_added": 527,
+    "not_added": 529,
     "not_kept": 0
   },
   "changes": [
@@ -2338,6 +2338,8 @@
       "verdict": "undetermined",
       "reason": "a core the platform names has no profile yet",
       "cores_examined": [
+        "mame0258",
+        "mame0278",
         "xroar"
       ],
       "unresolved_cores": [
@@ -2356,6 +2358,8 @@
       "verdict": "undetermined",
       "reason": "a core the platform names has no profile yet",
       "cores_examined": [
+        "mame0258",
+        "mame0278",
         "xroar"
       ],
       "unresolved_cores": [
@@ -2374,6 +2378,8 @@
       "verdict": "undetermined",
       "reason": "a core the platform names has no profile yet",
       "cores_examined": [
+        "mame0258",
+        "mame0278",
         "xroar"
       ],
       "unresolved_cores": [
@@ -2392,6 +2398,8 @@
       "verdict": "undetermined",
       "reason": "a core the platform names has no profile yet",
       "cores_examined": [
+        "mame0258",
+        "mame0278",
         "xroar"
       ],
       "unresolved_cores": [
@@ -2410,6 +2418,8 @@
       "verdict": "undetermined",
       "reason": "a core the platform names has no profile yet",
       "cores_examined": [
+        "mame0258",
+        "mame0278",
         "xroar"
       ],
       "unresolved_cores": [
@@ -2428,6 +2438,8 @@
       "verdict": "undetermined",
       "reason": "a core the platform names has no profile yet",
       "cores_examined": [
+        "mame0258",
+        "mame0278",
         "xroar"
       ],
       "unresolved_cores": [
@@ -2446,6 +2458,8 @@
       "verdict": "undetermined",
       "reason": "a core the platform names has no profile yet",
       "cores_examined": [
+        "mame0258",
+        "mame0278",
         "xroar"
       ],
       "unresolved_cores": [
@@ -2464,6 +2478,8 @@
       "verdict": "undetermined",
       "reason": "a core the platform names has no profile yet",
       "cores_examined": [
+        "mame0258",
+        "mame0278",
         "xroar"
       ],
       "unresolved_cores": [
diff --git a/exports/retroarch.json b/exports/retroarch.json
index 0300d8a3..29776aee 100644
--- a/exports/retroarch.json
+++ b/exports/retroarch.json
@@ -10,7 +10,7 @@
   "counts": {
     "kept": 516,
     "added": 152,
-    "not_added": 1221,
+    "not_added": 1214,
     "not_kept": 0
   },
   "changes": [
@@ -3064,7 +3064,7 @@
   ],
   "requirements_corrected": 0,
   "withheld": [],
-  "found_by_content": 108,
+  "found_by_content": 97,
   "removal_candidates": [
     {
       "system": "Dinothawr",
diff --git a/exports/retrobat.json b/exports/retrobat.json
index ea33f9b1..f39297df 100644
--- a/exports/retrobat.json
+++ b/exports/retrobat.json
@@ -10,7 +10,7 @@
   "counts": {
     "kept": 360,
     "added": 75,
-    "not_added": 1286,
+    "not_added": 1284,
     "not_kept": 0
   },
   "changes": [
diff --git a/exports/retrodeck.json b/exports/retrodeck.json
index 3432bfad..859059b4 100644
--- a/exports/retrodeck.json
+++ b/exports/retrodeck.json
@@ -24,11 +24,11 @@
     "xemu/component_manifest.json",
     "xroar/component_manifest.json"
   ],
-  "summary": "2021 kept, 37 files added, 1 hash updated to the emulator source, 52 required flags aligned with the code, 95 hashes added to an existing entry",
+  "summary": "2021 kept, 81 files added, 1 hash updated to the emulator source, 52 required flags aligned with the code, 94 hashes added to an existing entry",
   "counts": {
     "kept": 2021,
-    "added": 37,
-    "not_added": 975,
+    "added": 81,
+    "not_added": 1027,
     "not_kept": 0
   },
   "changes": [
@@ -396,6 +396,17 @@
       "old": "c733b4b7bd30fa849874d96c591c8639",
       "new": "b31a246b69493c35194fe0bac120dc37"
     },
+    {
+      "kind": "added",
+      "system": "fbneo",
+      "name": "segasp.zip",
+      "destination": "dc/segasp.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": true
+      }
+    },
     {
       "kind": "requirement_corrected",
       "system": "nds",
@@ -626,6 +637,17 @@
       "old": null,
       "new": "8974193e76cf255ebc40fe20b95b405db2cc1ea07910584380e50c6d9ca181aa"
     },
+    {
+      "kind": "added",
+      "system": "3do",
+      "name": "3do.xml",
+      "destination": "mame/hash/3do.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
     {
       "kind": "requirement_corrected",
       "system": "amiga",
@@ -671,15 +693,6 @@
       "old": false,
       "new": true
     },
-    {
-      "kind": "hash_filled",
-      "system": "amiga",
-      "name": "AmigaVision.rom",
-      "destination": "bios/AmigaVision.rom",
-      "field": "sha256",
-      "old": null,
-      "new": "6d43840d4099a74170ea0f0425b6257c3891ebcaa39c4d1840075a9ab22b5707"
-    },
     {
       "kind": "hash_filled",
       "system": "atari800",
@@ -752,6 +765,193 @@
       "old": true,
       "new": false
     },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "apple2_flop_clcracked.xml",
+      "destination": "mame/hash/apple2_flop_clcracked.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "apple2_flop_misc.xml",
+      "destination": "mame/hash/apple2_flop_misc.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "apple2_flop_orig.xml",
+      "destination": "mame/hash/apple2_flop_orig.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "apple2gs_flop_clcracked.xml",
+      "destination": "mame/hash/apple2gs_flop_clcracked.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "apple2gs_flop_misc.xml",
+      "destination": "mame/hash/apple2gs_flop_misc.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "apple2gs_flop_orig.xml",
+      "destination": "mame/hash/apple2gs_flop_orig.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "a2diskiing.zip",
+      "destination": "a2diskiing.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "a2focdrv.zip",
+      "destination": "a2focdrv.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "a2hsscsi.zip",
+      "destination": "a2hsscsi.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "a2memexp.zip",
+      "destination": "a2memexp.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "a2mouse.zip",
+      "destination": "a2mouse.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "a2parprn.zip",
+      "destination": "a2parprn.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "a2pdromdr.zip",
+      "destination": "a2pdromdr.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "a2pic.zip",
+      "destination": "a2pic.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "ace80.zip",
+      "destination": "ace80.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "d2fdc.zip",
+      "destination": "d2fdc.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "apple2gs",
+      "name": "ibsap2.zip",
+      "destination": "ibsap2.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
     {
       "kind": "requirement_corrected",
       "system": "apple2",
@@ -797,6 +997,17 @@
       "old": false,
       "new": true
     },
+    {
+      "kind": "added",
+      "system": "cdimono1",
+      "name": "cdi.xml",
+      "destination": "mame/hash/cdi.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
     {
       "kind": "hash_filled",
       "system": "enterprise",
@@ -941,6 +1152,39 @@
       "old": null,
       "new": "822d76ccacf7e228477acdb7165f474512408c2fdf3edb93dfabdafdf0a69bd1"
     },
+    {
+      "kind": "added",
+      "system": "enterprise",
+      "name": "ep64_cart.xml",
+      "destination": "mame/hash/ep64_cart.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "enterprise",
+      "name": "ep64_cass.xml",
+      "destination": "mame/hash/ep64_cass.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "enterprise",
+      "name": "ep64_flop.xml",
+      "destination": "mame/hash/ep64_flop.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
     {
       "kind": "requirement_corrected",
       "system": "gamecom",
@@ -950,6 +1194,17 @@
       "old": false,
       "new": true
     },
+    {
+      "kind": "added",
+      "system": "gamecom",
+      "name": "gamecom.xml",
+      "destination": "mame/hash/gamecom.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
     {
       "kind": "requirement_corrected",
       "system": "gmaster",
@@ -959,6 +1214,17 @@
       "old": false,
       "new": true
     },
+    {
+      "kind": "added",
+      "system": "gmaster",
+      "name": "gmaster.xml",
+      "destination": "mame/hash/gmaster.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
     {
       "kind": "requirement_corrected",
       "system": "neogeo",
@@ -1256,6 +1522,160 @@
       "old": null,
       "new": "d55daa439b673b0e3f5897f99ac37ecb45f974d1862b4dadb85dec34af99cb42"
     },
+    {
+      "kind": "added",
+      "system": "mac2",
+      "name": "mac128k.zip",
+      "destination": "mac128k.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": true
+      }
+    },
+    {
+      "kind": "added",
+      "system": "mac2",
+      "name": "mac512k.zip",
+      "destination": "mac512k.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "mac2",
+      "name": "macplus.zip",
+      "destination": "macplus.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": true
+      }
+    },
+    {
+      "kind": "added",
+      "system": "mac2",
+      "name": "macse.zip",
+      "destination": "macse.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": true
+      }
+    },
+    {
+      "kind": "added",
+      "system": "mac2",
+      "name": "macclasc.zip",
+      "destination": "macclasc.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": true
+      }
+    },
+    {
+      "kind": "added",
+      "system": "mac2",
+      "name": "mac2fdhd.zip",
+      "destination": "mac2fdhd.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": true
+      }
+    },
+    {
+      "kind": "added",
+      "system": "mac2",
+      "name": "maciix.zip",
+      "destination": "maciix.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "mac2",
+      "name": "maclc3.zip",
+      "destination": "maclc3.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": true
+      }
+    },
+    {
+      "kind": "added",
+      "system": "mac2",
+      "name": "mac_cdrom.xml",
+      "destination": "mame/hash/mac_cdrom.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "mac2",
+      "name": "mac_flop.xml",
+      "destination": "mame/hash/mac_flop.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "mac2",
+      "name": "mac_flop_clcracked.xml",
+      "destination": "mame/hash/mac_flop_clcracked.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "mac2",
+      "name": "mac_flop_orig.xml",
+      "destination": "mame/hash/mac_flop_orig.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "mac2",
+      "name": "mac_hdd.xml",
+      "destination": "mame/hash/mac_hdd.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "mac2",
+      "name": "mac_hdflop.xml",
+      "destination": "mame/hash/mac_hdflop.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
     {
       "kind": "requirement_corrected",
       "system": "snes",
@@ -1337,6 +1757,17 @@
       "old": false,
       "new": true
     },
+    {
+      "kind": "added",
+      "system": "scv",
+      "name": "scv.xml",
+      "destination": "mame/hash/scv.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
     {
       "kind": "requirement_corrected",
       "system": "supracan",
@@ -1355,6 +1786,28 @@
       "old": false,
       "new": true
     },
+    {
+      "kind": "added",
+      "system": "vectrex",
+      "name": "vectrex.zip",
+      "destination": "vectrex.zip",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": true
+      }
+    },
+    {
+      "kind": "added",
+      "system": "vectrex",
+      "name": "vectrex.xml",
+      "destination": "mame/hash/vectrex.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
     {
       "kind": "requirement_corrected",
       "system": "vsmile",
@@ -1364,6 +1817,28 @@
       "old": false,
       "new": true
     },
+    {
+      "kind": "added",
+      "system": "vsmile",
+      "name": "vsmile_cart.xml",
+      "destination": "mame/hash/vsmile_cart.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
+    {
+      "kind": "added",
+      "system": "vsmile",
+      "name": "vsmilem_cart.xml",
+      "destination": "mame/hash/vsmilem_cart.xml",
+      "field": null,
+      "old": null,
+      "new": {
+        "required": false
+      }
+    },
     {
       "kind": "requirement_corrected",
       "system": "xbox",
@@ -1822,7 +2297,6 @@
     "3do/panafz1-kanji.bin sha256",
     "3do/panafz10ja-anvil-kanji.bin sha256",
     "3do/panafz1j-kanji.bin sha256",
-    "amiga/AmigaVision.rom sha256",
     "atari800/ROM_OS_BB02R3V4 sha256",
     "atari800/ROM_OS_CC01R4 sha256",
     "atari800/ROM_OS_BB01R59 sha256",
@@ -1895,7 +2369,7 @@
   "hashes_cleared": [],
   "requirements_corrected": 52,
   "withheld": [],
-  "found_by_content": 107,
+  "found_by_content": 97,
   "removal_candidates": [
     {
       "system": "mame",
@@ -8432,6 +8906,21 @@
       ],
       "unresolved_cores": []
     },
+    {
+      "system": "amiga",
+      "name": "AmigaVision.rom",
+      "destination": "bios/AmigaVision.rom",
+      "verdict": "candidate",
+      "reason": "no profile of a core the platform runs names it",
+      "cores_examined": [
+        "amiberry",
+        "fsuae",
+        "puae",
+        "puae2021",
+        "uae4arm"
+      ],
+      "unresolved_cores": []
+    },
     {
       "system": "atari800",
       "name": "ROM_OS_BB02R3",
diff --git a/exports/retrodeck/retroarch/component_manifest.json b/exports/retrodeck/retroarch/component_manifest.json
index d8ec87aa..11f257f8 100644
--- a/exports/retrodeck/retroarch/component_manifest.json
+++ b/exports/retrodeck/retroarch/component_manifest.json
@@ -3009,8 +3009,7 @@
           "md5": "646773759326fbac3b2311fd8c8793ee",
           "system": "amiga",
           "description": "Kickstart 4.0 ROM for AmigaVision.",
-          "required": "Yes, for AmigaVision",
-          "sha256": "6d43840d4099a74170ea0f0425b6257c3891ebcaa39c4d1840075a9ab22b5707"
+          "required": "Yes, for AmigaVision"
         },
         {
           "filename": "kick40063.A600",
@@ -5190,6 +5189,214 @@
           "md5": "11e59253c578c8f16ea2375ec398e4e9",
           "system": "vsmile",
           "description": " V.SMILE TV Learning System BIOS"
+        },
+        {
+          "filename": "segasp.zip",
+          "system": "fbneo",
+          "required": "Required",
+          "paths": "$bios_path/dc"
+        },
+        {
+          "filename": "3do.xml",
+          "system": "3do",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "apple2_flop_clcracked.xml",
+          "system": "apple2gs",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "apple2_flop_misc.xml",
+          "system": "apple2gs",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "apple2_flop_orig.xml",
+          "system": "apple2gs",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "apple2gs_flop_clcracked.xml",
+          "system": "apple2gs",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "apple2gs_flop_misc.xml",
+          "system": "apple2gs",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "apple2gs_flop_orig.xml",
+          "system": "apple2gs",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "a2diskiing.zip",
+          "system": "apple2gs"
+        },
+        {
+          "filename": "a2focdrv.zip",
+          "system": "apple2gs"
+        },
+        {
+          "filename": "a2hsscsi.zip",
+          "system": "apple2gs"
+        },
+        {
+          "filename": "a2memexp.zip",
+          "system": "apple2gs"
+        },
+        {
+          "filename": "a2mouse.zip",
+          "system": "apple2gs"
+        },
+        {
+          "filename": "a2parprn.zip",
+          "system": "apple2gs"
+        },
+        {
+          "filename": "a2pdromdr.zip",
+          "system": "apple2gs"
+        },
+        {
+          "filename": "a2pic.zip",
+          "system": "apple2gs"
+        },
+        {
+          "filename": "ace80.zip",
+          "system": "apple2gs"
+        },
+        {
+          "filename": "d2fdc.zip",
+          "system": "apple2gs"
+        },
+        {
+          "filename": "ibsap2.zip",
+          "system": "apple2gs"
+        },
+        {
+          "filename": "cdi.xml",
+          "system": "cdimono1",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "ep64_cart.xml",
+          "system": "enterprise",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "ep64_cass.xml",
+          "system": "enterprise",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "ep64_flop.xml",
+          "system": "enterprise",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "gamecom.xml",
+          "system": "gamecom",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "gmaster.xml",
+          "system": "gmaster",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "mac128k.zip",
+          "system": "mac2",
+          "required": "Required"
+        },
+        {
+          "filename": "mac512k.zip",
+          "system": "mac2"
+        },
+        {
+          "filename": "macplus.zip",
+          "system": "mac2",
+          "required": "Required"
+        },
+        {
+          "filename": "macse.zip",
+          "system": "mac2",
+          "required": "Required"
+        },
+        {
+          "filename": "macclasc.zip",
+          "system": "mac2",
+          "required": "Required"
+        },
+        {
+          "filename": "mac2fdhd.zip",
+          "system": "mac2",
+          "required": "Required"
+        },
+        {
+          "filename": "maciix.zip",
+          "system": "mac2"
+        },
+        {
+          "filename": "maclc3.zip",
+          "system": "mac2",
+          "required": "Required"
+        },
+        {
+          "filename": "mac_cdrom.xml",
+          "system": "mac2",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "mac_flop.xml",
+          "system": "mac2",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "mac_flop_clcracked.xml",
+          "system": "mac2",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "mac_flop_orig.xml",
+          "system": "mac2",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "mac_hdd.xml",
+          "system": "mac2",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "mac_hdflop.xml",
+          "system": "mac2",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "scv.xml",
+          "system": "scv",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "vectrex.zip",
+          "system": "vectrex",
+          "required": "Required"
+        },
+        {
+          "filename": "vectrex.xml",
+          "system": "vectrex",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "vsmile_cart.xml",
+          "system": "vsmile",
+          "paths": "$bios_path/mame/hash"
+        },
+        {
+          "filename": "vsmilem_cart.xml",
+          "system": "vsmile",
+          "paths": "$bios_path/mame/hash"
         }
       ]
     }
diff --git a/exports/retropie.json b/exports/retropie.json
index b8ac7f61..74bae1e1 100644
--- a/exports/retropie.json
+++ b/exports/retropie.json
@@ -47,7 +47,7 @@
   "hashes_cleared": [],
   "requirements_corrected": 0,
   "withheld": [],
-  "found_by_content": 109,
+  "found_by_content": 98,
   "removal_candidates": [
     {
       "system": "Dinothawr",
diff --git a/exports/rocknix.json b/exports/rocknix.json
index 4f2555c8..b3b07add 100644
--- a/exports/rocknix.json
+++ b/exports/rocknix.json
@@ -11,7 +11,7 @@
   "counts": {
     "kept": 38,
     "added": 1,
-    "not_added": 1734,
+    "not_added": 1727,
     "not_kept": 0
   },
   "changes": [
@@ -34,7 +34,7 @@
   "hashes_cleared": [],
   "requirements_corrected": 0,
   "withheld": [],
-  "found_by_content": 143,
+  "found_by_content": 132,
   "removal_candidates": [
     {
       "system": "dreamcast",
@@ -51,7 +51,6 @@
       "unresolved_cores": [
         "ares-sa",
         "armsx2-sa",
-        "azahar-sa",
         "bigpemu-sa",
         "cemu-sa",
         "dolphin-sa",
diff --git a/exports/romm.json b/exports/romm.json
index ebf7ae66..a0695b14 100644
--- a/exports/romm.json
+++ b/exports/romm.json
@@ -10,7 +10,7 @@
   "counts": {
     "kept": 374,
     "added": 93,
-    "not_added": 327,
+    "not_added": 321,
     "not_kept": 0
   },
   "changes": [