diff --git a/emulators/advancemame.yml b/emulators/advancemame.yml
index eed09aef..20d74ace 100644
--- a/emulators/advancemame.yml
+++ b/emulators/advancemame.yml
@@ -40,6 +40,8 @@ systems:
   - exidy-maxaflex
   - brezzasoft-crystal
   - imax-macs
+  - arcade
+  - barcrest-mpu4
 
 notes: |
   MAME 0.106 core (src/version.c:12) carrying its own video layer and driver
@@ -95,10 +97,11 @@ files:
     required: false
     bundled: true
     category: game_data
+    system: arcade
     sha1: "23e0dec66680aa4545eafe436c23d2bf5622e32e"
     md5: "2490bad5079ec0991c23c579092cca19"
     size: 176851
-    source_ref: "src/hiscore.c:28,133-147,313"
+    source_ref: "src/hiscore.c:28,133-147,313, src/mame.c:1105-1106"
     note: >-
       High score definitions, selected by misc_hiscorefile
       (advance/osd/glue.c:800,3293). Absent, hiscore_open matches no entry and
@@ -110,6 +113,7 @@ files:
     required: false
     bundled: true
     category: game_data
+    system: arcade
     sha1: "4978ecafc4634cf20b639d8801c044dc156ab162"
     md5: "69c6bbe7194e4bc62d53764dd6c6d890"
     size: 13923773
@@ -125,6 +129,7 @@ files:
     required: false
     bundled: true
     category: game_data
+    system: arcade
     sha1: "8c34c85f92bc6771d789e880953a1cc43341485e"
     md5: "ee99bb541116967f8785a5bc09932475"
     size: 22066
@@ -771,6 +776,7 @@ files:
   - name: bctvidbs.zip
     required: true
     category: bios_zip
+    system: barcrest-mpu4
     source_ref: "src/drivers/mpu4.c:2014-2017,2175"
     contents:
       - name: vid.p1
diff --git a/emulators/advmame-0.94.yml b/emulators/advmame-0.94.yml
index e64a4c05..7d8c603a 100644
--- a/emulators/advmame-0.94.yml
+++ b/emulators/advmame-0.94.yml
@@ -38,6 +38,7 @@ systems:
   - exidy-maxaflex
   - brezzasoft-crystal
   - imax-macs
+  - arcade
 
 notes: |
   AdvanceMAME 0.94.0, the MAME 0.94 core (src/version.c:1) under the Advance
@@ -103,10 +104,11 @@ files:
   - name: hiscore.dat
     required: false
     category: game_data
+    system: arcade
     sha1: "f247f8a80c7669df564cf1ac6f42c8100caa406c"
     md5: "303449713237a451424cf23c9e8c09fc"
     size: 153596
-    source_ref: "src/hiscore.c:18,103,223-225"
+    source_ref: "src/hiscore.c:18,103,223-225, src/cpuexec.c:316-318"
     note: >-
       High score definitions, selected by misc_hiscorefile
       (advance/osd/glue.c:742,2873,2947). Absent, hs_open finds no entry and
@@ -117,6 +119,7 @@ files:
     bundled: true
     required: false
     category: game_data
+    system: arcade
     sha1: "5206c85cad323acb885e28e1109b8e842919b7dd"
     md5: "ef258890848afdac0c07f016c2ac9294"
     size: 4208286
@@ -131,6 +134,7 @@ files:
   - name: mameinfo.dat
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/datafile.c:331,625-629"
     note: >-
       Driver information text, selected by misc_infofile
@@ -141,6 +145,7 @@ files:
   - name: cheat.dat
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/cheat.c:8442,8619-8622"
     note: >-
       Cheat definitions, selected by misc_cheatfile
@@ -152,6 +157,7 @@ files:
     bundled: true
     required: false
     category: game_data
+    system: arcade
     sha1: "8c34c85f92bc6771d789e880953a1cc43341485e"
     md5: "ee99bb541116967f8785a5bc09932475"
     size: 22066
diff --git a/emulators/advmame-1.4.yml b/emulators/advmame-1.4.yml
index ff4c578a..e8f0a769 100644
--- a/emulators/advmame-1.4.yml
+++ b/emulators/advmame-1.4.yml
@@ -40,6 +40,8 @@ systems:
   - exidy-maxaflex
   - brezzasoft-crystal
   - imax-macs
+  - arcade
+  - barcrest-mpu4
 
 notes: |
   AdvanceMAME 1.4, the MAME 0.106 core (src/version.c:12) under the Advance
@@ -104,11 +106,12 @@ files:
   - name: hiscore.dat
     required: false
     category: game_data
+    system: arcade
     bundled: true
     sha1: "fd33f94a131986478bf10a1ed9ac02d63f52d4af"
     md5: "fb2013a6505d34a5a7a6d94389f3a956"
     size: 166246
-    source_ref: "src/hiscore.c:28,133-147,313"
+    source_ref: "src/hiscore.c:28,133-147,313, src/mame.c:1105-1106"
     note: >-
       High score definitions, selected by misc_hiscorefile
       (advance/osd/glue.c:743,2872,2934). Absent, no entry matches and no
@@ -119,6 +122,7 @@ files:
   - name: cheat.dat
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/cheat.c:8504,8681-8684"
     note: >-
       Cheat definitions, selected by misc_cheatfile
@@ -129,6 +133,7 @@ files:
   - name: event.dat
     required: false
     category: game_data
+    system: arcade
     bundled: true
     sha1: "8c34c85f92bc6771d789e880953a1cc43341485e"
     md5: "ee99bb541116967f8785a5bc09932475"
@@ -780,6 +785,7 @@ files:
   - name: bctvidbs.zip
     required: true
     category: bios_zip
+    system: barcrest-mpu4
     source_ref: "src/drivers/mpu4.c:2011-2012,2014-2017,2175"
     contents:
       - name: vid.p1
diff --git a/emulators/fbalpha2012.yml b/emulators/fbalpha2012.yml
index 1910cd01..c303790b 100644
--- a/emulators/fbalpha2012.yml
+++ b/emulators/fbalpha2012.yml
@@ -57,7 +57,8 @@ files:
   - name: "hiscore.dat"
     description: "High score persistence database"
     required: false
-    source_ref: "svn-current/trunk/src/burn/hiscore.cpp:411"
+    system: arcade
+    source_ref: "svn-current/trunk/src/burn/hiscore.cpp:386-394, 411, svn-current/trunk/src/burn/burn.cpp:619"
     note: "Loaded from save directory (g_save_dir). Gated by EnableHiscores core option and per-game BDF_HISCORE_SUPPORTED flag."
 
   - name: "dkong.zip"
@@ -65,6 +66,7 @@ files:
     description: "Donkey Kong audio samples"
     required: false
     category: game_data
+    system: arcade
     source_ref: "svn-current/trunk/src/burn/snd/samples.cpp:248,262"
     note: "WAV samples for Donkey Kong and clones (dkongo, dkongj, dkongjo, dkongjo1, dkongf, dkongx, dkongx11)"
 
@@ -73,6 +75,7 @@ files:
     description: "Donkey Kong Jr audio samples"
     required: false
     category: game_data
+    system: arcade
     source_ref: "svn-current/trunk/src/burn/snd/samples.cpp:248,262"
     note: "WAV samples for Donkey Kong Jr and clones (dkongjrj, dkongjnrj, dkongjrb, jrking, dkingjr, dkongjre)"
 
@@ -81,6 +84,7 @@ files:
     description: "Galaga audio samples"
     required: false
     category: game_data
+    system: arcade
     source_ref: "svn-current/trunk/src/burn/snd/samples.cpp:248,262"
     note: "WAV samples for Galaga and clones (galagao, galagamw, galagamk, galagamf, gallag)"
 
@@ -89,6 +93,7 @@ files:
     description: "Rally-X audio samples"
     required: false
     category: game_data
+    system: arcade
     source_ref: "svn-current/trunk/src/burn/snd/samples.cpp:248,262"
     note: "WAV samples for Rally-X and clones (rallyxa, rallyxm, rallyxmr, nrallyx)"
 
@@ -97,6 +102,7 @@ files:
     description: "Ghox audio samples"
     required: false
     category: game_data
+    system: arcade
     source_ref: "svn-current/trunk/src/burn/snd/samples.cpp:248,262"
     note: "WAV samples for Ghox and Ghox (joystick). Substitutes undumped MCU sound."
 
@@ -105,6 +111,7 @@ files:
     description: "Fire Shark / Same! Same! Same! audio samples"
     required: false
     category: game_data
+    system: arcade
     source_ref: "svn-current/trunk/src/burn/snd/samples.cpp:248,262"
     note: "WAV samples for Fire Shark and clones (fireshrkd, fireshrkdh, samesame, samesame2)"
 
@@ -113,6 +120,7 @@ files:
     description: "Teki Paki audio samples"
     required: false
     category: game_data
+    system: arcade
     source_ref: "svn-current/trunk/src/burn/snd/samples.cpp:248,262"
 
   - name: "vimana.zip"
@@ -120,6 +128,7 @@ files:
     description: "Vimana audio samples"
     required: false
     category: game_data
+    system: arcade
     source_ref: "svn-current/trunk/src/burn/snd/samples.cpp:248,262"
     note: "WAV samples for Vimana and clones (vimanan, vimanaj)"
 
diff --git a/emulators/fbneo.yml b/emulators/fbneo.yml
index bdd0129d..77a8c3a0 100644
--- a/emulators/fbneo.yml
+++ b/emulators/fbneo.yml
@@ -33,6 +33,10 @@ systems:
   - snes
   - taito-cchip
   - ym2608
