diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix
index 8b6f1d1d6..f1b52985a 100644
--- a/resources/templates/es_systems.cfg_unix
+++ b/resources/templates/es_systems.cfg_unix
@@ -125,7 +125,16 @@
     <extension>.j64 .J64 .jag .JAG .rom .ROM .abs .ABS .cof .COF .bin .BIN .prg .PRG .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/virtualjaguar_libretro.so %ROM%</command>
     <platform>atarijaguar</platform>
-    <theme>atarijaguar</theme>
+    <theme>atarijaguar, atarijaguarcd</theme>
+  </system>
+  <system>
+    <name>atarijaguarcd</name>
+    <fullname>Atari Jaguar CD</fullname>
+    <path>%ROMPATH%/atarijaguarcd</path>
+    <extension>.j64 .J64 .jag .JAG .rom .ROM .abs .ABS .cof .COF .bin .BIN .prg .PRG .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L ~/.config/retroarch/cores/virtualjaguar_libretro.so %ROM%</command>
+    <platform>atarijaguarcd</platform>
+    <theme>atarijaguarcd</theme>
   </system>
   <system>
     <name>atarilynx</name>
@@ -145,6 +154,15 @@
     <platform>atarist</platform>
     <theme>atarist</theme>
   </system>
+  <system>
+    <name>atarixe</name>
+    <fullname>Atari XE</fullname>
+    <path>%ROMPATH%/atarixe</path>
+    <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L ~/.config/retroarch/cores/atari800_libretro.so %ROM%</command>
+    <platform>atarixe</platform>
+    <theme>atarixe</theme>
+  </system>
   <system>
     <name>bbcmicro</name>
     <fullname>BBC Micro</fullname>
@@ -354,7 +372,7 @@
   </system>
   <system>
     <name>lutro</name>
-    <fullname>Lutro</fullname>
+    <fullname>Lutro game engine</fullname>
     <path>%ROMPATH%/lutro</path>
     <extension>.lua .LUA .lutro .LUTRO .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/lutro_libretro.so %ROM%</command>
@@ -435,7 +453,7 @@
   </system>
   <system>
     <name>moonlight</name>
-    <fullname>Moonlight</fullname>
+    <fullname>Moonlight game streaming</fullname>
     <path>%ROMPATH%/moonlight</path>
     <extension>.moonlight .MOONLIGHT .7z .7Z .zip .ZIP</extension>
     <command>PLACEHOLDER %ROM%</command>
@@ -532,6 +550,15 @@
     <platform>odyssey2</platform>
     <theme>odyssey2</theme>
   </system>
+  <system>
+    <name>openbor</name>
+    <fullname>OpenBOR game engine</fullname>
+    <path>%ROMPATH%/openbor</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>openbor</platform>
+    <theme>openbor</theme>
+  </system>
   <system>
     <name>oric</name>
     <fullname>Tangerine Computer Systems Oric</fullname>
@@ -552,7 +579,7 @@
   </system>
   <system>
     <name>pcengine</name>
-    <fullname>PC Engine</fullname>
+    <fullname>NEC PC Engine</fullname>
     <path>%ROMPATH%/pcengine</path>
     <extension>.pce .PCE .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/mednafen_pce_fast_libretro.so %ROM%</command>
@@ -561,7 +588,7 @@
   </system>
   <system>
     <name>pcenginecd</name>
-    <fullname>PC Engine CD</fullname>
+    <fullname>NEC PC Engine CD</fullname>
     <path>%ROMPATH%/pcenginecd</path>
     <extension>.pce .PCE .cue .CUE .ccd .CCD .iso .ISO .img .IMG .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/mednafen_pce_libretro.so %ROM%</command>
@@ -577,6 +604,15 @@
     <platform>pcfx</platform>
     <theme>pcfx</theme>
   </system>
+  <system>
+    <name>ports</name>
+    <fullname>Ports</fullname>
+    <path>%ROMPATH%/ports</path>
+    <extension>.sh .SH</extension>
+    <command>bash %ROM%</command>
+    <platform>pc</platform>
+    <theme>ports</theme>
+  </system>
   <system>
     <name>ps2</name>
     <fullname>Sony PlayStation 2</fullname>
