diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1ac26f5a3..862abb284 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,7 +8,7 @@ There are many cards in the Kanban backlog that would be nice to implement. And
 
 Apart from code commits, help is especially needed for thorough testing of the software and for working on the rbsimple-DE theme.
 
-It's impossible for me to test every game system (rbsimple-DE has support for almost a 100 different systems!) so it would be especially useful to hear about any issues with starting games using the default es_systems.cfg configuration file and also if there are any problems with scraping for certain systems.
+It's impossible for me to test every game system (rbsimple-DE has support for more than a 100 different systems!) so it would be especially useful to hear about any issues with starting games using the default es_systems.cfg configuration file and also if there are any problems with scraping for certain systems.
 
 In general, a review of the [es_systems.cfg_unix](resources/templates/es_systems.cfg_unix) and [es_systems.cfg_windows](resources/templates/es_systems.cfg_windows) files including the supported file extensions would be great!
 
diff --git a/NEWS.md b/NEWS.md
index f79e0538d..b401dbc44 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -37,6 +37,7 @@ Many bugs have been fixed, and numerous features that were only partially implem
 * Improved input device configuration, and default keyboard mappings are now applied if the keyboard has not been configured by the user
 * GUI-configurable option to sort favorite games above non-favorite games (favorites marked with stars)
 * GUI-configurable option to sort folders on top of the gamelists
+* Expanded the metadata for folders and made it possible to mark them as favorites
 * Added new component GuiComplexTextEditPopup to handle changes to configuration file entries and similar
 * Speed improvements and optimizations, the application now starts faster and feels more responsive
 * Added metadata entry to mark games as broken/not working
diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix
index 9bdae8c4a..0767a1c2b 100644
--- a/resources/templates/es_systems.cfg_unix
+++ b/resources/templates/es_systems.cfg_unix
@@ -46,6 +46,15 @@
     <platform>amiga</platform>
     <theme>amiga1200</theme>
   </system>
+  <system>
+    <name>amigacd32</name>
+    <fullname>Commodore Amiga CD32</fullname>
+    <path>%ROMPATH%/amigacd32</path>
+    <extension>.adf .ADF .adz .ADZ .dms .DMS .fdi .FDI .ipf .IPF .hdf .HDF .hdz .HDZ .lha .LHA .cue .CUE .ccd .CCD .nrg .NRG .mds .MDS .iso .ISO .uae .UAE .m3u .M3U .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L ~/.config/retroarch/cores/puae_libretro.so %ROM%</command>
+    <platform>amigacd32</platform>
+    <theme>amigacd32</theme>
+  </system>
   <system>
     <name>amstradcpc</name>
     <fullname>Amstrad CPC</fullname>
@@ -64,6 +73,15 @@
     <platform>apple2</platform>
     <theme>apple2</theme>
   </system>
+  <system>
+    <name>apple2gs</name>
+    <fullname>Apple IIGS</fullname>
+    <path>%ROMPATH%/apple2gs</path>
+    <extension>.nib .NIB .do .DO .po .PO .dsk .DSK .7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>apple2gs</platform>
+    <theme>apple2gs</theme>
+  </system>
   <system>
     <name>arcade</name>
     <fullname>Arcade</fullname>
@@ -163,6 +181,15 @@
     <platform>atarixe</platform>
     <theme>atarixe</theme>
   </system>
+  <system>
+    <name>atomiswave</name>
+    <fullname>Atomiswave</fullname>
+    <path>%ROMPATH%/atomiswave</path>
+    <extension>.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L ~/.config/retroarch/cores/flycast_libretro.so %ROM%</command>
+    <platform>atomiswave</platform>
+    <theme>atomiswave</theme>
+  </system>
   <system>
     <name>bbcmicro</name>
     <fullname>BBC Micro</fullname>
@@ -190,6 +217,15 @@
     <platform>cavestory</platform>
     <theme>cavestory</theme>
   </system>
+  <system>
+    <name>cdtv</name>
+    <fullname>Commodore CDTV</fullname>
+    <path>%ROMPATH%/cdtv</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>cdtv</platform>
+    <theme>cdtv</theme>
+  </system>
   <system>
     <name>channelf</name>
     <fullname>Fairchild Channel F</fullname>
@@ -232,7 +268,7 @@
     <path>%ROMPATH%/doom</path>
     <extension>.wad .WAD .iwad .IWAD .pwad .PWAD</extension>
     <command>retroarch -L ~/.config/retroarch/cores/prboom_libretro.so %ROM%</command>
-    <platform>doom</platform>
+    <platform>pc</platform>
     <theme>doom</theme>
   </system>
   <system>
@@ -361,6 +397,15 @@
     <platform>genesis, megadrive</platform>
     <theme>genesis</theme>
   </system>
+  <system>
+    <name>gx4000</name>
+    <fullname>Amstrad GX4000</fullname>
+    <path>%ROMPATH%/gx4000</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>gx4000</platform>
+    <theme>gx4000</theme>
+  </system>
   <system>
     <name>intellivision</name>
     <fullname>Mattel Electronics Intellivision</fullname>
@@ -505,6 +550,15 @@
     <platform>n64</platform>
     <theme>n64</theme>
   </system>