+  - arcade
+  - nintendo-gba
+  - atari-system1
+  - bally-astrocade
 
 archive_prefix: fbneo
 
@@ -1463,16 +1467,18 @@ files:
     installed_on: [batocera, lakka, recalbox, retrobat, retrodeck, retropie]
     path: "fbneo/hiscore.dat"
     required: false
+    system: arcade
     sha1: "30c6ad697439de7c2158192ecdb48f5edd37478e"
     md5: "f5cdce5b3749d673ad8f073ccc7371e4"
     note: "High score database, enables persistent high scores across all arcade games. The hash is that of metadata/hiscore.dat at source_commit."
-    source_ref: "source src/burn/hiscore.cpp:407"
+    source_ref: "source src/burn/hiscore.cpp:154-161, 407, source src/burn/burn.cpp:876"
 
   # Large audio samples (>50MB, stored as release assets)
   - name: "donpachi.zip"
     path: "fbneo/samples/donpachi.zip"
     required: false
     category: game_data
+    system: arcade
     storage: release
     size: 209000000
     note: "DonPachi CD-quality soundtrack samples (14 WAVs)"
@@ -1482,6 +1488,7 @@ files:
     path: "fbneo/samples/sfz3mix.zip"
     required: false
     category: game_data
+    system: arcade
     storage: release
     size: 116000000
     note: "Street Fighter Zero 3 Mix custom audio samples (43 WAVs)"
@@ -1491,13 +1498,15 @@ files:
     path: "fbneo/samples/twotiger.zip"
     required: false
     category: game_data
+    system: midway-mcr
     storage: release
     size: 155000000
     note: "Two Tigers with Journey CD audio samples (2 WAVs)"
-    source_ref: "source src/burn/snd/samples.cpp"
+    source_ref: "source src/burn/snd/samples.cpp, source src/burn/drv/pre90s/d_mcr.cpp:2423, 2469"
 
   - name: "gba_bios.bin"
     archive: gba.zip
+    system: nintendo-gba
     required: true
     size: 16384
     crc32: "81977335"
@@ -1505,6 +1514,7 @@ files:
 
   - name: "st018.bin"
     archive: st018.zip
+    system: snes
     required: true
     size: 163840
     crc32: "5c403cc5"
@@ -1512,6 +1522,7 @@ files:
 
   - name: "136032.205.l13"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 16384
     crc32: "88d0be26"
@@ -1519,6 +1530,7 @@ files:
 
   - name: "136032.206.l12"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 16384
     crc32: "3c79ef05"
@@ -1526,6 +1538,7 @@ files:
 
   - name: "136032.104.f5"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 8192
     crc32: "7a29dc07"
@@ -1533,6 +1546,7 @@ files:
 
   - name: "136032.101.e3"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 256
     crc32: "7e84972a"
@@ -1540,6 +1554,7 @@ files:
 
   - name: "136032.102.e5"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 256
     crc32: "ebf1e0ae"
@@ -1547,6 +1562,7 @@ files:
 
   - name: "136032.103.f7"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 235
     crc32: "92d6a0b4"
@@ -1554,6 +1570,7 @@ files:
 
   - name: "136032.105.l13"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 16384
     crc32: "79021d3c"
@@ -1561,6 +1578,7 @@ files:
 
   - name: "136032.106.l12"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 16384
     crc32: "76ee86c4"
@@ -1568,6 +1586,7 @@ files:
 
   - name: "136032.104.f5"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 8192
     crc32: "7a29dc07"
@@ -1575,6 +1594,7 @@ files:
 
   - name: "136032.101.e3"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 256
     crc32: "7e84972a"
@@ -1582,6 +1602,7 @@ files:
 
   - name: "136032.102.e5"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 256
     crc32: "ebf1e0ae"
@@ -1589,6 +1610,7 @@ files:
 
   - name: "136032.103.f7"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 235
     crc32: "92d6a0b4"
@@ -1596,6 +1618,7 @@ files:
 
   - name: "136032.114.j11"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 16384
     crc32: "195c54ad"
@@ -1603,6 +1626,7 @@ files:
 
   - name: "136032.115.j10"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 16384
     crc32: "7275b4dc"
@@ -1610,6 +1634,7 @@ files:
 
   - name: "136032.107.b2"
     archive: atarisy1.zip
+    system: atari-system1
     required: true
     size: 8192
     crc32: "7a29dc07"
@@ -1617,6 +1642,7 @@ files:
 
   - name: "astro.bin"
     archive: astrocde.zip
+    system: bally-astrocade
     required: true
     size: 8192
     crc32: "ebc77f3a"
diff --git a/emulators/fbneo_cps12.yml b/emulators/fbneo_cps12.yml
index b2c178e0..a74a5cb2 100644
--- a/emulators/fbneo_cps12.yml
+++ b/emulators/fbneo_cps12.yml
@@ -12,6 +12,7 @@ cores:
 systems:
   - cps1
   - cps2
+  - arcade
 
 notes: |
   CPS-1/CPS-2 subset of FinalBurn Neo, current codebase (not frozen).
@@ -39,5 +40,6 @@ files:
   - name: "hiscore.dat"
     path: "fbneo/hiscore.dat"
     required: false
+    system: arcade
     note: "High score database, enables persistent high scores across all arcade games"
-    source_ref: "source src/burn/hiscore.cpp:407"
+    source_ref: "source src/burn/hiscore.cpp:154-161, 407, source src/burn/burn.cpp:876"
diff --git a/emulators/fbneo_neogeo.yml b/emulators/fbneo_neogeo.yml
index 2aba625b..32db8d2d 100644
--- a/emulators/fbneo_neogeo.yml
+++ b/emulators/fbneo_neogeo.yml
@@ -13,6 +13,7 @@ systems:
   - snk-neogeo-mvs
   - snk-neogeo-aes
   - snk-neogeo-cd
+  - arcade
 
 notes: |
   Neo Geo subset of FinalBurn Neo, current codebase (not frozen).
@@ -490,5 +491,6 @@ files:
   - name: "hiscore.dat"
     path: "fbneo/hiscore.dat"
     required: false
+    system: arcade
     note: "High score database, enables persistent high scores"
-    source_ref: "source src/burn/hiscore.cpp:407"
+    source_ref: "source src/burn/hiscore.cpp:154-161, 407, source src/burn/burn.cpp:876"
diff --git a/emulators/groovymame.yml b/emulators/groovymame.yml
index 697b0385..187622a6 100644
--- a/emulators/groovymame.yml
+++ b/emulators/groovymame.yml
@@ -75,6 +75,50 @@ systems:
   - tandy-vis
   - trs80
   - vgmplay
+  - sega-systemsp
+  - sega-shootingzone
+  - sammy-medal
+  - sega-isgsm
+  - sielectronics-y2
+  - nintendo-aleck64
+  - konami-gx
+  - konami-bubblesystem
+  - konami-endeavour
+  - konami-python
+  - konami-python2
+  - taito-fx1
+  - acclaim-zn1
+  - atari-zn1
+  - atlus-zn1
+  - videosystem-zn1
+  - eighting-zn1
+  - tecmo-tps
+  - taito-gnet
+  - taito-typezero
+  - imax-macs
+  - arcadia-systems
+  - alg-laserdisc
+  - atari-system1
+  - exidy-maxaflex
+  - brezzasoft-crystal
+  - aristocrat-mk5
+  - aristocrat-mk6
+  - aristocrat-mk7
+  - allied-leisure-pinball
+  - gameplan-mpu1
+  - gottlieb-system1
+  - recel-system3
+  - tab-silverball
+  - nichibutsu-hrdvd
+  - efo-cedar-magnet
+  - itech-eagle
+  - virtuality-su2000
+  - pce-tourvision
+  - barcrest-mpu4
+  - miuchiz
+  - andamiro-pumpitup
+  - ym2608
+  - ces-galaxy-games
 
 notes: |
   MAME fork adding Switchres 2.2.2 for CRT modeline generation, frame delay
@@ -565,6 +609,7 @@ files:
   - name: hod2bios.zip
     required: true
     category: bios_zip
+    system: sega-naomi
     source_ref: "source src/mame/sega/naomi.cpp:10918"
     contents:
       - name: epr-21331.ic27
@@ -599,6 +644,7 @@ files:
   - name: f355dlx.zip
     required: true
     category: bios_zip
+    system: sega-naomi
     source_ref: "source src/mame/sega/naomi.cpp:10919"
     contents:
       - name: epr-21864.ic27
@@ -633,6 +679,7 @@ files:
   - name: f355bios.zip
     required: true
     category: bios_zip
+    system: sega-naomi
     source_ref: "source src/mame/sega/naomi.cpp:10920"
     contents:
       - name: epr-22851.ic27
@@ -659,6 +706,7 @@ files:
   - name: airlbios.zip
     required: true
     category: bios_zip
+    system: sega-naomi
     source_ref: "source src/mame/sega/naomi.cpp:10921"
     contents:
       - name: epr-21802.ic27
@@ -778,6 +826,7 @@ files:
   - name: segasp.zip
     required: true
     category: bios_zip
+    system: sega-systemsp
     source_ref: "source src/mame/sega/segasp.cpp:1273"
     contents:
       - name: epr-24236a.ic50
@@ -910,6 +959,7 @@ files:
   - name: shtzone.zip
     required: true
     category: bios_zip
+    system: sega-shootingzone
     source_ref: "upstream src/mame/sega/shtzone.cpp:376"
     contents:
       - name: epr10894a.20
