diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md
index e63a97cb3..fc0d168c1 100644
--- a/USERGUIDE-DEV.md
+++ b/USERGUIDE-DEV.md
@@ -1670,7 +1670,7 @@ Default emulator/Alternative emulators columns: \
| System name | Full name | Default emulator | Alternative emulators | BIOS required | Recommended game setup |
| :-------------------- | :--------------------------------------------- | :-------------------------------- | :-------------------------------- | :------------ | :----------------------------------- |
| 3do | 3DO | | | | |
-| 64dd | Nintendo 64DD | Mupen64Plus-Next (RetroArch) [UW], ParaLLEl N64 (RetroArch) [M] | ParaLLEl N64 (RetroArch) [UW] | | |
+| 64dd | Nintendo 64DD | Mupen64Plus-Next (RetroArch) [UW]
ParaLLEl N64 (RetroArch) [M] | ParaLLEl N64 (RetroArch) [UW] | | |
| ags | Adventure Game Studio game engine | | | | |
| amiga | Commodore Amiga | P-UAE (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 | P-UAE (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 |
@@ -1679,7 +1679,7 @@ Default emulator/Alternative emulators columns: \
| amstradcpc | Amstrad CPC | | | | |
| apple2 | Apple II | | | | |
| apple2gs | Apple IIGS | | | | |
-| arcade | Arcade | MAME - Current (RetroArch) | MAME 2000 (RetroArch), MAME 2003-Plus (RetroArch), MAME 2010 (RetroArch) | Depends | Single archive file following MAME name standard in root folder |
+| arcade | Arcade | MAME - Current (RetroArch) | MAME 2000 (RetroArch)
MAME 2003-Plus (RetroArch)
MAME 2010 (RetroArch) | 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 | | | | |
@@ -1702,10 +1702,10 @@ Default emulator/Alternative emulators columns: \
| daphne | Daphne Arcade Laserdisc Emulator | | | | |
| desktop | Desktop applications | N/A | | No | |
| doom | Doom | | | | |
-| dos | DOS (PC) | DOSBox-core (RetroArch) | DOSBox-Pure (RetroArch), DOSBox-SVN (RetroArch) | No | In separate folder (one folder per game, with complete file structure retained) |
+| dos | DOS (PC) | DOSBox-core (RetroArch) | DOSBox-Pure (RetroArch)
DOSBox-SVN (RetroArch) | No | In separate folder (one folder per game, with complete file structure retained) |
| dragon32 | Dragon 32 | | | | |
| dreamcast | Sega Dreamcast | | | | |
-| famicom | Nintendo Family Computer | Nestopia UE (RetroArch) | FCEUmm (RetroArch), Mesen (RetroArch), QuickNES (RetroArch) | No | Single archive or ROM file in root folder |
+| famicom | Nintendo Family Computer | Nestopia UE (RetroArch) | FCEUmm (RetroArch)
Mesen (RetroArch)
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 |
@@ -1715,20 +1715,20 @@ Default emulator/Alternative emulators columns: \
| gba | Nintendo Game Boy Advance | | | | |
| gbc | Nintendo Game Boy Color | | | | |
| gc | Nintendo GameCube | | | | |
-| genesis | Sega Genesis | Genesis Plus GX (RetroArch) | Genesis Plus GX Wide (RetroArch), PicoDrive (RetroArch), BlastEm (RetroArch) | No | Single archive or ROM file in root folder |
+| genesis | Sega Genesis | Genesis Plus GX (RetroArch) | Genesis Plus GX Wide (RetroArch)
PicoDrive (RetroArch)
BlastEm (RetroArch) | No | Single archive or ROM file in root folder |
| gx4000 | Amstrad GX4000 | | | | |
| intellivision | Mattel Electronics Intellivision | | | | |
| 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 | | | | |
| macintosh | Apple Macintosh | | | | |
-| mame | Multiple Arcade Machine Emulator | MAME 2003-Plus (RetroArch) | MAME 2000 (RetroArch), MAME 2010 (RetroArch), MAME - Current (RetroArch) | Depends | Single archive file following MAME name standard in root folder |
+| mame | Multiple Arcade Machine Emulator | MAME 2003-Plus (RetroArch) | MAME 2000 (RetroArch)
MAME 2010 (RetroArch)
MAME - Current (RetroArch) | 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 | | | | |
| megacdjp | Sega Mega-CD [Japan] | | | | |
-| megadrive | Sega Mega Drive | Genesis Plus GX (RetroArch) | Genesis Plus GX Wide (RetroArch), PicoDrive (RetroArch), BlastEm (RetroArch) | No | Single archive or ROM file in root folder |
+| megadrive | Sega Mega Drive | Genesis Plus GX (RetroArch) | Genesis Plus GX Wide (RetroArch)
PicoDrive (RetroArch)
BlastEm (RetroArch) | No | Single archive or ROM file in root folder |
| mess | Multi Emulator Super System | | | | |
| moonlight | Moonlight game streaming | | | | |
| moto | Thomson MO/TO series | Theodore (RetroArch) | | | |
@@ -1740,19 +1740,19 @@ Default emulator/Alternative emulators columns: \
| naomi | Sega NAOMI | Flycast (RetroArch) | | | |
| naomigd | Sega NAOMI GD-ROM | Flycast (RetroArch) | | | |
| n3ds | Nintendo 3DS | Citra (RetroArch) | | | |
-| n64 | Nintendo 64 | Mupen64Plus-Next (RetroArch) [UW], ParaLLEl N64 (RetroArch) [M] | ParaLLEl N64 (RetroArch) [UW] | No | Single archive or ROM file in root folder |
+| n64 | Nintendo 64 | Mupen64Plus-Next (RetroArch) [UW]
ParaLLEl N64 (RetroArch) [M] | ParaLLEl N64 (RetroArch) [UW] | No | Single archive or ROM file in root folder |
| nds | Nintendo DS | | | | |
| 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), Mesen (RetroArch), QuickNES (RetroArch) | No | Single archive or ROM file in root folder |
+| nes | Nintendo Entertainment System | Nestopia UE (RetroArch) | FCEUmm (RetroArch)
Mesen (RetroArch)
QuickNES (RetroArch) | No | Single archive or ROM file in root folder |
| ngp | SNK Neo Geo Pocket | | | | |
| ngpc | SNK Neo Geo Pocket Color | | | | |
| odyssey2 | Magnavox Odyssey2 | | | | |
| openbor | OpenBOR game engine | | | | |
| oric | Tangerine Computer Systems Oric | | | | |
| palm | Palm OS | | | | |
-| pc | IBM PC | DOSBox-core (RetroArch) | DOSBox-Pure (RetroArch), DOSBox-SVN (RetroArch) | No | In separate folder (one folder per game, with complete file structure retained) |
+| pc | IBM PC | DOSBox-core (RetroArch) | DOSBox-Pure (RetroArch)
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) | | No | Single archive or ROM file in root folder |
@@ -1765,7 +1765,7 @@ Default emulator/Alternative emulators columns: \
| ps4 | Sony PlayStation 4 | | | | |
| psp | Sony PlayStation Portable | | | | |
| psvita | Sony PlayStation Vita | | | | |
-| psx | Sony PlayStation | Beetle PSX (RetroArch) | Beetle PSX HW (RetroArch), PCSX ReARMed (RetroArch), 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 (RetroArch) | Beetle PSX HW (RetroArch)
PCSX ReARMed (RetroArch)
DuckStation (RetroArch) | 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é | | | | |
| satellaview | Nintendo Satellaview | | | | |
@@ -1777,8 +1777,8 @@ Default emulator/Alternative emulators columns: \
| sega32xna | Sega Genesis 32X [North America] | PicoDrive (RetroArch) | | No | Single archive or ROM file in root folder |
| segacd | Sega CD | | | | |
| sg-1000 | Sega SG-1000 | | | | |
-| snes | Nintendo SNES (Super Nintendo) | Snes9x - Current (RetroArch) | Snes9x 2010 (RetroArch), bsnes (RetroArch), bsnes-mercury Accuracy (RetroArch), Beetle Supafaust (RetroArch) [UW], 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), bsnes (RetroArch), bsnes-mercury Accuracy (RetroArch), Beetle Supafaust (RetroArch) [UW], Mesen-S (RetroArch) | No | Single archive or ROM file in root folder |
+| snes | Nintendo SNES (Super Nintendo) | Snes9x - Current (RetroArch) | Snes9x 2010 (RetroArch)
bsnes (RetroArch)
bsnes-mercury Accuracy (RetroArch)
Beetle Supafaust (RetroArch) [UW]
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)
bsnes (RetroArch)
bsnes-mercury Accuracy (RetroArch)
Beetle Supafaust (RetroArch) [UW]
Mesen-S (RetroArch) | Single archive or ROM file in root folder |
| solarus | Solarus game engine | | | | |
| spectravideo | Spectravideo | | | | |
| steam | Valve Steam | Steam application | | No | Shell script/batch file in root folder |