diff --git a/USERGUIDE.md b/USERGUIDE.md
index 1490cbfdb..010520375 100644
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@@ -1532,6 +1532,7 @@ Consider the table below a work in progress as it's obvioulsy not fully populate
| stratagus | Stratagus game engine | | |
| sufami | Bandai SuFami Turbo | | |
| supergrafx | NEC SuperGrafx | | |
+| tanodragon | Tano Dragon | | |
| tg16 | NEC TurboGrafx-16 | | |
| tg-cd | NEC TurboGrafx-CD | | |
| ti99 | Texas Instruments TI-99 | | |
diff --git a/resources/templates/es_systems.cfg_macos b/resources/templates/es_systems.cfg_macos
index 5d86a4fb0..e50556a25 100644
--- a/resources/templates/es_systems.cfg_macos
+++ b/resources/templates/es_systems.cfg_macos
@@ -1054,6 +1054,15 @@
supergrafx
supergrafx
+
+ tanodragon
+ Tano Dragon
+ %ROMPATH%/tanodragon
+ .7z .7Z .zip .ZIP
+ PLACEHOLDER %ROM%
+ dragon32
+ tanodragon
+
tg16
NEC TurboGrafx-16
diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix
index b5e4aeae9..71b5257a0 100644
--- a/resources/templates/es_systems.cfg_unix
+++ b/resources/templates/es_systems.cfg_unix
@@ -1054,6 +1054,15 @@
supergrafx
supergrafx
+
+ tanodragon
+ Tano Dragon
+ %ROMPATH%/tanodragon
+ .7z .7Z .zip .ZIP
+ PLACEHOLDER %ROM%
+ dragon32
+ tanodragon
+
tg16
NEC TurboGrafx-16
diff --git a/resources/templates/es_systems.cfg_unix_flatpak b/resources/templates/es_systems.cfg_unix_flatpak
index f993ff7ec..c7b65d45d 100644
--- a/resources/templates/es_systems.cfg_unix_flatpak
+++ b/resources/templates/es_systems.cfg_unix_flatpak
@@ -1054,6 +1054,15 @@
supergrafx
supergrafx
+
+ tanodragon
+ Tano Dragon
+ %ROMPATH%/tanodragon
+ .7z .7Z .zip .ZIP
+ PLACEHOLDER %ROM%
+ dragon32
+ tanodragon
+
tg16
NEC TurboGrafx-16
diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows
index 998d74a7d..1eb6cf8fb 100644
--- a/resources/templates/es_systems.cfg_windows
+++ b/resources/templates/es_systems.cfg_windows
@@ -1054,6 +1054,15 @@
supergrafx
supergrafx
+
+ tanodragon
+ Tano Dragon
+ %ROMPATH%\tanodragon
+ .7z .7Z .zip .ZIP
+ PLACEHOLDER %ROM%
+ dragon32
+ tanodragon
+
tg16
NEC TurboGrafx-16
diff --git a/themes/rbsimple-DE/tanodragon/colors.xml b/themes/rbsimple-DE/tanodragon/colors.xml
new file mode 100644
index 000000000..bc31fb0a5
--- /dev/null
+++ b/themes/rbsimple-DE/tanodragon/colors.xml
@@ -0,0 +1,18 @@
+
+ 6
+
+
+
+ F50019
+
+
+ FBFA35
+
+
+ 74B719
+
+
+ 3262D9
+
+
+
diff --git a/themes/rbsimple-DE/tanodragon/images/console.svg b/themes/rbsimple-DE/tanodragon/images/console.svg
new file mode 100644
index 000000000..1884c7457
--- /dev/null
+++ b/themes/rbsimple-DE/tanodragon/images/console.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/tanodragon/images/consolegame.svg b/themes/rbsimple-DE/tanodragon/images/consolegame.svg
new file mode 100644
index 000000000..6cfabfbcf
--- /dev/null
+++ b/themes/rbsimple-DE/tanodragon/images/consolegame.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/tanodragon/images/controller.svg b/themes/rbsimple-DE/tanodragon/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/tanodragon/images/controller.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/themes/rbsimple-DE/tanodragon/images/game.svg b/themes/rbsimple-DE/tanodragon/images/game.svg
new file mode 100644
index 000000000..ebcfa3341
--- /dev/null
+++ b/themes/rbsimple-DE/tanodragon/images/game.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/tanodragon/images/logo.svg b/themes/rbsimple-DE/tanodragon/images/logo.svg
new file mode 100644
index 000000000..47740c120
--- /dev/null
+++ b/themes/rbsimple-DE/tanodragon/images/logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/tanodragon/systeminfo.xml b/themes/rbsimple-DE/tanodragon/systeminfo.xml
new file mode 100644
index 000000000..8586b426a
--- /dev/null
+++ b/themes/rbsimple-DE/tanodragon/systeminfo.xml
@@ -0,0 +1,27 @@
+
+ 6
+
+
+
+ Manufacturer : Dragon Data, Ltd. / Tano Corp.
+
+
+ Year of Release : 1982
+
+
+ OS : Microsoft Extended BASIC
+
+
+ CPU : Motorola 6809E @ 0.89 MHz
+
+
+ RAM : 32/64 KB
+
+
+ Resolution : max 256 x 192, 8 colours
+
+
+ Sound : 1 voice, 5 octaves with the Basic / 4 voices, 7 octaves with machine code
+
+
+
diff --git a/themes/rbsimple-DE/tanodragon/theme.xml b/themes/rbsimple-DE/tanodragon/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/tanodragon/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
+
+
+