diff --git a/USERGUIDE.md b/USERGUIDE.md
index 3fb4e7813..fd22fd3bc 100644
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@@ -1484,7 +1484,8 @@ Consider the table below a work in progress as it's obvioulsy not fully populate
| msx2 | MSX2 | RetroArch (blueMSX) | |
| msxturbor | MSX Turbo R | RetroArch (blueMSX) | |
| multivision | Othello Multivision | RetroArch (Gearsystem) | |
-| naomi | Sega NAOMI | | |
+| naomi | Sega NAOMI | RetroArch (Flycast) | |
+| naomigd | Sega NAOMI GD-ROM | RetroArch (Flycast) | |
| n3ds | Nintendo 3DS | RetroArch (Citra) | |
| n64 | Nintendo 64 | RetroArch (Mupen64Plus-Next on Unix & macOS, ParaLLEl N64 on Windows) | Single archive or ROM file in root folder |
| nds | Nintendo DS | | |
diff --git a/resources/templates/es_systems.cfg_macos b/resources/templates/es_systems.cfg_macos
index 74742eb02..6626a79d4 100644
--- a/resources/templates/es_systems.cfg_macos
+++ b/resources/templates/es_systems.cfg_macos
@@ -649,6 +649,15 @@
naomi
naomi
+
+ naomigd
+ Sega NAOMI GD-ROM
+ %ROMPATH%/naomigd
+ .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP
+ /Applications/RetroArch.app/Contents/MacOS/RetroArch -L %EMUPATH%/../Resources/cores/flycast_libretro.dylib %ROM%
+ naomi
+ naomigd
+
nds
Nintendo DS
diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix
index 45e28098f..4471209a9 100644
--- a/resources/templates/es_systems.cfg_unix
+++ b/resources/templates/es_systems.cfg_unix
@@ -649,6 +649,15 @@
naomi
naomi
+
+ naomigd
+ Sega NAOMI GD-ROM
+ %ROMPATH%/naomigd
+ .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP
+ retroarch -L %COREPATH%/flycast_libretro.so %ROM%
+ naomi
+ naomigd
+
nds
Nintendo DS
diff --git a/resources/templates/es_systems.cfg_unix_flatpak b/resources/templates/es_systems.cfg_unix_flatpak
index 2e657f873..f5ab0ca93 100644
--- a/resources/templates/es_systems.cfg_unix_flatpak
+++ b/resources/templates/es_systems.cfg_unix_flatpak
@@ -649,6 +649,15 @@
naomi
naomi
+
+ naomigd
+ Sega NAOMI GD-ROM
+ %ROMPATH%/naomigd
+ .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP
+ flatpak run org.libretro.RetroArch -L %COREPATH%/flycast_libretro.so %ROM%
+ naomi
+ naomigd
+
nds
Nintendo DS
diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows
index bdf8b6399..989ff25f7 100644
--- a/resources/templates/es_systems.cfg_windows
+++ b/resources/templates/es_systems.cfg_windows
@@ -649,6 +649,15 @@
naomi
naomi
+
+ naomigd
+ Sega NAOMI GD-ROM
+ %ROMPATH%\naomigd
+ .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP
+ retroarch.exe -L %EMUPATH%\cores\flycast_libretro.dll %ROM%
+ naomi
+ naomigd
+
nds
Nintendo DS
diff --git a/themes/rbsimple-DE/naomigd/colors.xml b/themes/rbsimple-DE/naomigd/colors.xml
new file mode 100644
index 000000000..7d7888ec2
--- /dev/null
+++ b/themes/rbsimple-DE/naomigd/colors.xml
@@ -0,0 +1,18 @@
+
+ 6
+
+
+
+ E4E7D7
+
+
+ A39B7C
+
+
+ C75433
+
+
+ 243551
+
+
+
diff --git a/themes/rbsimple-DE/naomigd/images/console.svg b/themes/rbsimple-DE/naomigd/images/console.svg
new file mode 100644
index 000000000..0392f0a2c
--- /dev/null
+++ b/themes/rbsimple-DE/naomigd/images/console.svg
@@ -0,0 +1,4507 @@
+
+
+
diff --git a/themes/rbsimple-DE/naomigd/images/consolegame.svg b/themes/rbsimple-DE/naomigd/images/consolegame.svg
new file mode 100644
index 000000000..e78e4c2bb
--- /dev/null
+++ b/themes/rbsimple-DE/naomigd/images/consolegame.svg
@@ -0,0 +1,5174 @@
+
+
+
diff --git a/themes/rbsimple-DE/naomigd/images/controller.svg b/themes/rbsimple-DE/naomigd/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/naomigd/images/controller.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/themes/rbsimple-DE/naomigd/images/game.svg b/themes/rbsimple-DE/naomigd/images/game.svg
new file mode 100644
index 000000000..2a6e846d4
--- /dev/null
+++ b/themes/rbsimple-DE/naomigd/images/game.svg
@@ -0,0 +1,658 @@
+
+
+
diff --git a/themes/rbsimple-DE/naomigd/images/logo.svg b/themes/rbsimple-DE/naomigd/images/logo.svg
new file mode 100644
index 000000000..a89a3ea7f
--- /dev/null
+++ b/themes/rbsimple-DE/naomigd/images/logo.svg
@@ -0,0 +1,110 @@
+
+
+
diff --git a/themes/rbsimple-DE/naomigd/systeminfo.xml b/themes/rbsimple-DE/naomigd/systeminfo.xml
new file mode 100644
index 000000000..f05652a77
--- /dev/null
+++ b/themes/rbsimple-DE/naomigd/systeminfo.xml
@@ -0,0 +1,27 @@
+
+ 6
+
+
+
+ Manufacturer : Sega
+
+
+ Year of Release : 1998
+
+
+ CPU : Hitachi SH-4 32-bit RISC CPU (@ 200 MHz 360 MIPS / 1.4 GFLOPS)
+
+
+ GPU : NEC-Videologic PowerVR (PVR2DC/CLX2) @ 100 MHz
+
+
+ Sound : ARM7 Yamaha AICA 45 MHZ (with internal 32-bit RISC CPU, 64 channel ADPCM)
+
+
+ RAM : 56 MB (64 MB with GD-ROM)
+
+
+ Media : ROM Board (max. size of 168 MB) / GD-ROM
+
+
+
diff --git a/themes/rbsimple-DE/naomigd/theme.xml b/themes/rbsimple-DE/naomigd/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/naomigd/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
+
+
+