diff --git a/install/amberelec.json b/install/amberelec.json
index 827faab4..32e73e66 100644
--- a/install/amberelec.json
+++ b/install/amberelec.json
@@ -44340,9 +44340,7 @@
       "size": 131072,
       "repo_path": "bios/Sega/Dreamcast/dc_nvmem.bin",
       "cores": [
-        "flycast",
-        "flycast2021",
-        "flycast2021le"
+        "flycast"
       ],
       "systems": [
         "sega-dreamcast"
@@ -44733,13 +44731,11 @@
       "repo_path": "bios/Nintendo/Game Boy/dmg_boot.bin",
       "cores": [
         "gearboy",
-        "sameboy",
-        "mesen-s"
+        "sameboy"
       ],
       "systems": [
         "nintendo-gb",
-        "nintendo-gbc",
-        "nintendo-satellaview"
+        "nintendo-gbc"
       ]
     },
     {
@@ -44750,13 +44746,11 @@
       "repo_path": "bios/Nintendo/Game Boy Color/cgb_boot.bin",
       "cores": [
         "gearboy",
-        "sameboy",
-        "mesen-s"
+        "sameboy"
       ],
       "systems": [
         "nintendo-gb",
-        "nintendo-gbc",
-        "nintendo-satellaview"
+        "nintendo-gbc"
       ]
     },
     {
@@ -64614,11 +64608,23 @@
       "size": 251658304,
       "repo_path": "bios/Nintendo/Nintendo DSi/dsi_nand.bin",
       "cores": [
-        "melonds_ds",
-        "melonds"
+        "melonds_ds"
       ],
       "storage": "release",
-      "release_asset": "dsi_nand.bin"
+      "release_asset": "dsi_nand.bin",
+      "alternatives": [
+        {
+          "sha1": "2b972cec368e83a2699e6ab38165638b1bc1302c",
+          "sha256": "eb8960711bb99c11d1c92de195c29c8e1bf927e8e1a5d134155fd69a9a11134e",
+          "size": 251658304,
+          "repo_path": "bios/Nintendo/Nintendo DSi/.variants/dsi_nand.bin.8b79a73c",
+          "cores": [
+            "melonds"
+          ],
+          "storage": "release",
+          "release_asset": "dsi_nand.bin.8b79a73c"
+        }
+      ]
     },
     {
       "dest": "bios/StudyBox.bin",
@@ -65712,13 +65718,7 @@
       "size": 256,
       "repo_path": "bios/Nintendo/Super Game Boy/sgb_boot.bin",
       "cores": [
-        "sameboy",
-        "mesen-s"
-      ],
-      "systems": [
-        "nintendo-gb",
-        "nintendo-gbc",
-        "nintendo-satellaview"
+        "sameboy"
       ]
     },
     {
@@ -65728,13 +65728,7 @@
       "size": 256,
       "repo_path": "bios/Nintendo/Super Game Boy/sgb2_boot.bin",
       "cores": [
-        "sameboy",
-        "mesen-s"
-      ],
-      "systems": [
-        "nintendo-gb",
-        "nintendo-gbc",
-        "nintendo-satellaview"
+        "sameboy"
       ]
     },
     {
@@ -65827,9 +65821,7 @@
       "size": 262144,
       "repo_path": "bios/Commodore/Amiga/amiga-ext-130-cdtv.rom",
       "cores": [
-        "uae4arm",
-        "puae",
-        "puae2021"
+        "uae4arm"
       ],
       "systems": [
         "commodore-amiga"
diff --git a/install/batocera.json b/install/batocera.json
index 1eaa7d6a..ea34b904 100644
--- a/install/batocera.json
+++ b/install/batocera.json
@@ -12086,9 +12086,6 @@
         "latin-america",
         "north-america"
       ],
-      "region_groups": [
-        "sony-playstation"
-      ],
       "region_system_groups": [
         "sony-playstation"
       ],
@@ -12099,6 +12096,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph1001.bin",
           "cores": [
+            "duckstation",
             "duckstation-legacy",
             "pcsx_rearmed"
           ]
@@ -12132,6 +12130,7 @@
           "repo_path": "bios/Sony/PlayStation/scph5500.bin",
           "cores": [
             "beetle_psx",
+            "duckstation",
             "duckstation-legacy",
             "pcsx_rearmed",
             "swanstation"
@@ -12167,6 +12166,7 @@
           "repo_path": "bios/Sony/PlayStation/scph5501.bin",
           "cores": [
             "beetle_psx",
+            "duckstation",
             "duckstation-legacy",
             "pcsx_rearmed",
             "swanstation"
@@ -12202,6 +12202,7 @@
           "repo_path": "bios/Sony/PlayStation/scph5502.bin",
           "cores": [
             "beetle_psx",
+            "duckstation",
             "duckstation-legacy",
             "pcsx_rearmed",
             "swanstation"
@@ -12223,9 +12224,6 @@
         "latin-america",
         "north-america"
       ],
-      "region_groups": [
-        "sony-playstation"
-      ],
       "region_system_groups": [
         "sony-playstation"
       ],
@@ -12236,6 +12234,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph7001.bin",
           "cores": [
+            "duckstation",
             "duckstation-legacy",
             "pcsx_rearmed"
           ]
@@ -60665,7 +60664,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1002b.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -60686,7 +60686,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1002c.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -60707,7 +60708,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/dtlh1100.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -60727,7 +60729,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1001_v20.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -60748,7 +60751,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1001_v21.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -60769,7 +60773,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph5000.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -60789,7 +60794,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph7000w.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -60809,7 +60815,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph101_v44.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -60830,7 +60837,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1000r.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -60850,7 +60858,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/ps2-50j.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -60870,7 +60879,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/ps2_scph30003.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -61776,10 +61786,12 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2_scph50006.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "pcsx2"
       ],
       "systems": [
-        "sony-playstation"
+        "sony-playstation",
+        "sony-playstation-2"
       ],
       "regions": [
         "japan"
@@ -61816,10 +61828,12 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2_scph50008.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "pcsx2"
       ],
       "systems": [
-        "sony-playstation"
+        "sony-playstation",
+        "sony-playstation-2"
       ],
       "regions": [
         "europe",
@@ -179419,7 +179433,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/openbios.bin",
       "cores": [
-        "beetle_psx"
+        "beetle_psx",
+        "duckstation"
       ],
       "systems": [
         "sony-playstation"
diff --git a/install/emudeck.json b/install/emudeck.json
index e13e679f..b78b755e 100644
--- a/install/emudeck.json
+++ b/install/emudeck.json
@@ -2076,6 +2076,7 @@
           "cores": [
             "ares",
             "beetle_psx",
+            "duckstation",
             "pcsx_rearmed",
             "rustation",
             "swanstation"
@@ -2102,6 +2103,7 @@
           "cores": [
             "ares",
             "beetle_psx",
+            "duckstation",
             "pcsx1",
             "pcsx_rearmed",
             "rustation",
@@ -2139,6 +2141,7 @@
           "cores": [
             "ares",
             "beetle_psx",
+            "duckstation",
             "pcsx_rearmed",
             "rustation",
             "swanstation"
@@ -5062,7 +5065,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1000.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -5082,7 +5086,10 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1001.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation",
+        "pcsx1",
+        "pcsx_rearmed"
       ],
       "systems": [
         "sony-playstation"
@@ -5124,7 +5131,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1002b.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -5145,7 +5153,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1002c.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -5166,7 +5175,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/dtlh1100.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -5186,7 +5196,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph3000.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -5206,7 +5217,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1001_v20.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -5227,7 +5239,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph3500.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -5247,7 +5260,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1001_v21.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -5268,7 +5282,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph5000.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -5288,7 +5303,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph7000.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -5308,7 +5324,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph7000w.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -5328,7 +5345,10 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph7001.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation",
+        "pcsx1",
+        "pcsx_rearmed"
       ],
       "systems": [
         "sony-playstation"
@@ -5349,7 +5369,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph7002.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -5370,7 +5391,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph100.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -5453,7 +5475,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph102B.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -6420,10 +6443,12 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2_scph50006.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "pcsx2"
       ],
       "systems": [
-        "sony-playstation"
+        "sony-playstation",
+        "sony-playstation-2"
       ],
       "regions": [
         "japan"
@@ -6460,10 +6485,12 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2_scph50008.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "pcsx2"
       ],
       "systems": [
-        "sony-playstation"
+        "sony-playstation",
+        "sony-playstation-2"
       ],
       "regions": [
         "europe",
@@ -69260,7 +69287,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/openbios.bin",
       "cores": [
-        "beetle_psx"
+        "beetle_psx",
+        "duckstation"
       ],
       "systems": [
         "sony-playstation"
@@ -72173,8 +72201,7 @@
       "size": 131072,
       "repo_path": "bios/Sega/Dreamcast/dc_nvmem.bin",
       "cores": [
-        "flycast",
-        "flycast2021"
+        "flycast"
       ],
       "systems": [
         "sega-dreamcast"
@@ -91911,11 +91938,23 @@
       "size": 251658304,
       "repo_path": "bios/Nintendo/Nintendo DSi/dsi_nand.bin",
       "cores": [
-        "melonds_ds",
-        "melonds"
+        "melonds_ds"
       ],
       "storage": "release",
-      "release_asset": "dsi_nand.bin"
+      "release_asset": "dsi_nand.bin",
+      "alternatives": [
+        {
+          "sha1": "2b972cec368e83a2699e6ab38165638b1bc1302c",
+          "sha256": "eb8960711bb99c11d1c92de195c29c8e1bf927e8e1a5d134155fd69a9a11134e",
+          "size": 251658304,
+          "repo_path": "bios/Nintendo/Nintendo DSi/.variants/dsi_nand.bin.8b79a73c",
+          "cores": [
+            "melonds"
+          ],
+          "storage": "release",
+          "release_asset": "dsi_nand.bin.8b79a73c"
+        }
+      ]
     },
     {
       "dest": "StudyBox.bin",
@@ -98364,7 +98403,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0230a-20080220.bin",
       "cores": [
-        "armsx2"
+        "armsx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
diff --git a/install/emuelec.json b/install/emuelec.json
index 4b8a01de..331d0071 100644
--- a/install/emuelec.json
+++ b/install/emuelec.json
@@ -9889,6 +9889,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph5500.bin",
           "cores": [
+            "duckstation",
             "pcsx_rearmed",
             "swanstation"
           ]
@@ -9923,6 +9924,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph5501.bin",
           "cores": [
+            "duckstation",
             "pcsx_rearmed",
             "swanstation"
           ]
@@ -9957,6 +9959,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph5502.bin",
           "cores": [
+            "duckstation",
             "pcsx_rearmed",
             "swanstation"
           ]
@@ -13927,7 +13930,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1001.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "pcsx_rearmed"
       ],
       "systems": [
         "sony-playstation"
@@ -14173,7 +14177,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph7001.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "pcsx_rearmed"
       ],
       "systems": [
         "sony-playstation"
@@ -48859,13 +48864,11 @@
       "repo_path": "bios/Nintendo/Game Boy/dmg_boot.bin",
       "cores": [
         "gearboy",
-        "sameboy",
-        "mesen-s"
+        "sameboy"
       ],
       "systems": [
         "nintendo-gb",
-        "nintendo-gbc",
-        "nintendo-satellaview"
+        "nintendo-gbc"
       ]
     },
     {
@@ -48876,13 +48879,11 @@
       "repo_path": "bios/Nintendo/Game Boy Color/cgb_boot.bin",
       "cores": [
         "gearboy",
-        "sameboy",
-        "mesen-s"
+        "sameboy"
       ],
       "systems": [
         "nintendo-gb",
-        "nintendo-gbc",
-        "nintendo-satellaview"
+        "nintendo-gbc"
       ]
     },
     {
@@ -70794,13 +70795,7 @@
       "size": 256,
       "repo_path": "bios/Nintendo/Super Game Boy/sgb_boot.bin",
       "cores": [
-        "sameboy",
-        "mesen-s"
-      ],
-      "systems": [
-        "nintendo-gb",
-        "nintendo-gbc",
-        "nintendo-satellaview"
+        "sameboy"
       ]
     },
     {
@@ -70810,13 +70805,7 @@
       "size": 256,
       "repo_path": "bios/Nintendo/Super Game Boy/sgb2_boot.bin",
       "cores": [
-        "sameboy",
-        "mesen-s"
-      ],
-      "systems": [
-        "nintendo-gb",
-        "nintendo-gbc",
-        "nintendo-satellaview"
+        "sameboy"
       ]
     },
     {
@@ -70909,9 +70898,7 @@
       "size": 262144,
       "repo_path": "bios/Commodore/Amiga/amiga-ext-130-cdtv.rom",
       "cores": [
-        "uae4arm",
-        "puae",
-        "puae2021"
+        "uae4arm"
       ],
       "systems": [
         "commodore-amiga"
diff --git a/install/knulli.json b/install/knulli.json
index c0b2b463..89b0a859 100644
--- a/install/knulli.json
+++ b/install/knulli.json
@@ -10711,9 +10711,6 @@
         "latin-america",
         "north-america"
       ],
-      "region_groups": [
-        "sony-playstation"
-      ],
       "region_system_groups": [
         "sony-playstation"
       ],
@@ -10724,6 +10721,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph1001.bin",
           "cores": [
+            "duckstation",
             "duckstation-legacy",
             "pcsx_rearmed"
           ]
@@ -10757,6 +10755,7 @@
           "repo_path": "bios/Sony/PlayStation/scph5500.bin",
           "cores": [
             "beetle_psx",
+            "duckstation",
             "duckstation-legacy",
             "pcsx_rearmed",
             "swanstation"
@@ -10792,6 +10791,7 @@
           "repo_path": "bios/Sony/PlayStation/scph5501.bin",
           "cores": [
             "beetle_psx",
+            "duckstation",
             "duckstation-legacy",
             "pcsx_rearmed",
             "swanstation"
@@ -10827,6 +10827,7 @@
           "repo_path": "bios/Sony/PlayStation/scph5502.bin",
           "cores": [
             "beetle_psx",
+            "duckstation",
             "duckstation-legacy",
             "pcsx_rearmed",
             "swanstation"
@@ -10848,9 +10849,6 @@
         "latin-america",
         "north-america"
       ],
-      "region_groups": [
-        "sony-playstation"
-      ],
       "region_system_groups": [
         "sony-playstation"
       ],
@@ -10861,6 +10859,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph7001.bin",
           "cores": [
+            "duckstation",
             "duckstation-legacy",
             "pcsx_rearmed"
           ]
@@ -20957,7 +20956,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1000.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -20977,7 +20977,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1002.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -20998,7 +20999,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1002b.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21019,7 +21021,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1002c.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21040,7 +21043,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/dtlh1100.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21060,7 +21064,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph3000.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21080,7 +21085,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1001_v20.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21101,7 +21107,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph3500.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21121,7 +21128,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1001_v21.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21142,7 +21150,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph5000.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21162,7 +21171,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph7000.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21182,7 +21192,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph7000w.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21202,7 +21213,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph7002.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21223,7 +21235,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph100.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21243,7 +21256,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph101_v44.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21264,7 +21278,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph101.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21285,7 +21300,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph102.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21306,7 +21322,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph102B.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21327,7 +21344,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1000r.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21347,7 +21365,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/ps2-50j.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -21367,7 +21386,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/ps2_scph30003.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "duckstation-legacy"
       ],
       "systems": [
         "sony-playstation"
@@ -22274,7 +22294,8 @@
       "repo_path": "bios/Sony/PlayStation 2/ps2_scph50006.bin",
       "cores": [
         "duckstation",
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation",
@@ -22316,7 +22337,8 @@
       "repo_path": "bios/Sony/PlayStation 2/ps2_scph50008.bin",
       "cores": [
         "duckstation",
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation",
@@ -111529,7 +111551,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/openbios.bin",
       "cores": [
-        "beetle_psx"
+        "beetle_psx",
+        "duckstation"
       ],
       "systems": [
         "sony-playstation"
@@ -168369,7 +168392,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0230a-20080220.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169802,7 +169826,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-300e.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169815,7 +169840,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-300u.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169828,7 +169854,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-302c.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169841,7 +169868,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-302e.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169854,7 +169882,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-302u.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169867,7 +169896,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-310.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169880,7 +169910,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-311.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169893,7 +169924,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-10000.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169906,7 +169938,8 @@
       "size": 4,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-10000.MEC",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169919,7 +169952,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-30004R.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169932,7 +169966,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-39001.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169945,7 +169980,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-50009_BIOS_V10_CHN_190.BIN",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169958,7 +169994,8 @@
       "size": 1024,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-50009_BIOS_V10_CHN_190.NVM",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169971,7 +170008,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-50009_BIOS_V10_CHN_190.ROM2",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169984,7 +170022,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-50009_BIOS_V10_CHN_190.ROM1",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -169997,7 +170036,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-70004.BIN",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170010,7 +170050,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-70004.ROM1",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170023,7 +170064,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-70008_BIOS_V12_RUS_200.BIN",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170036,7 +170078,8 @@
       "size": 1024,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-70008_BIOS_V12_RUS_200.NVM",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170049,7 +170092,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0100jd-20000117.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170062,7 +170106,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0101j-20000217.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170075,7 +170120,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0101jd-20000217.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170088,7 +170134,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0101xd-20000224.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170101,7 +170148,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0110a-20000727.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170114,7 +170162,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0110ad-20000727.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170127,7 +170176,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0120a-20000902.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170140,7 +170190,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0120e-20000902.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170153,7 +170204,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0120ed-20000902-20030110.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170166,7 +170218,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0120ed-20000902.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170179,7 +170232,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0120j-20001027-185015.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170192,7 +170246,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0120j-20001027-191435.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170205,7 +170260,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0150a-20001228.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170218,7 +170274,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0150ad-20001228-20030520.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170231,7 +170288,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0150e-20001228.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170244,7 +170302,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0150ed-20001228-20030520.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170257,7 +170316,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0150j-20010118.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170270,7 +170330,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0150jd-20010118.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170283,7 +170344,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0160a-20010427.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170296,7 +170358,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0160a-20010704.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170309,7 +170372,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0160a-20011004.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170322,7 +170386,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0160e-20010704.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170335,7 +170400,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0160e-20011004.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170348,7 +170414,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0160e-20020319.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170361,7 +170428,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0160e-20020426.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170374,7 +170442,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0160h-20010730.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170387,7 +170456,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0160h-20020426.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170400,7 +170470,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0160h-20030602.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170413,7 +170484,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0160j-20010427.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170426,7 +170498,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0160j-20011004.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170439,7 +170512,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0160j-20020426.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170452,7 +170526,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0170a-20030325.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170465,7 +170540,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0170ad-20030325.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170478,7 +170554,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0170e-20030227.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170491,7 +170568,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0170ed-20030227.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170504,7 +170582,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0170j-20030206.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170517,7 +170596,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0170jd-20030206.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170530,7 +170610,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0180cd-20030224.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170543,7 +170624,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0180j-20031028.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170556,7 +170638,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0190a-20030623.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170569,7 +170652,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0190a-20040329.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170582,7 +170666,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0190ad-20030623.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170595,7 +170680,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0190c-20030623.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170608,7 +170694,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0190cd-20030623.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170621,7 +170708,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0190e-20030623.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170634,7 +170722,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0190e-20030822.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170647,7 +170736,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0190h-20030623.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170660,7 +170750,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0190j-20030623.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170673,7 +170764,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0190j-20030822.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170686,7 +170778,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0190k-20030623.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170699,7 +170792,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0190r-20030623.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170712,7 +170806,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0200a-20040614.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170725,7 +170820,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0200ad-20040614.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170738,7 +170834,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0200ed-20040614.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170751,7 +170848,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0200h-20040614.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170764,7 +170862,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0200j-20040614.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170777,7 +170876,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0210j-20040917.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170790,7 +170890,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220a-20050620.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170803,7 +170904,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220a-20060210.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170816,7 +170918,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220a-20060905.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170829,7 +170932,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220ad-20050620.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170842,7 +170946,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220ad-20060905.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170855,7 +170960,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220e-20050620.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170868,7 +170974,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220e-20060210.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170881,7 +170988,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220e-20060905.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170894,7 +171002,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220h-20050620.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170907,7 +171016,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220h-20060210.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170920,7 +171030,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220h-20060905.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170933,7 +171044,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220j-20050620.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170946,7 +171058,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220j-20060210.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170959,7 +171072,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220j-20060905.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170972,7 +171086,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220jd-20050620.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170985,7 +171100,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0220jd-20060905.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -170998,7 +171114,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0230e-20080220.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171011,7 +171128,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0230h-20080220.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171024,7 +171142,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0230j-20080220.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171037,7 +171156,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0250e-20100415.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171050,7 +171170,8 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0250j-20100415.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171063,7 +171184,8 @@
       "size": 2097152,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-110u.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171076,7 +171198,8 @@
       "size": 2097152,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-120e.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171089,7 +171212,8 @@
       "size": 2097152,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-120u.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171102,7 +171226,8 @@
       "size": 2097152,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-130e.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171115,7 +171240,8 @@
       "size": 2097152,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-130u.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171128,7 +171254,8 @@
       "size": 2097152,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-200j.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171141,7 +171268,8 @@
       "size": 2097152,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-210e.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171154,7 +171282,8 @@
       "size": 2097152,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-210j.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171167,7 +171296,8 @@
       "size": 2097152,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-210u.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171180,7 +171310,8 @@
       "size": 2097152,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-212g.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171193,7 +171324,8 @@
       "size": 2097152,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-212u.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171206,7 +171338,8 @@
       "size": 2097152,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-213e.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171219,7 +171352,8 @@
       "size": 2097152,
       "repo_path": "bios/Sony/PlayStation 2/DVD Firmware/ps2-dvd-215g.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171232,7 +171366,8 @@
       "size": 1024,
       "repo_path": "bios/Sony/PlayStation 2/.variants/SCPH30004R.nvm.5e0200d0",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171245,7 +171380,8 @@
       "size": 247968,
       "repo_path": "bios/Sony/PlayStation 2/EROM.BIN",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171258,7 +171394,8 @@
       "size": 8192,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-70004_BIOS_V12_EUR_200.ROM2",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171271,7 +171408,8 @@
       "size": 1024,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-70006_BIOS_V12_HK_200.NVM",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171284,7 +171422,8 @@
       "size": 1024,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-75008_BIOS_V14_RUS_220.NVM",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171297,7 +171436,8 @@
       "size": 1024,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-77008_BIOS_V15_RUS_220.NVM",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171310,7 +171450,8 @@
       "size": 1024,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-90006_BIOS_VX_HK _230.NVM",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171323,7 +171464,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation 2/SCPH-90006_BIOS_VX_HK _230.ROM1",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171336,7 +171478,8 @@
       "size": 42525,
       "repo_path": "bios/Sony/PlayStation 2/cheats_ni.zip",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171349,7 +171492,8 @@
       "size": 64,
       "repo_path": "bios/Sony/PlayStation 2/eeprom.dat",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171362,7 +171506,8 @@
       "size": 1024,
       "repo_path": "bios/Sony/PlayStation 2/ps2-0230a-20080220.nvm",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171375,7 +171520,8 @@
       "size": 15696,
       "repo_path": "bios/Sony/PlayStation 2/resources/sounds/achievements/message.wav",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171388,7 +171534,8 @@
       "size": 199680,
       "repo_path": "bios/Sony/PlayStation 2/rom1.bin",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171401,7 +171548,8 @@
       "size": 1024,
       "repo_path": "bios/Sony/PlayStation 2/scph30004fr.nvm",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
@@ -171414,7 +171562,8 @@
       "size": 1024,
       "repo_path": "bios/Sony/PlayStation 2/scph39001.nvm",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "pcsx2"
       ],
       "systems": [
         "sony-playstation-2"
diff --git a/install/recalbox.json b/install/recalbox.json
index 26611851..f56ba168 100644
--- a/install/recalbox.json
+++ b/install/recalbox.json
@@ -6523,6 +6523,7 @@
           "repo_path": "bios/Sony/PlayStation/scph5500.bin",
           "cores": [
             "beetle_psx",
+            "duckstation",
             "pcsx_rearmed",
             "swanstation"
           ]
@@ -6557,6 +6558,7 @@
           "repo_path": "bios/Sony/PlayStation/scph5501.bin",
           "cores": [
             "beetle_psx",
+            "duckstation",
             "pcsx_rearmed",
             "swanstation"
           ]
@@ -6591,6 +6593,7 @@
           "repo_path": "bios/Sony/PlayStation/scph5502.bin",
           "cores": [
             "beetle_psx",
+            "duckstation",
             "pcsx_rearmed",
             "swanstation"
           ]
@@ -6643,9 +6646,6 @@
         "latin-america",
         "north-america"
       ],
-      "region_groups": [
-        "sony-playstation"
-      ],
       "region_system_groups": [
         "sony-playstation"
       ],
@@ -6656,6 +6656,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph7001.bin",
           "cores": [
+            "duckstation",
             "pcsx_rearmed"
           ]
         }
@@ -6675,9 +6676,6 @@
         "latin-america",
         "north-america"
       ],
-      "region_groups": [
-        "sony-playstation"
-      ],
       "region_system_groups": [
         "sony-playstation"
       ],
@@ -6688,6 +6686,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph1001.bin",
           "cores": [
+            "duckstation",
             "pcsx_rearmed"
           ]
         }
@@ -17786,10 +17785,12 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2_scph50006.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "pcsx2"
       ],
       "systems": [
-        "sony-playstation"
+        "sony-playstation",
+        "sony-playstation-2"
       ],
       "regions": [
         "japan"
@@ -17826,10 +17827,12 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2_scph50008.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "pcsx2"
       ],
       "systems": [
-        "sony-playstation"
+        "sony-playstation",
+        "sony-playstation-2"
       ],
       "regions": [
         "europe",
@@ -38759,7 +38762,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/openbios.bin",
       "cores": [
-        "beetle_psx"
+        "beetle_psx",
+        "duckstation"
       ],
       "systems": [
         "sony-playstation"
diff --git a/install/retrobat.json b/install/retrobat.json
index 055e2dc7..60a91991 100644
--- a/install/retrobat.json
+++ b/install/retrobat.json
@@ -16306,6 +16306,7 @@
       "cores": [
         "ares",
         "beetle_psx",
+        "duckstation",
         "mednafen",
         "swanstation",
         "pcsx_rearmed"
@@ -16330,6 +16331,7 @@
       "cores": [
         "ares",
         "beetle_psx",
+        "duckstation",
         "mednafen",
         "swanstation",
         "pcsx_rearmed"
@@ -16353,6 +16355,7 @@
       "cores": [
         "ares",
         "beetle_psx",
+        "duckstation",
         "mednafen",
         "swanstation",
         "pcsx_rearmed"
@@ -23888,7 +23891,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1001.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "pcsx_rearmed"
       ],
       "systems": [
         "sony-playstation"
@@ -24134,7 +24138,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph7001.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "pcsx_rearmed"
       ],
       "systems": [
         "sony-playstation"
@@ -25226,10 +25231,13 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2_scph50006.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "pcsx2",
+        "pcsx2-legacy"
       ],
       "systems": [
-        "sony-playstation"
+        "sony-playstation",
+        "sony-playstation-2"
       ],
       "regions": [
         "japan"
@@ -25266,10 +25274,13 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2_scph50008.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "pcsx2",
+        "pcsx2-legacy"
       ],
       "systems": [
-        "sony-playstation"
+        "sony-playstation",
+        "sony-playstation-2"
       ],
       "regions": [
         "europe",
@@ -46243,7 +46254,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/openbios.bin",
       "cores": [
-        "beetle_psx"
+        "beetle_psx",
+        "duckstation"
       ],
       "systems": [
         "sony-playstation"
@@ -55302,13 +55314,10 @@
       "repo_path": "bios/Nintendo/Game Boy/dmg_boot.bin",
       "cores": [
         "jgenesis",
-        "sameboy",
-        "mesen-s"
+        "sameboy"
       ],
       "systems": [
-        "nintendo-gb",
-        "nintendo-gbc",
-        "nintendo-satellaview"
+        "nintendo-gb"
       ]
     },
     {
@@ -55319,13 +55328,10 @@
       "repo_path": "bios/Nintendo/Game Boy Color/cgb_boot.bin",
       "cores": [
         "jgenesis",
-        "sameboy",
-        "mesen-s"
+        "sameboy"
       ],
       "systems": [
-        "nintendo-gb",
-        "nintendo-gbc",
-        "nintendo-satellaview"
+        "nintendo-gbc"
       ]
     },
     {
@@ -101207,11 +101213,23 @@
       "size": 251658304,
       "repo_path": "bios/Nintendo/Nintendo DSi/dsi_nand.bin",
       "cores": [
-        "melonds_ds",
-        "melonds"
+        "melonds_ds"
       ],
       "storage": "release",
-      "release_asset": "dsi_nand.bin"
+      "release_asset": "dsi_nand.bin",
+      "alternatives": [
+        {
+          "sha1": "2b972cec368e83a2699e6ab38165638b1bc1302c",
+          "sha256": "eb8960711bb99c11d1c92de195c29c8e1bf927e8e1a5d134155fd69a9a11134e",
+          "size": 251658304,
+          "repo_path": "bios/Nintendo/Nintendo DSi/.variants/dsi_nand.bin.8b79a73c",
+          "cores": [
+            "melonds"
+          ],
+          "storage": "release",
+          "release_asset": "dsi_nand.bin.8b79a73c"
+        }
+      ]
     },
     {
       "dest": "StudyBox.bin",
diff --git a/install/retrodeck.json b/install/retrodeck.json
index c640f319..81f465ba 100644
--- a/install/retrodeck.json
+++ b/install/retrodeck.json
@@ -40236,9 +40236,6 @@
       "regions": [
         "japan"
       ],
-      "region_groups": [
-        "sony-playstation"
-      ],
       "region_system_groups": [
         "sony-playstation"
       ],
@@ -40251,6 +40248,7 @@
           "repo_path": "bios/Sony/PlayStation/scph5500.bin",
           "cores": [
             "beetle_psx",
+            "duckstation",
             "pcsx_rearmed",
             "rustation",
             "swanstation"
@@ -40272,9 +40270,6 @@
         "latin-america",
         "north-america"
       ],
-      "region_groups": [
-        "sony-playstation"
-      ],
       "region_system_groups": [
         "sony-playstation"
       ],
@@ -40287,6 +40282,7 @@
           "repo_path": "bios/Sony/PlayStation/scph5501.bin",
           "cores": [
             "beetle_psx",
+            "duckstation",
             "pcsx1",
             "pcsx_rearmed",
             "rustation",
@@ -40309,9 +40305,6 @@
         "europe",
         "oceania"
       ],
-      "region_groups": [
-        "sony-playstation"
-      ],
       "region_system_groups": [
         "sony-playstation"
       ],
@@ -40324,6 +40317,7 @@
           "repo_path": "bios/Sony/PlayStation/scph5502.bin",
           "cores": [
             "beetle_psx",
+            "duckstation",
             "pcsx_rearmed",
             "rustation",
             "swanstation"
@@ -40359,6 +40353,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph7001.bin",
           "cores": [
+            "duckstation",
             "pcsx1",
             "pcsx_rearmed",
             "rustation"
@@ -40394,6 +40389,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph7002.bin",
           "cores": [
+            "duckstation",
             "rustation"
           ]
         }
@@ -40489,6 +40485,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph1000.bin",
           "cores": [
+            "duckstation",
             "rustation"
           ]
         }
@@ -40522,6 +40519,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph1001.bin",
           "cores": [
+            "duckstation",
             "pcsx1",
             "pcsx_rearmed",
             "rustation"
@@ -40585,6 +40583,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph100.bin",
           "cores": [
+            "duckstation",
             "rustation"
           ]
         }
@@ -40680,6 +40679,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph3000.bin",
           "cores": [
+            "duckstation",
             "rustation"
           ]
         }
@@ -40712,6 +40712,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph3500.bin",
           "cores": [
+            "duckstation",
             "rustation"
           ]
         }
@@ -40744,6 +40745,7 @@
           "size": 524288,
           "repo_path": "bios/Sony/PlayStation/scph5000.bin",
           "cores": [
+            "duckstation",
             "rustation"
           ]
         }
@@ -44782,7 +44784,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1002b.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -44803,7 +44806,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1002c.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -44824,7 +44828,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/dtlh1100.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -44844,7 +44849,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1001_v20.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -44865,7 +44871,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph1001_v21.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -44886,7 +44893,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph7000.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -44906,7 +44914,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph7000w.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -44989,7 +44998,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/scph102B.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "rustation"
       ],
       "systems": [
         "sony-playstation"
@@ -45956,10 +45966,12 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2_scph50006.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "pcsx2"
       ],
       "systems": [
-        "sony-playstation"
+        "sony-playstation",
+        "sony-playstation-2"
       ],
       "regions": [
         "japan"
@@ -45996,10 +46008,12 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2_scph50008.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "pcsx2"
       ],
       "systems": [
-        "sony-playstation"
+        "sony-playstation",
+        "sony-playstation-2"
       ],
       "regions": [
         "europe",
@@ -118340,7 +118354,8 @@
       "size": 524288,
       "repo_path": "bios/Sony/PlayStation/openbios.bin",
       "cores": [
-        "beetle_psx"
+        "beetle_psx",
+        "duckstation"
       ],
       "systems": [
         "sony-playstation"
@@ -118609,8 +118624,7 @@
       "repo_path": "bios/Nintendo/Game Boy/GB_sgb.bin",
       "cores": [
         "bsnes2014",
-        "bsnes_mercury",
-        "supersnes9x"
+        "bsnes_mercury"
       ]
     },
     {
@@ -120412,24 +120426,11 @@
         "emux_gb",
         "gearboy",
         "irogb",
-        "sameboy",
-        "mesen-s"
+        "sameboy"
       ],
       "systems": [
         "nintendo-gb",
-        "nintendo-gbc",
-        "nintendo-snes"
-      ],
-      "alternatives": [
-        {
-          "sha1": "4ed31ec6b0b175bb109c0eb5fd3d193da823339f",
-          "sha256": "cf053eccb4ccafff9e67339d4e78e98dce7d1ed59be819d2a1ba2232c6fce1c7",
-          "size": 256,
-          "repo_path": "bios/Nintendo/Game Boy/GB_dmg.bin",
-          "cores": [
-            "mesence"
-          ]
-        }
+        "nintendo-gbc"
       ]
     },
     {
@@ -120770,8 +120771,7 @@
       "size": 131072,
       "repo_path": "bios/Sega/Dreamcast/dc_nvmem.bin",
       "cores": [
-        "flycast",
-        "flycast2021"
+        "flycast"
       ],
       "systems": [
         "sega-dreamcast"
@@ -121203,24 +121203,11 @@
       "cores": [
         "gearboy",
         "irogb",
-        "sameboy",
-        "mesen-s"
+        "sameboy"
       ],
       "systems": [
         "nintendo-gb",
-        "nintendo-gbc",
-        "nintendo-snes"
-      ],
-      "alternatives": [
-        {
-          "sha1": "1293d68bf9643bc4f36954c1e80e38f39864528d",
-          "sha256": "b4f2e416a35eef52cba161b159c7c8523a92594facb924b3ede0d722867c50c7",
-          "size": 2304,
-          "repo_path": "bios/Nintendo/Game Boy Color/GBC_cgb.bin",
-          "cores": [
-            "mesence"
-          ]
-        }
+        "nintendo-gbc"
       ]
     },
     {
@@ -126463,11 +126450,23 @@
       "size": 251658304,
       "repo_path": "bios/Nintendo/Nintendo DSi/dsi_nand.bin",
       "cores": [
-        "melonds_ds",
-        "melonds"
+        "melonds_ds"
       ],
       "storage": "release",
-      "release_asset": "dsi_nand.bin"
+      "release_asset": "dsi_nand.bin",
+      "alternatives": [
+        {
+          "sha1": "2b972cec368e83a2699e6ab38165638b1bc1302c",
+          "sha256": "eb8960711bb99c11d1c92de195c29c8e1bf927e8e1a5d134155fd69a9a11134e",
+          "size": 251658304,
+          "repo_path": "bios/Nintendo/Nintendo DSi/.variants/dsi_nand.bin.8b79a73c",
+          "cores": [
+            "melonds"
+          ],
+          "storage": "release",
+          "release_asset": "dsi_nand.bin.8b79a73c"
+        }
+      ]
     },
     {
       "dest": "bios/StudyBox.bin",
@@ -129746,13 +129745,7 @@
       "size": 256,
       "repo_path": "bios/Nintendo/Super Game Boy/sgb_boot.bin",
       "cores": [
-        "sameboy",
-        "mesen-s"
-      ],
-      "systems": [
-        "nintendo-gb",
-        "nintendo-gbc",
-        "nintendo-snes"
+        "sameboy"
       ]
     },
     {
@@ -132580,8 +132573,7 @@
       "size": 314122,
       "repo_path": "bios/Arcade/FBNeo/hiscore.dat",
       "cores": [
-        "fbneo_cps12",
-        "fbneo_neogeo"
+        "fbneo_cps12"
       ],
       "systems": [
         "arcade"
diff --git a/install/retropie.json b/install/retropie.json
index 80f35176..d051b739 100644
--- a/install/retropie.json
+++ b/install/retropie.json
@@ -122224,8 +122224,7 @@
       "size": 7971360,
       "repo_path": "bios/Arcade/MAME/cheat.dat",
       "cores": [
-        "advmame-0.94",
-        "advmame-1.4"
+        "advmame-0.94"
       ],
       "systems": [
         "arcade"
diff --git a/install/rocknix.json b/install/rocknix.json
index 93ccf3c6..8bda2a87 100644
--- a/install/rocknix.json
+++ b/install/rocknix.json
@@ -7377,10 +7377,12 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2_scph50006.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "aethersx2"
       ],
       "systems": [
-        "sony-playstation"
+        "sony-playstation",
+        "sony-playstation-2"
       ],
       "regions": [
         "japan"
@@ -7417,10 +7419,12 @@
       "size": 4194304,
       "repo_path": "bios/Sony/PlayStation 2/ps2_scph50008.bin",
       "cores": [
-        "duckstation"
+        "duckstation",
+        "aethersx2"
       ],
       "systems": [
-        "sony-playstation"
+        "sony-playstation",
+        "sony-playstation-2"
       ],
       "regions": [
         "europe",
@@ -57426,23 +57430,11 @@
         "emux_gb",
         "gearboy",
         "irogb",
-        "sameboy",
-        "mesen-s"
+        "sameboy"
       ],
       "systems": [
         "nintendo-gb",
         "nintendo-gbc"
-      ],
-      "alternatives": [
-        {
-          "sha1": "4ed31ec6b0b175bb109c0eb5fd3d193da823339f",
-          "sha256": "cf053eccb4ccafff9e67339d4e78e98dce7d1ed59be819d2a1ba2232c6fce1c7",
-          "size": 256,
-          "repo_path": "bios/Nintendo/Game Boy/GB_dmg.bin",
-          "cores": [
-            "mesence"
-          ]
-        }
       ]
     },
     {
@@ -58049,8 +58041,7 @@
       "size": 131072,
       "repo_path": "bios/Sega/Dreamcast/dc_nvmem.bin",
       "cores": [
-        "flycast",
-        "flycast2021"
+        "flycast"
       ],
       "systems": [
         "sega-dreamcast"
@@ -58503,23 +58494,11 @@
       "cores": [
         "gearboy",
         "irogb",
-        "sameboy",
-        "mesen-s"
+        "sameboy"
       ],
       "systems": [
         "nintendo-gb",
         "nintendo-gbc"
-      ],
-      "alternatives": [
-        {
-          "sha1": "1293d68bf9643bc4f36954c1e80e38f39864528d",
-          "sha256": "b4f2e416a35eef52cba161b159c7c8523a92594facb924b3ede0d722867c50c7",
-          "size": 2304,
-          "repo_path": "bios/Nintendo/Game Boy Color/GBC_cgb.bin",
-          "cores": [
-            "mesence"
-          ]
-        }
       ]
     },
     {
@@ -84150,7 +84129,10 @@
       "size": 64,
       "repo_path": "bios/Sony/PlayStation 2/eeprom.dat",
       "cores": [
-        "aethersx2"
+        "aethersx2",
+        "armsx2",
+        "pcee2",
+        "yaps2"
       ],
       "systems": [
         "sony-playstation-2"