diff --git a/backend/handler/metadata/ss_handler.py b/backend/handler/metadata/ss_handler.py
index fba463d3b..3a370b4f2 100644
--- a/backend/handler/metadata/ss_handler.py
+++ b/backend/handler/metadata/ss_handler.py
@@ -732,12 +732,15 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.AMIGA_CD: {"id": 134, "name": "Amiga CD"},
     UPS.AMIGA_CD32: {"id": 130, "name": "Amiga CD32"},
     UPS.ACPC: {"id": 65, "name": "CPC"},
+    UPS.ACTION_MAX: {"id": 81, "name": "Action Max"},
     UPS.ADVENTURE_VISION: {
         "id": 78,
         "name": "Entex Adventure Vision",
     },
     UPS.AMSTRAD_GX4000: {"id": 87, "name": "Amstrad GX4000"},
     UPS.ANDROID: {"id": 63, "name": "Android"},
+    UPS.APPLE: {"id": 86, "name": "Apple I"},
+    UPS.APPLEIII: {"id": 86, "name": "Apple III"},
     UPS.APPLEII: {"id": 86, "name": "Apple II"},
     UPS.APPLE_IIGS: {"id": 51, "name": "Apple IIGS"},
     UPS.ARCADE: {"id": ARCADE_SS_ID, "name": "Arcade"},
@@ -746,9 +749,14 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.ATARI2600: {"id": 26, "name": "Atari 2600"},
     UPS.ATARI5200: {"id": 40, "name": "Atari 5200"},
     UPS.ATARI7800: {"id": 41, "name": "Atari 7800"},
+    UPS.ATARI800: {"id": 43, "name": "Atari 800"},
+    UPS.ATARI_XEGS: {"id": 43, "name": "Atari XEGS"},
     UPS.ATARI8BIT: {"id": 43, "name": "Atari 8bit"},
+    UPS.ATARI_JAGUAR_CD: {"id": 171, "name": "Atari Jaguar CD"},
     UPS.ATARI_ST: {"id": 42, "name": "Atari ST"},
     UPS.ATOM: {"id": 36, "name": "Atom"},
+    UPS.ACORN_ARCHIMEDES: {"id": 84, "name": "Acorn Archimedes"},
+    UPS.ATMOS: {"id": 131, "name": "Oric Atmos"},
     UPS.BBCMICRO: {"id": 37, "name": "BBC Micro"},
     UPS.BK: {"id": 93, "name": "Elektronika BK"},
     UPS.ASTROCADE: {"id": 44, "name": "Astrocade"},
@@ -797,8 +805,12 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.NGC: {"id": 13, "name": "GameCube"},
     UPS.GENESIS: {"id": 1, "name": "Megadrive"},
     UPS.HARTUNG: {"id": 103, "name": "Game Master"},
+    UPS.HIKARU: {"id": 258, "name": "Sega Hikaru"},
     UPS.INTELLIVISION: {"id": 115, "name": "Intellivision"},
     UPS.JAGUAR: {"id": 27, "name": "Jaguar"},
+    UPS.MODEL2: {"id": 54, "name": "Sega Model 2"},
+    UPS.MODEL3: {"id": 55, "name": "Sega Model 3"},
+    UPS.MSX2PLUS: {"id": 117, "name": "Microsoft MSX2+"},
     UPS.JUPITER_ACE: {"id": 126, "name": "Jupiter Ace"},
     UPS.LINUX: {"id": 145, "name": "Linux"},
     UPS.LYNX: {"id": 28, "name": "Lynx"},
@@ -832,8 +844,11 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.PC_FX: {"id": 72, "name": "PC-FX"},
     UPS.PEGASUS: {"id": 83, "name": "Aamber Pegasus"},
     UPS.PICO: {"id": 234, "name": "Pico-8"},
+    UPS.PINBALL: {"id": 197, "name": "Pinball"},
+    UPS.POCKET_CHALLENGE_V2: {"id": 237, "name": "Benesse Pocket Challenge V2"},
     UPS.PSVITA: {"id": 62, "name": "PS Vita"},
     UPS.PSP: {"id": PSP_SS_ID, "name": "PSP"},
+    UPS.PSP_MINIS: {"id": 172, "name": "PSP Minis"},
     UPS.PALM_OS: {"id": 219, "name": "Palm OS"},
     UPS.PHILIPS_VG_5000: {"id": 261, "name": "Philips VG 5000"},
     UPS.PSX: {"id": PS1_SS_ID, "name": "Playstation"},
@@ -852,6 +867,7 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.SG1000: {"id": 109, "name": "SG-1000"},
     UPS.SNES: {"id": 4, "name": "Super Nintendo"},
     UPS.SFAM: {"id": 4, "name": "Super Famicom"},