@@ -596,13 +632,13 @@
     <theme>psp</theme>
   </system>
   <system>
-    <name>ports</name>
-    <fullname>Ports</fullname>
-    <path>%ROMPATH%/ports</path>
-    <extension>.sh .SH</extension>
-    <command>bash %ROM%</command>
-    <platform>pc</platform>
-    <theme>ports</theme>
+    <name>psvita</name>
+    <fullname>PlayStation Vita</fullname>
+    <path>%ROMPATH%/psp</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>psvita</platform>
+    <theme>psvita</theme>
   </system>
   <system>
     <name>psx</name>
@@ -615,7 +651,7 @@
   </system>
   <system>
     <name>residualvm</name>
-    <fullname>ResidualVM</fullname>
+    <fullname>ResidualVM game engine</fullname>
     <path>%ROMPATH%/residualvm</path>
     <extension>.7z .7Z .zip .ZIP</extension>
     <command>PLACEHOLDER %ROM%</command>
@@ -642,7 +678,7 @@
   </system>
   <system>
     <name>scummvm</name>
-    <fullname>ScummVM</fullname>
+    <fullname>ScummVM game engine</fullname>
     <path>%ROMPATH%/scummvm</path>
     <extension>.scummvm .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/scummvm_libretro.so %ROM%</command>
@@ -660,7 +696,7 @@
   </system>
   <system>
     <name>segacd</name>
-    <fullname>Mega CD</fullname>
+    <fullname>Sega Mega-CD</fullname>
     <path>%ROMPATH%/segacd</path>
     <extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/genesis_plus_gx_libretro.so %ROM%</command>
@@ -705,7 +741,7 @@
   </system>
   <system>
     <name>supergrafx</name>
-    <fullname>Supergrafx</fullname>
+    <fullname>NEC SuperGrafx</fullname>
     <path>%ROMPATH%/supergrafx</path>
     <extension>.pce .PCE .sgx .SGX .cue .CUE .ccd .CCD .chd .CHD .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/mednafen_supergrafx_libretro.so %ROM%</command>
@@ -714,7 +750,7 @@
   </system>
   <system>
     <name>tg16</name>
-    <fullname>TurboGrafx-16</fullname>
+    <fullname>NEC TurboGrafx-16</fullname>
     <path>%ROMPATH%/tg16</path>
     <extension>.pce .PCE .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/mednafen_pce_fast_libretro.so %ROM%</command>
@@ -723,7 +759,7 @@
   </system>
   <system>
     <name>tg-cd</name>
-    <fullname>TurboGrafx-CD</fullname>
+    <fullname>NEC TurboGrafx-CD</fullname>
     <path>%ROMPATH%/tg-cd</path>
     <extension>.pce .PCE .cue .CUE .ccd .CCD .iso .ISO .img .IMG .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/mednafen_pce_libretro.so %ROM%</command>
@@ -784,9 +820,18 @@
     <platform>wii</platform>
     <theme>wii</theme>
   </system>
+  <system>
+    <name>wiiu</name>
+    <fullname>Nintendo Wii U</fullname>
+    <path>%ROMPATH%/wiiu</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>wiiu</platform>
+    <theme>wiiu</theme>
+  </system>
   <system>
     <name>wonderswan</name>
-    <fullname>WonderSwan</fullname>
+    <fullname>Bandai WonderSwan</fullname>
     <path>%ROMPATH%/wonderswan</path>
     <extension>.ws .WS .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/mednafen_wswan_libretro.so %ROM%</command>
@@ -795,13 +840,40 @@
   </system>
   <system>
     <name>wonderswancolor</name>
-    <fullname>WonderSwan Color</fullname>
+    <fullname>Bandai WonderSwan Color</fullname>
     <path>%ROMPATH%/wonderswancolor</path>
     <extension>.ws .WS .wsc .WSC .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/mednafen_wswan_libretro.so %ROM%</command>
     <platform>wonderswancolor</platform>
     <theme>wonderswancolor</theme>
   </system>