@@ -920,6 +970,7 @@ files:
   - name: sammymdl.zip
     required: true
     category: bios_zip
+    system: sammy-medal
     source_ref: "upstream src/mame/sigma/sammymdl.cpp:1025"
     contents:
       - name: vm1211l01.u2
@@ -1008,6 +1059,7 @@ files:
   - name: isgsm.zip
     required: true
     category: bios_zip
+    system: sega-isgsm
     source_ref: "upstream src/mame/sega/segas16b_isgsm.cpp:608"
     contents:
       - name: ism2006v00.u1
@@ -1018,6 +1070,7 @@ files:
   - name: systemy2.zip
     required: true
     category: bios_zip
+    system: sielectronics-y2
     source_ref: "source src/mame/sega/y2.cpp:141"
     contents:
       - name: system_y2_m25p40.u801
@@ -1349,6 +1402,7 @@ files:
   - name: aleck64.zip
     required: true
     category: bios_zip
+    system: nintendo-aleck64
     source_ref: "source src/mame/nintendo/aleck64.cpp:1417"
     contents:
       - name: pifdata.bin
@@ -1459,6 +1513,7 @@ files:
   - name: konamigx.zip
     required: true
     category: bios_zip
+    system: konami-gx
     source_ref: "source src/mame/konami/konamigx.cpp:4191"
     contents:
       - name: 300a01.34k
@@ -1480,6 +1535,7 @@ files:
   - name: kviper.zip
     required: true
     category: bios_zip
+    system: konami-viper
     source_ref: "source src/mame/konami/viper.cpp:3213"
     contents:
       - name: 941b01.u25
@@ -1513,6 +1569,7 @@ files:
   - name: bubsys.zip
     required: true
     category: bios_zip
+    system: konami-bubblesystem
     source_ref: "upstream src/mame/konami/nemesis.cpp:3140"
     contents:
       - name: boot.bin
@@ -1535,6 +1592,7 @@ files:
   - name: konendev.zip
     required: true
     category: bios_zip
+    system: konami-endeavour
     source_ref: "upstream src/mame/konami/konendev.cpp:909"
     contents:
       - name: 2v02s502_ifu.u190
@@ -1545,6 +1603,7 @@ files:
   - name: kpython.zip
     required: true
     category: bios_zip
+    system: konami-python
     source_ref: "upstream src/mame/konami/kpython.cpp:376"
     contents:
       - name: b22a01.u42
@@ -1555,6 +1614,7 @@ files:
   - name: kpython2.zip
     required: true
     category: bios_zip
+    system: konami-python2
     source_ref: "upstream src/mame/konami/kpython2.cpp:1918"
     contents:
       - name: ps2-0190j-20030822.bin
@@ -1601,6 +1661,7 @@ files:
   - name: coh1000t.zip
     required: true
     category: bios_zip
+    system: taito-fx1
     source_ref: "source src/mame/sony/zn.cpp:5989"
     contents:
       - name: m534002c-14.ic353
@@ -1615,6 +1676,7 @@ files:
   - name: coh1000a.zip
     required: true
     category: bios_zip
+    system: acclaim-zn1
     source_ref: "source src/mame/sony/zn.cpp:6015"
     contents:
       - name: m534002c-15.ic353
@@ -1629,6 +1691,7 @@ files:
   - name: coh1000w.zip
     required: true
     category: bios_zip
+    system: atari-zn1
     source_ref: "source src/mame/sony/zn.cpp:6024"
     contents:
       - name: msm27c402zb.ic353
@@ -1643,6 +1706,7 @@ files:
   - name: coh1001l.zip
     required: true
     category: bios_zip
+    system: atlus-zn1
     source_ref: "source src/mame/sony/zn.cpp:6028"
     contents:
       - name: m534002c-17.ic353
@@ -1657,6 +1721,7 @@ files:
   - name: coh1002v.zip
     required: true
     category: bios_zip
+    system: videosystem-zn1
     source_ref: "source src/mame/sony/zn.cpp:6032"
     contents:
       - name: coh-1002v.ic353
@@ -1671,6 +1736,7 @@ files:
   - name: coh1002e.zip
     required: true
     category: bios_zip
+    system: eighting-zn1
     source_ref: "source src/mame/sony/zn.cpp:6038"
     contents:
       - name: m27c402cz-54.ic353
@@ -1685,6 +1751,7 @@ files:
   - name: coh1002m.zip
     required: true
     category: bios_zip
+    system: tecmo-tps
     source_ref: "source src/mame/sony/zn.cpp:6089"
     contents:
       - name: m534002c-61.ic353
@@ -1699,6 +1766,7 @@ files:
   - name: coh3002t.zip
     required: true
     category: bios_zip
+    system: taito-gnet
     source_ref: "upstream src/mame/sony/taitogn.cpp:1341"
     contents:
       - name: m534002c-60.ic353
@@ -1741,6 +1809,7 @@ files:
   - name: coh1002t.zip
     required: true
     category: bios_zip
+    system: taito-gnet
     source_ref: "upstream src/mame/sony/taitogn.cpp:1342"
     contents:
       - name: m534002c-14.ic353
@@ -1763,6 +1832,7 @@ files:
   - name: taitotz.zip
     required: true
     category: bios_zip
+    system: taito-typezero
     source_ref: "source src/mame/taito/taitotz.cpp:3016"
     contents:
       - name: e68-05-1.ic6
@@ -1812,12 +1882,14 @@ files:
   - name: mac2bios.zip
     required: false
     category: bios_zip
+    system: imax-macs
     source_ref: "upstream src/mame/seta/macs.cpp:776"
     note: "no ROM entries in the set"
 
   - name: macsbios.zip
     required: true
     category: bios_zip
+    system: imax-macs
     source_ref: "upstream src/mame/seta/macs.cpp:775"
     contents:
       - name: am_macs_os_low.u43
@@ -1863,6 +1935,7 @@ files:
   - name: alg3do.zip
     required: true
     category: bios_zip
+    system: panasonic-3do
     source_ref: "source src/mame/misc/3do.cpp:573"
     contents:
       - name: saot_rom2.bin
@@ -1920,6 +1993,7 @@ files:
   - name: ar_bios.zip
     required: true
     category: bios_zip
+    system: arcadia-systems
     source_ref: "upstream src/mame/amiga/arsystems.cpp:1011"
     contents:
       - name: 315093-01.u2
@@ -2010,6 +2084,7 @@ files:
   - name: alg_bios.zip
     required: true
     category: bios_zip
+    system: alg-laserdisc
     source_ref: "upstream src/mame/amiga/alg.cpp:923"
     contents:
       - name: 315093-02.u2
@@ -2021,6 +2096,7 @@ files:
   - name: atarisy1.zip
     required: true
     category: bios_zip
+    system: atari-system1
     source_ref: "upstream src/mame/atari/atarisy1.cpp:2669"
     contents:
       - name: 136032.205.l13
@@ -2087,6 +2163,7 @@ files:
   - name: maxaflex.zip
     required: true
     category: bios_zip
+    system: exidy-maxaflex
     source_ref: "source src/mame/atari/maxaflex.cpp:447"
     contents:
       - name: atarixl.rom
@@ -2105,6 +2182,7 @@ files:
   - name: crysbios.zip
     required: true
     category: bios_zip
+    system: brezzasoft-crystal
     source_ref: "source src/mame/misc/crystal.cpp:845"
     contents:
       - name: mx27l1000.u14
@@ -2121,6 +2199,7 @@ files:
   - name: aristmk5.zip
     required: true
     category: bios_zip
+    system: aristocrat-mk5
     source_ref: "source src/mame/acorn/aristmk5.cpp:9298"
     contents:
       - name: setchip v4.04.09.u7
@@ -2220,6 +2299,7 @@ files:
   - name: aristmk6.zip
     required: true
     category: bios_zip
+    system: aristocrat-mk6
     source_ref: "upstream src/mame/aristocrat/aristmk6.cpp:6639"
     contents:
       - name: 24013001_right.u83
@@ -2622,6 +2702,7 @@ files:
   - name: aristmk7.zip
     required: true
     category: bios_zip
+    system: aristocrat-mk7
     source_ref: "upstream src/mame/aristocrat/aristmk7.cpp:233"
     contents:
       - name: mk7-bios_590176_01_1.00.7.u1
@@ -2632,6 +2713,7 @@ files:
   - name: allied.zip
     required: true
     category: bios_zip
+    system: allied-leisure-pinball
     source_ref: "upstream src/mame/pinball/allied.cpp:772"
     contents:
       - name: 6530-009.u5
@@ -2650,6 +2732,7 @@ files:
   - name: gp_110.zip
     required: true
     category: bios_zip
+    system: gameplan-mpu1
     source_ref: "upstream src/mame/pinball/gp_1.cpp:575"
     contents:
       - name: a-110.u12
@@ -2664,6 +2747,7 @@ files:
   - name: gts1.zip
     required: true
     category: bios_zip
+    system: gottlieb-system1
     source_ref: "upstream src/mame/pinball/gts1.cpp:1070"
     contents:
       - name: a1752cf.u5
@@ -2678,6 +2762,7 @@ files:
   - name: recel.zip
     required: true
     category: bios_zip
+    system: recel-system3
     source_ref: "upstream src/mame/pinball/recel.cpp:546"
     contents:
       - name: a2361.b1
@@ -2692,6 +2777,7 @@ files:
   - name: slvrball.zip
     required: true
     category: bios_zip
