diff --git a/USERGUIDE.md b/USERGUIDE.md
index db019c488..1490cbfdb 100644
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@@ -1516,7 +1516,8 @@ Consider the table below a work in progress as it's obvioulsy not fully populate
| residualvm | ResidualVM game engine | | |
| samcoupe | SAM Coupé | | |
| satellaview | Nintendo Satellaview | | |
-| saturn | Sega Saturn | | |
+| saturn | Sega Saturn | RetroArch (Beetle Saturn) | |
+| saturnjp | Sega Saturn [Japan] | RetroArch (Beetle Saturn) | |
| scummvm | ScummVM game engine | RetroArch (ScummVM) | In separate folder (one folder per game, with complete file structure retained) |
| sega32x | Sega Mega Drive 32X | RetroArch (PicoDrive) | Single archive or ROM file in root folder |
| sega32xjp | Sega Super 32X [Japan] | RetroArch (PicoDrive) | Single archive or ROM file in root folder |
diff --git a/resources/templates/es_systems.cfg_macos b/resources/templates/es_systems.cfg_macos
index a871e362a..5d86a4fb0 100644
--- a/resources/templates/es_systems.cfg_macos
+++ b/resources/templates/es_systems.cfg_macos
@@ -868,7 +868,7 @@
psvita
Sony PlayStation Vita
- %ROMPATH%/psp
+ %ROMPATH%/psvita
.7z .7Z .zip .ZIP
PLACEHOLDER %ROM%
psvita
@@ -919,6 +919,15 @@
saturn
saturn
+
+ saturnjp
+ Sega Saturn
+ %ROMPATH%/saturnjp
+ .ccd .CCD .chd .CHD .cue .CUE .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP
+ /Applications/RetroArch.app/Contents/MacOS/RetroArch -L %EMUPATH%/../Resources/cores/mednafen_saturn_libretro.dylib %ROM%
+ saturn
+ saturnjp
+
scummvm
ScummVM game engine
diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix
index 63b176b75..b5e4aeae9 100644
--- a/resources/templates/es_systems.cfg_unix
+++ b/resources/templates/es_systems.cfg_unix
@@ -868,7 +868,7 @@
psvita
Sony PlayStation Vita
- %ROMPATH%/psp
+ %ROMPATH%/psvita
.7z .7Z .zip .ZIP
PLACEHOLDER %ROM%
psvita
@@ -919,6 +919,15 @@
saturn
saturn
+
+ saturnjp
+ Sega Saturn
+ %ROMPATH%/saturnjp
+ .ccd .CCD .chd .CHD .cue .CUE .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP
+ retroarch -L %COREPATH%/mednafen_saturn_libretro.so %ROM%
+ saturn
+ saturnjp
+
scummvm
ScummVM game engine
diff --git a/resources/templates/es_systems.cfg_unix_flatpak b/resources/templates/es_systems.cfg_unix_flatpak
index 4174ece73..f993ff7ec 100644
--- a/resources/templates/es_systems.cfg_unix_flatpak
+++ b/resources/templates/es_systems.cfg_unix_flatpak
@@ -868,7 +868,7 @@
psvita
Sony PlayStation Vita
- %ROMPATH%/psp
+ %ROMPATH%/psvita
.7z .7Z .zip .ZIP
PLACEHOLDER %ROM%
psvita
@@ -919,6 +919,15 @@
saturn
saturn
+
+ saturnjp
+ Sega Saturn
+ %ROMPATH%/saturnjp
+ .ccd .CCD .chd .CHD .cue .CUE .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP
+ retroarch -L %COREPATH%/mednafen_saturn_libretro.so %ROM%
+ saturn
+ saturnjp
+
scummvm
ScummVM game engine
diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows
index 3297e6d5b..998d74a7d 100644
--- a/resources/templates/es_systems.cfg_windows
+++ b/resources/templates/es_systems.cfg_windows
@@ -868,7 +868,7 @@
psvita
Sony PlayStation Vita
- %ROMPATH%\psp
+ %ROMPATH%\psvita
.7z .7Z .zip .ZIP
PLACEHOLDER %ROM%
psvita
@@ -919,6 +919,15 @@
saturn
saturn
+
+ saturnjp
+ Sega Saturn
+ %ROMPATH%\saturnjp
+ .ccd .CCD .chd .CHD .cue .CUE .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP
+ retroarch.exe -L %EMUPATH%\cores\mednafen_saturn_libretro.dll %ROM%
+ saturn
+ saturnjp
+
scummvm
ScummVM game engine
diff --git a/themes/rbsimple-DE/saturnjp/colors.xml b/themes/rbsimple-DE/saturnjp/colors.xml
new file mode 100644
index 000000000..05aea1ac5
--- /dev/null
+++ b/themes/rbsimple-DE/saturnjp/colors.xml
@@ -0,0 +1,18 @@
+
+ 6
+
+
+
+ 0D7176
+
+
+ D1AE44
+
+
+ 2740A5
+
+
+ 86254A
+
+
+
diff --git a/themes/rbsimple-DE/saturnjp/images/console.svg b/themes/rbsimple-DE/saturnjp/images/console.svg
new file mode 100644
index 000000000..7baffbd5b
--- /dev/null
+++ b/themes/rbsimple-DE/saturnjp/images/console.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/saturnjp/images/consolegame.svg b/themes/rbsimple-DE/saturnjp/images/consolegame.svg
new file mode 100644
index 000000000..998fb1ee1
--- /dev/null
+++ b/themes/rbsimple-DE/saturnjp/images/consolegame.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/saturnjp/images/controller.svg b/themes/rbsimple-DE/saturnjp/images/controller.svg
new file mode 100644
index 000000000..e8fff8ea9
--- /dev/null
+++ b/themes/rbsimple-DE/saturnjp/images/controller.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/saturnjp/images/game.svg b/themes/rbsimple-DE/saturnjp/images/game.svg
new file mode 100644
index 000000000..78a716189
--- /dev/null
+++ b/themes/rbsimple-DE/saturnjp/images/game.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/saturnjp/images/logo.svg b/themes/rbsimple-DE/saturnjp/images/logo.svg
new file mode 100644
index 000000000..010f238a6
--- /dev/null
+++ b/themes/rbsimple-DE/saturnjp/images/logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/saturnjp/systeminfo.xml b/themes/rbsimple-DE/saturnjp/systeminfo.xml
new file mode 100644
index 000000000..11321ac75
--- /dev/null
+++ b/themes/rbsimple-DE/saturnjp/systeminfo.xml
@@ -0,0 +1,36 @@
+
+ 6
+
+
+
+ Manufacturer : Sega
+
+
+ Year of Release : 1994
+
+
+ Units sold : 9.26 million
+
+
+ Best-selling game : Virtua Fighter 2
+
+
+ CPU : 2× Hitachi SH-2 @ 28.6 MHz
+
+
+ RAM : 16Mb / VRAM : 12Mb
+
+
+ Video : VDP1 (sprite/texture and polygons), VDP2 (backgrounds)
+
+
+ Resolution : 320x224 to 704x224, 16.77 million colors
+
+
+ Sound : Motorola 68EC000, Yamaha FH1 YMF292, 32 channels
+
+
+ Media : CD-ROM
+
+
+
diff --git a/themes/rbsimple-DE/saturnjp/theme.xml b/themes/rbsimple-DE/saturnjp/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/saturnjp/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
+
+
+