+  <system>
+    <name>x68000</name>
+    <fullname>Sharp X68000</fullname>
+    <path>%ROMPATH%/x68000</path>
+    <extension>.dim .DIM .img .IMG .d88 .D88 .88d .88D .hdm .HDM .dup .DUP .2hd .2HD .xdf .XDF .hdf .HDF .cmd .CMD .m3u .M3U .7z .7Z .zip .ZIP</extension>
+    <command>retroarch -L ~/.config/retroarch/cores/px68k_libretro.so %ROM%</command>
+    <platform>x68000</platform>
+    <theme>x68000</theme>
+  </system>
+  <system>
+    <name>xbox</name>
+    <fullname>Microsoft Xbox</fullname>
+    <path>%ROMPATH%/xbox</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>xbox</platform>
+    <theme>xbox</theme>
+  </system>
+  <system>
+    <name>xbox360</name>
+    <fullname>Microsoft Xbox 360</fullname>
+    <path>%ROMPATH%/xbox360</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>xbox360</platform>
+    <theme>xbox360</theme>
+  </system>
   <system>
     <name>zmachine</name>
     <fullname>Infocom Z-machine</fullname>
@@ -813,7 +885,7 @@
   </system>
   <system>
     <name>zx81</name>
-    <fullname>ZX81</fullname>
+    <fullname>Sinclair ZX81</fullname>
     <path>%ROMPATH%/zx81</path>
     <extension>.tzx .TZX .p .P .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/81_libretro.so %ROM%</command>
@@ -822,7 +894,7 @@
   </system>
   <system>
     <name>zxspectrum</name>
-    <fullname>ZX Spectrum</fullname>
+    <fullname>Sinclair ZX Spectrum</fullname>
     <path>%ROMPATH%/zxspectrum</path>
     <extension>.tzx .TZX .tap .TAP .z80 .Z80 .rzx .RZX .scl .SCL .trd .TRD .sh .SH .sna .SNA .szx .SZX .udi .UDI .mgt .MGT .img .IMG .dsk .DSK .gz .GZ .7z .7Z .zip .ZIP</extension>
     <command>retroarch -L ~/.config/retroarch/cores/fuse_libretro.so %ROM%</command>
diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows
index 2888eea48..957d5f51c 100644
--- a/resources/templates/es_systems.cfg_windows
+++ b/resources/templates/es_systems.cfg_windows
@@ -124,7 +124,16 @@
     <path>%ROMPATH%\atarijaguar</path>
     <extension>.j64 .J64 .jag .JAG .rom .ROM .abs .ABS .cof .COF .bin .BIN .prg .PRG .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\virtualjaguar_libretro.dll" %ROM%</command>
-    <platform>atarijaguar</platform>
+    <platform>atarijaguar, atarijaguarcd</platform>
+    <theme>atarijaguar</theme>
+  </system>
+  <system>
+    <name>atarijaguarcd</name>
+    <fullname>Atari Jaguar CD</fullname>
+    <path>%ROMPATH%\atarijaguarcd</path>
+    <extension>.j64 .J64 .jag .JAG .rom .ROM .abs .ABS .cof .COF .bin .BIN .prg .PRG .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L "%EMUPATH%\cores\virtualjaguar_libretro.dll" %ROM%</command>
+    <platform>atarijaguarcd</platform>
     <theme>atarijaguar</theme>
   </system>
   <system>
@@ -145,6 +154,15 @@
     <platform>atarist</platform>
     <theme>atarist</theme>
   </system>
+  <system>
+    <name>atarixe</name>
+    <fullname>Atari XE</fullname>
+    <path>%ROMPATH%\atarixe</path>
+    <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L "%EMUPATH%\cores\atari800_libretro.dll" %ROM%</command>
+    <platform>atarixe</platform>
+    <theme>atarixe</theme>
+  </system>
   <system>
     <name>bbcmicro</name>
     <fullname>BBC Micro</fullname>
@@ -354,7 +372,7 @@
   </system>
   <system>
     <name>lutro</name>