+    system: tab-silverball
     source_ref: "upstream src/mame/misc/silverball.cpp:259"
     contents:
       - name: bios47.bin
@@ -2793,6 +2879,7 @@ files:
   - name: nichidvd.zip
     required: true
     category: bios_zip
+    system: nichibutsu-hrdvd
     source_ref: "upstream src/mame/nichibutsu/hrdvd.cpp:1012"
     contents:
       - name: va1b102.u2
@@ -2811,6 +2898,7 @@ files:
   - name: cedmag.zip
     required: true
     category: bios_zip
+    system: efo-cedar-magnet
     source_ref: "source src/mame/efo/cedar_magnet.cpp:1166"
     contents:
       - name: magnet-master-vid-e03.bin
@@ -2821,6 +2909,7 @@ files:
   - name: iteagle.zip
     required: true
     category: bios_zip
+    system: itech-eagle
     source_ref: "upstream src/mame/itech/iteagle.cpp:756"
     contents:
       - name: eagle_u15_v209.u15
@@ -2907,6 +2996,7 @@ files:
   - name: su2000.zip
     required: true
     category: bios_zip
+    system: virtuality-su2000
     source_ref: "upstream src/mame/misc/su2000.cpp:302"
     contents:
       - name: hmc86304_bios_v208.u7
@@ -3089,6 +3179,7 @@ files:
   - name: tourvis.zip
     required: true
     category: bios_zip
+    system: pce-tourvision
     source_ref: "source src/mame/pce/tourvis.cpp:448"
     contents:
       - name: v4-60.ic29
@@ -3150,6 +3241,7 @@ files:
   - name: v4bios.zip
     required: true
     category: bios_zip
+    system: barcrest-mpu4
     source_ref: "source src/mame/barcrest/mpu4vid.cpp:8698"
     contents:
       - name: vid.p1
@@ -3160,6 +3252,7 @@ files:
   - name: miuchiz.zip
     required: true
     category: bios_zip
+    system: miuchiz
     source_ref: "upstream src/mame/misc/miuchiz.cpp:227"
     contents:
       - name: otp.dat
@@ -3170,6 +3263,7 @@ files:
   - name: pumpitup.zip
     required: true
     category: bios_zip
+    system: andamiro-pumpitup
     source_ref: "upstream src/mame/misc/xtom3d.cpp:997"
     contents:
       - name: mk3_1.0_bios.u22
@@ -4414,6 +4508,7 @@ files:
   - name: ym2608.zip
     required: true
     category: bios_zip
+    system: ym2608
     source_ref: "upstream src/devices/sound/ymopn.cpp:76"
     contents:
       - name: ym2608_adpcm_rom.bin
@@ -4618,6 +4713,7 @@ files:
   - name: galgames.zip
     required: true
     category: bios_zip
+    system: ces-galaxy-games
     source_ref: "source src/mame/ces/galgames.cpp:1301"
     contents:
       - name: galaxy_u2__v1.90_12-01-98.u2
diff --git a/emulators/mame2000.yml b/emulators/mame2000.yml
index 6b99890a..b840fe1e 100644
--- a/emulators/mame2000.yml
+++ b/emulators/mame2000.yml
@@ -15,6 +15,7 @@ cores:
 systems:
   - snk-neogeo-mvs
   - deco-cassette
+  - arcade
 
 notes: |
   Frozen snapshot of MAME 0.37b5 via iMAME4All (David Valdeita). Fastest and
@@ -35,10 +36,11 @@ files:
   - name: hiscore.dat
     required: false
     category: game_data
+    system: arcade
     sha1: "21ddda0c61bd4f1cc04fb9d09e16d403d620f9e8"
     md5: "9b262149ec70cbda741a8ba55784f8e1"
     size: 36182
-    source_ref: "src/hiscore.c:18,132-146,252-254"
+    source_ref: "src/hiscore.c:18,132-146,252-254, src/cpuintrf.c:664-666"
     note: >-
       high score definitions, loaded from ROM directory. metadata/hiscore.dat
       of the core repository. is_mem_range reads only "cpu:addr:len:start:end"
@@ -48,18 +50,21 @@ files:
     path: "mame2000/cheat/cheat.dat"
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/cheat.c:210, src/cheat.c:618, src/cheat.c:833"
     note: "cheat definitions, loaded from system_dir/mame2000/cheat/"
 
   - name: history.dat
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/datafile.c:52,281,541"
     note: "game history database, loaded from ROM directory"
 
   - name: mameinfo.dat
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/datafile.c:53,281,568"
     note: "game technical info database, loaded from ROM directory"
 
diff --git a/emulators/mame2003.yml b/emulators/mame2003.yml
index 00f26c1b..a425c113 100644
--- a/emulators/mame2003.yml
+++ b/emulators/mame2003.yml
@@ -30,6 +30,7 @@ systems:
   - zn1-tecmo
   - zn1-video-system
   - zn1-acclaim
+  - arcade
 
 notes: |
   Frozen snapshot of MAME 0.78 (xmame, January 2003). Stock version without
@@ -52,10 +53,11 @@ files:
     path: "mame2003/hiscore.dat"
     required: false
     category: game_data
+    system: arcade
     sha1: "a22ec279222ec6aeb3249932f7d377b7cf1e7bf1"
     md5: "c6f35123264db9cdfb216e8fdb673679"
     size: 215475
-    source_ref: "src/hiscore.c:14,102-116,248-262"
+    source_ref: "src/hiscore.c:14,102-116,248-262, src/cpuexec.c:280-282"
     note: >-
       high score definitions, auto-generated if missing from
       precompile/hiscore_dat.h, which holds metadata/hiscore.dat with CRLF line
@@ -67,6 +69,7 @@ files:
     path: "mame2003/cheat.dat"
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/cheat.c:383,8249-8255"
     note: "cheat definitions, requires cheats core option enabled"
 
@@ -74,6 +77,7 @@ files:
     path: "mame2003/history.dat"
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/datafile.c:327, src/datafile.c:563"
     note: "game history and information database"
 
@@ -81,6 +85,7 @@ files:
     path: "mame2003/mameinfo.dat"
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/datafile.c:327, src/datafile.c:622-626"
     note: "game technical information database"
 
diff --git a/emulators/mame2003_midway.yml b/emulators/mame2003_midway.yml
index 5143dfc1..41425569 100644
--- a/emulators/mame2003_midway.yml
+++ b/emulators/mame2003_midway.yml
@@ -11,7 +11,8 @@ display_name: "Arcade (MAME 2003 Midway)"
 cores:
   - mame2003_midway
 
-systems: []
+systems:
+  - arcade
 
 notes: |
   Stripped-down MAME 0.78 build with only 4 Midway driver files
@@ -30,7 +31,8 @@ files:
     path: "mame2003/hiscore.dat"
     required: false
     category: game_data
-    source_ref: "src/hiscore.c:18,225"
+    system: arcade
+    source_ref: "src/hiscore.c:18,225, src/cpuexec.c:292-294"
     note: "high score definitions, loaded from system_dir/mame2003/"
 
   - name: cheat.dat
@@ -38,6 +40,7 @@ files:
     path: "mame2003/cheat.dat"
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/cheat.c:839,8597-8607"
     note: "cheat definitions, loaded from system_dir/mame2003/"
 
@@ -45,6 +48,7 @@ files:
     path: "mame2003/history.dat"
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/datafile.c:51,619-623"
     note: "game history database, loaded from system_dir/mame2003/"
 
@@ -52,5 +56,6 @@ files:
     path: "mame2003/mameinfo.dat"
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/datafile.c:52,649-653"
     note: "game technical information database, loaded from system_dir/mame2003/"
diff --git a/emulators/mame2003_plus.yml b/emulators/mame2003_plus.yml
index 22c85dbc..e8ce6872 100644
--- a/emulators/mame2003_plus.yml
+++ b/emulators/mame2003_plus.yml
@@ -34,6 +34,7 @@ systems:
   - zn1-acclaim
   - zn1-atlus
   - century-cvs
+  - arcade
 
 notes: |
   MAME 2003-Plus is a libretro port of MAME 0.78 with backported drivers, bug fixes,
@@ -67,10 +68,11 @@ files:
     path: "mame2003-plus/hiscore.dat"
     required: false
     category: game_data
+    system: arcade
     sha1: "c086306096722da7f02f624e7efb447659aca1d3"
     md5: "2f60c1ed69c152dea95e734979ca2ecb"
     size: 131878
-    source_ref: "src/hiscore.c:15,102-116,248"
+    source_ref: "src/hiscore.c:15,102-116,248, src/cpuexec.c:296-298"
     note: >-
       high score definitions, compiled into binary and spawned on first run.
       metadata/hiscore.dat of the core repository. The compiled copy
@@ -82,6 +84,7 @@ files:
     path: "mame2003-plus/cheat.dat"
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/cheat.c:383,8249-8255"
     note: "cheat definitions, requires cheats core option enabled"
 
@@ -90,6 +93,7 @@ files:
     path: "mame2003-plus/history.dat"
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/datafile.c:327,608"
     note: "game history and information database"
 
@@ -97,6 +101,7 @@ files:
     path: "mame2003-plus/mameinfo.dat"
     required: false
     category: game_data
+    system: arcade
     source_ref: "src/datafile.c:327,638"
     note: "technical driver information, appended to history display"
 
@@ -109,6 +114,7 @@ files:
     path: "mame2003-plus/artwork/blueshrk.zip"
     required: false
     category: game_data
+    system: arcade
     size: 925914
     sha1: "4317f301d6e4117dfde42b33dfaf73a2b25f43c1"
     md5: "4659968035d462be471fdfb46b604696"
