diff --git a/CHANGELOG.md b/CHANGELOG.md
index b89e281e7..d3f912e68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,7 +60,9 @@ In addition to the above many bugs have been fixed and the application has recei
* Added support for the Taito Type X (type-x) game system
* Added support for the Microsoft Windows 3.x (windows3x) game system
* Added support for the Microsoft Windows 9x (windows9x) game system
-* Removed support for the MAME4ALL (mame-mame4all) system
+* Removed support for the MAME4ALL (mame-mame4all) game system
+* Removed support for the Moonlight Game Streaming (moonlight) game system
+* Removed support for the Stratagus Game Engine (stratagus) game system
* Added support for the AdvanceMAME (mame-advmame) system on Unix and Windows
* Added Mesen standalone as an alternative emulator for 14 systems on Linux and Windows
* Added Flycast Dojo standalone as an alternative emulator for the arcade, atomiswave, dreamcast, mame, naomi and naomigd systems
@@ -73,7 +75,9 @@ In addition to the above many bugs have been fixed and the application has recei
* Set %STARTDIR%=%GAMEDIR% for the X Millennium RetroArch core as it created temporary files in the ES-DE directory
* Added TIC-80 standalone as an alternative emulator for the tic80 system
* Added the MAME - Current RetroArch core as an alternative emulator for the apple2 system
-* Added the MAME - Current RetroArch core and MAME standalone as alternative emulators for the daphne, odyssey2, vectrex and videopac systems
+* Added the MAME - Current RetroArch core and MAME standalone as alternative emulators for the channelf, daphne and intellivision systems
+* Added the MAME - Current RetroArch core and MAME standalone as alternative emulators for the megaduck, odyssey2 and supervision
+* Added the MAME - Current RetroArch core and MAME standalone as alternative emulators for the vectrex and videopac systems
* Added MAME standalone as an alternative emulator for the fmtowns system on Unix and Windows
* (macOS) Added MAME standalone as the default emulator for the fmtowns system (was previously a placeholder system)
* Added QUASI88 standalone as an alternative emulator for the pc88 system
@@ -109,6 +113,7 @@ In addition to the above many bugs have been fixed and the application has recei
* Added arcade as an extra platform to the daphne system (to improve scraping)
* Removed the videopac platform ID entry as it's identical to odyssey2
* Changed the platform for the videopac system to odyssey2 to improve scraping
+* Added the snes-msu1 platform so that these games can be scraped using ScreenScraper (requires custom system config)
* Changed the full name for the vectrex system from "Smith Engineering Vectrex" to "GCE Vectrex"
* Changed the fullname for the tic80 system from "TIC-80 Game Engine" to "TIC-80 Fantasy Computer"
* (modern-es-de) Replaced the carousel images for the c64 and dos systems
diff --git a/THEMES-DEV.md b/THEMES-DEV.md
index bdcf7a811..d6ac09a8d 100644
--- a/THEMES-DEV.md
+++ b/THEMES-DEV.md
@@ -499,7 +499,7 @@ It's also possible to define both the `noVideos` and `noMedia` triggers for the
```
-In this case the `withoutVideos` variant will be selected if there are no videos but if there is other media available. If there is however no media matching the `mediaType` property then the `noGameMedia` variant will be selected instead. Note that `noMedia` always take precedence over `noVideos`.
+In this case the `withoutVideos` variant will be selected if there are no videos but if there is other media available. If there is however no media matching the `mediaType` property then the `noGameMedia` variant will be selected instead. Note that `noMedia` always takes precedence over `noVideos`. If you would like to trigger the `withoutVideos` variant if there are videos but no other media, then you'll need to add _video_ to the `mediaType` property for the `noMedia` trigger.
It's however not possible to define multi-step variant triggers like this:
diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md
index 61eabbfc7..527cc73aa 100644
--- a/USERGUIDE-DEV.md
+++ b/USERGUIDE-DEV.md
@@ -3796,7 +3796,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| cdimono1 | Philips CD-i | SAME CDi | CDi 2015,
MAME **(Standalone)** | Yes | Single .bin/.cue pair |
| cdtv | Commodore CDTV | PUAE | PUAE 2021,
FS-UAE **(Standalone)**,
Amiberry **(Standalone)** [UM] | Yes | See the specific _Commodore Amiga and CDTV_ section elsewhere in this guide |
| chailove | ChaiLove Game Engine | ChaiLove | | | |
-| channelf | Fairchild Channel F | FreeChaF | | | |
+| channelf | Fairchild Channel F | FreeChaF | MAME - Current,
MAME **(Standalone)** | Yes | Single archive or ROM file |
| coco | Tandy Color Computer | XRoar CoCo 2 NTSC **(Standalone)** | XRoar CoCo 2 PAL **(Standalone)** | Yes | See the specific _Tandy Color Computer_ section elsewhere in this guide |
| colecovision | Coleco ColecoVision | blueMSX | Gearcoleco,
openMSX **(Standalone)**,
ares **(Standalone)** | Yes | Single archive or ROM file |
| consolearcade | Console Arcade Systems | MAME - Current | MAME **(Standalone)**,
Flycast,
Flycast **(Standalone)**,
Flycast Dojo **(Standalone)**,
Kronos [UW],
Mednafen [Sega Saturn] **(Standalone)**,
Play! **(Standalone)**,
RPCS3 Shortcut **(Standalone)**,
Triforce **(Standalone)** [UW],
xemu **(Standalone)**,
Cxbx-Reloaded **(Standalone)** [W],
_Shortcut or script_ | Depends | See the specific _Console Arcade Systems_ section elsewhere in this guide |
@@ -3834,7 +3834,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| genesis | Sega Genesis | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
BlastEm,
BlastEm **(Standalone)** [U],
Mednafen **(Standalone)**,
ares **(Standalone)** | No | Single archive or ROM file |
| gmaster | Hartung Game Master | MAME - Current | MAME **(Standalone)** | Yes | Single archive or ROM file |
| gx4000 | Amstrad GX4000 | Caprice32 | CrocoDS,
MAME **(Standalone)** | No | Single archive or ROM file |
-| intellivision | Mattel Electronics Intellivision | FreeIntv | | | |
+| intellivision | Mattel Electronics Intellivision | FreeIntv | MAME - Current,
MAME **(Standalone)** | Yes | Single archive or ROM file |
| j2me | Java 2 Micro Edition (J2ME) | SquirrelJME | KEmulator **(Standalone)** [W] | No | Single .jar file |
| kodi | Kodi Home Theatre Software | Kodi **(Standalone)** | | No | Shortcut (.desktop/.app/.lnk) file |
| laserdisc | LaserDisc Games | Hypseus [Daphne] **(Standalone)** | Hypseus [Singe] **(Standalone)**,
MAME - Current,
MAME **(Standalone)** | Yes for Daphne games | See the specific _LaserDisc Games_ section elsewhere in this guide |
@@ -3850,11 +3850,10 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| megacdjp | Sega Mega-CD [Japan] | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
ares **(Standalone)** | Yes | |
| megadrive | Sega Mega Drive | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
BlastEm,
BlastEm **(Standalone)** [U],
Mednafen **(Standalone)**,
ares **(Standalone)** | No | Single archive or ROM file |
| megadrivejp | Sega Mega Drive [Japan] | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
BlastEm,
BlastEm **(Standalone)** [U],
Mednafen **(Standalone)**,
ares **(Standalone)** | No | Single archive or ROM file |
-| megaduck | Creatronic Mega Duck | SameDuck | | No | Single archive or ROM file |
+| megaduck | Creatronic Mega Duck | SameDuck | MAME - Current,
MAME **(Standalone)** | No | Single archive or ROM file |
| mess | Multi Emulator Super System | MESS 2015 | | | |
| model2 | Sega Model 2 | Model 2 Emulator **(Standalone)** [W],
MAME - Current [UM] | Model 2 Emulator [Suspend ES-DE] **(Standalone)** [W],
MAME - Current [W],
MAME **(Standalone)**,
Model 2 Emulator **(Wine)** [U],
Model 2 Emulator **(Proton)** [U] | Yes for MAME | See the specific _Arcade and Neo Geo_ section elsewhere in this guide |
| model3 | Sega Model 3 | Supermodel **(Standalone)** [UW] | Supermodel [Fullscreen] **(Standalone)** [UW] | No | See the specific _Arcade and Neo Geo_ section elsewhere in this guide |
-| moonlight | Moonlight Game Streaming | _Placeholder_ | | | |
| moto | Thomson MO/TO Series | Theodore | | | |
| msx | MSX | blueMSX | fMSX,
openMSX **(Standalone)**,
openMSX No Machine **(Standalone)**,
ares **(Standalone)** | Yes | |
| msx1 | MSX1 | blueMSX | fMSX,
openMSX **(Standalone)**,
openMSX No Machine **(Standalone)**,
ares **(Standalone)** | Yes | |
@@ -3917,11 +3916,10 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| solarus | Solarus Game Engine | Solarus **(Standalone)** | | No | Single .solarus game file |
| spectravideo | Spectravideo | blueMSX | | | |
| steam | Valve Steam | Steam **(Standalone)** | | No | See the specific _Steam_ section elsewhere in this guide |
-| stratagus | Stratagus Game Engine | _Placeholder_ | | | |
| stv | Sega Titan Video Game System | Kronos [UW],
MAME - Current [M] | MAME - Current [UW],
MAME **(Standalone)**,
Mednafen **(Standalone)** | Yes | Single archive file |
| sufami | Bandai SuFami Turbo | Snes9x - Current | Snes9x 2010,
Snes9x **(Standalone)**,
bsnes,
bsnes-hd,
bsnes-mercury Accuracy,
bsnes **(Standalone)** [UW],
ares **(Standalone)** | | |
| supergrafx | NEC SuperGrafx | Beetle SuperGrafx | Beetle PCE,
ares **(Standalone)** | | |
-| supervision | Watara Supervision | Potator | | No | Single archive or ROM file |
+| supervision | Watara Supervision | Potator | MAME - Current,
MAME **(Standalone)** | No | Single archive or ROM file |
| supracan | Funtech Super A'Can | MAME - Current | MAME **(Standalone)** | Yes/No | Single archive or ROM file. To make MAME start these games create an empty file named internal_68k.bin and zip it into supracan.zip |
| switch | Nintendo Switch | Yuzu **(Standalone)** [UW],
Ryujinx **(Standalone)** [M] | Ryujinx **(Standalone)** [UW] | Yes | |
| symbian | Symbian | EKA2L1 [Nokia N-Gage] **(Standalone)** | EKA2L1 [Nokia N70] **(Standalone)**,
EKA2L1 [Nokia N97] **(Standalone)**,
EKA2L1 [Custom device] **(Standalone)** | Yes | See the specific _Symbian and Nokia N-Gage_ section elsewhere in this guide |