-    <fullname>Lutro</fullname>
+    <fullname>Lutro game engine</fullname>
     <path>%ROMPATH%\lutro</path>
     <extension>.lua .LUA .lutro .LUTRO .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\lutro_libretro.dll" %ROM%</command>
@@ -435,7 +453,7 @@
   </system>
   <system>
     <name>moonlight</name>
-    <fullname>Moonlight</fullname>
+    <fullname>Moonlight game streaming</fullname>
     <path>%ROMPATH%\moonlight</path>
     <extension>.moonlight .MOONLIGHT .7z .7Z .zip .ZIP</extension>
     <command>PLACEHOLDER %ROM%</command>
@@ -532,6 +550,15 @@
     <platform>odyssey2</platform>
     <theme>odyssey2</theme>
   </system>
+  <system>
+    <name>openbor</name>
+    <fullname>OpenBOR game engine</fullname>
+    <path>%ROMPATH%\openbor</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>openbor</platform>
+    <theme>openbor</theme>
+  </system>
   <system>
     <name>oric</name>
     <fullname>Tangerine Computer Systems Oric</fullname>
@@ -552,7 +579,7 @@
   </system>
   <system>
     <name>pcengine</name>
-    <fullname>PC Engine</fullname>
+    <fullname>NEC PC Engine</fullname>
     <path>%ROMPATH%\pcengine</path>
     <extension>.pce .PCE .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_pce_fast_libretro.dll" %ROM%</command>
@@ -561,7 +588,7 @@
   </system>
   <system>
     <name>pcenginecd</name>
-    <fullname>PC Engine CD</fullname>
+    <fullname>NEC PC Engine CD</fullname>
     <path>%ROMPATH%\pcenginecd</path>
     <extension>.pce .PCE .cue .CUE .ccd .CCD .iso .ISO .img .IMG .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_pce_libretro.dll" %ROM%</command>
@@ -577,6 +604,15 @@
     <platform>pcfx</platform>
     <theme>pcfx</theme>
   </system>
+  <system>
+    <name>ports</name>
+    <fullname>Ports</fullname>
+    <path>%ROMPATH%\ports</path>
+    <extension>.sh .SH</extension>
+    <command>bash %ROM%</command>
+    <platform>pc</platform>
+    <theme>ports</theme>
+  </system>
   <system>
     <name>ps2</name>
     <fullname>Sony PlayStation 2</fullname>
@@ -596,13 +632,13 @@
     <theme>psp</theme>
   </system>
   <system>
-    <name>ports</name>
-    <fullname>Ports</fullname>
-    <path>%ROMPATH%\ports</path>
-    <extension>.sh .SH</extension>
-    <command>bash %ROM%</command>
-    <platform>pc</platform>
-    <theme>ports</theme>
+    <name>psvita</name>
+    <fullname>PlayStation Vita</fullname>
+    <path>%ROMPATH%\psp</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>psvita</platform>
+    <theme>psvita</theme>
   </system>
   <system>
     <name>psx</name>
@@ -615,7 +651,7 @@
   </system>
   <system>
     <name>residualvm</name>
-    <fullname>ResidualVM</fullname>
+    <fullname>ResidualVM game engine</fullname>
     <path>%ROMPATH%\residualvm</path>
     <extension>.7z .7Z .zip .ZIP</extension>
     <command>PLACEHOLDER %ROM%</command>
@@ -642,7 +678,7 @@
   </system>
   <system>
     <name>scummvm</name>
-    <fullname>ScummVM</fullname>
+    <fullname>ScummVM game engine</fullname>
     <path>%ROMPATH%\scummvm</path>
     <extension>.scummvm .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\scummvm_libretro.dll" %ROM%</command>
@@ -660,7 +696,7 @@
   </system>
   <system>
     <name>segacd</name>
-    <fullname>Mega CD</fullname>
+    <fullname>Sega Mega-CD</fullname>
     <path>%ROMPATH%\segacd</path>
     <extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\genesis_plus_gx_libretro.dll" %ROM%</command>
@@ -705,7 +741,7 @@
   </system>
   <system>
     <name>supergrafx</name>