@@ -122,6 +128,7 @@ files:
     path: "mame2003-plus/artwork/frogs.zip"
     required: false
     category: game_data
+    system: arcade
     size: 2832731
     sha1: "cdff29398e76b92d93825d96c0f9cae5bb6b3400"
     md5: "e30e8ef4631596e25466523b97fee19f"
@@ -132,6 +139,7 @@ files:
     path: "mame2003-plus/artwork/invaders.zip"
     required: false
     category: game_data
+    system: arcade
     size: 4324198
     sha1: "4b18db526ca907707fd888385d907a7a585935d0"
     md5: "23d65ad40ac1f2121fe35fe0c7893721"
@@ -142,6 +150,7 @@ files:
     path: "mame2003-plus/artwork/omegrace.zip"
     required: false
     category: game_data
+    system: arcade
     size: 1754523
     sha1: "1ca22afdfefcfa5943742e988c45c1fc0e1124bd"
     md5: "255155cf3f9912c92be8f813e8112a54"
@@ -152,6 +161,7 @@ files:
     path: "mame2003-plus/artwork/skydiver.zip"
     required: false
     category: game_data
+    system: arcade
     size: 117241
     sha1: "a0548e37e76a21fb37005cff944319ee63f93d1e"
     md5: "95e05db7f8fa208daafd7b0d32041db8"
@@ -162,6 +172,7 @@ files:
     path: "mame2003-plus/artwork/solarq.zip"
     required: false
     category: game_data
+    system: arcade
     size: 1342645
     sha1: "ff532cee1de69668b0c68238aff0c16813640476"
     md5: "b4b70db555dfb48b91a067eea747c771"
@@ -172,6 +183,7 @@ files:
     path: "mame2003-plus/artwork/warrior.zip"
     required: false
     category: game_data
+    system: arcade
     size: 1125335
     sha1: "57f89bbac39d8071e45c87f97e9b918f31d21994"
     md5: "29fe11717016182d446ca6af56a08f75"
diff --git a/emulators/mame2010.yml b/emulators/mame2010.yml
index 67b3603d..20edf39d 100644
--- a/emulators/mame2010.yml
+++ b/emulators/mame2010.yml
@@ -56,6 +56,7 @@ systems:
   - konami-twinkle
   - imax-macs
   - arcade
+  - barcrest-mpu4
 
 notes: |
   Frozen snapshot of MAME 0.139 (mid-2010). Sourced from mame0139s.zip.
@@ -475,5 +476,5 @@ files:
   - name: bctvidbs.zip
     required: true
     category: bios_zip
-    system: arcade
+    system: barcrest-mpu4
     source_ref: "upstream src/mame/drivers/mpu4drvr.c:3116"
diff --git a/emulators/mame2014.yml b/emulators/mame2014.yml
index c61d2838..835cee5b 100644
--- a/emulators/mame2014.yml
+++ b/emulators/mame2014.yml
@@ -47,6 +47,38 @@ systems:
   - panasonic-3do
   - hyper-neogeo64
   - konami-twinkle
+  - arcade
+  - konami-gx
+  - taito-typezero
+  - taito-fx1
+  - atari-zn1
+  - acclaim-zn1
+  - tecmo-tps
+  - videosystem-zn1
+  - eighting-zn1
+  - atlus-zn1
+  - imax-macs
+  - arcadia-systems
+  - alg-laserdisc
+  - nintendo-aleck64
+  - atari-system1
+  - exidy-maxaflex
+  - brezzasoft-crystal
+  - ces-galaxy-games
+  - aristocrat-mk5
+  - aristocrat-mk6
+  - allied-leisure-pinball
+  - gameplan-mpu1
+  - gottlieb-system1
+  - konami-bubblesystem
+  - sega-isgsm
+  - itech-eagle
+  - konami-python
+  - sammy-medal
+  - sega-shootingzone
+  - virtuality-su2000
+  - pce-tourvision
+  - barcrest-mpu4
 
 notes: |
   The core of libretro/mame2015-libretro as it stood before the repository
@@ -72,10 +104,11 @@ files:
   - name: hiscore.dat
     required: false
     category: game_data
+    system: arcade
     sha1: "68e94fb579f46f3255ef7c34c0322f3f0f3c8e20"
     md5: "7e31f0b84f6ea6f9ffec0cd968decf9f"
     size: 216250
-    source_ref: "source src/emu/hiscore.c:122-138, 330-338"
+    source_ref: "source src/emu/hiscore.c:122-138, 330-338, source src/emu/machine.c:346-347"
     note: >-
       high score definitions, external file, not embedded. metadata/hiscore.dat of the core repository. Opened by
       emu_file with no search path, so from the working directory of the frontend. is_mem_range reads only
@@ -123,24 +156,28 @@ files:
   - name: hod2bios.zip
     required: false
     category: bios_zip
+    system: sega-naomi
     source_ref: "upstream src/mame/drivers/naomi.c:8961"
     note: "game-specific BIOS for House of the Dead 2"
 
   - name: f355dlx.zip
     required: false
     category: bios_zip
+    system: sega-naomi
     source_ref: "upstream src/mame/drivers/naomi.c:8962"
     note: "game-specific BIOS for Ferrari F355 Challenge deluxe"
 
   - name: f355bios.zip
     required: false
     category: bios_zip
+    system: sega-naomi
     source_ref: "upstream src/mame/drivers/naomi.c:8963"
     note: "game-specific BIOS for Ferrari F355 Challenge twin"
 
   - name: airlbios.zip
     required: false
     category: bios_zip
+    system: sega-naomi
     source_ref: "upstream src/mame/drivers/naomi.c:8964"
     note: "game-specific BIOS for Airline Pilots deluxe"
 
@@ -264,6 +301,7 @@ files:
   - name: konamigx.zip
     required: true
     category: bios_zip
+    system: konami-gx
     source_ref: "upstream src/mame/drivers/konamigx.c:3775"
 
   - name: gq863.zip
@@ -282,11 +320,13 @@ files:
   - name: taitotz.zip
     required: true
     category: bios_zip
+    system: taito-typezero
     source_ref: "upstream src/mame/drivers/taitotz.c:2951"
 
   - name: taitofx1.zip
     required: true
     category: bios_zip
+    system: taito-fx1
     source_ref: "upstream src/mame/drivers/zn.c:4906"
 
   # PSX-based arcade boards (ZN)
@@ -305,31 +345,37 @@ files:
   - name: atpsx.zip
     required: true
     category: bios_zip
+    system: atari-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4853"
 
   - name: acpsx.zip
     required: true
     category: bios_zip
+    system: acclaim-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4862"
 
   - name: tps.zip
     required: true
     category: bios_zip
+    system: tecmo-tps
     source_ref: "upstream src/mame/drivers/zn.c:4873"
 
   - name: vspsx.zip
     required: true
     category: bios_zip
+    system: videosystem-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4896"
 
   - name: psarc95.zip
     required: true
     category: bios_zip
+    system: eighting-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4935"
 
   - name: atluspsx.zip
     required: true
     category: bios_zip
+    system: atlus-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4961"
 
   # Super Kaneko Nova System
@@ -342,11 +388,13 @@ files:
   - name: mac2bios.zip
     required: true
     category: bios_zip
+    system: imax-macs
     source_ref: "upstream src/mame/drivers/macs.c:747"
 
   - name: macsbios.zip
     required: true
     category: bios_zip
+    system: imax-macs
     source_ref: "upstream src/mame/drivers/macs.c:746"
 
   # Panasonic 3DO
@@ -367,123 +415,146 @@ files:
   - name: ar_bios.zip
     required: true
     category: bios_zip
+    system: arcadia-systems
     source_ref: "upstream src/mame/drivers/arcadia.c:963"
 
   # American Laser Games
   - name: alg_bios.zip
     required: true
     category: bios_zip
+    system: alg-laserdisc
     source_ref: "upstream src/mame/drivers/alg.c:772"
 
   # Aleck64 (N64-based)
   - name: aleck64.zip
     required: true
     category: bios_zip
+    system: nintendo-aleck64
     source_ref: "upstream src/mame/drivers/aleck64.c:1161"
 
   # Atari System 1
   - name: atarisy1.zip
     required: true
     category: bios_zip
+    system: atari-system1
     source_ref: "upstream src/mame/drivers/atarisy1.c:2368"
 
   # Exidy Max-A-Flex
   - name: maxaflex.zip
     required: true
     category: bios_zip
+    system: exidy-maxaflex
     source_ref: "upstream src/mame/drivers/maxaflex.c:536"
 
   # Crystal System
   - name: crysbios.zip
     required: true
     category: bios_zip
+    system: brezzasoft-crystal
     source_ref: "upstream src/mame/drivers/crystal.c:1134"
 
   # Galaxy Games
   - name: galgbios.zip
     required: true
     category: bios_zip
+    system: ces-galaxy-games
     source_ref: "source src/mame/drivers/tmaster.c:1850"
 
   # Aristocrat MK5/MK6
   - name: aristmk5.zip
     required: true
     category: bios_zip
+    system: aristocrat-mk5
     source_ref: "upstream src/mame/drivers/aristmk5.c:739"
 
   - name: aristmk6.zip
     required: true
     category: bios_zip
+    system: aristocrat-mk6
     source_ref: "source src/mame/drivers/aristmk6.c:224"
 
   - name: mk6nsw11.zip
     required: true
     category: bios_zip
+    system: aristocrat-mk6
     source_ref: "source src/mame/drivers/aristmk6.c:225"
 
   # Pinball
   - name: allied.zip
     required: true
     category: bios_zip