+  <system>
+    <name>naomi</name>
+    <fullname>Sega NAOMI</fullname>
+    <path>%ROMPATH%/naomi</path>
+    <extension>.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L ~/.config/retroarch/cores/flycast_libretro.so %ROM%</command>
+    <platform>naomi</platform>
+    <theme>naomi</theme>
+  </system>
   <system>
     <name>nds</name>
     <fullname>Nintendo DS</fullname>
@@ -523,6 +577,15 @@
     <platform>neogeo</platform>
     <theme>neogeo</theme>
   </system>
+  <system>
+    <name>neogeocd</name>
+    <fullname>Neo Geo CD</fullname>
+    <path>%ROMPATH%/neogeocd</path>
+    <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L ~/.config/retroarch/cores/neocd_libretro.so %ROM%</command>
+    <platform>neogeocd</platform>
+    <theme>neogeocd</theme>
+  </system>
   <system>
     <name>nes</name>
     <fullname>Nintendo Entertainment System</fullname>
@@ -577,6 +640,15 @@
     <platform>oric</platform>
     <theme>oric</theme>
   </system>
+  <system>
+    <name>palm</name>
+    <fullname>Palm OS</fullname>
+    <path>%ROMPATH%/palm</path>
+    <extension>.prc .PRC .pqa .PQA .img .IMG .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L ~/.config/retroarch/cores/mu_libretro.so %ROM%</command>
+    <platform>palm</platform>
+    <theme>palm</theme>
+  </system>
   <system>
     <name>pc</name>
     <fullname>IBM PC</fullname>
@@ -613,6 +685,15 @@
     <platform>pcfx</platform>
     <theme>pcfx</theme>
   </system>
+  <system>
+    <name>pokemini</name>
+    <fullname>Nintendo Pokémon Mini</fullname>
+    <path>%ROMPATH%/pokemini</path>
+    <extension>.min .MIN .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L ~/.config/retroarch/cores/pokemini_libretro.so %ROM%</command>
+    <platform>pokemini</platform>
+    <theme>pokemini</theme>
+  </system>
   <system>
     <name>ports</name>
     <fullname>Ports</fullname>
@@ -676,6 +757,15 @@
     <platform>samcoupe</platform>
     <theme>samcoupe</theme>
   </system>
+  <system>
+    <name>satellaview</name>
+    <fullname>Nintendo Satellaview</fullname>
+    <path>%ROMPATH%/satellaview</path>
+    <extension>.smc .SMC .sfc .SFC .swc .SWC .fig .FIG .bs .BS .bin .BIN .mgd .MGD .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L ~/.config/retroarch/cores/snes9x_libretro.so %ROM%</command>
+    <platform>satellaview</platform>
+    <theme>satellaview</theme>
+  </system>
   <system>
     <name>saturn</name>
     <fullname>Sega Saturn</fullname>
@@ -739,6 +829,24 @@
     <platform>solarus</platform>
     <theme>solarus</theme>
   </system>
+  <system>
+    <name>spectravideo</name>
+    <fullname>Spectravideo</fullname>
+    <path>%ROMPATH%/spectravideo</path>
+    <extension>.rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L ~/.config/retroarch/cores/bluemsx_libretro.so %ROM%</command>
+    <platform>spectravideo</platform>
+    <theme>spectravideo</theme>
+  </system>
+  <system>
+    <name>steam</name>
+    <fullname>Valve Steam</fullname>
+    <path>%ROMPATH%/steam</path>
+    <extension>.sh .csh</extension>
+    <command>bash %ROM%</command>
+    <platform>pc</platform>
+    <theme>steam</theme>
+  </system>
   <system>
     <name>stratagus</name>
     <fullname>Stratagus game engine</fullname>
@@ -748,6 +856,15 @@
     <platform>stratagus</platform>
     <theme>stratagus</theme>
   </system>
+  <system>
+    <name>sufami</name>
+    <fullname>Bandai SuFami Turbo</fullname>
+    <path>%ROMPATH%/sufami</path>
+    <extension>.smc .SMC .sfc .SFC .swc .SWC .fig .FIG .bs .BS .bin .BIN .mgd .MGD .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L ~/.config/retroarch/cores/snes9x_libretro.so %ROM%</command>
+    <platform>sufami</platform>
+    <theme>sufami</theme>
+  </system>
   <system>
     <name>supergrafx</name>
     <fullname>NEC SuperGrafx</fullname>
@@ -757,6 +874,15 @@
     <platform>supergrafx</platform>
     <theme>supergrafx</theme>
   </system>
+  <system>
+    <name>thomson</name>
+    <fullname>Thomson TO/MO series</fullname>
+    <path>%ROMPATH%/thomson</path>
+    <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L ~/.config/retroarch/cores/theodore_libretro.so %ROM%</command>
+    <platform>thomson</platform>
+    <theme>thomson</theme>
+  </system>
   <system>
     <name>tg16</name>
     <fullname>NEC TurboGrafx-16</fullname>
@@ -793,6 +919,15 @@
     <platform>trs-80</platform>
     <theme>trs-80</theme>
   </system>