-    <fullname>Supergrafx</fullname>
+    <fullname>NEC SuperGrafx</fullname>
     <path>%ROMPATH%\supergrafx</path>
     <extension>.pce .PCE .sgx .SGX .cue .CUE .ccd .CCD .chd .CHD .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_supergrafx_libretro.dll" %ROM%</command>
@@ -714,7 +750,7 @@
   </system>
   <system>
     <name>tg16</name>
-    <fullname>TurboGrafx-16</fullname>
+    <fullname>NEC TurboGrafx-16</fullname>
     <path>%ROMPATH%\tg16</path>
     <extension>.pce .PCE .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_pce_fast_libretro.dll" %ROM%</command>
@@ -723,7 +759,7 @@
   </system>
   <system>
     <name>tg-cd</name>
-    <fullname>TurboGrafx-CD</fullname>
+    <fullname>NEC TurboGrafx-CD</fullname>
     <path>%ROMPATH%\tg-cd</path>
     <extension>.pce .PCE .cue .CUE .ccd .CCD .iso .ISO .img .IMG .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_pce_libretro.dll" %ROM%</command>
@@ -784,9 +820,18 @@
     <platform>wii</platform>
     <theme>wii</theme>
   </system>
+  <system>
+    <name>wiiu</name>
+    <fullname>Nintendo Wii U</fullname>
+    <path>%ROMPATH%\wiiu</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>wiiu</platform>
+    <theme>wiiu</theme>
+  </system>
   <system>
     <name>wonderswan</name>
-    <fullname>WonderSwan</fullname>
+    <fullname>Bandai WonderSwan</fullname>
     <path>%ROMPATH%\wonderswan</path>
     <extension>.ws .WS .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_wswan_libretro.dll" %ROM%</command>
@@ -795,13 +840,40 @@
   </system>
   <system>
     <name>wonderswancolor</name>
-    <fullname>WonderSwan Color</fullname>
+    <fullname>Bandai WonderSwan Color</fullname>
     <path>%ROMPATH%\wonderswancolor</path>
     <extension>.ws .WS .wsc .WSC .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_wswan_libretro.dll" %ROM%</command>
     <platform>wonderswancolor</platform>
     <theme>wonderswancolor</theme>
   </system>
+  <system>
+    <name>x68000</name>
+    <fullname>Sharp X68000</fullname>
+    <path>%ROMPATH%\x68000</path>
+    <extension>.dim .DIM .img .IMG .d88 .D88 .88d .88D .hdm .HDM .dup .DUP .2hd .2HD .xdf .XDF .hdf .HDF .cmd .CMD .m3u .M3U .7z .7Z .zip .ZIP</extension>
+    <command>retroarch.exe -L "%EMUPATH%\cores\px68k_libretro.dll" %ROM%</command>
+    <platform>x68000</platform>
+    <theme>x68000</theme>
+  </system>
+  <system>
+    <name>xbox</name>
+    <fullname>Microsoft Xbox</fullname>
+    <path>%ROMPATH%\xbox</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>xbox</platform>
+    <theme>xbox</theme>
+  </system>
+  <system>
+    <name>xbox360</name>
+    <fullname>Microsoft Xbox 360</fullname>
+    <path>%ROMPATH%\xbox360</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>xbox360</platform>
+    <theme>xbox360</theme>
+  </system>
   <system>
     <name>zmachine</name>
     <fullname>Infocom Z-machine</fullname>
@@ -813,7 +885,7 @@
   </system>
   <system>
     <name>zx81</name>
-    <fullname>ZX81</fullname>
+    <fullname>Sinclair ZX81</fullname>
     <path>%ROMPATH%\zx81</path>
     <extension>.tzx .TZX .p .P .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\81_libretro.dll" %ROM%</command>
@@ -822,7 +894,7 @@
   </system>
   <system>
     <name>zxspectrum</name>
-    <fullname>ZX Spectrum</fullname>
+    <fullname>Sinclair ZX Spectrum</fullname>
     <path>%ROMPATH%\zxspectrum</path>
     <extension>.tzx .TZX .tap .TAP .z80 .Z80 .rzx .RZX .scl .SCL .trd .TRD .sh .SH .sna .SNA .szx .SZX .udi .UDI .mgt .MGT .img .IMG .dsk .DSK .gz .GZ .7z .7Z .zip .ZIP</extension>
     <command>retroarch.exe -L "%EMUPATH%\cores\fuse_libretro.dll" %ROM%</command>