+    system: allied-leisure-pinball
     source_ref: "upstream src/mame/drivers/allied.c:711"
 
   - name: gp_110.zip
     required: true
     category: bios_zip
+    system: gameplan-mpu1
     source_ref: "upstream src/mame/drivers/gp_1.c:531"
 
   - name: gts1.zip
     required: true
     category: bios_zip
+    system: gottlieb-system1
     source_ref: "upstream src/mame/drivers/gts1.c:978"
 
   - name: gts1s.zip
     required: true
     category: bios_zip
+    system: gottlieb-system1
     source_ref: "upstream src/mame/drivers/gts1.c:981"
 
   # Other BIOS root sets
   - name: bubsys.zip
     required: true
     category: bios_zip
+    system: konami-bubblesystem
     source_ref: "upstream src/mame/drivers/nemesis.c:2707"
 
   - name: isgsm.zip
     required: true
     category: bios_zip
+    system: sega-isgsm
     source_ref: "upstream src/mame/drivers/segas16b.c:7501"
 
   - name: iteagle.zip
     required: true
     category: bios_zip
+    system: itech-eagle
     source_ref: "upstream src/mame/drivers/iteagle.c:315"
 
   - name: pyson.zip
     required: true
     category: bios_zip
+    system: konami-python
     source_ref: "upstream src/mame/drivers/pyson.c:251"
 
   - name: sammymdl.zip
     required: true
     category: bios_zip
+    system: sammy-medal
     source_ref: "source src/mame/drivers/sigmab98.c:2277"
 
   - name: shtzone.zip
     required: true
     category: bios_zip
+    system: sega-shootingzone
     source_ref: "upstream src/mame/drivers/shtzone.c:121"
 
   - name: su2000.zip
     required: true
     category: bios_zip
+    system: virtuality-su2000
     source_ref: "upstream src/mame/drivers/su2000.c:296"
 
   - name: tourvis.zip
     required: true
     category: bios_zip
+    system: pce-tourvision
     source_ref: "upstream src/mame/drivers/tourvis.c:612"
 
   - name: v4bios.zip
     required: true
     category: bios_zip
+    system: barcrest-mpu4
     source_ref: "upstream src/mame/drivers/mpu4vid.c:3655"
diff --git a/emulators/mame2015.yml b/emulators/mame2015.yml
index 9ab35357..816735dc 100644
--- a/emulators/mame2015.yml
+++ b/emulators/mame2015.yml
@@ -45,6 +45,38 @@ systems:
   - panasonic-3do
   - hyper-neogeo64
   - konami-twinkle
+  - arcade
+  - konami-gx
+  - taito-typezero
+  - taito-fx1
+  - atari-zn1
+  - acclaim-zn1
+  - tecmo-tps
+  - videosystem-zn1
+  - eighting-zn1
+  - atlus-zn1
+  - imax-macs
+  - arcadia-systems
+  - alg-laserdisc
+  - nintendo-aleck64
+  - atari-system1
+  - exidy-maxaflex
+  - brezzasoft-crystal
+  - ces-galaxy-games
+  - aristocrat-mk5
+  - aristocrat-mk6
+  - allied-leisure-pinball
+  - gameplan-mpu1
+  - gottlieb-system1
+  - konami-bubblesystem
+  - sega-isgsm
+  - itech-eagle
+  - konami-python
+  - sammy-medal
+  - sega-shootingzone
+  - virtuality-su2000
+  - pce-tourvision
+  - barcrest-mpu4
 
 notes: |
   Frozen snapshot of MAME 0.160 (mid-2015). 69 BIOS root sets. Upstream
@@ -62,10 +94,11 @@ files:
     installed_on: [recalbox]
     required: false
     category: game_data
+    system: arcade
     sha1: "68e94fb579f46f3255ef7c34c0322f3f0f3c8e20"
     md5: "7e31f0b84f6ea6f9ffec0cd968decf9f"
     size: 216250
-    source_ref: "source src/emu/hiscore.c:122-138, 330-338, source src/emu/fileio.c:42-67, 341-370"
+    source_ref: "source src/emu/hiscore.c:122-138, 330-338, source src/emu/fileio.c:42-67, 341-370, source src/emu/machine.c:346-347"
     note: >-
       high score definitions, external file, not embedded. metadata/hiscore.dat of the core repository. is_mem_range reads
       only "cpu:addr:len:start:end" lines under a "gamename:" header. Opened by emu_file with no search path, so from
@@ -113,24 +146,28 @@ files:
   - name: hod2bios.zip
     required: false
     category: bios_zip
+    system: sega-naomi
     source_ref: "upstream src/mame/drivers/naomi.c:8961"
     note: "game-specific BIOS for House of the Dead 2"
 
   - name: f355dlx.zip
     required: false
     category: bios_zip
+    system: sega-naomi
     source_ref: "upstream src/mame/drivers/naomi.c:8962"
     note: "game-specific BIOS for Ferrari F355 Challenge deluxe"
 
   - name: f355bios.zip
     required: false
     category: bios_zip
+    system: sega-naomi
     source_ref: "upstream src/mame/drivers/naomi.c:8963"
     note: "game-specific BIOS for Ferrari F355 Challenge twin"
 
   - name: airlbios.zip
     required: false
     category: bios_zip
+    system: sega-naomi
     source_ref: "upstream src/mame/drivers/naomi.c:8964"
     note: "game-specific BIOS for Airline Pilots deluxe"
 
@@ -254,6 +291,7 @@ files:
   - name: konamigx.zip
     required: true
     category: bios_zip
+    system: konami-gx
     source_ref: "upstream src/mame/drivers/konamigx.c:3775"
 
   - name: gq863.zip
@@ -272,11 +310,13 @@ files:
   - name: taitotz.zip
     required: true
     category: bios_zip
+    system: taito-typezero
     source_ref: "upstream src/mame/drivers/taitotz.c:2951"
 
   - name: taitofx1.zip
     required: true
     category: bios_zip
+    system: taito-fx1
     source_ref: "upstream src/mame/drivers/zn.c:4906"
 
   # PSX-based arcade boards (ZN)
@@ -295,31 +335,37 @@ files:
   - name: atpsx.zip
     required: true
     category: bios_zip
+    system: atari-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4853"
 
   - name: acpsx.zip
     required: true
     category: bios_zip
+    system: acclaim-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4862"
 
   - name: tps.zip
     required: true
     category: bios_zip
+    system: tecmo-tps
     source_ref: "upstream src/mame/drivers/zn.c:4873"
 
   - name: vspsx.zip
     required: true
     category: bios_zip
+    system: videosystem-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4896"
 
   - name: psarc95.zip
     required: true
     category: bios_zip
+    system: eighting-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4935"
 
   - name: atluspsx.zip
     required: true
     category: bios_zip
+    system: atlus-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4961"
 
   # Super Kaneko Nova System
@@ -332,11 +378,13 @@ files:
   - name: mac2bios.zip
     required: true
     category: bios_zip
+    system: imax-macs
     source_ref: "upstream src/mame/drivers/macs.c:747"
 
   - name: macsbios.zip
     required: true
     category: bios_zip
+    system: imax-macs
     source_ref: "upstream src/mame/drivers/macs.c:746"
 
   # Panasonic 3DO
@@ -357,123 +405,146 @@ files:
   - name: ar_bios.zip
     required: true
     category: bios_zip
+    system: arcadia-systems
     source_ref: "upstream src/mame/drivers/arcadia.c:963"
 
   # American Laser Games
   - name: alg_bios.zip
     required: true
     category: bios_zip
+    system: alg-laserdisc
     source_ref: "upstream src/mame/drivers/alg.c:772"
 
   # Aleck64 (N64-based)
   - name: aleck64.zip
     required: true
     category: bios_zip
+    system: nintendo-aleck64
     source_ref: "upstream src/mame/drivers/aleck64.c:1161"
 
   # Atari System 1
   - name: atarisy1.zip
     required: true
     category: bios_zip
+    system: atari-system1
     source_ref: "upstream src/mame/drivers/atarisy1.c:2368"
 
   # Exidy Max-A-Flex
   - name: maxaflex.zip
     required: true
     category: bios_zip
+    system: exidy-maxaflex
     source_ref: "upstream src/mame/drivers/maxaflex.c:536"
 
   # Crystal System
   - name: crysbios.zip
     required: true
     category: bios_zip
+    system: brezzasoft-crystal
     source_ref: "upstream src/mame/drivers/crystal.c:1134"
 
   # Galaxy Games
   - name: galgbios.zip
     required: true
     category: bios_zip
+    system: ces-galaxy-games
     source_ref: "source src/mame/drivers/tmaster.c:1850"
 
   # Aristocrat MK5/MK6
   - name: aristmk5.zip
     required: true
     category: bios_zip
+    system: aristocrat-mk5
     source_ref: "upstream src/mame/drivers/aristmk5.c:739"
 
   - name: aristmk6.zip
     required: true
     category: bios_zip
+    system: aristocrat-mk6
     source_ref: "source src/mame/drivers/aristmk6.c:224"
 
   - name: mk6nsw11.zip
     required: true
     category: bios_zip
+    system: aristocrat-mk6
     source_ref: "source src/mame/drivers/aristmk6.c:225"
 
   # Pinball
   - name: allied.zip
     required: true
     category: bios_zip
+    system: allied-leisure-pinball
     source_ref: "upstream src/mame/drivers/allied.c:711"
 
   - name: gp_110.zip
     required: true
     category: bios_zip
