diff --git a/INSTALL-DEV.md b/INSTALL-DEV.md
index d7963cb34..e7db548c6 100644
--- a/INSTALL-DEV.md
+++ b/INSTALL-DEV.md
@@ -1447,10 +1447,10 @@ Below is an overview of the file layout with various examples. For the command t
         <!-- It's possible to define alternative emulators by adding additional command tags for a system. When doing this,
         the "label" attribute is mandatory for all tags. It's these labels that will be shown in the user interface when
         selecting the alternative emulators either system-wide or per game. The first row will be the default emulator. -->
-        <command label="Nestopia UE (RetroArch)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
-        <command label="FCEUmm (RetroArch)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
-        <command label="Mesen (RetroArch)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%</command>
-        <command label="QuickNES (RetroArch)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM%</command>
+        <command label="Nestopia UE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
+        <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
+        <command label="Mesen">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%</command>
+        <command label="QuickNES">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM%</command>
 
         <!-- This example for Unix will search for RetroArch in the PATH environment variable and it also has an absolute path to
         the snes9x_libretro core, If there are spaces in the path or file name, you must enclose them in quotation marks, such as
@@ -1531,9 +1531,9 @@ Here are some additional real world examples of system entries, the first one fo
     <fullname>DOS (PC)</fullname>
     <path>%ROMPATH%/dos</path>
     <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command label="DOSBox-core (RetroArch)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM%</command>
-    <command label="DOSBox-Pure (RetroArch)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM%</command>
-    <command label="DOSBox-SVN (RetroArch)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.so %ROM%</command>
+    <command label="DOSBox-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM%</command>
+    <command label="DOSBox-Pure">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM%</command>
+    <command label="DOSBox-SVN">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.so %ROM%</command>
     <platform>dos</platform>
     <theme>dos</theme>
 </system>
@@ -1557,13 +1557,14 @@ And finally one for Windows:
 
 ```xml
 <system>
-    <name>sega32x</name>
-    <fullname>Sega Mega Drive 32X</fullname>
-    <path>%ROMPATH%\sega32x</path>
-    <extension>.bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP</extension>
-    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\picodrive_libretro.dll %ROM%</command>
-    <platform>sega32x</platform>
-    <theme>sega32x</theme>
+    <name>pcengine</name>
+    <fullname>NEC PC Engine</fullname>
+    <path>%ROMPATH%\pcengine</path>
+    <extension>.bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP</extension>
+    <command label="Beetle PCE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_libretro.dll %ROM%</command>
+    <command label="Beetle PCE FAST">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_fast_libretro.dll %ROM%</command>
+    <platform>pcengine</platform>
+    <theme>pcengine</theme>
 </system>
 ```
 
diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md
index adc48ec9d..4d75dc06b 100644
--- a/USERGUIDE-DEV.md
+++ b/USERGUIDE-DEV.md
@@ -310,16 +310,16 @@ The supported file extensions are listed in [unix/es_systems.xml](resources/syst
 
 Here is the snippet from the unix/es_systems.xml file:
 
-```
+```xml
 <system>
     <name>nes</name>
     <fullname>Nintendo Entertainment System</fullname>
     <path>%ROMPATH%/nes</path>
     <extension>.nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
-    <command label="Nestopia UE (RetroArch)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
-    <command label="FCEUmm (RetroArch)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
-    <command label="Mesen (RetroArch)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%</command>
-    <command label="QuickNES (RetroArch)">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM%</command>
+    <command label="Nestopia UE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
+    <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
+    <command label="Mesen">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%</command>
+    <command label="QuickNES">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM%</command>
     <platform>nes</platform>
     <theme>nes</theme>
 </system>
@@ -1644,9 +1644,9 @@ Sometimes the name of the console is (more or less) the same for multiple region
 
 For the **Full name** column, text inside square brackets [] are comments and not part of the actual system name.
 
-The **Default emulator** column lists the primary emulator as configured in es_systems.xml. If this differs between Unix, macOS and Windows that is specified in square brackets, such as [UW] for Unix and Windows and [M] for macOS. If not all of the three platforms are specified it means that the system is not available on those platforms. For example Lutris which is only avaialable on Unix is marked as _Lutris application [U]_.
+The **Default emulator** column lists the primary emulator as configured in es_systems.xml. If this differs between Unix, macOS and Windows then it's specified in square brackets, such as [UW] for Unix and Windows and [M] for macOS. If not all of the three platforms are specified it means that the system is not available on the missing platforms. For example Lutris which is only avaialable on Unix is marked with only a _[U]_. Unless explicitly marked as **(Standalone)**, each emulator is a RetroArch core.
 
-The **Alternative emulators** column lists additional emulators configured in es_systems.xml that can be selected per system and per game, as explained earlier in this guide. This does not necessarily include everything in existence, as for some platforms there are a lot of emulators to choose from. In those cases the included emulators is a curated selection. In the same manner as the _Default emulator_ column, differences between Unix, macOS and Windows are marked using square brackets.
+The **Alternative emulators** column lists additional emulators configured in es_systems.xml that can be selected per system and per game, as explained earlier in this guide. This does not necessarily include everything in existence, as for some platforms there are a lot of emulators to choose from. In those cases the included emulators is a curated selection. In the same manner as the _Default emulator_ column, differences between Unix, macOS and Windows are marked using square brackets. Unless explicitly marked as **(Standalone)**, echo emulator is a RetroArch core.
 
 The **Needs BIOS** column indicates if additional BIOS/system ROMs are required, as should be explained by the emulator documentation. Good starting points for such documentation are [https://docs.libretro.com](https://docs.libretro.com) and [https://docs.libretro.com/library/bios](https://docs.libretro.com/library/bios)
 
@@ -1656,7 +1656,7 @@ If you generated the ROMs directory structure when first starting ES-DE, the sys
 
 For CD-based systems it's generally recommended to use CHD files (extension .chd) as this saves space due to compression compared to BIN/CUE, IMG, ISO etc. The CHD format is also supported by most emulators. You can convert to CHD from various formats using the MAME `chdman` utility, for example `chdman createcd -i mygame.iso -o mygame.chd`. Sometimes chdman has issues converting from the IMG and BIN formats, and in this case it's possible to first convert to ISO using `ccd2iso`, such as `ccd2iso mygame.img mygame.iso`.
 
-MAME emulation is a bit special as the choice of emulator depends on which ROM set you're using. It's recommended to go for the latest available set, as MAME is constantly improved with more complete and accurate emulation. Therefore the `arcade` system is configured to use _MAME - Current (RetroArch)_ by default, which as the name implies will be the latest available MAME version. But if you have a really slow computer you may want to use another ROM set such as the popular 0.78. In this case, you can either select _MAME 2003-Plus (RetroArch)_ as an alternative emulator, or you can use the `mame` system which comes configured with this emulator as the default. There are more MAME versions available as alternative emulators, as you can see in the table below.
+MAME emulation is a bit special as the choice of emulator depends on which ROM set you're using. It's recommended to go for the latest available set, as MAME is constantly improved with more complete and accurate emulation. Therefore the `arcade` system is configured to use _MAME - Current_ by default, which as the name implies will be the latest available MAME version. But if you have a really slow computer you may want to use another ROM set such as the popular 0.78. In this case, you can either select _MAME 2003-Plus_ as an alternative emulator, or you can use the `mame` system which comes configured with this emulator as the default. There are more MAME versions available as alternative emulators, as you can see in the table below.
 
 There are also other MAME forks and derivates available such as MAME4ALL, AdvanceMAME, FinalBurn Alpha and FinalBurn Neo but it's beyond the scope of this document to describe those in detail. For more information, refer to the [RetroPie arcade documentation](https://retropie.org.uk/docs/Arcade) which has a good overview of the various MAME alternatives.
 
@@ -1667,144 +1667,147 @@ Consider the table below a work in progress as it's obvioulsy not fully populate
 Default emulator/Alternative emulators columns: \
 **[U]**: Unix, **[M]**: macOS, **[W]**: Windows
 
+All emulators are RetroArch cores unless marked as **(Standalone**)
+
 | System name           | Full name                                      | Default emulator                  | Alternative emulators             | Needs BIOS   | Recommended game setup               |
 | :-------------------- | :--------------------------------------------- | :-------------------------------- | :-------------------------------- | :----------- | :----------------------------------- |
-| 3do                   | 3DO                                            | 4DO (RetroArch)                   |                                   |              |                                      |
-| 64dd                  | Nintendo 64DD                                  | Mupen64Plus-Next (RetroArch) [UW]<br>ParaLLEl N64 (RetroArch) [M] | ParaLLEl N64 (RetroArch) [UW] |              |                                      |
+| 3do                   | 3DO                                            | 4DO                               |                                   |              |                                      |
+| 64dd                  | Nintendo 64DD                                  | Mupen64Plus-Next [UW],<br>ParaLLEl N64 [M] | ParaLLEl N64 [UW]         |              |                                      |
 | ags                   | Adventure Game Studio game engine              |                                   |                                   |              |                                      |
-| amiga                 | Commodore Amiga                                | PUAE (RetroArch)                  |                                   | Yes          | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disc, or in separate folder with .m3u playlist if multi-disc |
-| amiga600              | Commodore Amiga 600                            | PUAE (RetroArch)                  |                                   | Yes          | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disc, or in separate folder with .m3u playlist if multi-disc |
-| amiga1200             | Commodore Amiga 1200                           | PUAE (RetroArch)                  |                                   | Yes          | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disc, or in separate folder with .m3u playlist if multi-disc |
-| amigacd32             | Commodore Amiga CD32                           | PUAE (RetroArch)                  |                                   |              |                                      |
-| amstradcpc            | Amstrad CPC                                    | Caprice32 (RetroArch)             |                                   |              |                                      |
+| amiga                 | Commodore Amiga                                | PUAE                              |                                   | Yes          | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disc, or in separate folder with .m3u playlist if multi-disc |
+| amiga600              | Commodore Amiga 600                            | PUAE                              |                                   | Yes          | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disc, or in separate folder with .m3u playlist if multi-disc |
+| amiga1200             | Commodore Amiga 1200                           | PUAE                              |                                   | Yes          | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disc, or in separate folder with .m3u playlist if multi-disc |
+| amigacd32             | Commodore Amiga CD32                           | PUAE                              |                                   |              |                                      |
+| amstradcpc            | Amstrad CPC                                    | Caprice32                         |                                   |              |                                      |
 | apple2                | Apple II                                       |                                   |                                   |              |                                      |
 | apple2gs              | Apple IIGS                                     |                                   |                                   |              |                                      |
-| arcade                | Arcade                                         | MAME - Current (RetroArch)        | MAME 2000 (RetroArch)<br>MAME 2003-Plus (RetroArch)<br>MAME 2010 (RetroArch)<br>FinalBurn Neo (RetroArch)<br>FB Alpha 2012 (RetroArch) | Depends      | Single archive file following MAME name standard in root folder |
+| arcade                | Arcade                                         | MAME - Current                    | MAME 2000,<br>MAME 2003-Plus,<br>MAME 2010,<br>FinalBurn Neo,<br>FB Alpha 2012 | Depends      | Single archive file following MAME name standard in root folder |
 | astrocade             | Bally Astrocade                                |                                   |                                   |              |                                      |
-| atari2600             | Atari 2600                                     | Stella (RetroArch)                | Stella 2014 (RetroArch)           | No           | Single archive or ROM file in root folder |
-| atari5200             | Atari 5200                                     | Atari800 (RetroArch)              |                                   |              |                                      |
-| atari7800             | Atari 7800 ProSystem                           | ProSystem (RetroArch)             |                                   |              |                                      |
-| atari800              | Atari 800                                      | Atari800 (RetroArch)              |                                   |              |                                      |
-| atarijaguar           | Atari Jaguar                                   | Virtual Jaguar (RetroArch)        |                                   |              |                                      |
-| atarijaguarcd         | Atari Jaguar CD                                | Virtual Jaguar (RetroArch)        |                                   |              |                                      |
-| atarilynx             | Atari Lynx                                     | Beetle Lynx (RetroArch)           |                                   |              |                                      |
-| atarist               | Atari ST [also STE and Falcon]                 | Hatari (RetroArch)                |                                   |              |                                      |
-| atarixe               | Atari XE                                       | Atari800 (RetroArch)              |                                   |              |                                      |
-| atomiswave            | Atomiswave                                     | Flycast (RetroArch)               |                                   |              |                                      |
+| atari2600             | Atari 2600                                     | Stella                            | Stella 2014                       | No           | Single archive or ROM file in root folder |
+| atari5200             | Atari 5200                                     | Atari800                          |                                   |              |                                      |
+| atari7800             | Atari 7800 ProSystem                           | ProSystem                         |                                   |              |                                      |
+| atari800              | Atari 800                                      | Atari800                          |                                   |              |                                      |
+| atarijaguar           | Atari Jaguar                                   | Virtual Jaguar                    |                                   |              |                                      |
+| atarijaguarcd         | Atari Jaguar CD                                | Virtual Jaguar                    |                                   |              |                                      |
+| atarilynx             | Atari Lynx                                     | Beetle Lynx                       |                                   |              |                                      |
+| atarist               | Atari ST [also STE and Falcon]                 | Hatari                            |                                   |              |                                      |
+| atarixe               | Atari XE                                       | Atari800                          |                                   |              |                                      |
+| atomiswave            | Atomiswave                                     | Flycast                           |                                   |              |                                      |
 | bbcmicro              | BBC Micro                                      |                                   |                                   |              |                                      |
-| c64                   | Commodore 64                                   | VICE x64sc Accurate (RetroArch)   | VICE x64 Fast (RetroArch)<br>VICE x64 SuperCPU (RetroArch)<br>VICE x128 (RetroArch)<br>Frodo (RetroArch) | No           | Single disk, tape r cartridge image in root folder and/or multi-disc images in separate folder |
-| cavestory             | Cave Story (NXEngine)                          | NXEngine (RetroArch)              |                                   |              |                                      |
+| c64                   | Commodore 64                                   | VICE x64sc Accurate               | VICE x64 Fast,<br>VICE x64 SuperCPU,<br>VICE x128,<br>Frodo | No           | Single disk, tape r cartridge image in root folder and/or multi-disc images in separate folder |
+| cavestory             | Cave Story (NXEngine)                          | NXEngine                          |                                   |              |                                      |
 | cdtv                  | Commodore CDTV                                 |                                   |                                   |              |                                      |
-| chailove              | ChaiLove game engine                           | ChaiLove (RetroArch)              |                                   |              |                                      |
-| channelf              | Fairchild Channel F                            | FreeChaF (RetroArch)              |                                   |              |                                      |
+| chailove              | ChaiLove game engine                           | ChaiLove                          |                                   |              |                                      |
+| channelf              | Fairchild Channel F                            | FreeChaF                          |                                   |              |                                      |
 | coco                  | Tandy Color Computer                           |                                   |                                   |              |                                      |
-| colecovision          | ColecoVision                                   | blueMSX (RetroArch)               |                                   |              |                                      |
+| colecovision          | ColecoVision                                   | blueMSX                           |                                   |              |                                      |
 | daphne                | Daphne Arcade Laserdisc Emulator               |                                   |                                   |              |                                      |
 | desktop               | Desktop applications                           | N/A                               |                                   | No           |                                      |
-| doom                  | Doom                                           | PrBoom (RetroArch)                |                                   |              |                                      |
-| dos                   | DOS (PC)                                       | DOSBox-core (RetroArch)           | DOSBox-Pure (RetroArch)<br>DOSBox-SVN (RetroArch) | No           | In separate folder (one folder per game, with complete file structure retained) |
+| doom                  | Doom                                           | PrBoom                            |                                   |              |                                      |
+| dos                   | DOS (PC)                                       | DOSBox-Core                       | DOSBox-Pure,<br>DOSBox-SVN | No           | In separate folder (one folder per game, with complete file structure retained) |
 | dragon32              | Dragon 32                                      |                                   |                                   |              |                                      |
-| dreamcast             | Sega Dreamcast                                 | Flycast (RetroArch)               |                                   |              |                                      |
-| famicom               | Nintendo Family Computer                       | Nestopia UE (RetroArch)           | FCEUmm (RetroArch)<br>Mesen (RetroArch)<br>QuickNES (RetroArch) | No           | Single archive or ROM file in root folder |
-| fba                   | FinalBurn Alpha                                | FB Alpha 2012 (RetroArch)         |                                   | Yes          | Single archive file following MAME name standard in root folder |
-| fbneo                 | FinalBurn Neo                                  | FinalBurn Neo (RetroArch)         |                                   | Yes          | Single archive file following MAME name standard in root folder |
-| fds                   | Nintendo Famicom Disk System                   | Nestopia UE (RetroArch)           |                                   | Yes          | Single archive or ROM file in root folder |
-| gameandwatch          | Nintendo Game and Watch                        | GW (RetroArch)                    |                                   |              |                                      |
-| gamegear              | Sega Game Gear                                 | Genesis Plus GX (RetroArch)       |                                   |              |                                      |
-| gb                    | Nintendo Game Boy                              | bsnes (RetroArch)                 |                                   |              |                                      |
-| gba                   | Nintendo Game Boy Advance                      | Beetle GBA (RetroArch)            |                                   |              |                                      |
-| gbc                   | Nintendo Game Boy Color                        | bsnes (RetroArch)                 |                                   |              |                                      |
-| gc                    | Nintendo GameCube                              | Dolphin (RetroArch)               |                                   |              |                                      |
-| genesis               | Sega Genesis                                   | Genesis Plus GX (RetroArch)       | Genesis Plus GX Wide (RetroArch)<br>PicoDrive (RetroArch)<br>BlastEm (RetroArch) | No           | Single archive or ROM file in root folder |
+| dreamcast             | Sega Dreamcast                                 | Flycast                           |                                   |              |                                      |
+| famicom               | Nintendo Family Computer                       | Nestopia UE                       | FCEUmm,<br>Mesen,<br>QuickNES | No           | Single archive or ROM file in root folder |
+| fba                   | FinalBurn Alpha                                | FB Alpha 2012                     | FB Alpha 2012 Neo Geo,<br>FB Alpha 2012 CPS-1,<br>FB Alpha 2012 CPS-2,<br>FB Alpha 2012 CPS-3 | Yes          | Single archive file following MAME name standard in root folder |
+| fbneo                 | FinalBurn Neo                                  | FinalBurn Neo                     |                                   | Yes          | Single archive file following MAME name standard in root folder |
+| fds                   | Nintendo Famicom Disk System                   | Nestopia UE                       |                                   | Yes          | Single archive or ROM file in root folder |
+| gameandwatch          | Nintendo Game and Watch                        | GW                                |                                   |              |                                      |
+| gamegear              | Sega Game Gear                                 | Genesis Plus GX                   |                                   |              |                                      |
+| gb                    | Nintendo Game Boy                              | bsnes                             |                                   |              |                                      |
+| gba                   | Nintendo Game Boy Advance                      | Beetle GBA                        |                                   |              |                                      |
+| gbc                   | Nintendo Game Boy Color                        | bsnes                             |                                   |              |                                      |
+| gc                    | Nintendo GameCube                              | Dolphin                           |                                   |              |                                      |
+| genesis               | Sega Genesis                                   | Genesis Plus GX                   | Genesis Plus GX Wide,<br>PicoDrive,<br>BlastEm | No           | Single archive or ROM file in root folder |
 | gx4000                | Amstrad GX4000                                 |                                   |                                   |              |                                      |
-| intellivision         | Mattel Electronics Intellivision               | FreeIntv (RetroArch)              |                                   |              |                                      |
+| intellivision         | Mattel Electronics Intellivision               | FreeIntv                          |                                   |              |                                      |
 | kodi                  | Kodi home theatre software                     | N/A                               |                                   | No           |                                      |
-| lutris                | Lutris open gaming platform                    | Lutris application [U]            |                                   | No           | Shell script in root folder          |
-| lutro                 | Lutro game engine                              | Lutro (RetroArch)                 |                                   |              |                                      |
+| lutris                | Lutris open gaming platform                    | Lutris application **(Standalone)** [U] |                                   | No           | Shell script in root folder          |
+| lutro                 | Lutro game engine                              | Lutro                             |                                   |              |                                      |
 | macintosh             | Apple Macintosh                                |                                   |                                   |              |                                      |
-| mame                  | Multiple Arcade Machine Emulator               | MAME 2003-Plus (RetroArch)        | MAME 2000 (RetroArch)<br>MAME 2010 (RetroArch)<br>MAME - Current (RetroArch)<br>FinalBurn Neo (RetroArch)<br>FB Alpha 2012 (RetroArch) | Depends      | Single archive file following MAME name standard in root folder |
+| mame                  | Multiple Arcade Machine Emulator               | MAME 2003-Plus                    | MAME 2000,<br>MAME 2010,<br>MAME - Current,<br>FinalBurn Neo,<br>FB Alpha 2012 | Depends      | Single archive file following MAME name standard in root folder |
 | mame-advmame          | AdvanceMAME                                    |                                   |                                   | Depends      | Single archive file following MAME name standard in root folder |
 | mame-mame4all         | MAME4ALL                                       |                                   |                                   | Depends      | Single archive file following MAME name standard in root folder |
-| mastersystem          | Sega Master System                             | Genesis Plus GX (RetroArch)       |                                   | No           | Single archive or ROM file in root folder |
-| megacd                | Sega Mega-CD                                   | Genesis Plus GX (RetroArch)       |                                   |              |                                      |
-| megacdjp              | Sega Mega-CD [Japan]                           | Genesis Plus GX (RetroArch)       |                                   |              |                                      |
-| megadrive             | Sega Mega Drive                                | Genesis Plus GX (RetroArch)       | Genesis Plus GX Wide (RetroArch)<br>PicoDrive (RetroArch)<br>BlastEm (RetroArch) | No           | Single archive or ROM file in root folder |
-| mess                  | Multi Emulator Super System                    | MESS 2015 (RetroArch)             |                                   |              |                                      |
+| mastersystem          | Sega Master System                             | Genesis Plus GX                   | Genesis Plus GX Wide,<br>SMS Plus GX,<br>Gearsystem,<br>PicoDrive | No           | Single archive or ROM file in root folder |
+| megacd                | Sega Mega-CD                                   | Genesis Plus GX                   |                                   |              |                                      |
+| megacdjp              | Sega Mega-CD [Japan]                           | Genesis Plus GX                   |                                   |              |                                      |
+| megadrive             | Sega Mega Drive                                | Genesis Plus GX                   | Genesis Plus GX Wide,<br>PicoDrive,<br>BlastEm | No           | Single archive or ROM file in root folder |
+| mess                  | Multi Emulator Super System                    | MESS 2015                         |                                   |              |                                      |
 | moonlight             | Moonlight game streaming                       |                                   |                                   |              |                                      |
-| moto                  | Thomson MO/TO series                           | Theodore (RetroArch)              |                                   |              |                                      |
-| msx                   | MSX                                            | blueMSX (RetroArch)               |                                   |              |                                      |
-| msx1                  | MSX1                                           | blueMSX (RetroArch)               |                                   |              |                                      |
-| msx2                  | MSX2                                           | blueMSX (RetroArch)               |                                   |              |                                      |
-| msxturbor             | MSX Turbo R                                    | blueMSX (RetroArch)               |                                   |              |                                      |
-| multivision           | Othello Multivision                            | Gearsystem (RetroArch)            |                                   |              |                                      |
-| naomi                 | Sega NAOMI                                     | Flycast (RetroArch)               |                                   |              |                                      |
-| naomigd               | Sega NAOMI GD-ROM                              | Flycast (RetroArch)               |                                   |              |                                      |
-| n3ds                  | Nintendo 3DS                                   | Citra (RetroArch)                 |                                   |              |                                      |
-| n64                   | Nintendo 64                                    | Mupen64Plus-Next (RetroArch) [UW]<br>ParaLLEl N64 (RetroArch) [M] | ParaLLEl N64 (RetroArch) [UW] | No           | Single archive or ROM file in root folder |
-| nds                   | Nintendo DS                                    | melonDS (RetroArch)               |                                   |              |                                      |
-| neogeo                | SNK Neo Geo                                    | FinalBurn Neo (RetroArch)         |                                   | Yes          | Single archive file following MAME name standard in root folder |
-| neogeocd              | SNK Neo Geo CD                                 | NeoCD (RetroArch)                 |                                   | Yes          | Single archive in root folder (which includes the CD image and ripped audio) |
-| neogeocdjp            | SNK Neo Geo CD [Japan]                         | NeoCD (RetroArch)                 |                                   | Yes          | Single archive in root folder (which includes the CD image and ripped audio) |
-| nes                   | Nintendo Entertainment System                  | Nestopia UE (RetroArch)           | FCEUmm (RetroArch)<br>Mesen (RetroArch)<br>QuickNES (RetroArch) | No           | Single archive or ROM file in root folder |
-| ngp                   | SNK Neo Geo Pocket                             | Beetle NeoPop (RetroArch)         |                                   |              |                                      |
-| ngpc                  | SNK Neo Geo Pocket Color                       | Beetle NeoPop (RetroArch)         |                                   |              |                                      |
-| odyssey2              | Magnavox Odyssey2                              | O2EM (RetroArch)                  |                                   |              |                                      |
+| moto                  | Thomson MO/TO series                           | Theodore                          |                                   |              |                                      |
+| msx                   | MSX                                            | blueMSX                           |                                   |              |                                      |
+| msx1                  | MSX1                                           | blueMSX                           |                                   |              |                                      |
+| msx2                  | MSX2                                           | blueMSX                           |                                   |              |                                      |
+| msxturbor             | MSX Turbo R                                    | blueMSX                           |                                   |              |                                      |
+| multivision           | Othello Multivision                            | Gearsystem                        |                                   |              |                                      |
+| naomi                 | Sega NAOMI                                     | Flycast                           |                                   |              |                                      |
+| naomigd               | Sega NAOMI GD-ROM                              | Flycast                           |                                   |              |                                      |
+| n3ds                  | Nintendo 3DS                                   | Citra                             |                                   |              |                                      |
+| n64                   | Nintendo 64                                    | Mupen64Plus-Next [UW],<br>ParaLLEl N64 [M] | ParaLLEl N64 [UW] | No           | Single archive or ROM file in root folder |
+| nds                   | Nintendo DS                                    | melonDS                           |                                   |              |                                      |
+| neogeo                | SNK Neo Geo                                    | FinalBurn Neo                     |                                   | Yes          | Single archive file following MAME name standard in root folder |
+| neogeocd              | SNK Neo Geo CD                                 | NeoCD                             |                                   | Yes          | Single archive in root folder (which includes the CD image and ripped audio) |
+| neogeocdjp            | SNK Neo Geo CD [Japan]                         | NeoCD                             |                                   | Yes          | Single archive in root folder (which includes the CD image and ripped audio) |
+| nes                   | Nintendo Entertainment System                  | Nestopia UE                       | FCEUmm,<br>Mesen,<br>QuickNES       | No           | Single archive or ROM file in root folder |
+| ngp                   | SNK Neo Geo Pocket                             | Beetle NeoPop                     |                                   |              |                                      |
+| ngpc                  | SNK Neo Geo Pocket Color                       | Beetle NeoPop                     |                                   |              |                                      |
+| odyssey2              | Magnavox Odyssey2                              | O2EM                              |                                   |              |                                      |
 | openbor               | OpenBOR game engine                            |                                   |                                   |              |                                      |
 | oric                  | Tangerine Computer Systems Oric                |                                   |                                   |              |                                      |
-| palm                  | Palm OS                                        | Mu (RetroArch)                    |                                   |              |                                      |
-| pc                    | IBM PC                                         | DOSBox-core (RetroArch)           | DOSBox-Pure (RetroArch)<br>DOSBox-SVN (RetroArch) | No           | In separate folder (one folder per game, with complete file structure retained) |
-| pc88                  | NEC PC-8800 series                             | QUASI88 (RetroArch)               |                                   |              |                                      |
-| pc98                  | NEC PC-9800 series                             | Neko Project II Kai (RetroArch)   |                                   |              |                                      |
-| pcengine              | NEC PC Engine                                  | Beetle PCE (RetroArch)            | Beetle PCE FAST (RetroArch)       | No           | Single archive or ROM file in root folder |
-| pcenginecd            | NEC PC Engine CD                               | Beetle PCE (RetroArch)            | Beetle PCE FAST (RetroArch)       | Yes          |                                      |
-| pcfx                  | NEC PC-FX                                      | Beetle PC-FX (RetroArch)          |                                   |              |                                      |
-| pokemini              | Nintendo Pokémon Mini                          | PokeMini (RetroArch)              |                                   | No           |                                      |
+| palm                  | Palm OS                                        | Mu                                |                                   |              |                                      |
+| pc                    | IBM PC                                         | DOSBox-Core                       | DOSBox-Pure,<br>DOSBox-SVN         | No           | In separate folder (one folder per game, with complete file structure retained) |
+| pc88                  | NEC PC-8800 series                             | QUASI88                           |                                   |              |                                      |
+| pc98                  | NEC PC-9800 series                             | Neko Project II Kai               |                                   |              |                                      |
+| pcengine              | NEC PC Engine                                  | Beetle PCE                        | Beetle PCE FAST                   | No           | Single archive or ROM file in root folder |
+| pcenginecd            | NEC PC Engine CD                               | Beetle PCE                        | Beetle PCE FAST                   | Yes          |                                      |
+| pcfx                  | NEC PC-FX                                      | Beetle PC-FX                      |                                   |              |                                      |
+| pokemini              | Nintendo Pokémon Mini                          | PokeMini                          |                                   | No           |                                      |
 | ports                 | Ports                                          | N/A                               |                                   | No           | Shell/batch script in separate folder (possibly combined with game data) |
-| ps2                   | Sony PlayStation 2                             | PCSX2 (RetroArch) [UW]            |                                   |              |                                      |
+| ps2                   | Sony PlayStation 2                             | PCSX2 [UW]                        |                                   |              |                                      |
 | ps3                   | Sony PlayStation 3                             |                                   |                                   |              |                                      |
 | ps4                   | Sony PlayStation 4                             |                                   |                                   |              |                                      |
-| psp                   | Sony PlayStation Portable                      | PPSSPP (RetroArch)                |                                   |              |                                      |
+| psp                   | Sony PlayStation Portable                      | PPSSPP                            |                                   |              |                                      |
 | psvita                | Sony PlayStation Vita                          |                                   |                                   |              |                                      |
-| psx                   | Sony PlayStation                               | Beetle PSX (RetroArch)            | Beetle PSX HW (RetroArch)<br>PCSX ReARMed (RetroArch)<br>DuckStation (RetroArch) | Yes          | .chd file in root folder for single-disc games, .m3u playlist in root folder for multi-disc games |
+| psx                   | Sony PlayStation                               | Beetle PSX                        | Beetle PSX HW,<br>PCSX ReARMed,<br>DuckStation | Yes          | .chd file in root folder for single-disc games, .m3u playlist in root folder for multi-disc games |
 | residualvm            | ResidualVM game engine                         |                                   |                                   |              |                                      |
-| samcoupe              | SAM Coupé                                      | SimCoupe (RetroArch)              |                                   |              |                                      |
-| satellaview           | Nintendo Satellaview                           | Snes9x - Current (RetroArch)      |                                   |              |                                      |
-| saturn                | Sega Saturn                                    | Beetle Saturn (RetroArch)         |                                   |              |                                      |
-| saturnjp              | Sega Saturn [Japan]                            | Beetle Saturn (RetroArch)         |                                   |              |                                      |
-| scummvm               | ScummVM game engine                            | ScummVM (RetroArch)               |                                   | No           | In separate folder (one folder per game, with complete file structure retained) |
-| sega32x               | Sega Mega Drive 32X                            | PicoDrive (RetroArch)             |                                   | No           | Single archive or ROM file in root folder |
-| sega32xjp             | Sega Super 32X [Japan]                         | PicoDrive (RetroArch)             |                                   | No           | Single archive or ROM file in root folder |
-| sega32xna             | Sega Genesis 32X [North America]               | PicoDrive (RetroArch)             |                                   | No           | Single archive or ROM file in root folder |
-| segacd                | Sega CD                                        | Genesis Plus GX (RetroArch)       |                                   |              |                                      |
-| sg-1000               | Sega SG-1000                                   | Genesis Plus GX (RetroArch)       |                                   |              |                                      |
-| snes                  | Nintendo SNES (Super Nintendo)                 | Snes9x - Current (RetroArch)      | Snes9x 2010 (RetroArch)<br>bsnes (RetroArch)<br>bsnes-mercury Accuracy (RetroArch)<br>Beetle Supafaust (RetroArch) [UW]<br>Mesen-S (RetroArch) | No           | Single archive or ROM file in root folder |
-| snesna                | Nintendo SNES (Super Nintendo) [North America] | Snes9x - Current (RetroArch)      | Snes9x 2010 (RetroArch)<br>bsnes (RetroArch)<br>bsnes-mercury Accuracy (RetroArch)<br>Beetle Supafaust (RetroArch) [UW]<br>Mesen-S (RetroArch) | No           | Single archive or ROM file in root folder |
+| samcoupe              | SAM Coupé                                      | SimCoupe                          |                                   |              |                                      |
+| satellaview           | Nintendo Satellaview                           | Snes9x - Current                  |                                   |              |                                      |
+| saturn                | Sega Saturn                                    | Beetle Saturn                     |                                   |              |                                      |
+| saturnjp              | Sega Saturn [Japan]                            | Beetle Saturn                     |                                   |              |                                      |
+| scummvm               | ScummVM game engine                            | ScummVM                           |                                   | No           | In separate folder (one folder per game, with complete file structure retained) |
+| sega32x               | Sega Mega Drive 32X                            | PicoDrive                         |                                   | No           | Single archive or ROM file in root folder |
+| sega32xjp             | Sega Super 32X [Japan]                         | PicoDrive                         |                                   | No           | Single archive or ROM file in root folder |
+| sega32xna             | Sega Genesis 32X [North America]               | PicoDrive                         |                                   | No           | Single archive or ROM file in root folder |
+| segacd                | Sega CD                                        | Genesis Plus GX                   |                                   |              |                                      |
+| sg-1000               | Sega SG-1000                                   | Genesis Plus GX                   |                                   |              |                                      |
+| snes                  | Nintendo SNES (Super Nintendo)                 | Snes9x - Current                  | Snes9x 2010,<br>bsnes,<br>bsnes-mercury Accuracy,<br>Beetle Supafaust [UW],<br>Mesen-S | No           | Single archive or ROM file in root folder |
+| snesna                | Nintendo SNES (Super Nintendo) [North America] | Snes9x - Current                  | Snes9x 2010,<br>bsnes,<br>bsnes-mercury Accuracy,<br>Beetle Supafaust [UW],<br>Mesen-S | No           | Single archive or ROM file in root folder |
 | solarus               | Solarus game engine                            |                                   |                                   |              |                                      |
-| spectravideo          | Spectravideo                                   | blueMSX (RetroArch)               |                                   |              |                                      |
-| steam                 | Valve Steam                                    | Steam application                 |                                   | No           | Shell script/batch file in root folder |
+| spectravideo          | Spectravideo                                   | blueMSX                           |                                   |              |                                      |
+| steam                 | Valve Steam                                    | Steam application **(Standalone)** |                                   | No           | Shell script/batch file in root folder |
 | stratagus             | Stratagus game engine                          |                                   |                                   |              |                                      |
-| sufami                | Bandai SuFami Turbo                            | Snes9x - Current (RetroArch)      |                                   |              |                                      |
-| supergrafx            | NEC SuperGrafx                                 | Beetle SuperGrafx (RetroArch)     |                                   |              |                                      |
-| switch                | Nintendo Switch                                | Yuzu [UW]                         |                                   | Yes          |                                      |
+| sufami                | Bandai SuFami Turbo                            | Snes9x - Current                  |                                   |              |                                      |
+| supergrafx            | NEC SuperGrafx                                 | Beetle SuperGrafx                 | Beetle PCE                        |              |                                      |
+| switch                | Nintendo Switch                                | Yuzu **(Standalone)** [UW]        |                                   | Yes          |                                      |
 | tanodragon            | Tano Dragon                                    |                                   |                                   |              |                                      |
-| tg16                  | NEC TurboGrafx-16                              | Beetle PCE (RetroArch)            | Beetle PCE FAST (RetroArch)       | No           | Single archive or ROM file in root folder |
-| tg-cd                 | NEC TurboGrafx-CD                              | Beetle PCE (RetroArch)            | Beetle PCE FAST (RetroArch)       | Yes          |                                      |
+| tg16                  | NEC TurboGrafx-16                              | Beetle PCE                        | Beetle PCE FAST                   | No           | Single archive or ROM file in root folder |
+| tg-cd                 | NEC TurboGrafx-CD                              | Beetle PCE                        | Beetle PCE FAST                   | Yes          |                                      |
 | ti99                  | Texas Instruments TI-99                        |                                   |                                   |              |                                      |
 | tic80                 | TIC-80 game engine                             |                                   |                                   |              |                                      |
-| to8                   | Thomson TO8                                    | Theodore (RetroArch)              |                                   |              |                                      |
+| to8                   | Thomson TO8                                    | Theodore                          |                                   |              |                                      |
 | trs-80                | Tandy TRS-80                                   |                                   |                                   |              |                                      |
-| uzebox                | Uzebox                                         | Uzem (RetroArch)                  |                                   |              |                                      |
-| vectrex               | Vectrex                                        | vecx (RetroArch)                  |                                   |              |                                      |
-| videopac              | Philips Videopac G7000 (Magnavox Odyssey2)     | O2EM (RetroArch)                  |                                   |              |                                      |
-| virtualboy            | Nintendo Virtual Boy                           | Beetle VB (RetroArch)             |                                   |              |                                      |
-| wii                   | Nintendo Wii                                   | Dolphin (RetroArch)               |                                   |              |                                      |
+| uzebox                | Uzebox                                         | Uzem                              |                                   |              |                                      |
+| vectrex               | Vectrex                                        | vecx                              |                                   |              |                                      |
+| videopac              | Philips Videopac G7000 (Magnavox Odyssey2)     | O2EM                              |                                   |              |                                      |
+| virtualboy            | Nintendo Virtual Boy                           | Beetle VB                         |                                   |              |                                      |
+| wii                   | Nintendo Wii                                   | Dolphin                           |                                   |              |                                      |
 | wiiu                  | Nintendo Wii U                                 |                                   |                                   |              |                                      |
-| wonderswan            | Bandai WonderSwan                              | Beetle Cygne (RetroArch)          |                                   |              |                                      |
-| wonderswancolor       | Bandai WonderSwan Color                        | Beetle Cygne (RetroArch)          |                                   |              |                                      |
-| x1                    | Sharp X1                                       | x1 (RetroArch)                    |                                   |              | Single archive or ROM file in root folder |
-| x68000                | Sharp X68000                                   | PX68k (RetroArch)                 |                                   |              |                                      |
+| wonderswan            | Bandai WonderSwan                              | Beetle Cygne                      |                                   |              |                                      |
+| wonderswancolor       | Bandai WonderSwan Color                        | Beetle Cygne                      |                                   |              |                                      |
+| x1                    | Sharp X1                                       | x1                                |                                   |              | Single archive or ROM file in root folder |
+| x68000                | Sharp X68000                                   | PX68k                             |                                   |              |                                      |
 | xbox                  | Microsoft Xbox                                 |                                   |                                   |              |                                      |
 | xbox360               | Microsoft Xbox 360                             |                                   |                                   |              |                                      |
 | zmachine              | Infocom Z-machine                              |                                   |                                   |              |                                      |
-| zx81                  | Sinclair ZX81                                  | EightyOne (RetroArch)             |                                   |              |                                      |
-| zxspectrum            | Sinclair ZX Spectrum                           | Fuse (RetroArch)                  |                                   |              |                                      |
+| zx81                  | Sinclair ZX81                                  | EightyOne                         |                                   |              |                                      |
+| zxspectrum            | Sinclair ZX Spectrum                           | Fuse                              |                                   |              |                                      |              | Amstrad GX4000                                 |                                   |                                   |              |                                      |
+