diff --git a/themes/rbsimple-DE/MISSING.md b/themes/rbsimple-DE/MISSING.md
index 89dfc450f..9d5d1876b 100644
--- a/themes/rbsimple-DE/MISSING.md
+++ b/themes/rbsimple-DE/MISSING.md
@@ -14,7 +14,9 @@ Missing (or not updated) theme data
 * 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
 * atarijaguar: Atari Jaguar - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
+* 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
 * 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)
@@ -29,10 +31,12 @@ Missing (or not updated) theme data
 * 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
+* 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
 * pcfx: NEC PC-FX - system info, customized colors, 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
 * saturn: Sega Saturn - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
@@ -42,4 +46,8 @@ Missing (or not updated) theme data
 * ti99: Texas Instruments TI-99 - 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
 * 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
+* xbox: Microsoft Xbox - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
+* xbox360: Microsoft Xbox - system info, customized colors, logo.svg, consolegame.svg, console.svg, controller.svg, game.svg
 * zmachine: Infocom Z-machine - system info, customized colors, consolegame.svg, console.svg, controller.svg, game.svg
diff --git a/themes/rbsimple-DE/atarijaguarcd/colors.xml b/themes/rbsimple-DE/atarijaguarcd/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/atarijaguarcd/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/atarijaguarcd/images/console.svg b/themes/rbsimple-DE/atarijaguarcd/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/atarijaguarcd/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/atarijaguarcd/images/consolegame.svg b/themes/rbsimple-DE/atarijaguarcd/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/atarijaguarcd/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/atarijaguarcd/images/controller.svg b/themes/rbsimple-DE/atarijaguarcd/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/atarijaguarcd/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/atarijaguarcd/systeminfo.xml b/themes/rbsimple-DE/atarijaguarcd/systeminfo.xml
new file mode 100644
index 000000000..30ed8043c
--- /dev/null
+++ b/themes/rbsimple-DE/atarijaguarcd/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Atari Jaguar CD</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/atarijaguarcd/theme.xml b/themes/rbsimple-DE/atarijaguarcd/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/atarijaguarcd/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/atarixe/colors.xml b/themes/rbsimple-DE/atarixe/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/atarixe/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/atarixe/images/console.svg b/themes/rbsimple-DE/atarixe/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/atarixe/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/atarixe/images/consolegame.svg b/themes/rbsimple-DE/atarixe/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/atarixe/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/atarixe/images/controller.svg b/themes/rbsimple-DE/atarixe/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/atarixe/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/atarixe/systeminfo.xml b/themes/rbsimple-DE/atarixe/systeminfo.xml
new file mode 100644
index 000000000..59d1dd893
--- /dev/null
+++ b/themes/rbsimple-DE/atarixe/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Atari XE</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/atarixe/theme.xml b/themes/rbsimple-DE/atarixe/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/atarixe/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/openbor/colors.xml b/themes/rbsimple-DE/openbor/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/openbor/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/openbor/images/console.svg b/themes/rbsimple-DE/openbor/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/openbor/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/openbor/images/consolegame.svg b/themes/rbsimple-DE/openbor/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/openbor/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/openbor/images/controller.svg b/themes/rbsimple-DE/openbor/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/openbor/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/openbor/systeminfo.xml b/themes/rbsimple-DE/openbor/systeminfo.xml
new file mode 100644
index 000000000..3c19e352a
--- /dev/null
+++ b/themes/rbsimple-DE/openbor/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Open Beats of Rage (OpenBOR) game engine</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/openbor/theme.xml b/themes/rbsimple-DE/openbor/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/openbor/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/psvita/colors.xml b/themes/rbsimple-DE/psvita/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/psvita/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/psvita/images/console.svg b/themes/rbsimple-DE/psvita/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/psvita/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/psvita/images/consolegame.svg b/themes/rbsimple-DE/psvita/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/psvita/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/psvita/images/controller.svg b/themes/rbsimple-DE/psvita/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/psvita/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/psvita/systeminfo.xml b/themes/rbsimple-DE/psvita/systeminfo.xml
new file mode 100644
index 000000000..49600d236
--- /dev/null
+++ b/themes/rbsimple-DE/psvita/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Sony PlayStation Vita</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/psvita/theme.xml b/themes/rbsimple-DE/psvita/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/psvita/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/wiiu/colors.xml b/themes/rbsimple-DE/wiiu/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/wiiu/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/wiiu/images/console.svg b/themes/rbsimple-DE/wiiu/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/wiiu/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/wiiu/images/consolegame.svg b/themes/rbsimple-DE/wiiu/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/wiiu/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/wiiu/images/controller.svg b/themes/rbsimple-DE/wiiu/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/wiiu/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/wiiu/systeminfo.xml b/themes/rbsimple-DE/wiiu/systeminfo.xml
new file mode 100644
index 000000000..95494f95a
--- /dev/null
+++ b/themes/rbsimple-DE/wiiu/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Nintendo Wii U</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/wiiu/theme.xml b/themes/rbsimple-DE/wiiu/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/wiiu/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/x68000/colors.xml b/themes/rbsimple-DE/x68000/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/x68000/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/x68000/images/console.svg b/themes/rbsimple-DE/x68000/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/x68000/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/x68000/images/consolegame.svg b/themes/rbsimple-DE/x68000/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/x68000/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/x68000/images/controller.svg b/themes/rbsimple-DE/x68000/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/x68000/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/x68000/systeminfo.xml b/themes/rbsimple-DE/x68000/systeminfo.xml
new file mode 100644
index 000000000..7b79c79b9
--- /dev/null
+++ b/themes/rbsimple-DE/x68000/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Sharp X68000</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/x68000/theme.xml b/themes/rbsimple-DE/x68000/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/x68000/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/xbox/colors.xml b/themes/rbsimple-DE/xbox/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/xbox/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/xbox/images/console.svg b/themes/rbsimple-DE/xbox/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/xbox/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/xbox/images/consolegame.svg b/themes/rbsimple-DE/xbox/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/xbox/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/xbox/images/controller.svg b/themes/rbsimple-DE/xbox/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/xbox/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/xbox/systeminfo.xml b/themes/rbsimple-DE/xbox/systeminfo.xml
new file mode 100644
index 000000000..10e2c4615
--- /dev/null
+++ b/themes/rbsimple-DE/xbox/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Microsoft Xbox</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/xbox/theme.xml b/themes/rbsimple-DE/xbox/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/xbox/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/xbox360/colors.xml b/themes/rbsimple-DE/xbox360/colors.xml
new file mode 100644
index 000000000..973ffdf14
--- /dev/null
+++ b/themes/rbsimple-DE/xbox360/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/xbox360/images/console.svg b/themes/rbsimple-DE/xbox360/images/console.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/xbox360/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/xbox360/images/consolegame.svg b/themes/rbsimple-DE/xbox360/images/consolegame.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/xbox360/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/xbox360/images/controller.svg b/themes/rbsimple-DE/xbox360/images/controller.svg
new file mode 100644
index 000000000..345a518f0
--- /dev/null
+++ b/themes/rbsimple-DE/xbox360/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/xbox360/systeminfo.xml b/themes/rbsimple-DE/xbox360/systeminfo.xml
new file mode 100644
index 000000000..9604171f9
--- /dev/null
+++ b/themes/rbsimple-DE/xbox360/systeminfo.xml
@@ -0,0 +1,9 @@
+<theme>
+    <formatVersion>6</formatVersion>
+
+    <view name="system">
+        <text name="info1" extra="true">
+            <text>Microsoft Xbox 360</text>
+        </text>
+    </view>
+</theme>
diff --git a/themes/rbsimple-DE/xbox360/theme.xml b/themes/rbsimple-DE/xbox360/theme.xml
new file mode 100644
index 000000000..f097080c3
--- /dev/null
+++ b/themes/rbsimple-DE/xbox360/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>