+    system: gameplan-mpu1
     source_ref: "upstream src/mame/drivers/gp_1.c:531"
 
   - name: gts1.zip
     required: true
     category: bios_zip
+    system: gottlieb-system1
     source_ref: "upstream src/mame/drivers/gts1.c:978"
 
   - name: gts1s.zip
     required: true
     category: bios_zip
+    system: gottlieb-system1
     source_ref: "upstream src/mame/drivers/gts1.c:981"
 
   # Other BIOS root sets
   - name: bubsys.zip
     required: true
     category: bios_zip
+    system: konami-bubblesystem
     source_ref: "upstream src/mame/drivers/nemesis.c:2707"
 
   - name: isgsm.zip
     required: true
     category: bios_zip
+    system: sega-isgsm
     source_ref: "upstream src/mame/drivers/segas16b.c:7501"
 
   - name: iteagle.zip
     required: true
     category: bios_zip
+    system: itech-eagle
     source_ref: "upstream src/mame/drivers/iteagle.c:315"
 
   - name: pyson.zip
     required: true
     category: bios_zip
+    system: konami-python
     source_ref: "upstream src/mame/drivers/pyson.c:251"
 
   - name: sammymdl.zip
     required: true
     category: bios_zip
+    system: sammy-medal
     source_ref: "source src/mame/drivers/sigmab98.c:2277"
 
   - name: shtzone.zip
     required: true
     category: bios_zip
+    system: sega-shootingzone
     source_ref: "upstream src/mame/drivers/shtzone.c:121"
 
   - name: su2000.zip
     required: true
     category: bios_zip
+    system: virtuality-su2000
     source_ref: "upstream src/mame/drivers/su2000.c:296"
 
   - name: tourvis.zip
     required: true
     category: bios_zip
+    system: pce-tourvision
     source_ref: "upstream src/mame/drivers/tourvis.c:612"
 
   - name: v4bios.zip
     required: true
     category: bios_zip
+    system: barcrest-mpu4
     source_ref: "upstream src/mame/drivers/mpu4vid.c:3655"
diff --git a/emulators/mame4all.yml b/emulators/mame4all.yml
index 807fcd2b..77c8d171 100644
--- a/emulators/mame4all.yml
+++ b/emulators/mame4all.yml
@@ -79,6 +79,7 @@ files:
     path: "mame4all/hiscore.dat"
     required: false
     category: game_data
+    system: arcade
     bundled: true
     size: 50821
     md5: "5567b18ff76cf4406c915d9d5deac2f4"
@@ -94,6 +95,7 @@ files:
     path: "mame4all/cheat.dat"
     required: false
     category: game_data
+    system: arcade
     bundled: true
     size: 1522317
     md5: "c5b456237958c7a7c120a8ad710786a0"
@@ -110,6 +112,7 @@ files:
     path: "mame4all/history.dat"
     required: false
     category: game_data
+    system: arcade
     description: "Game history database"
     note: "Read for the game information screen. Not installed."
     source_ref: "src/datafile.cpp:52, src/datafile.cpp:541, src/rpi/config.cpp:384"
@@ -118,6 +121,7 @@ files:
     path: "mame4all/mameinfo.dat"
     required: false
     category: game_data
+    system: arcade
     description: "Driver information database"
     note: "Read with history.dat for the game information screen. Not installed."
     source_ref: "src/datafile.cpp:53, src/datafile.cpp:568, src/rpi/config.cpp:386"
diff --git a/emulators/mame4droid.yml b/emulators/mame4droid.yml
index db6c0bcb..70306df9 100644
--- a/emulators/mame4droid.yml
+++ b/emulators/mame4droid.yml
@@ -63,6 +63,8 @@ systems:
   - exidy-maxaflex
   - brezzasoft-crystal
   - ces-galaxy-games
+  - taito-typezero
+  - barcrest-mpu4
 
 notes: |
   Android port of MAME 0.139u1 by David Valdeita (Seleuco), package
@@ -110,6 +112,7 @@ files:
     size: 219154
     sha1: "c686635c5470e4711dbf817e8196dcb169fdc68d"
     category: game_data
+    system: arcade
     description: "high score memory ranges per game"
     note: "Opened from the installation root with an empty search path, once per session, when the hiscore setting is on. That setting is off by default on Android. Seeded from the package assets on first run. The hash identifies that drop, the engine reads the file without checking it. Definitions are keyed to the 0.139 driver names, so another MAME generation's file is a different one."
     source_ref: "source src/emu/hiscore.c:29, 365, source src/emu/machine.c:379-382, source src/osd/droid-ios/osd-droid.c:89, 345"
@@ -121,6 +124,7 @@ files:
     size: 24981772
     sha1: "a737e925e3b86374da57496e3261d0303889977f"
     category: game_data
+    system: arcade
     description: "per-game XML cheat files"
     note: "cheat_list_load opens cheat/<gamename>.xml and fopen_attempt_zipped rewrites the directory component to cheat.zip. Loaded when the cheat setting is on. Seeded from the package assets on first run. The hash identifies that drop, the engine reads members without checking the container."
     source_ref: "source src/emu/cheat.c:428, 1026-1027, source src/emu/fileio.c:276-352, upstream src/emu/emuopts.c:48, source src/osd/droid-ios/osdmain.c:317"
@@ -132,6 +136,7 @@ files:
     size: 86983
     sha1: "75d31d949614b7d4e79de676c8a4b1c68b571f0a"
     category: game_data
+    system: arcade
     description: "game name to category map for the ROM list filter"
     note: "Read from the installation root with a plain fopen the first time the category filter is used, then sorted for binary search. Seeded from the package assets on first run. The hash identifies that drop, the reader checks nothing."
     source_ref: "source src/emu/uimenu.c:4600-4648"
@@ -140,6 +145,7 @@ files:
     path: ui.bdf
     required: false
     category: game_data
+    system: arcade
     description: "BDF font for the MAME menu overlay"
     note: "Opened from fontpath, which defaults to the installation root. A miss falls back to the font compiled into the binary. A successful load writes a ui.bdc cache next to it. The 0.139 tree carries no BDF: the built-in was generated from src/emu/uismall.png by png2bdc. The file here is the uismall.bdf MAME committed on 2016-03-20 from that same PNG, which differs in 8 of 191 glyphs (slashed zero, j, |, ~, 0xB4, ß, ø, ÿ) and passes every rule of render_font_load_bdf."
     source_ref: "source src/emu/ui.c:245, source src/emu/rendfont.c:139-163, 430, 453, source src/emu/emuopts.c:47"
@@ -148,6 +154,7 @@ files:
     path: crosshair/cross1.png
     required: false
     category: game_data
+    system: arcade
     description: "crosshair bitmap for player 1"
     note: "create_bitmap looks in crosshair/<gamename>/ first, then crosshair/, and falls back to the bitmap compiled into the binary. Loaded only for players whose input has a crosshair axis. No external set was ever shipped: the files here are the compiled-in bitmap of src/emu/crsshair.c exported as 100x100 RGBA PNGs in each player colour."
     source_ref: "source src/emu/crsshair.c:169-174, source src/emu/emuopts.c:49"
@@ -156,6 +163,7 @@ files:
     path: crosshair/cross2.png
     required: false
     category: game_data
+    system: arcade
     description: "crosshair bitmap for player 2"
     source_ref: "source src/emu/crsshair.c:169-174"
 
@@ -163,6 +171,7 @@ files:
     path: crosshair/cross3.png
     required: false
     category: game_data
+    system: arcade
     description: "crosshair bitmap for player 3"
     source_ref: "source src/emu/crsshair.c:169-174"
 
@@ -170,6 +179,7 @@ files:
     path: crosshair/cross4.png
     required: false
     category: game_data
+    system: arcade
     description: "crosshair bitmap for player 4"
     source_ref: "source src/emu/crsshair.c:169-174"
 
@@ -177,6 +187,7 @@ files:
     path: crosshair/cross5.png
     required: false
     category: game_data
+    system: arcade
     description: "crosshair bitmap for player 5"
     source_ref: "source src/emu/crsshair.c:169-174"
 
@@ -184,6 +195,7 @@ files:
     path: crosshair/cross6.png
     required: false
     category: game_data
+    system: arcade
     description: "crosshair bitmap for player 6"
     source_ref: "source src/emu/crsshair.c:169-174"
 
@@ -191,6 +203,7 @@ files:
     path: crosshair/cross7.png
     required: false
     category: game_data
+    system: arcade
     description: "crosshair bitmap for player 7"
     source_ref: "source src/emu/crsshair.c:169-174"
 
@@ -198,6 +211,7 @@ files:
     path: crosshair/cross8.png
     required: false
     category: game_data
+    system: arcade
     description: "crosshair bitmap for player 8"
     note: "MAX_PLAYERS is 8 in src/emu/inptport.h:29. crosshair_colors has seven entries, so player 8 reads past the table, and the file follows the white that 0.289 assigns beyond the table."
     source_ref: "source src/emu/crsshair.c:169-174, source src/emu/inptport.h:29"
@@ -1124,8 +1138,9 @@ files:
   - name: taitotz.zip
     required: true
     category: bios_zip
+    system: taito-typezero
     description: "Type Zero BIOS"
-    source_ref: "upstream src/mame/drivers/taitotz.c:188"
+    source_ref: "upstream src/mame/drivers/taitotz.c:187"
     contents:
       - name: "e68-05-1.ic6"
         size: 524288
@@ -1371,8 +1386,9 @@ files:
   - name: bctvidbs.zip
     required: true
     category: bios_zip
