diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix
index 39b911cf9..e5c60eb61 100644
--- a/resources/templates/es_systems.cfg_unix
+++ b/resources/templates/es_systems.cfg_unix
@@ -163,6 +163,15 @@
c64
c64
+
+ cavestory
+ Cave Story (NXEngine)
+ %ROMPATH%/cavestory
+ .exe .EXE .7z .7Z .zip .ZIP
+ retroarch -L ~/.config/retroarch/cores/nxengine_libretro.so %ROM%
+ cavestory
+ cavestory
+
channelf
Fairchild Channel F
diff --git a/themes/rbsimple-DE/cavestory/colors.xml b/themes/rbsimple-DE/cavestory/colors.xml
new file mode 100644
index 000000000..d68fb5e79
--- /dev/null
+++ b/themes/rbsimple-DE/cavestory/colors.xml
@@ -0,0 +1,18 @@
+
+ 5
+
+
+
+ 648DBD
+
+
+ B63523
+
+
+ 6F1312
+
+
+ 182142
+
+
+
diff --git a/themes/rbsimple-DE/cavestory/images/console.svg b/themes/rbsimple-DE/cavestory/images/console.svg
new file mode 100644
index 000000000..9c004d3cb
--- /dev/null
+++ b/themes/rbsimple-DE/cavestory/images/console.svg
@@ -0,0 +1,426 @@
+
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/cavestory/images/consolegame.svg b/themes/rbsimple-DE/cavestory/images/consolegame.svg
new file mode 100644
index 000000000..52b57c17a
--- /dev/null
+++ b/themes/rbsimple-DE/cavestory/images/consolegame.svg
@@ -0,0 +1,1390 @@
+
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/cavestory/images/controller.svg b/themes/rbsimple-DE/cavestory/images/controller.svg
new file mode 100644
index 000000000..ddbd3c293
--- /dev/null
+++ b/themes/rbsimple-DE/cavestory/images/controller.svg
@@ -0,0 +1,477 @@
+
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/cavestory/images/game.svg b/themes/rbsimple-DE/cavestory/images/game.svg
new file mode 100644
index 000000000..d159548e8
--- /dev/null
+++ b/themes/rbsimple-DE/cavestory/images/game.svg
@@ -0,0 +1,731 @@
+
+
\ No newline at end of file
diff --git a/themes/rbsimple-DE/cavestory/images/logo.svg b/themes/rbsimple-DE/cavestory/images/logo.svg
new file mode 100644
index 000000000..7df94b1b2
--- /dev/null
+++ b/themes/rbsimple-DE/cavestory/images/logo.svg
@@ -0,0 +1,84 @@
+
+
+
diff --git a/themes/rbsimple-DE/cavestory/systeminfo.xml b/themes/rbsimple-DE/cavestory/systeminfo.xml
new file mode 100644
index 000000000..731d7ea8d
--- /dev/null
+++ b/themes/rbsimple-DE/cavestory/systeminfo.xml
@@ -0,0 +1,36 @@
+
+ 5
+
+
+
+ Designer : Daisuke Amaya
+
+
+ Developer : Studio Pixel
+
+
+ Type : Freeware platform-adventure
+
+
+ Origin : Japan
+
+
+ English translation : Aeon Genesis Translations
+
+
+ Year of first release : 2004
+
+
+ The game focuses on an amnesiac protagonist who awakens in a cave.
+
+
+ Through his explorations, he discovers a plot by the Doctor,
+
+
+ a megalomaniac who intends to force the inhabitants of the cave to fight for him in his bid to conquer the world.
+
+
+ The protagonist is thrust into the position of savior as he endeavors to defeat the Doctor.
+
+
+
diff --git a/themes/rbsimple-DE/cavestory/theme.xml b/themes/rbsimple-DE/cavestory/theme.xml
new file mode 100644
index 000000000..fbb954069
--- /dev/null
+++ b/themes/rbsimple-DE/cavestory/theme.xml
@@ -0,0 +1,40 @@
+
+ 5
+ ./../theme.xml
+ ./colors.xml
+ ./systeminfo.xml
+
+
+
+ ./images/controller.svg
+
+
+
+
+
+ 262626
+ 262626
+
+
+
+
+
+ ./images/logo.svg
+
+
+ ./images/consolegame.svg
+
+
+
+
+
+ ./images/console.svg
+
+
+
+
+
+ ./images/logo.svg
+
+
+