+    UPS.SATELLAVIEW: {"id": 107, "name": "Satellaview"},
     UPS.X1: {"id": 220, "name": "Sharp X1"},
     UPS.SHARP_X68000: {"id": 79, "name": "Sharp X68000"},
     UPS.SPECTRAVIDEO: {"id": 218, "name": "Spectravideo"},
@@ -859,18 +875,24 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.SUPER_ACAN: {"id": 100, "name": "Super A'can"},
     UPS.SUPERGRAFX: {"id": 105, "name": "PC Engine SuperGrafx"},
     UPS.SUPERVISION: {"id": 207, "name": "Watara Supervision"},
-    UPS.TI_99: {"id": 205, "name": "TI-99/4A"},
+    UPS.STV: {"id": 69, "name": "Sega ST-V"},
+    UPS.SWITCH_2: {"id": 296, "name": "Nintendo Switch 2"},
+    UPS.SYSTEM_32: {"id": 156, "name": "Namco System 22"},
+    UPS.TI_994A: {"id": 205, "name": "TI-99/4A"},
+    UPS.TI_99: {"id": 205, "name": "TI-99"},
     UPS.TIC_80: {"id": 222, "name": "TIC-80"},
     UPS.TRS_80_COLOR_COMPUTER: {
         "id": 144,
         "name": "TRS-80 Color Computer",
     },
-    UPS.TAITO_X_55: {"id": 112, "name": "Type X"},
+    UPS.TYPE_X: {"id": 112, "name": "Type X"},
+    UPS.TAITO_X_55: {"id": 112, "name": "Type X 55"},
     UPS.THOMSON_MO5: {"id": 141, "name": "Thomson MO/TO"},
     UPS.THOMSON_TO: {"id": 141, "name": "Thomson MO/TO"},
     UPS.TURBOGRAFX_CD: {"id": 114, "name": "PC Engine CD-Rom"},
     UPS.TG16: {"id": 31, "name": "PC Engine"},
     UPS.UZEBOX: {"id": 216, "name": "UzeBox"},
+    UPS.VC_4000: {"id": 281, "name": "VC 4000"},
     UPS.VSMILE: {"id": 120, "name": "V.Smile"},
     UPS.VIC_20: {"id": 73, "name": "Vic-20"},
     UPS.VECTREX: {"id": 102, "name": "Vectrex"},
@@ -880,6 +902,7 @@ SCREENSAVER_PLATFORM_LIST: dict[UPS, SlugToSSId] = {
     UPS.WIIU: {"id": 18, "name": "Wii U"},
     UPS.WIN: {"id": 138, "name": "PC Windows"},
     UPS.WIN3X: {"id": 136, "name": "PC Win3.xx"},
+    UPS.WASM_4: {"id": 262, "name": "WASM-4"},
     UPS.WONDERSWAN: {"id": 45, "name": "WonderSwan"},
     UPS.WONDERSWAN_COLOR: {"id": 46, "name": "WonderSwan Color"},
     UPS.XBOX: {"id": 32, "name": "Xbox"},
diff --git a/frontend/src/components/common/Game/Dialog/EditRom/AdditionalDetails.vue b/frontend/src/components/common/Game/Dialog/EditRom/AdditionalDetails.vue
index fc72b6fd7..106452e5a 100644
--- a/frontend/src/components/common/Game/Dialog/EditRom/AdditionalDetails.vue
+++ b/frontend/src/components/common/Game/Dialog/EditRom/AdditionalDetails.vue
@@ -73,6 +73,7 @@ const manualMetadata = computed(() => props.rom.manual_metadata || {});
             :model-value="manualMetadata.companies || []"
             chips
             multiple
+            closable-chips
             label="Companies"
             variant="outlined"
             @update:model-value="
@@ -85,6 +86,7 @@ const manualMetadata = computed(() => props.rom.manual_metadata || {});
             :model-value="manualMetadata.genres || []"
             chips
             multiple
+            closable-chips
             label="Genres"
             variant="outlined"
             @update:model-value="
@@ -97,6 +99,7 @@ const manualMetadata = computed(() => props.rom.manual_metadata || {});
             :model-value="manualMetadata.franchises || []"
             chips
             multiple
+            closable-chips
             label="Franchises"
             variant="outlined"
             @update:model-value="
@@ -130,6 +133,7 @@ const manualMetadata = computed(() => props.rom.manual_metadata || {});
             :model-value="manualMetadata.game_modes || []"
             chips
             multiple
+            closable-chips
             :items="[
               'Single player',
               'Multiplayer',
@@ -160,6 +164,7 @@ const manualMetadata = computed(() => props.rom.manual_metadata || {});
             :model-value="manualMetadata.age_ratings || []"
             chips
             multiple
+            closable-chips
             :items="AGE_RATINGS"
             label="Age Ratings"
             variant="outlined"