+  <system>
+    <name>uzebox</name>
+    <fullname>Uzebox</fullname>
+    <path>%ROMPATH%/uzebox</path>
+    <extension>.uze .UZE .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L ~/.config/retroarch/cores/uzem_libretro.so %ROM%</command>
+    <platform>uzebox</platform>
+    <theme>uzebox</theme>
+  </system>
   <system>
     <name>vectrex</name>
     <fullname>Vectrex</fullname>
diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows
index 8ffb5cdeb..7e58f0076 100644
--- a/resources/templates/es_systems.cfg_windows
+++ b/resources/templates/es_systems.cfg_windows
@@ -46,6 +46,15 @@
     <platform>amiga</platform>
     <theme>amiga1200</theme>
   </system>
+  <system>
+    <name>amigacd32</name>
+    <fullname>Commodore Amiga CD32</fullname>
+    <path>%ROMPATH%\amigacd32</path>
+    <extension>.adf .ADF .adz .ADZ .dms .DMS .fdi .FDI .ipf .IPF .hdf .HDF .hdz .HDZ .lha .LHA .cue .CUE .ccd .CCD .nrg .NRG .mds .MDS .iso .ISO .uae .UAE .m3u .M3U .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L "%EMUPATH%\cores\puae_libretro.dll" %ROM%</command>
+    <platform>amigacd32</platform>
+    <theme>amigacd32</theme>
+  </system>
   <system>
     <name>amstradcpc</name>
     <fullname>Amstrad CPC</fullname>
@@ -64,6 +73,15 @@
     <platform>apple2</platform>
     <theme>apple2</theme>
   </system>
+  <system>
+    <name>apple2gs</name>
+    <fullname>Apple IIGS</fullname>
+    <path>%ROMPATH%\apple2gs</path>
+    <extension>.nib .NIB .do .DO .po .PO .dsk .DSK .7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>apple2gs</platform>
+    <theme>apple2gs</theme>
+  </system>
   <system>
     <name>arcade</name>
     <fullname>Arcade</fullname>
@@ -163,6 +181,15 @@
     <platform>atarixe</platform>
     <theme>atarixe</theme>
   </system>
+  <system>
+    <name>atomiswave</name>
+    <fullname>Atomiswave</fullname>
+    <path>%ROMPATH%\atomiswave</path>
+    <extension>.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L "%EMUPATH%\cores\flycast_libretro.dll" %ROM%</command>
+    <platform>atomiswave</platform>
+    <theme>atomiswave</theme>
+  </system>
   <system>
     <name>bbcmicro</name>
     <fullname>BBC Micro</fullname>
@@ -190,6 +217,15 @@
     <platform>cavestory</platform>
     <theme>cavestory</theme>
   </system>
+  <system>
+    <name>cdtv</name>
+    <fullname>Commodore CDTV</fullname>
+    <path>%ROMPATH%\cdtv</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>cdtv</platform>
+    <theme>cdtv</theme>
+  </system>
   <system>
     <name>channelf</name>
     <fullname>Fairchild Channel F</fullname>
@@ -232,7 +268,7 @@
     <path>%ROMPATH%\doom</path>
     <extension>.wad .WAD .iwad .IWAD .pwad .PWAD</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\prboom_libretro.dll" %ROM%</command>
-    <platform>doom</platform>
+    <platform>pc</platform>
     <theme>doom</theme>
   </system>
   <system>
@@ -361,6 +397,15 @@
     <platform>genesis, megadrive</platform>
     <theme>genesis</theme>
   </system>
+  <system>
+    <name>gx4000</name>
+    <fullname>Amstrad GX4000</fullname>
+    <path>%ROMPATH%\gx4000</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>gx4000</platform>
+    <theme>gx4000</theme>
+  </system>
   <system>
     <name>intellivision</name>
     <fullname>Mattel Electronics Intellivision</fullname>
@@ -505,6 +550,15 @@
     <platform>n64</platform>
     <theme>n64</theme>
   </system>
+  <system>
+    <name>naomi</name>
+    <fullname>Sega NAOMI</fullname>
+    <path>%ROMPATH%\naomi</path>
+    <extension>.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L "%EMUPATH%\cores\flycast_libretro.dll" %ROM%</command>
+    <platform>naomi</platform>
+    <theme>naomi</theme>
+  </system>
   <system>
     <name>nds</name>
     <fullname>Nintendo DS</fullname>
@@ -523,6 +577,15 @@
     <platform>neogeo</platform>
     <theme>neogeo</theme>
   </system>
+  <system>
+    <name>neogeocd</name>
+    <fullname>Neo Geo CD</fullname>
+    <path>%ROMPATH%\neogeocd</path>
+    <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L "%EMUPATH%\cores\neocd_libretro.dll" %ROM%</command>
+    <platform>neogeocd</platform>
+    <theme>neogeocd</theme>
+  </system>
   <system>
     <name>nes</name>
     <fullname>Nintendo Entertainment System</fullname>
@@ -577,6 +640,15 @@
     <platform>oric</platform>
     <theme>oric</theme>
   </system>
