diff --git a/src/BizHawk.Client.Common/config/Config.cs b/src/BizHawk.Client.Common/config/Config.cs
index bc39a4252c..b87856c447 100644
--- a/src/BizHawk.Client.Common/config/Config.cs
+++ b/src/BizHawk.Client.Common/config/Config.cs
@@ -25,28 +25,28 @@ namespace BizHawk.Client.Common
 		/// </remarks>
 		public static readonly IReadOnlyList<(string[] AppliesTo, string[] CoreNames)> CorePickerUIData = new List<(string[], string[])>
 		{
-			(new[] { VSystemID.Raw.GB, VSystemID.Raw.GBC },
-				new[] { CoreNames.Gambatte, CoreNames.Sameboy, CoreNames.GbHawk, CoreNames.SubGbHawk }),
-			(new[] { VSystemID.Raw.GBL },
-				new[] { CoreNames.GambatteLink, CoreNames.GBHawkLink, CoreNames.GBHawkLink3x, CoreNames.GBHawkLink4x }),
-			(new[] { VSystemID.Raw.SGB },
-				new[] { CoreNames.Gambatte, CoreNames.Bsnes115, CoreNames.SubBsnes115, CoreNames.Bsnes }),
-			(new[] { VSystemID.Raw.GEN },
-				new[] { CoreNames.Gpgx, CoreNames.PicoDrive }),
-			(new[] { VSystemID.Raw.N64 },
-				new[] { CoreNames.Mupen64Plus, CoreNames.Ares64 }),
-			(new[] { VSystemID.Raw.NES },
-				new[] { CoreNames.QuickNes, CoreNames.NesHawk, CoreNames.SubNesHawk }),
-			(new[] { VSystemID.Raw.PCE, VSystemID.Raw.PCECD, VSystemID.Raw.SGX, VSystemID.Raw.SGXCD },
-				new[] { CoreNames.TurboNyma, CoreNames.HyperNyma, CoreNames.PceHawk }),
-			(new[] { VSystemID.Raw.PSX },
-				new[] { CoreNames.Nymashock, CoreNames.Octoshock }),
-			(new[] { VSystemID.Raw.SMS, VSystemID.Raw.GG, VSystemID.Raw.SG },
-				new[] { CoreNames.Gpgx, CoreNames.SMSHawk }),
-			(new[] { VSystemID.Raw.SNES },
-				new[] { CoreNames.Snes9X, CoreNames.Bsnes115, CoreNames.SubBsnes115, CoreNames.Faust, CoreNames.Bsnes }),
-			(new[] { VSystemID.Raw.TI83 },
-				new[] { CoreNames.Emu83, CoreNames.TI83Hawk }),
+			([ VSystemID.Raw.GB, VSystemID.Raw.GBC ],
+				[ CoreNames.Gambatte, CoreNames.Sameboy, CoreNames.GbHawk, CoreNames.SubGbHawk ]),
+			([ VSystemID.Raw.GBL ],
+				[ CoreNames.GambatteLink, CoreNames.GBHawkLink, CoreNames.GBHawkLink3x, CoreNames.GBHawkLink4x ]),
+			([ VSystemID.Raw.SGB ],
+				[ CoreNames.Gambatte, CoreNames.Bsnes115, CoreNames.SubBsnes115, CoreNames.Bsnes ]),
+			([ VSystemID.Raw.GEN ],
+				[ CoreNames.Gpgx, CoreNames.PicoDrive ]),
+			([ VSystemID.Raw.N64 ],
+				[ CoreNames.Mupen64Plus, CoreNames.Ares64 ]),
+			([ VSystemID.Raw.NES ],
+				[ CoreNames.QuickNes, CoreNames.NesHawk, CoreNames.SubNesHawk ]),
+			([ VSystemID.Raw.PCE, VSystemID.Raw.PCECD, VSystemID.Raw.SGX, VSystemID.Raw.SGXCD ],
+				[ CoreNames.TurboNyma, CoreNames.HyperNyma, CoreNames.PceHawk ]),
+			([ VSystemID.Raw.PSX ],
+				[ CoreNames.Nymashock, CoreNames.Octoshock ]),
+			([ VSystemID.Raw.SMS, VSystemID.Raw.GG, VSystemID.Raw.SG ],
+				[ CoreNames.Gpgx, CoreNames.SMSHawk ]),
+			([ VSystemID.Raw.SNES ],
+				[ CoreNames.Snes9X, CoreNames.Bsnes115, CoreNames.SubBsnes115, CoreNames.Faust, CoreNames.Bsnes ]),
+			([ VSystemID.Raw.TI83 ],
+				[ CoreNames.Emu83, CoreNames.TI83Hawk ]),
 		};
 
 		public Config()
@@ -383,18 +383,22 @@ namespace BizHawk.Client.Common
 
 		public Dictionary<string, string> PreferredCores = new()
 		{
-			[VSystemID.Raw.NES] = CoreNames.QuickNes,
-			[VSystemID.Raw.SNES] = CoreNames.Snes9X,
-			[VSystemID.Raw.N64] = CoreNames.Mupen64Plus,
 			[VSystemID.Raw.GB] = CoreNames.Gambatte,
 			[VSystemID.Raw.GBC] = CoreNames.Gambatte,
 			[VSystemID.Raw.GBL] = CoreNames.GambatteLink,
 			[VSystemID.Raw.SGB] = CoreNames.Gambatte,
+			[VSystemID.Raw.GEN] = CoreNames.Gpgx,
+			[VSystemID.Raw.N64] = CoreNames.Mupen64Plus,
+			[VSystemID.Raw.NES] = CoreNames.QuickNes,
 			[VSystemID.Raw.PCE] = CoreNames.TurboNyma,
 			[VSystemID.Raw.PCECD] = CoreNames.TurboNyma,
 			[VSystemID.Raw.SGX] = CoreNames.TurboNyma,
 			[VSystemID.Raw.SGXCD] = CoreNames.TurboNyma,
 			[VSystemID.Raw.PSX] = CoreNames.Nymashock,
+			[VSystemID.Raw.SMS] = CoreNames.Gpgx, 
+			[VSystemID.Raw.GG] = CoreNames.Gpgx,
+			[VSystemID.Raw.SG] = CoreNames.Gpgx,
+			[VSystemID.Raw.SNES] = CoreNames.Snes9X,
 			[VSystemID.Raw.TI83] = CoreNames.Emu83,
 		};