diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs
index c2d5bb6cc9..08485cd273 100644
--- a/src/BizHawk.Client.Common/RomLoader.cs
+++ b/src/BizHawk.Client.Common/RomLoader.cs
@@ -943,45 +943,45 @@ namespace BizHawk.Client.Common
 
 		/// <remarks>TODO add and handle <see cref="FilesystemFilter.LuaScripts"/> (you can drag-and-drop scripts and there are already non-rom things in this list, so why not?)</remarks>
 		public static readonly FilesystemFilterSet RomFilter = new(
-			new FilesystemFilter("Music Files", Array.Empty<string>(), devBuildExtraExts: new[] { "psf", "minipsf", "sid", "nsf", "gbs" }),
+			FilesystemFilter.Archives,
 			new FilesystemFilter("Disc Images", FilesystemFilter.DiscExtensions),
 			new FilesystemFilter("Rom Bundles", new[] { "xml" }),
-			new FilesystemFilter("NES", RomFileExtensions.NES.Concat(new[] { "nsf" }).ToList(), addArchiveExts: true),
-			new FilesystemFilter("Super NES", RomFileExtensions.SNES, addArchiveExts: true),
-			new FilesystemFilter("PlayStation", RomFileExtensions.PSX.Concat(FilesystemFilter.DiscExtensions).ToList()),
-			new FilesystemFilter("PSF Playstation Sound File", new[] { "psf", "minipsf" }),
-			new FilesystemFilter("Nintendo 64", RomFileExtensions.N64),
-			new FilesystemFilter("Nintendo 64 Disk Drive", RomFileExtensions.N64DD),
-			new FilesystemFilter("Gameboy", RomFileExtensions.GB.Concat(new[] { "gbs" }).ToList(), addArchiveExts: true),
-			new FilesystemFilter("Gameboy Advance", RomFileExtensions.GBA, addArchiveExts: true),
-			new FilesystemFilter("Nintendo 3DS", RomFileExtensions.N3DS),
-			new FilesystemFilter("Nintendo DS", RomFileExtensions.NDS),
-			new FilesystemFilter("Master System", RomFileExtensions.SMS, addArchiveExts: true),
-			new FilesystemFilter("PC Engine", RomFileExtensions.PCE.Concat(FilesystemFilter.DiscExtensions).ToList(), addArchiveExts: true),
-			new FilesystemFilter("Atari 2600", RomFileExtensions.A26, devBuildExtraExts: new[] { "bin" }, addArchiveExts: true),
-			new FilesystemFilter("Atari 7800", RomFileExtensions.A78, devBuildExtraExts: new[] { "bin" }, addArchiveExts: true),
-			new FilesystemFilter("Atari Jaguar", RomFileExtensions.Jaguar, addArchiveExts: true),
-			new FilesystemFilter("Atari Lynx", RomFileExtensions.Lynx, addArchiveExts: true),
-			new FilesystemFilter("ColecoVision", RomFileExtensions.Coleco, addArchiveExts: true),
-			new FilesystemFilter("IntelliVision", RomFileExtensions.INTV, addArchiveExts: true),
-			new FilesystemFilter("TI-83", RomFileExtensions.TI83, addArchiveExts: true),
-			new FilesystemFilter("TIC-80", RomFileExtensions.TIC80, addArchiveExts: true),
-			FilesystemFilter.Archives,
-			new FilesystemFilter("Genesis", RomFileExtensions.GEN.Concat(FilesystemFilter.DiscExtensions).ToList(), addArchiveExts: true),
-			new FilesystemFilter("SID Commodore 64 Music File", Array.Empty<string>(), devBuildExtraExts: new[] { "sid" }, devBuildAddArchiveExts: true),
-			new FilesystemFilter("WonderSwan", RomFileExtensions.WSWAN, addArchiveExts: true),
-			new FilesystemFilter("Apple II", RomFileExtensions.AppleII, addArchiveExts: true),
-			new FilesystemFilter("Virtual Boy", RomFileExtensions.VB, addArchiveExts: true),
-			new FilesystemFilter("Neo Geo Pocket", RomFileExtensions.NGP, addArchiveExts: true),
-			new FilesystemFilter("Commodore 64", RomFileExtensions.C64, addArchiveExts: true),
-			new FilesystemFilter("Amstrad CPC", Array.Empty<string>(), devBuildExtraExts: new[] { "cdt", "dsk" }, devBuildAddArchiveExts: true),
-			new FilesystemFilter("Sinclair ZX Spectrum", RomFileExtensions.ZXSpectrum.Concat(new[] { "csw", "wav" }).ToList(), addArchiveExts: true),
-			new FilesystemFilter("Odyssey 2", RomFileExtensions.O2),
-			new FilesystemFilter("Uzebox", RomFileExtensions.UZE),
-			new FilesystemFilter("Vectrex", RomFileExtensions.VEC),
-			new FilesystemFilter("MSX", RomFileExtensions.MSX),
-			new FilesystemFilter("Arcade", RomFileExtensions.Arcade),
-			new FilesystemFilter("Amiga", RomFileExtensions.Amiga),
+			new FilesystemFilter(/*VSystemID.Raw.N3DS*/"Nintendo 3DS", RomFileExtensions.N3DS),
+			new FilesystemFilter(/*VSystemID.Raw.A26*/"Atari 2600", RomFileExtensions.A26, devBuildExtraExts: new[] { "bin" }, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.A78*/"Atari 7800", RomFileExtensions.A78, devBuildExtraExts: new[] { "bin" }, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.Amiga*/"Amiga", RomFileExtensions.Amiga),
+			new FilesystemFilter(/*VSystemID.Raw.AmstradCPC*/"Amstrad CPC", Array.Empty<string>(), devBuildExtraExts: new[] { "cdt", "dsk" }, devBuildAddArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.AppleII*/"Apple II", RomFileExtensions.AppleII, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.Arcade*/"Arcade", RomFileExtensions.Arcade),
+			new FilesystemFilter(/*VSystemID.Raw.C64*/"Commodore 64", RomFileExtensions.C64, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.C64*/"SID Commodore 64 Music File", Array.Empty<string>(), devBuildExtraExts: new[] { "sid" }, devBuildAddArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.Coleco*/"ColecoVision", RomFileExtensions.Coleco, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.GB*/"Gameboy", RomFileExtensions.GB.Concat(new[] { "gbs" }).ToList(), addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.GBA*/"Gameboy Advance", RomFileExtensions.GBA, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.GEN*/"Genesis", RomFileExtensions.GEN.Concat(FilesystemFilter.DiscExtensions).ToList(), addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.INTV*/"IntelliVision", RomFileExtensions.INTV, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.Jaguar*/"Atari Jaguar", RomFileExtensions.Jaguar, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.Lynx*/"Atari Lynx", RomFileExtensions.Lynx, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.MSX*/"MSX", RomFileExtensions.MSX),
+			new FilesystemFilter(/*VSystemID.Raw.N64*/"Nintendo 64", RomFileExtensions.N64),
+			new FilesystemFilter(/*VSystemID.Raw.N64*/"Nintendo 64 Disk Drive", RomFileExtensions.N64DD),
+			new FilesystemFilter(/*VSystemID.Raw.NDS*/"Nintendo DS", RomFileExtensions.NDS),
+			new FilesystemFilter(/*VSystemID.Raw.NES*/"NES", RomFileExtensions.NES.Concat(new[] { "nsf" }).ToList(), addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.NGP*/"Neo Geo Pocket", RomFileExtensions.NGP, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.O2*/"Odyssey 2", RomFileExtensions.O2),
+			new FilesystemFilter(/*VSystemID.Raw.PCE*/"PC Engine", RomFileExtensions.PCE.Concat(FilesystemFilter.DiscExtensions).ToList(), addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.PSX*/"PlayStation", RomFileExtensions.PSX.Concat(FilesystemFilter.DiscExtensions).ToList()),
+			new FilesystemFilter(/*VSystemID.Raw.PSX*/"PSF Playstation Sound File", new[] { "psf", "minipsf" }),
+			new FilesystemFilter(/*VSystemID.Raw.SMS*/"Master System", RomFileExtensions.SMS, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.SNES*/"Super NES", RomFileExtensions.SNES, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.TI83*/"TI-83", RomFileExtensions.TI83, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.TIC80*/"TIC-80", RomFileExtensions.TIC80, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.UZE*/"Uzebox", RomFileExtensions.UZE),
+			new FilesystemFilter(/*VSystemID.Raw.VB*/"Virtual Boy", RomFileExtensions.VB, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.VEC*/"Vectrex", RomFileExtensions.VEC),
+			new FilesystemFilter(/*VSystemID.Raw.WSWAN*/"WonderSwan", RomFileExtensions.WSWAN, addArchiveExts: true),
+			new FilesystemFilter(/*VSystemID.Raw.ZXSpectrum*/"Sinclair ZX Spectrum", RomFileExtensions.ZXSpectrum.Concat(new[] { "csw", "wav" }).ToList(), addArchiveExts: true),
+			new FilesystemFilter("Music Files", Array.Empty<string>(), devBuildExtraExts: new[] { "psf", "minipsf", "sid", "nsf", "gbs" }),
 			FilesystemFilter.EmuHawkSaveStates)
 		{
 			CombinedEntryDesc = "Everything",