+    system: barcrest-mpu4
     description: "MPU4 Video Firmware"
-    source_ref: "upstream src/mame/drivers/mpu4drvr.c:3142"
+    source_ref: "upstream src/mame/drivers/mpu4drvr.c:3116"
     contents:
       - name: "vid.p1"
         size: 65536
diff --git a/emulators/ume2015.yml b/emulators/ume2015.yml
index 5b59de36..71eea26e 100644
--- a/emulators/ume2015.yml
+++ b/emulators/ume2015.yml
@@ -45,6 +45,38 @@ systems:
   - panasonic-3do
   - hyper-neogeo64
   - konami-twinkle
+  - arcade
+  - konami-gx
+  - taito-typezero
+  - taito-fx1
+  - atari-zn1
+  - acclaim-zn1
+  - tecmo-tps
+  - videosystem-zn1
+  - eighting-zn1
+  - atlus-zn1
+  - imax-macs
+  - arcadia-systems
+  - alg-laserdisc
+  - nintendo-aleck64
+  - atari-system1
+  - exidy-maxaflex
+  - brezzasoft-crystal
+  - ces-galaxy-games
+  - aristocrat-mk5
+  - aristocrat-mk6
+  - allied-leisure-pinball
+  - gameplan-mpu1
+  - gottlieb-system1
+  - konami-bubblesystem
+  - sega-isgsm
+  - itech-eagle
+  - konami-python
+  - sammy-medal
+  - sega-shootingzone
+  - virtuality-su2000
+  - pce-tourvision
+  - barcrest-mpu4
 
 notes: |
   Universal Machine Emulator: combined MAME + MESS before the official
@@ -68,10 +100,11 @@ files:
     path: "ume2015/hiscore.dat"
     required: false
     category: game_data
+    system: arcade
     sha1: "68e94fb579f46f3255ef7c34c0322f3f0f3c8e20"
     md5: "7e31f0b84f6ea6f9ffec0cd968decf9f"
     size: 216250
-    source_ref: "source src/emu/hiscore.c:122-138, 335-337"
+    source_ref: "source src/emu/hiscore.c:122-138, 335-337, source src/emu/machine.c:346-347"
     note: >-
       high score definitions, external file, not embedded. metadata/hiscore.dat of the core repository. is_mem_range reads
       only "cpu:addr:len:start:end" lines under a "gamename:" header.
@@ -118,24 +151,28 @@ files:
   - name: hod2bios.zip
     required: false
     category: bios_zip
+    system: sega-naomi
     source_ref: "upstream src/mame/drivers/naomi.c:8961"
     note: "game-specific BIOS for House of the Dead 2"
 
   - name: f355dlx.zip
     required: false
     category: bios_zip
+    system: sega-naomi
     source_ref: "upstream src/mame/drivers/naomi.c:8962"
     note: "game-specific BIOS for Ferrari F355 Challenge deluxe"
 
   - name: f355bios.zip
     required: false
     category: bios_zip
+    system: sega-naomi
     source_ref: "upstream src/mame/drivers/naomi.c:8963"
     note: "game-specific BIOS for Ferrari F355 Challenge twin"
 
   - name: airlbios.zip
     required: false
     category: bios_zip
+    system: sega-naomi
     source_ref: "upstream src/mame/drivers/naomi.c:8964"
     note: "game-specific BIOS for Airline Pilots deluxe"
 
@@ -259,6 +296,7 @@ files:
   - name: konamigx.zip
     required: true
     category: bios_zip
+    system: konami-gx
     source_ref: "upstream src/mame/drivers/konamigx.c:3775"
 
   - name: gq863.zip
@@ -277,11 +315,13 @@ files:
   - name: taitotz.zip
     required: true
     category: bios_zip
+    system: taito-typezero
     source_ref: "upstream src/mame/drivers/taitotz.c:2951"
 
   - name: taitofx1.zip
     required: true
     category: bios_zip
+    system: taito-fx1
     source_ref: "upstream src/mame/drivers/zn.c:4906"
 
   # PSX-based arcade boards (ZN)
@@ -300,31 +340,37 @@ files:
   - name: atpsx.zip
     required: true
     category: bios_zip
+    system: atari-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4853"
 
   - name: acpsx.zip
     required: true
     category: bios_zip
+    system: acclaim-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4862"
 
   - name: tps.zip
     required: true
     category: bios_zip
+    system: tecmo-tps
     source_ref: "upstream src/mame/drivers/zn.c:4873"
 
   - name: vspsx.zip
     required: true
     category: bios_zip
+    system: videosystem-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4896"
 
   - name: psarc95.zip
     required: true
     category: bios_zip
+    system: eighting-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4935"
 
   - name: atluspsx.zip
     required: true
     category: bios_zip
+    system: atlus-zn1
     source_ref: "upstream src/mame/drivers/zn.c:4961"
 
   # Super Kaneko Nova System
@@ -337,11 +383,13 @@ files:
   - name: mac2bios.zip
     required: true
     category: bios_zip
+    system: imax-macs
     source_ref: "upstream src/mame/drivers/macs.c:747"
 
   - name: macsbios.zip
     required: true
     category: bios_zip
+    system: imax-macs
     source_ref: "upstream src/mame/drivers/macs.c:746"
 
   # Panasonic 3DO
@@ -362,123 +410,146 @@ files:
   - name: ar_bios.zip
     required: true
     category: bios_zip
+    system: arcadia-systems
     source_ref: "upstream src/mame/drivers/arcadia.c:963"
 
   # American Laser Games
   - name: alg_bios.zip
     required: true
     category: bios_zip
+    system: alg-laserdisc
     source_ref: "upstream src/mame/drivers/alg.c:772"
 
   # Aleck64 (N64-based)
   - name: aleck64.zip
     required: true
     category: bios_zip
+    system: nintendo-aleck64
     source_ref: "upstream src/mame/drivers/aleck64.c:1161"
 
   # Atari System 1
   - name: atarisy1.zip
     required: true
     category: bios_zip
+    system: atari-system1
     source_ref: "upstream src/mame/drivers/atarisy1.c:2368"
 
   # Exidy Max-A-Flex
   - name: maxaflex.zip
     required: true
     category: bios_zip
+    system: exidy-maxaflex
     source_ref: "upstream src/mame/drivers/maxaflex.c:536"
 
   # Crystal System
   - name: crysbios.zip
     required: true
     category: bios_zip
+    system: brezzasoft-crystal
     source_ref: "upstream src/mame/drivers/crystal.c:1134"
 
   # Galaxy Games
   - name: galgbios.zip
     required: true
     category: bios_zip
+    system: ces-galaxy-games
     source_ref: "source src/mame/drivers/tmaster.c:1850"
 
   # Aristocrat MK5/MK6
   - name: aristmk5.zip
     required: true
     category: bios_zip
+    system: aristocrat-mk5
     source_ref: "upstream src/mame/drivers/aristmk5.c:739"
 
   - name: aristmk6.zip
     required: true
     category: bios_zip
+    system: aristocrat-mk6
     source_ref: "source src/mame/drivers/aristmk6.c:224"
 
   - name: mk6nsw11.zip
     required: true
     category: bios_zip
+    system: aristocrat-mk6
     source_ref: "source src/mame/drivers/aristmk6.c:225"
 
   # Pinball
   - name: allied.zip
     required: true
     category: bios_zip
+    system: allied-leisure-pinball
     source_ref: "upstream src/mame/drivers/allied.c:711"
 
   - name: gp_110.zip
     required: true
     category: bios_zip
+    system: gameplan-mpu1
     source_ref: "upstream src/mame/drivers/gp_1.c:531"
 
   - name: gts1.zip
     required: true
     category: bios_zip
+    system: gottlieb-system1
     source_ref: "upstream src/mame/drivers/gts1.c:978"
 
   - name: gts1s.zip
     required: true
     category: bios_zip
+    system: gottlieb-system1
     source_ref: "upstream src/mame/drivers/gts1.c:981"
 
   # Other BIOS root sets
   - name: bubsys.zip
     required: true
     category: bios_zip
+    system: konami-bubblesystem
     source_ref: "upstream src/mame/drivers/nemesis.c:2707"
 
   - name: isgsm.zip
     required: true
     category: bios_zip
+    system: sega-isgsm
     source_ref: "upstream src/mame/drivers/segas16b.c:7501"
 
   - name: iteagle.zip
     required: true
     category: bios_zip
+    system: itech-eagle
     source_ref: "source src/mame/drivers/iteagle.c:315"
 
   - name: pyson.zip
     required: true
     category: bios_zip
+    system: konami-python
     source_ref: "upstream src/mame/drivers/pyson.c:251"
 
   - name: sammymdl.zip
     required: true
     category: bios_zip
+    system: sammy-medal
     source_ref: "source src/mame/drivers/sigmab98.c:2277"
 
   - name: shtzone.zip
     required: true
     category: bios_zip
+    system: sega-shootingzone
     source_ref: "upstream src/mame/drivers/shtzone.c:121"
 
   - name: su2000.zip
     required: true
     category: bios_zip
+    system: virtuality-su2000
     source_ref: "upstream src/mame/drivers/su2000.c:296"
 
   - name: tourvis.zip
     required: true
     category: bios_zip
+    system: pce-tourvision
     source_ref: "upstream src/mame/drivers/tourvis.c:612"
 
   - name: v4bios.zip
     required: true
     category: bios_zip
+    system: barcrest-mpu4
     source_ref: "upstream src/mame/drivers/mpu4vid.c:3655"