+  <system>
+    <name>palm</name>
+    <fullname>Palm OS</fullname>
+    <path>%ROMPATH%\palm</path>
+    <extension>.prc .PRC .pqa .PQA .img .IMG .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L "%EMUPATH%\cores\mu_libretro.dll" %ROM%</command>
+    <platform>palm</platform>
+    <theme>palm</theme>
+  </system>
   <system>
     <name>pc</name>
     <fullname>IBM PC</fullname>
@@ -613,6 +685,15 @@
     <platform>pcfx</platform>
     <theme>pcfx</theme>
   </system>
+  <system>
+    <name>pokemini</name>
+    <fullname>Nintendo Pokémon Mini</fullname>
+    <path>%ROMPATH%\pokemini</path>
+    <extension>.min .MIN .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L "%EMUPATH%\cores\pokemini_libretro.dll" %ROM%</command>
+    <platform>pokemini</platform>
+    <theme>pokemini</theme>
+  </system>
   <system>
     <name>ports</name>
     <fullname>Ports</fullname>
@@ -676,6 +757,15 @@
     <platform>samcoupe</platform>
     <theme>samcoupe</theme>
   </system>
+  <system>
+    <name>satellaview</name>
+    <fullname>Nintendo Satellaview</fullname>
+    <path>%ROMPATH%\satellaview</path>
+    <extension>.smc .SMC .sfc .SFC .swc .SWC .fig .FIG .bs .BS .bin .BIN .mgd .MGD .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L "%EMUPATH%\cores\snes9x_libretro.dll" %ROM%</command>
+    <platform>satellaview</platform>
+    <theme>satellaview</theme>
+  </system>
   <system>
     <name>saturn</name>
     <fullname>Sega Saturn</fullname>
@@ -739,6 +829,24 @@
     <platform>solarus</platform>
     <theme>solarus</theme>
   </system>
+  <system>
+    <name>spectravideo</name>
+    <fullname>Spectravideo</fullname>
+    <path>%ROMPATH%\spectravideo</path>
+    <extension>.rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L "%EMUPATH%\cores\bluemsx_libretro.dll" %ROM%</command>
+    <platform>spectravideo</platform>
+    <theme>spectravideo</theme>
+  </system>
+  <system>
+    <name>steam</name>
+    <fullname>Valve Steam</fullname>
+    <path>%ROMPATH%\steam</path>
+    <extension>.bat .ps1</extension>
+    <command>%ROM%</command>
+    <platform>pc</platform>
+    <theme>steam</theme>
+  </system>
   <system>
     <name>stratagus</name>
     <fullname>Stratagus game engine</fullname>
@@ -748,6 +856,15 @@
     <platform>stratagus</platform>
     <theme>stratagus</theme>
   </system>
+  <system>
+    <name>sufami</name>
+    <fullname>Bandai SuFami Turbo</fullname>
+    <path>%ROMPATH%\sufami</path>
+    <extension>.smc .SMC .sfc .SFC .swc .SWC .fig .FIG .bs .BS .bin .BIN .mgd .MGD .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L "%EMUPATH%\cores\snes9x_libretro.dll" %ROM%</command>
+    <platform>sufami</platform>
+    <theme>sufami</theme>
+  </system>
   <system>
     <name>supergrafx</name>
     <fullname>NEC SuperGrafx</fullname>
@@ -757,6 +874,15 @@
     <platform>supergrafx</platform>
     <theme>supergrafx</theme>
   </system>
+  <system>
+    <name>thomson</name>
+    <fullname>Thomson TO/MO series</fullname>
+    <path>%ROMPATH%\thomson</path>
+    <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L "%EMUPATH%\cores\theodore_libretro.dll" %ROM%</command>
+    <platform>thomson</platform>
+    <theme>thomson</theme>
+  </system>
   <system>
     <name>tg16</name>
     <fullname>NEC TurboGrafx-16</fullname>
@@ -793,6 +919,15 @@
     <platform>trs-80</platform>
     <theme>trs-80</theme>
   </system>
+  <system>
+    <name>uzebox</name>
+    <fullname>Uzebox</fullname>
+    <path>%ROMPATH%\uzebox</path>
+    <extension>.uze .UZE .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L "%EMUPATH%\cores\uzem_libretro.dll" %ROM%</command>
+    <platform>uzebox</platform>
+    <theme>uzebox</theme>
+  </system>
   <system>
     <name>vectrex</name>
     <fullname>Vectrex</fullname>
diff --git a/themes/rbsimple-DE/MISSING.md b/themes/rbsimple-DE/MISSING.md
index fbfced449..83033fd03 100644
--- a/themes/rbsimple-DE/MISSING.md
+++ b/themes/rbsimple-DE/MISSING.md
@@ -10,6 +10,8 @@ Missing (or not updated) theme data
 * amiga: Amiga (general) - system info
 * amiga600: Amiga 600 - system info
 * amiga1200: Amiga 1200 - system info
+* amigacd32: Amiga CD32 - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
+* apple2gs: Apple IIGS - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * astrocade: Bally Astrocade - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * atari800: Atari 800 - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * atari5200: Atari 5200 - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
@@ -17,35 +19,47 @@ Missing (or not updated) theme data
 * atarijaguarcd: Atari Jaguar CD - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * atarist: Atari ST - controller.svg, game.svg
 * atarixe: Atari XE - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
