diff --git a/ANDROID.md b/ANDROID.md
index 8040ef835..338ef822e 100644
--- a/ANDROID.md
+++ b/ANDROID.md
@@ -22,7 +22,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| archimedes | Acorn Archimedes | _Placeholder_ | | | |
| arduboy | Arduboy Miniature Game System | Arduous | | No | Single archive or .hex file |
| astrocde | Bally Astrocade | _Placeholder_ | | | |
-| atari2600 | Atari 2600 | Stella | Stella 2014 | No | Single archive or ROM file |
+| atari2600 | Atari 2600 | Stella | Stella 2014,
2600.emu **(Standalone)** | No | Single archive or ROM file |
| atari5200 | Atari 5200 | a5200 | Atari800 | Yes | Single archive or ROM file |
| atari7800 | Atari 7800 ProSystem | ProSystem | | Yes | Single archive or ROM file |
| atari800 | Atari 800 | Atari800 | | Yes | |
@@ -33,13 +33,13 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| atarixe | Atari XE | Atari800 | | Yes | |
| atomiswave | Sammy Corporation Atomiswave | Flycast | Flycast **(Standalone)** | Depends | Single archive file |
| bbcmicro | Acorn Computers BBC Micro | _Placeholder_ | | | |
-| c64 | Commodore 64 | VICE x64sc Accurate | VICE x64 Fast,
VICE x64 SuperCPU,
VICE x128 | No | Single archive or image file for tape, cartridge or single-diskette games, .m3u playlist for multi-diskette games |
+| c64 | Commodore 64 | VICE x64sc Accurate | VICE x64 Fast,
VICE x64 SuperCPU,
VICE x128,
C64.emu **(Standalone)** | No | Single archive or image file for tape, cartridge or single-diskette games, .m3u playlist for multi-diskette games |
| cdimono1 | Philips CD-i | SAME CDi | | Yes | Single .bin/.cue pair |
| cdtv | Commodore CDTV | PUAE | PUAE 2021 | Yes | |
| chailove | ChaiLove Game Engine | ChaiLove | | | |
| channelf | Fairchild Channel F | FreeChaF | | Yes | Single archive or ROM file |
| coco | Tandy Color Computer | _Placeholder_ | | | |
-| colecovision | Coleco ColecoVision | blueMSX | Gearcoleco | Yes | Single archive or ROM file |
+| colecovision | Coleco ColecoVision | blueMSX | MSX.emu **(Standalone)**,
Gearcoleco | Yes | Single archive or ROM file |
| consolearcade | Console Arcade Systems | _Placeholder_ | | | |
| cps | Capcom Play System | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2000,
MAME4droid **(Standalone)**,
FinalBurn Neo,
FB Alpha 2012,
FB Alpha 2012 CPS-1,
FB Alpha 2012 CPS-2,
FB Alpha 2012 CPS-3 | Depends | |
| cps1 | Capcom Play System I | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2000,
MAME4droid **(Standalone)**,
FinalBurn Neo,
FB Alpha 2012,
FB Alpha 2012 CPS-1 | Depends | |
@@ -56,10 +56,10 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| electron | Acorn Electron | _Placeholder_ | | | |
| emulators | Emulators | _Placeholder_ | | | |
| epic | Epic Games Store | _Placeholder_ | | | |
-| famicom | Nintendo Family Computer | Mesen | Nestopia UE,
FCEUmm,
QuickNES | No | Single archive or ROM file |
+| famicom | Nintendo Family Computer | Mesen | Nestopia UE,
FCEUmm,
QuickNES,
NES.emu **(Standalone)** | No | Single archive or ROM file |
| fba | FinalBurn Alpha | FB Alpha 2012 | FB Alpha 2012 Neo Geo,
FB Alpha 2012 CPS-1,
FB Alpha 2012 CPS-2,
FB Alpha 2012 CPS-3 | Yes | |
| fbneo | FinalBurn Neo | FinalBurn Neo | | Yes | |
-| fds | Nintendo Famicom Disk System | Mesen | Nestopia UE,
FCEUmm | Yes | Single archive or ROM file |
+| fds | Nintendo Famicom Disk System | Mesen | Nestopia UE,
FCEUmm,
NES.emu **(Standalone)** | Yes | Single archive or ROM file |
| flash | Adobe Flash | _Placeholder_ | | | |
| fm7 | Fujitsu FM-7 | _Placeholder_ | | | |
| fmtowns | Fujitsu FM Towns | _Placeholder_ | | | |
@@ -68,11 +68,11 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| gameandwatch | Nintendo Game and Watch | Handheld Electronic (GW) | | No | |
| gamecom | Tiger Electronics Game.com | _Placeholder_ | | | |
| gamegear | Sega Game Gear | Genesis Plus GX | Genesis Plus GX Wide,
Gearsystem,
SMS Plus GX,
PicoDrive | No | Single archive or ROM file |
-| gb | Nintendo Game Boy | Gambatte | SameBoy,
Gearboy,
TGB Dual,
DoubleCherryGB,
Mesen-S,
bsnes,
mGBA,
VBA-M | No | Single archive or ROM file |
-| gba | Nintendo Game Boy Advance | mGBA | VBA-M,
VBA Next,
gpSP | No | Single archive or ROM file |
-| gbc | Nintendo Game Boy Color | Gambatte | SameBoy,
Gearboy,
TGB Dual,
DoubleCherryGB,
Mesen-S,
bsnes,
mGBA,
VBA-M | No | Single archive or ROM file |
+| gb | Nintendo Game Boy | Gambatte | GBC.emu **(Standalone)**,
SameBoy,
Gearboy,
TGB Dual,
DoubleCherryGB,
Mesen-S,
bsnes,
mGBA,
VBA-M | No | Single archive or ROM file |
+| gba | Nintendo Game Boy Advance | mGBA | VBA-M,
GBA.emu **(Standalone)**,
VBA Next,
gpSP | No | Single archive or ROM file |
+| gbc | Nintendo Game Boy Color | Gambatte | GBC.emu **(Standalone)**,
SameBoy,
Gearboy,
TGB Dual,
DoubleCherryGB,
Mesen-S,
bsnes,
mGBA,
VBA-M | No | Single archive or ROM file |
| gc | Nintendo GameCube | Dolphin | Dolphin **(Standalone)** | No | Disc image file for single-disc games, .m3u playlist for multi-disc games |
-| genesis | Sega Genesis | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive | No | Single archive or ROM file |
+| genesis | Sega Genesis | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
MD.emu **(Standalone)** | No | Single archive or ROM file |
| gmaster | Hartung Game Master | _Placeholder_ | | | |
| gx4000 | Amstrad GX4000 | Caprice32 | CrocoDS | No | Single archive or ROM file |
| intellivision | Mattel Electronics Intellivision | FreeIntv | | Yes | Single archive or ROM file |
@@ -86,20 +86,20 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| macintosh | Apple Macintosh | _Placeholder_ | | | |
| mame | Multiple Arcade Machine Emulator | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2000,
MAME4droid **(Standalone)**,
FinalBurn Neo,
FB Alpha 2012,
Flycast,
Flycast **(Standalone)** | Depends | |
| mame-advmame | AdvanceMAME | _Placeholder_ | | | |
-| mastersystem | Sega Master System | Genesis Plus GX | Genesis Plus GX Wide,
SMS Plus GX,
Gearsystem,
PicoDrive | No | Single archive or ROM file |
-| megacd | Sega Mega-CD | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive | Yes | |
-| megacdjp | Sega Mega-CD [Japan] | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive | Yes | |
-| megadrive | Sega Mega Drive | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive | No | Single archive or ROM file |
-| megadrivejp | Sega Mega Drive [Japan] | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive | No | Single archive or ROM file |
+| mastersystem | Sega Master System | Genesis Plus GX | Genesis Plus GX Wide,
SMS Plus GX,
Gearsystem,
PicoDrive,
MD.emu **(Standalone)** | No | Single archive or ROM file |
+| megacd | Sega Mega-CD | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
MD.emu **(Standalone)** | Yes | |
+| megacdjp | Sega Mega-CD [Japan] | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
MD.emu **(Standalone)** | Yes | |
+| megadrive | Sega Mega Drive | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
MD.emu **(Standalone)** | No | Single archive or ROM file |
+| megadrivejp | Sega Mega Drive [Japan] | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
MD.emu **(Standalone)** | No | Single archive or ROM file |
| megaduck | Creatronic Mega Duck | SameDuck | | No | Single archive or ROM file |
| mess | Multi Emulator Super System | MESS 2015 | | | |
| model2 | Sega Model 2 | MAME - Current | | Yes | |
| model3 | Sega Model 3 | _Placeholder_ | | | |
| moto | Thomson MO/TO Series | Theodore | | | |
-| msx | MSX | blueMSX | fMSX | Yes | |
-| msx1 | MSX1 | blueMSX | fMSX | Yes | |
-| msx2 | MSX2 | blueMSX | fMSX | Yes | |
-| msxturbor | MSX Turbo R | blueMSX | | | |
+| msx | MSX | blueMSX | MSX.emu **(Standalone)**,
fMSX | Yes | |
+| msx1 | MSX1 | blueMSX | MSX.emu **(Standalone)**,
fMSX | Yes | |
+| msx2 | MSX2 | blueMSX | MSX.emu **(Standalone)**,
fMSX | Yes | |
+| msxturbor | MSX Turbo R | blueMSX | MSX.emu **(Standalone)**,
fMSX | Yes | |
| mugen | M.U.G.E.N Game Engine | _Placeholder_ | | | |
| multivision | Othello Multivision | Gearsystem | | | |
| naomi | Sega NAOMI | Flycast | Flycast **(Standalone)** | Yes | Single archive file + .chd file in subdirectory if GD-ROM game |
@@ -108,11 +108,11 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| n3ds | Nintendo 3DS | Citra | Citra **(Standalone)** [Play store version or Nightly],
Citra Canary **(Standalone)**,
Citra MMJ **(Standalone)** | No | Single ROM file |
| n64 | Nintendo 64 | Mupen64Plus-Next | M64Plus FZ **(Standalone)**,
ParaLLEl N64 | No | Single archive or ROM file |
| n64dd | Nintendo 64DD | Mupen64Plus-Next | ParaLLEl N64 | Yes | |
-| nds | Nintendo DS | melonDS DS | melonDS @,
DeSmuME,
DeSmuME 2015,
DraStic **(Standalone)** | No | Single archive or ROM file |
+| nds | Nintendo DS | melonDS DS | melonDS @,
melonDS **(Standalone)**,
DeSmuME,
DeSmuME 2015,
DraStic **(Standalone)** | No | Single archive or ROM file |
| neogeo | SNK Neo Geo | FinalBurn Neo | MAME4droid **(Standalone)** | Yes | Single archive or ROM file |
| neogeocd | SNK Neo Geo CD | NeoCD | FinalBurn Neo | Yes | |
| neogeocdjp | SNK Neo Geo CD [Japan] | NeoCD | FinalBurn Neo | Yes | |
-| nes | Nintendo Entertainment System | Mesen | Nestopia UE,
FCEUmm,
QuickNES | No | Single archive or ROM file |
+| nes | Nintendo Entertainment System | Mesen | Nestopia UE,
FCEUmm,
QuickNES,
NES.emu **(Standalone)** | No | Single archive or ROM file |
| ngage | Nokia N-Gage | _Placeholder_ | | | |
| ngp | SNK Neo Geo Pocket | Beetle NeoPop | RACE | | |
| ngpc | SNK Neo Geo Pocket Color | Beetle NeoPop | RACE | | |
@@ -124,8 +124,8 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| pc88 | NEC PC-8800 Series | QUASI88 | | Yes | |
| pc98 | NEC PC-9800 Series | Neko Project II Kai | Neko Project II | | |
| pcarcade | PC Arcade Systems | _Placeholder_ | | | | |
-| pcengine | NEC PC Engine | Beetle PCE | Beetle PCE FAST | No | Single archive or ROM file |
-| pcenginecd | NEC PC Engine CD | Beetle PCE | Beetle PCE FAST | Yes | |
+| pcengine | NEC PC Engine | Beetle PCE | Beetle PCE FAST,
PCE.emu **(Standalone)** | No | Single archive or ROM file |
+| pcenginecd | NEC PC Engine CD | Beetle PCE | Beetle PCE FAST,
PCE.emu **(Standalone)** | Yes | |
| pcfx | NEC PC-FX | Beetle PC-FX | | Yes | |
| pico8 | PICO-8 Fantasy Console | Retro8 | | No | |
| plus4 | Commodore Plus/4 | VICE xplus4 | | No | Single archive or image file for tape, cartridge or single-diskette games, .m3u playlist for multi-diskette games |
@@ -140,7 +140,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| pv1000 | Casio PV-1000 | _Placeholder_ | | | |
| quake | Quake | TyrQuake | vitaQuake 2,
vitaQuake 2 [Rogue],
vitaQuake 2 [Xatrix],
vitaQuake 2 [Zaero] | No | |
| samcoupe | MGT SAM Coupé | _Placeholder_ | | | |
-| satellaview | Nintendo Satellaview | Snes9x - Current | Snes9x 2010,
bsnes,
bsnes-hd,
bsnes-mercury Accuracy,
Mesen-S | | |
+| satellaview | Nintendo Satellaview | Snes9x - Current | Snes9x 2010,
Snes9x EX+ **(Standalone)**,
bsnes,
bsnes-hd,
bsnes-mercury Accuracy,
Mesen-S | | |
| saturn | Sega Saturn | Beetle Saturn | YabaSanshiro,
Yabause | Yes | In separate folder interpreted as a file, with .m3u playlist if multi-disc game |
| saturnjp | Sega Saturn [Japan] | Beetle Saturn | YabaSanshiro,
Yabause | Yes | In separate folder interpreted as a file, with .m3u playlist if multi-disc game |
| scummvm | ScummVM Game Engine | ScummVM | | No | |
@@ -148,25 +148,25 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| sega32x | Sega Mega Drive 32X | PicoDrive | | No | Single archive or ROM file |
| sega32xjp | Sega Super 32X [Japan] | PicoDrive | | No | Single archive or ROM file |
| sega32xna | Sega Genesis 32X [North America] | PicoDrive | | No | Single archive or ROM file |
-| segacd | Sega CD | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive | Yes | |
-| sfc | Nintendo SFC (Super Famicom) | Snes9x - Current | Snes9x 2010,
bsnes,
bsnes-hd,
bsnes-mercury Accuracy,
Beetle Supafaust,
Mesen-S | No | Single archive or ROM file |
+| segacd | Sega CD | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
MD.emu **(Standalone)** | Yes | |
+| sfc | Nintendo SFC (Super Famicom) | Snes9x - Current | Snes9x 2010,
Snes9x EX+ **(Standalone)**,
bsnes,
bsnes-hd,
bsnes-mercury Accuracy,
Beetle Supafaust,
Mesen-S | No | Single archive or ROM file |
| sg-1000 | Sega SG-1000 | Genesis Plus GX | Genesis Plus GX Wide,
Gearsystem,
blueMSX | No | |
| sgb | Nintendo Super Game Boy | Mesen-S | SameBoy,
mGBA | | Single archive or ROM file |
-| snes | Nintendo SNES (Super Nintendo) | Snes9x - Current | Snes9x 2010,
bsnes,
bsnes-hd,
bsnes-mercury Accuracy,
Beetle Supafaust,
Mesen-S | No | Single archive or ROM file |
-| snesna | Nintendo SNES (Super Nintendo) [North America] | Snes9x - Current | Snes9x 2010,
bsnes,
bsnes-hd,
bsnes-mercury Accuracy,
Beetle Supafaust,
Mesen-S | No | Single archive or ROM file |
+| snes | Nintendo SNES (Super Nintendo) | Snes9x - Current | Snes9x 2010,
Snes9x EX+ **(Standalone)**,
bsnes,
bsnes-hd,
bsnes-mercury Accuracy,
Beetle Supafaust,
Mesen-S | No | Single archive or ROM file |
+| snesna | Nintendo SNES (Super Nintendo) [North America] | Snes9x - Current | Snes9x 2010,
Snes9x EX+ **(Standalone)**,
bsnes,
bsnes-hd,
bsnes-mercury Accuracy,
Beetle Supafaust,
Mesen-S | No | Single archive or ROM file |
| solarus | Solarus Game Engine | _Placeholder_ | | | |
| spectravideo | Spectravideo | blueMSX | | | |
| steam | Valve Steam | _Placeholder_ | | | |
| stv | Sega Titan Video Game System | MAME - Current | MAME4droid **(Standalone)** | Yes | Single archive file |
-| sufami | Bandai SuFami Turbo | Snes9x - Current | Snes9x 2010,
bsnes,
bsnes-hd,
bsnes-mercury Accuracy | | |
+| sufami | Bandai SuFami Turbo | Snes9x - Current | Snes9x 2010,
Snes9x EX+ **(Standalone)**,
bsnes,
bsnes-hd,
bsnes-mercury Accuracy | | |
| supergrafx | NEC SuperGrafx | Beetle SuperGrafx | Beetle PCE | | |
| supervision | Watara Supervision | Potator | | No | Single archive or ROM file |
| supracan | Funtech Super A'Can | _Placeholder_ | | | |
| switch | Nintendo Switch | Yuzu **(Standalone)** | | Yes | |
| symbian | Symbian | _Placeholder_ | | | |
| tanodragon | Tano Dragon | _Placeholder_ | | | |
-| tg16 | NEC TurboGrafx-16 | Beetle PCE | Beetle PCE FAST | No | Single archive or ROM file |
-| tg-cd | NEC TurboGrafx-CD | Beetle PCE | Beetle PCE FAST | Yes | |
+| tg16 | NEC TurboGrafx-16 | Beetle PCE | Beetle PCE FAST,
PCE.emu **(Standalone)** | No | Single archive or ROM file |
+| tg-cd | NEC TurboGrafx-CD | Beetle PCE | Beetle PCE FAST,
PCE.emu **(Standalone)** | Yes | |
| ti99 | Texas Instruments TI-99 | _Placeholder_ | | | |
| tic80 | TIC-80 Fantasy Computer | TIC-80 | | No | Single .tic file |
| to8 | Thomson TO8 | Theodore | | | |