diff --git a/USERGUIDE.md b/USERGUIDE.md
index 8b25fe767..2baf1cb54 100644
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@@ -1403,7 +1403,7 @@ Regional differences are handled by simply using the game system name correspond
Sometimes the name of the console is (more or less) the same for multiple regions, and in those circumstances the region has been added as a suffix to the game system name. For instance `na` for North America has been added to `snes` (Super Nintendo) giving the system name `snesna`. The same goes for Japan, as in `megacd` and `megacdjp`. Again, this only affects the theme and theme graphics.
-The **Default emulator** column shows the emulator configured in es_systems.cfg, and for emulators that support multiple cores, the configured core is shown inside brackets.
+The **Default emulator** column shows the emulator configured in es_systems.cfg, and for emulators that support multiple cores, the configured core is shown inside brackets. Any system marked with an asterisk (*) in this column requires additional system/BIOS ROMs to run, as should be explained in the emulator documentation.
For additional details regarding which game file extensions are supported per system, refer to the es_systems.cfg templates [es_systems.cfg_unix](resources/templates/es_systems.cfg_unix), [es_systems.cfg_macos](resources/templates/es_systems.cfg_macos) and [es_systems.cfg_windows](resources/templates/es_systems.cfg_windows). Normally the extensions setup in these files should cover everything that the emulators support.
@@ -1413,14 +1413,14 @@ Consider the table below a work in progress as it's obvioulsy not fully populate
| :-------------------- | :--------------------------------------------- | :-------------------------------- | :----------------------------------- |
| 3do | 3DO | | |
| ags | Adventure Game Studio | | |
-| amiga | Commodore Amiga | RetroArch (P-UAE) | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disk, or in separate folder with .m3u playlist if multi-disk |
-| amiga600 | Commodore Amiga 600 | RetroArch (P-UAE) | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disk, or in separate folder with .m3u playlist if multi-disk |
-| amiga1200 | Commodore Amiga 1200 | RetroArch (P-UAE) | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disk, or in separate folder with .m3u playlist if multi-disk |
+| amiga | Commodore Amiga | RetroArch (P-UAE)* | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disk, or in separate folder with .m3u playlist if multi-disk |
+| amiga600 | Commodore Amiga 600 | RetroArch (P-UAE)* | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disk, or in separate folder with .m3u playlist if multi-disk |
+| amiga1200 | Commodore Amiga 1200 | RetroArch (P-UAE)* | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disk, or in separate folder with .m3u playlist if multi-disk |
| amigacd32 | Commodore Amiga CD32 | | |
| amstradcpc | Amstrad CPC | | |
| apple2 | Apple II | | |
| 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 |
+| 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 | | |
| atari5200 | Atari 5200 | | |
@@ -1480,8 +1480,9 @@ Consider the table below a work in progress as it's obvioulsy not fully populate
| naomi | Sega NAOMI | | |
| n64 | Nintendo 64 | RetroArch (Mupen64Plus-Next on Unix & macOS, ParaLLEl N64 on Windows) | Single archive or ROM file in root folder |
| nds | Nintendo DS | | |
-| neogeo | Neo Geo | RetroArch (FinalBurn Neo) | Single archive file following MAME name standard in root folder |
-| neogeocd | Neo Geo CD | | |
+| neogeo | Neo Geo | RetroArch (FinalBurn Neo)* | Single archive file following MAME name standard in root folder |
+| neogeocd | Neo Geo CD | RetroArch (NeoCD)* | Single ZIP archive per game which includes the CD image and ripped audio |
+| neogeocdjp | Neo Geo CD (Japan) | RetroArch (NeoCD)* | Single ZIP archive per game which includes the CD image and ripped audio |
| nes | Nintendo Entertainment System | RetroArch (Nestopia UE) | Single archive or ROM file in root folder |
| ngp | Neo Geo Pocket | | |
| ngpc | Neo Geo Pocket Color | | |
diff --git a/resources/templates/es_systems.cfg_macos b/resources/templates/es_systems.cfg_macos
index 7f7f6df5b..13a9d6dce 100644
--- a/resources/templates/es_systems.cfg_macos
+++ b/resources/templates/es_systems.cfg_macos
@@ -640,6 +640,15 @@
neogeocdneogeocd
+
+ neogeocdjp
+ Neo Geo CD
+ %ROMPATH%/neogeocdjp
+ .chd .CHD .cue .CUE .7z .7Z .zip .ZIP
+ /Applications/RetroArch.app/Contents/MacOS/RetroArch -L %EMUPATH%/../Resources/cores/neocd_libretro.dylib %ROM%
+ neogeocd
+ neogeocdjp
+ nesNintendo Entertainment System
diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix
index 9e8cc02ab..6fa490704 100644
--- a/resources/templates/es_systems.cfg_unix
+++ b/resources/templates/es_systems.cfg_unix
@@ -640,6 +640,15 @@
neogeocdneogeocd
+
+ neogeocdjp
+ Neo Geo CD
+ %ROMPATH%/neogeocdjp
+ .chd .CHD .cue .CUE .7z .7Z .zip .ZIP
+ retroarch -L %COREPATH%/neocd_libretro.so %ROM%
+ neogeocd
+ neogeocdjp
+ nesNintendo Entertainment System
diff --git a/resources/templates/es_systems.cfg_unix_flatpak b/resources/templates/es_systems.cfg_unix_flatpak
index 6c34502dc..ef8c420dc 100644
--- a/resources/templates/es_systems.cfg_unix_flatpak
+++ b/resources/templates/es_systems.cfg_unix_flatpak
@@ -640,6 +640,15 @@
neogeocdneogeocd
+
+ neogeocdjp
+ Neo Geo CD
+ %ROMPATH%/neogeocdjp
+ .chd .CHD .cue .CUE .7z .7Z .zip .ZIP
+ flatpak run org.libretro.RetroArch -L %COREPATH%/neocd_libretro.so %ROM%
+ neogeocd
+ neogeocdjp
+ nesNintendo Entertainment System
diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows
index d626a9b00..ef2636f9d 100644
--- a/resources/templates/es_systems.cfg_windows
+++ b/resources/templates/es_systems.cfg_windows
@@ -640,6 +640,15 @@
neogeocdneogeocd
+
+ neogeocdjp
+ Neo Geo CD
+ %ROMPATH%\neogeocdjp
+ .chd .CHD .cue .CUE .7z .7Z .zip .ZIP
+ retroarch.exe -L %EMUPATH%\cores\neocd_libretro.dll %ROM%
+ neogeocd
+ neogeocdjp
+ nesNintendo Entertainment System
diff --git a/themes/rbsimple-DE/MISSING.md b/themes/rbsimple-DE/MISSING.md
index 972841899..bdde6c885 100644
--- a/themes/rbsimple-DE/MISSING.md
+++ b/themes/rbsimple-DE/MISSING.md
@@ -41,7 +41,8 @@ None at the moment.
* mess: MESS (Multi Emulator Super System) - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
* moto: Thomson MO/TO series - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
* naomi: Sega NAOMI - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
-* neogeocd: Neo Geo CD - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
+* neogeocd: Neo Geo CD - system info, customized colors
+* neogeocdjp: Neo Geo CD (Japan) - system info, customized colors
* openbor: Open Beats of Rage (OpenBOR) game engine - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
* oric: Tangerine Computer Systems Oric - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
* palm: Palm OS - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
diff --git a/themes/rbsimple-DE/neogeocd/images/console.svg b/themes/rbsimple-DE/neogeocd/images/console.svg
index 345a518f0..6b2bbfa29 100644
--- a/themes/rbsimple-DE/neogeocd/images/console.svg
+++ b/themes/rbsimple-DE/neogeocd/images/console.svg
@@ -1,3 +1 @@
-
-
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/neogeocd/images/consolegame.svg b/themes/rbsimple-DE/neogeocd/images/consolegame.svg
index 345a518f0..bfc7c4abe 100644
--- a/themes/rbsimple-DE/neogeocd/images/consolegame.svg
+++ b/themes/rbsimple-DE/neogeocd/images/consolegame.svg
@@ -1,3 +1 @@
-
-
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/neogeocd/images/controller.svg b/themes/rbsimple-DE/neogeocd/images/controller.svg
index 345a518f0..2ada53fd6 100644
--- a/themes/rbsimple-DE/neogeocd/images/controller.svg
+++ b/themes/rbsimple-DE/neogeocd/images/controller.svg
@@ -1,3 +1 @@
-
-
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/neogeocd/images/game.svg b/themes/rbsimple-DE/neogeocd/images/game.svg
new file mode 100644
index 000000000..c396174bf
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocd/images/game.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/neogeocd/images/logo.svg b/themes/rbsimple-DE/neogeocd/images/logo.svg
new file mode 100644
index 000000000..a238050db
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocd/images/logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/neogeocdjp/colors.xml b/themes/rbsimple-DE/neogeocdjp/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocdjp/colors.xml
@@ -0,0 +1,18 @@
+
+ 6
+
+
+
+ F6DD08
+
+
+ 800000
+
+
+ FF0000
+
+
+ 4C504E
+
+
+
diff --git a/themes/rbsimple-DE/neogeocdjp/images/console.svg b/themes/rbsimple-DE/neogeocdjp/images/console.svg
new file mode 100644
index 000000000..a432c0ace
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocdjp/images/console.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/neogeocdjp/images/consolegame.svg b/themes/rbsimple-DE/neogeocdjp/images/consolegame.svg
new file mode 100644
index 000000000..b18746c3b
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocdjp/images/consolegame.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/neogeocdjp/images/controller.svg b/themes/rbsimple-DE/neogeocdjp/images/controller.svg
new file mode 100644
index 000000000..2ada53fd6
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocdjp/images/controller.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/neogeocdjp/images/game.svg b/themes/rbsimple-DE/neogeocdjp/images/game.svg
new file mode 100644
index 000000000..c396174bf
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocdjp/images/game.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/neogeocdjp/images/logo.svg b/themes/rbsimple-DE/neogeocdjp/images/logo.svg
new file mode 100644
index 000000000..a238050db
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocdjp/images/logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/neogeocdjp/systeminfo.xml b/themes/rbsimple-DE/neogeocdjp/systeminfo.xml
new file mode 100644
index 000000000..d0e3e63be
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocdjp/systeminfo.xml
@@ -0,0 +1,9 @@
+
+ 6
+
+
+
+ Neo Geo CD
+
+
+
diff --git a/themes/rbsimple-DE/neogeocdjp/theme.xml b/themes/rbsimple-DE/neogeocdjp/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocdjp/theme.xml
@@ -0,0 +1,40 @@
+
+ 6
+ ./../theme.xml
+ ./colors.xml
+ ./systeminfo.xml
+
+
+
+ ./images/controller.svg
+
+
+
+
+
+ 262626
+ 262626
+
+
+
+
+
+ ./images/logo.svg
+
+
+ ./images/consolegame.svg
+
+
+
+
+
+ ./images/console.svg
+
+
+
+
+
+ ./images/logo.svg
+
+
+