+* atomiswave: Atomiswave - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * auto-allgames - customized colors, consolegame.svg, console.svg, controller.svg, game.svg (uses temporary art)
 * auto-favorites - customized colors, consolegame.svg, console.svg, controller.svg, game.svg (uses temporary art)
 * auto-lastplayed - customized colors, consolegame.svg, console.svg, controller.svg, game.svg (uses temporary art)
 * bbcmicro: BBC Micro - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
+* cdtv: Commodore CDTV - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * channelf: Fairchild Channel F - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * coco: Tandy Color Computer - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * daphne: Daphne Arcade Laserdisc Emulator - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * dos: DOS - system info
 * desktop: Desktop applications - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * dragon32: Dragon 32 - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
+* gx4000: Amstrad GX4000 - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * intellivision: Intellivision - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * kodi: Kodi home theatre software - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * love: Löve game engine - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * macintosh: Apple Macintosh - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * mess: MESS (Multi Emulator Super System) - 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
 * 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
 * pcfx: NEC PC-FX - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
+* pokemini: Nintendo Pokémon Mini - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * ports: Source ports - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * ps2: Sony PlayStation 2 - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * psvita: Sony PlayStation Vita - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * residualvm: ResidualVM - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * samcoupe: SAM Coupé - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
+* satellaview: Nintendo Satellaview - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * saturn: Sega Saturn - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * solarus: Solarus game engine - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
+* spectravideo: Spectravideo - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * steam: Steam game distribution service - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * stratagus: Stratagus game engine - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
-* ti99: Texas Instruments TI-99 - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
+* sufami: Bandai SuFami Turbo - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
+* x68000: Sharp X68000 - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
+* thomson: Thomson TO/MO series - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
 * trs-80: Tandy TRS 80 - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
+* uzebox: Uzebox - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * videopac: Magnavox Videopac (Odyssey 2) - update all info and graphics to differentiate European version from USA version
 * wiiu: Nintendo Wii U - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * x68000: Sharp X68000 - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
