diff --git a/USERGUIDE.md b/USERGUIDE.md
index 20aff5c01..cdceb58e3 100644
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@@ -1427,7 +1427,7 @@ Consider the table below a work in progress as it's obvioulsy not fully populate
| apple2gs | Apple IIGS | | |
| arcade | Arcade | RetroArch (MAME 2016 on Unix & Windows, MAME 2010 on macOS)* | Single archive file following MAME name standard in root folder |
| astrocade | Bally Astrocade | | |
-| atari2600 | Atari 2600 | | |
+| atari2600 | Atari 2600 | RetroArch(Stella 2014) | Single archive or ROM file in root folder |
| atari5200 | Atari 5200 | | |
| atari7800 | Atari 7800 ProSystem | | |
| atari800 | Atari 800 | | |
@@ -1452,9 +1452,9 @@ Consider the table below a work in progress as it's obvioulsy not fully populate
| dragon32 | Dragon 32 | | |
| dreamcast | Sega Dreamcast | | |
| famicom | Nintendo Family Computer | RetroArch (Nestopia UE) | Single archive or ROM file in root folder |
-| fba | Final Burn Alpha | | Single archive file following MAME name standard in root folder |
-| fbneo | FinalBurn Neo | | Single archive file following MAME name standard in root folder |
-| fds | Nintendo Famicom Disk System | RetroArch (Nestopia UE) | Single archive or ROM file in root folder |
+| fba | Final Burn Alpha | RetroArch (FB Alpha 2012)* | Single archive file following MAME name standard in root folder |
+| fbneo | FinalBurn Neo | RetroArch (FinalBurn Neo)* | Single archive file following MAME name standard in root folder |
+| fds | Nintendo Famicom Disk System | RetroArch (Nestopia UE)* | Single archive or ROM file in root folder |
| gameandwatch | Nintendo Game and Watch | | |
| gamegear | Sega Game Gear | | |
| gb | Nintendo Game Boy | | |
@@ -1468,11 +1468,11 @@ Consider the table below a work in progress as it's obvioulsy not fully populate
| lutris | Lutris open gaming platform | Lutris application (Unix only) | Shell script in root folder |
| lutro | Lutro game engine | | |
| macintosh | Apple Macintosh | | |
-| mame | Multiple Arcade Machine Emulator | | Single archive file following MAME name standard in root folder |
+| mame | Multiple Arcade Machine Emulator | RetroArch (MAME 2016 on Unix & Windows, MAME 2010 on macOS)* | Single archive file following MAME name standard in root folder |
| mame-advmame | AdvanceMAME | | Single archive file following MAME name standard in root folder |
-| mame-libretro | Multiple Arcade Machine Emulator | | Single archive file following MAME name standard in root folder |
+| mame-libretro | Multiple Arcade Machine Emulator | RetroArch(MAME - Current)* | Single archive file following MAME name standard in root folder |
| mame-mame4all | MAME4ALL | | Single archive file following MAME name standard in root folder |
-| mastersystem | Sega Master System | | |
+| mastersystem | Sega Master System | RetroArch (Genesis Plus GX) | Single archive or ROM file in root folder |
| megacd | Sega Mega-CD | | |
| megacdjp | Sega Mega-CD [Japan] | | |
| megadrive | Sega Mega Drive | RetroArch (Genesis Plus GX) | Single archive or ROM file in root folder |
@@ -1533,7 +1533,7 @@ Consider the table below a work in progress as it's obvioulsy not fully populate
| sufami | Bandai SuFami Turbo | | |
| supergrafx | NEC SuperGrafx | | |
| tanodragon | Tano Dragon | | |
-| tg16 | NEC TurboGrafx-16 | | |
+| tg16 | NEC TurboGrafx-16 | RetroArch (Beetle PCE FAST) | Single archive or ROM file in root folder |
| tg-cd | NEC TurboGrafx-CD | | |
| ti99 | Texas Instruments TI-99 | | |
| tic80 | TIC-80 game engine | | |
diff --git a/resources/templates/es_systems.cfg_macos b/resources/templates/es_systems.cfg_macos
index e50556a25..34e9e2559 100644
--- a/resources/templates/es_systems.cfg_macos
+++ b/resources/templates/es_systems.cfg_macos
@@ -339,7 +339,7 @@
Final Burn Alpha
%ROMPATH%/fba
.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP
- /Applications/RetroArch.app/Contents/MacOS/RetroArch -L %EMUPATH%/../Resources/cores/fbneo_libretro.dylib %ROM%
+ /Applications/RetroArch.app/Contents/MacOS/RetroArch -L %EMUPATH%/../Resources/cores/fbalpha2012_libretro.dylib %ROM%
arcade
fba
@@ -508,7 +508,7 @@
mame-mame4all
MAME4ALL
- %ROMPATH%/mame-advmame
+ %ROMPATH%/mame-mame4all
.chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP
PLACEHOLDER %ROM%
arcade
diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix
index 71b5257a0..201083fc5 100644
--- a/resources/templates/es_systems.cfg_unix
+++ b/resources/templates/es_systems.cfg_unix
@@ -339,7 +339,7 @@
Final Burn Alpha
%ROMPATH%/fba
.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP
- retroarch -L %COREPATH%/fbneo_libretro.so %ROM%
+ retroarch -L %COREPATH%/fbalpha2012_libretro.so %ROM%
arcade
fba
@@ -508,7 +508,7 @@
mame-mame4all
MAME4ALL
- %ROMPATH%/mame-advmame
+ %ROMPATH%/mame-mame4all
.chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP
PLACEHOLDER %ROM%
arcade
diff --git a/resources/templates/es_systems.cfg_unix_flatpak b/resources/templates/es_systems.cfg_unix_flatpak
index c7b65d45d..f47a05ae4 100644
--- a/resources/templates/es_systems.cfg_unix_flatpak
+++ b/resources/templates/es_systems.cfg_unix_flatpak
@@ -339,7 +339,7 @@
Final Burn Alpha
%ROMPATH%/fba
.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP
- flatpak run org.libretro.RetroArch -L %COREPATH%/fbneo_libretro.so %ROM%
+ flatpak run org.libretro.RetroArch -L %COREPATH%/fbalpha2012_libretro.so %ROM%
arcade
fba
@@ -508,7 +508,7 @@
mame-mame4all
MAME4ALL
- %ROMPATH%/mame-advmame
+ %ROMPATH%/mame-mame4all
.chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP
PLACEHOLDER %ROM%
arcade
diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows
index 1eb6cf8fb..c6fc1cc98 100644
--- a/resources/templates/es_systems.cfg_windows
+++ b/resources/templates/es_systems.cfg_windows
@@ -339,7 +339,7 @@
Final Burn Alpha
%ROMPATH%\fba
.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP
- retroarch.exe -L %EMUPATH%\cores\fbneo_libretro.dll %ROM%
+ retroarch.exe -L %EMUPATH%\cores\fbalpha2012_libretro.dll %ROM%
arcade
fba
@@ -508,7 +508,7 @@
mame-mame4all
MAME4ALL
- %ROMPATH%\mame-advmame
+ %ROMPATH%\mame-mame4all
.chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP
PLACEHOLDER %ROM%
arcade
diff --git a/themes/rbsimple-DE/MISSING.md b/themes/rbsimple-DE/MISSING.md
index 1a494b386..ae04aebba 100644
--- a/themes/rbsimple-DE/MISSING.md
+++ b/themes/rbsimple-DE/MISSING.md
@@ -74,12 +74,12 @@ None at the moment.
* to8: Thomson TO8 - consolegame.svg, console.svg, controller.svg, game.svg
* trs-80: Tandy TRS 80 - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
* uzebox: Uzebox - consolegame.svg, console.svg, game.svg
-* vectrex: Vectrex - consolegame.svg (needs simplification as it takes a long time to rasterize)
+* vectrex: Vectrex - consolegame.svg, console.svg (needs simplification as it takes a long time to rasterize)
* videopac: Magnavox Videopac (Odyssey 2) - update all info and graphics to differentiate European version from USA version
-* virtualboy: Nintendo Virtual Boy - consolegame.svg (needs simplification as it takes a long time to rasterize)
+* virtualboy: Nintendo Virtual Boy - consolegame.svg, console.svg (needs simplification as it takes a long time to rasterize)
* wiiu: Nintendo Wii U - consolegame.svg, console.svg, controller.svg, game.svg
* x1: Sharp X1 - consolegame.svg, console.svg, game.svg
-* x68000: Sharp X68000 - consolegame.svg (image of actual console)
+* x68000: Sharp X68000 - consolegame.svg, console.svg (image of actual console)
* xbox: Microsoft Xbox - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
* xbox360: Microsoft Xbox - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
* zmachine: Infocom Z-machine - system info, customized colors, consolegame.svg, console.svg, controller.svg