diff --git a/themes/rbsimple-DE/amigacd32/colors.xml b/themes/rbsimple-DE/amigacd32/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/amigacd32/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>800000</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FF0000</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>4C504E</color>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/amigacd32/images/console.svg b/themes/rbsimple-DE/amigacd32/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/amigacd32/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/amigacd32/images/consolegame.svg b/themes/rbsimple-DE/amigacd32/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/amigacd32/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/amigacd32/images/controller.svg b/themes/rbsimple-DE/amigacd32/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/amigacd32/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/amigacd32/systeminfo.xml b/themes/rbsimple-DE/amigacd32/systeminfo.xml
new file mode 100644
index 000000000..933a33950
--- /dev/null
+++ b/themes/rbsimple-DE/amigacd32/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Amiga CD32</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/amigacd32/theme.xml b/themes/rbsimple-DE/amigacd32/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/amigacd32/theme.xml
@@ -0,0 +1,40 @@
+<theme>
+    <formatVersion>6</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed, grid, video">
+        <helpsystem name="help">
+            <textColor>262626</textColor>
+            <iconColor>262626</iconColor>
+        </helpsystem>
+    </view>
+
+    <view name="system, basic, detailed, video">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed">
+        <image name="console" extra="true">
+            <path>./images/console.svg</path>
+        </image>
+    </view>
+
+    <view name="grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/apple2gs/colors.xml b/themes/rbsimple-DE/apple2gs/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/apple2gs/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>800000</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FF0000</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>4C504E</color>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/apple2gs/images/console.svg b/themes/rbsimple-DE/apple2gs/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/apple2gs/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/apple2gs/images/consolegame.svg b/themes/rbsimple-DE/apple2gs/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/apple2gs/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/apple2gs/images/controller.svg b/themes/rbsimple-DE/apple2gs/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/apple2gs/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/apple2gs/systeminfo.xml b/themes/rbsimple-DE/apple2gs/systeminfo.xml
new file mode 100644
index 000000000..4fca803d7
--- /dev/null
+++ b/themes/rbsimple-DE/apple2gs/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Apple IIGS</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/apple2gs/theme.xml b/themes/rbsimple-DE/apple2gs/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/apple2gs/theme.xml
@@ -0,0 +1,40 @@
+<theme>
+    <formatVersion>6</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed, grid, video">
+        <helpsystem name="help">
+            <textColor>262626</textColor>
+            <iconColor>262626</iconColor>
+        </helpsystem>
+    </view>
+
+    <view name="system, basic, detailed, video">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed">
+        <image name="console" extra="true">
+            <path>./images/console.svg</path>
+        </image>
+    </view>
+
+    <view name="grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/atomiswave/colors.xml b/themes/rbsimple-DE/atomiswave/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/atomiswave/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>800000</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FF0000</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>4C504E</color>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/atomiswave/images/console.svg b/themes/rbsimple-DE/atomiswave/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/atomiswave/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/atomiswave/images/consolegame.svg b/themes/rbsimple-DE/atomiswave/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/atomiswave/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/atomiswave/images/controller.svg b/themes/rbsimple-DE/atomiswave/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/atomiswave/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/atomiswave/systeminfo.xml b/themes/rbsimple-DE/atomiswave/systeminfo.xml
new file mode 100644
index 000000000..f1293f1d8
--- /dev/null
+++ b/themes/rbsimple-DE/atomiswave/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Atomiswave</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/atomiswave/theme.xml b/themes/rbsimple-DE/atomiswave/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/atomiswave/theme.xml
@@ -0,0 +1,40 @@
+<theme>
+    <formatVersion>6</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed, grid, video">
+        <helpsystem name="help">
+            <textColor>262626</textColor>
+            <iconColor>262626</iconColor>
+        </helpsystem>
+    </view>
+
+    <view name="system, basic, detailed, video">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed">
+        <image name="console" extra="true">
+            <path>./images/console.svg</path>
+        </image>
+    </view>
+
+    <view name="grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/cdtv/colors.xml b/themes/rbsimple-DE/cdtv/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/cdtv/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>800000</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FF0000</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>4C504E</color>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/cdtv/images/console.svg b/themes/rbsimple-DE/cdtv/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/cdtv/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/cdtv/images/consolegame.svg b/themes/rbsimple-DE/cdtv/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/cdtv/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/cdtv/images/controller.svg b/themes/rbsimple-DE/cdtv/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/cdtv/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/cdtv/systeminfo.xml b/themes/rbsimple-DE/cdtv/systeminfo.xml
new file mode 100644
index 000000000..cbdaa2c7e
--- /dev/null
+++ b/themes/rbsimple-DE/cdtv/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Commodore CDTV</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/cdtv/theme.xml b/themes/rbsimple-DE/cdtv/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/cdtv/theme.xml
@@ -0,0 +1,40 @@
+<theme>
+    <formatVersion>6</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed, grid, video">
+        <helpsystem name="help">
+            <textColor>262626</textColor>
+            <iconColor>262626</iconColor>
+        </helpsystem>
+    </view>
+
+    <view name="system, basic, detailed, video">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed">
+        <image name="console" extra="true">
+            <path>./images/console.svg</path>
+        </image>
+    </view>
+
+    <view name="grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/gx4000/colors.xml b/themes/rbsimple-DE/gx4000/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/gx4000/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>800000</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FF0000</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>4C504E</color>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/gx4000/images/console.svg b/themes/rbsimple-DE/gx4000/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/gx4000/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/gx4000/images/consolegame.svg b/themes/rbsimple-DE/gx4000/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/gx4000/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/gx4000/images/controller.svg b/themes/rbsimple-DE/gx4000/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/gx4000/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/gx4000/systeminfo.xml b/themes/rbsimple-DE/gx4000/systeminfo.xml
new file mode 100644
index 000000000..b695ab696
--- /dev/null
+++ b/themes/rbsimple-DE/gx4000/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Amstrad GX4000</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/gx4000/theme.xml b/themes/rbsimple-DE/gx4000/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/gx4000/theme.xml
@@ -0,0 +1,40 @@
+<theme>
+    <formatVersion>6</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed, grid, video">
+        <helpsystem name="help">
+            <textColor>262626</textColor>
+            <iconColor>262626</iconColor>
+        </helpsystem>
+    </view>
+
+    <view name="system, basic, detailed, video">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed">
+        <image name="console" extra="true">
+            <path>./images/console.svg</path>
+        </image>
+    </view>
+
+    <view name="grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/naomi/colors.xml b/themes/rbsimple-DE/naomi/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/naomi/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>800000</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FF0000</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>4C504E</color>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/naomi/images/console.svg b/themes/rbsimple-DE/naomi/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/naomi/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/naomi/images/consolegame.svg b/themes/rbsimple-DE/naomi/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/naomi/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/naomi/images/controller.svg b/themes/rbsimple-DE/naomi/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/naomi/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/naomi/systeminfo.xml b/themes/rbsimple-DE/naomi/systeminfo.xml
new file mode 100644
index 000000000..6b9af2090
--- /dev/null
+++ b/themes/rbsimple-DE/naomi/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Sega NAOMI</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/naomi/theme.xml b/themes/rbsimple-DE/naomi/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/naomi/theme.xml
@@ -0,0 +1,40 @@
+<theme>
+    <formatVersion>6</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed, grid, video">
+        <helpsystem name="help">
+            <textColor>262626</textColor>
+            <iconColor>262626</iconColor>
+        </helpsystem>
+    </view>
+
+    <view name="system, basic, detailed, video">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed">
+        <image name="console" extra="true">
+            <path>./images/console.svg</path>
+        </image>
+    </view>
+
+    <view name="grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/neogeocd/colors.xml b/themes/rbsimple-DE/neogeocd/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocd/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>800000</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FF0000</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>4C504E</color>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/neogeocd/images/console.svg b/themes/rbsimple-DE/neogeocd/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocd/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/neogeocd/images/consolegame.svg b/themes/rbsimple-DE/neogeocd/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocd/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/neogeocd/images/controller.svg b/themes/rbsimple-DE/neogeocd/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocd/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/neogeocd/systeminfo.xml b/themes/rbsimple-DE/neogeocd/systeminfo.xml
new file mode 100644
index 000000000..d0e3e63be
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocd/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Neo Geo CD</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/neogeocd/theme.xml b/themes/rbsimple-DE/neogeocd/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/neogeocd/theme.xml
@@ -0,0 +1,40 @@
+<theme>
+    <formatVersion>6</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed, grid, video">
+        <helpsystem name="help">
+            <textColor>262626</textColor>
+            <iconColor>262626</iconColor>
+        </helpsystem>
+    </view>
+
+    <view name="system, basic, detailed, video">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed">
+        <image name="console" extra="true">
+            <path>./images/console.svg</path>
+        </image>
+    </view>
+
+    <view name="grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/palm/colors.xml b/themes/rbsimple-DE/palm/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/palm/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>800000</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FF0000</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>4C504E</color>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/palm/images/console.svg b/themes/rbsimple-DE/palm/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/palm/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/palm/images/consolegame.svg b/themes/rbsimple-DE/palm/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/palm/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/palm/images/controller.svg b/themes/rbsimple-DE/palm/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/palm/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/palm/systeminfo.xml b/themes/rbsimple-DE/palm/systeminfo.xml
new file mode 100644
index 000000000..a522a4503
--- /dev/null
+++ b/themes/rbsimple-DE/palm/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Palm OS</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/palm/theme.xml b/themes/rbsimple-DE/palm/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/palm/theme.xml
@@ -0,0 +1,40 @@
+<theme>
+    <formatVersion>6</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed, grid, video">
+        <helpsystem name="help">
+            <textColor>262626</textColor>
+            <iconColor>262626</iconColor>
+        </helpsystem>
+    </view>
+
+    <view name="system, basic, detailed, video">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed">
+        <image name="console" extra="true">
+            <path>./images/console.svg</path>
+        </image>
+    </view>
+
+    <view name="grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/pokemini/colors.xml b/themes/rbsimple-DE/pokemini/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/pokemini/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>800000</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FF0000</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>4C504E</color>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/pokemini/images/console.svg b/themes/rbsimple-DE/pokemini/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/pokemini/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/pokemini/images/consolegame.svg b/themes/rbsimple-DE/pokemini/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/pokemini/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/pokemini/images/controller.svg b/themes/rbsimple-DE/pokemini/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/pokemini/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/pokemini/systeminfo.xml b/themes/rbsimple-DE/pokemini/systeminfo.xml
new file mode 100644
index 000000000..7823d87ce
--- /dev/null
+++ b/themes/rbsimple-DE/pokemini/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Nintendo Pokémon Mini</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/pokemini/theme.xml b/themes/rbsimple-DE/pokemini/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/pokemini/theme.xml
@@ -0,0 +1,40 @@
+<theme>
+    <formatVersion>6</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed, grid, video">
+        <helpsystem name="help">
+            <textColor>262626</textColor>
+            <iconColor>262626</iconColor>
+        </helpsystem>
+    </view>
+
+    <view name="system, basic, detailed, video">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed">
+        <image name="console" extra="true">
+            <path>./images/console.svg</path>
+        </image>
+    </view>
+
+    <view name="grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/satellaview/colors.xml b/themes/rbsimple-DE/satellaview/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/satellaview/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>800000</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FF0000</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>4C504E</color>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/satellaview/images/console.svg b/themes/rbsimple-DE/satellaview/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/satellaview/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/satellaview/images/consolegame.svg b/themes/rbsimple-DE/satellaview/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/satellaview/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/satellaview/images/controller.svg b/themes/rbsimple-DE/satellaview/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/satellaview/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/satellaview/systeminfo.xml b/themes/rbsimple-DE/satellaview/systeminfo.xml
new file mode 100644
index 000000000..c68c55023
--- /dev/null
+++ b/themes/rbsimple-DE/satellaview/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Nintendo Satellaview</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/satellaview/theme.xml b/themes/rbsimple-DE/satellaview/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/satellaview/theme.xml
@@ -0,0 +1,40 @@
+<theme>
+    <formatVersion>6</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed, grid, video">
+        <helpsystem name="help">
+            <textColor>262626</textColor>
+            <iconColor>262626</iconColor>
+        </helpsystem>
+    </view>
+
+    <view name="system, basic, detailed, video">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed">
+        <image name="console" extra="true">
+            <path>./images/console.svg</path>
+        </image>
+    </view>
+
+    <view name="grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/spectravideo/colors.xml b/themes/rbsimple-DE/spectravideo/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/spectravideo/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>800000</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FF0000</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>4C504E</color>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/spectravideo/images/console.svg b/themes/rbsimple-DE/spectravideo/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/spectravideo/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/spectravideo/images/consolegame.svg b/themes/rbsimple-DE/spectravideo/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/spectravideo/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/spectravideo/images/controller.svg b/themes/rbsimple-DE/spectravideo/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/spectravideo/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/spectravideo/systeminfo.xml b/themes/rbsimple-DE/spectravideo/systeminfo.xml
new file mode 100644
index 000000000..11be841dc
--- /dev/null
+++ b/themes/rbsimple-DE/spectravideo/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Spectravideo</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/spectravideo/theme.xml b/themes/rbsimple-DE/spectravideo/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/spectravideo/theme.xml
@@ -0,0 +1,40 @@
+<theme>
+    <formatVersion>6</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed, grid, video">
+        <helpsystem name="help">
+            <textColor>262626</textColor>
+            <iconColor>262626</iconColor>
+        </helpsystem>
+    </view>
+
+    <view name="system, basic, detailed, video">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed">
+        <image name="console" extra="true">
+            <path>./images/console.svg</path>
+        </image>
+    </view>
+
+    <view name="grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/sufami/colors.xml b/themes/rbsimple-DE/sufami/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/sufami/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>800000</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FF0000</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>4C504E</color>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/sufami/images/console.svg b/themes/rbsimple-DE/sufami/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/sufami/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/sufami/images/consolegame.svg b/themes/rbsimple-DE/sufami/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/sufami/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/sufami/images/controller.svg b/themes/rbsimple-DE/sufami/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/sufami/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/sufami/systeminfo.xml b/themes/rbsimple-DE/sufami/systeminfo.xml
new file mode 100644
index 000000000..f3c041973
--- /dev/null
+++ b/themes/rbsimple-DE/sufami/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Bandai SuFami Turbo</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/sufami/theme.xml b/themes/rbsimple-DE/sufami/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/sufami/theme.xml
@@ -0,0 +1,40 @@
+<theme>
+    <formatVersion>6</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed, grid, video">
+        <helpsystem name="help">
+            <textColor>262626</textColor>
+            <iconColor>262626</iconColor>
+        </helpsystem>
+    </view>
+
+    <view name="system, basic, detailed, video">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed">
+        <image name="console" extra="true">
+            <path>./images/console.svg</path>
+        </image>
+    </view>
+
+    <view name="grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/thomson/colors.xml b/themes/rbsimple-DE/thomson/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/thomson/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>800000</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FF0000</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>4C504E</color>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/thomson/images/console.svg b/themes/rbsimple-DE/thomson/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/thomson/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/thomson/images/consolegame.svg b/themes/rbsimple-DE/thomson/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/thomson/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/thomson/images/controller.svg b/themes/rbsimple-DE/thomson/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/thomson/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/thomson/systeminfo.xml b/themes/rbsimple-DE/thomson/systeminfo.xml
new file mode 100644
index 000000000..edc417c4b
--- /dev/null
+++ b/themes/rbsimple-DE/thomson/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Thomson TO/MO series</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/thomson/theme.xml b/themes/rbsimple-DE/thomson/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/thomson/theme.xml
@@ -0,0 +1,40 @@
+<theme>
+    <formatVersion>6</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed, grid, video">
+        <helpsystem name="help">
+            <textColor>262626</textColor>
+            <iconColor>262626</iconColor>
+        </helpsystem>
+    </view>
+
+    <view name="system, basic, detailed, video">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed">
+        <image name="console" extra="true">
+            <path>./images/console.svg</path>
+        </image>
+    </view>
+
+    <view name="grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/uzebox/colors.xml b/themes/rbsimple-DE/uzebox/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/uzebox/colors.xml
@@ -0,0 +1,18 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system, basic, detailed, grid, video">
+        <image name="band1" extra="true">
+            <color>F6DD08</color>
+        </image>
+        <image name="band2" extra="true">
+            <color>800000</color>
+        </image>
+        <image name="band3" extra="true">
+            <color>FF0000</color>
+        </image>
+        <image name="band4" extra="true">
+            <color>4C504E</color>
+        </image>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/uzebox/images/console.svg b/themes/rbsimple-DE/uzebox/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/uzebox/images/console.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/uzebox/images/consolegame.svg b/themes/rbsimple-DE/uzebox/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/uzebox/images/consolegame.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/uzebox/images/controller.svg b/themes/rbsimple-DE/uzebox/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/uzebox/images/controller.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="42" height="42" version="1.1" viewBox="0 0 42 42" xmlns="http://www.w3.org/2000/svg">
+</svg>
diff --git a/themes/rbsimple-DE/uzebox/systeminfo.xml b/themes/rbsimple-DE/uzebox/systeminfo.xml
new file mode 100644
index 000000000..a0e0c5565
--- /dev/null
+++ b/themes/rbsimple-DE/uzebox/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Uzebox</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/uzebox/theme.xml b/themes/rbsimple-DE/uzebox/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/uzebox/theme.xml
@@ -0,0 +1,40 @@
+<theme>
+    <formatVersion>6</formatVersion>
+    <include>./../theme.xml</include>
+    <include>./colors.xml</include>
+    <include>./systeminfo.xml</include>
+
+    <view name="system">
+        <image name="controller" extra="true">
+            <path>./images/controller.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed, grid, video">
+        <helpsystem name="help">
+            <textColor>262626</textColor>
+            <iconColor>262626</iconColor>
+        </helpsystem>
+    </view>
+
+    <view name="system, basic, detailed, video">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+        <image name="consolegame" extra="true">
+            <path>./images/consolegame.svg</path>
+        </image>
+    </view>
+
+    <view name="basic, detailed">
+        <image name="console" extra="true">
+            <path>./images/console.svg</path>
+        </image>
+    </view>
+
+    <view name="grid">
+        <image name="logo">
+            <path>./images/logo.svg</path>
+        </image>
+    </view>
+</theme>