diff --git a/USERGUIDE.md b/USERGUIDE.md
index d5d5892bd..a898aaadc 100644
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@@ -18,6 +18,8 @@ If you just want to get started as quickly as possible, simply follow these step
 6) Start ES-DE and follow the on-screen instructions to configure your controller
 7) Scrape game media for your collection and play some games!
 
+As long as ES-DE hasn't frozen, you can always press F4 to close the application.
+
 For additional details, read on below.
 
 ## Getting started
@@ -481,7 +483,25 @@ ES-DE is a game browsing frontend and does not provide any emulation by itself.
 
 Installation and configuration of RetroArch and other emulators is beyond the scope of this guide, but many good resources can be found online on how to do this.
 
-In order to use the default es_systems.cfg file, you need to make sure that the emulator binary directory is in the operating system's path. On Unix systems this is normally not an issue as a package manager has typically been used to install the emulator, and even if compiled from source there is a standardized directory structure which should have you covered. Likewise on macOS, it's assumed that the emulator is installed under the Applications folder so everything should just work. But for Windows you may need to add the emulator directory to your %PATH% variable manually (tip: open Settings from the Start menu and search for _path_).
+A general recommendation regarding installation on Linux though is to try to avoid the versions included in the OS repositories as they're usually quite limited with regards to the number of available cores, and they're usually older versions. Instead go for either the Snap or Flatpak distributions or build from source.
+
+In order to use the default es_systems.cfg file, you need to make sure that the emulator binary is in the operating system's path. On Unix systems this is normally not an issue (unless Flatpak is used) as a package manager has typically been used to install the emulator, and even if compiled from source there is a standardized directory structure which should have you covered. Likewise on macOS, it's assumed that the emulator is installed under the Applications folder so everything should just work. But for Windows you may need to add the emulator directory to your %PATH% variable manually (tip: open Settings from the Start menu and search for _path_).
+
+If installing RetroArch as Flatpak on Linux you have to work around an incredibly annoying deficiency of this type of software distribution which is that there will be no RetroArch executable directly available to run. To run RetroArch you would instead need to execute `flatpak run org.libretro.RetroArch` and to get ES-DE to work properly with this you either need to use a customized es_systems.cfg file, or create a shell script somewhere in your path that executes the Flatpak command.
+Here's an example of such a script:
+```
+#!/bin/sh
+flatpak run org.libretro.RetroArch "$@"
+```
+
+For instance on Fedora you could place the shell script in `~/bin` and name it `retroarch` and then everything will work fine.
+
+There is also a Flatpak-specific es_systems.cfg template shipped with ES-DE, but you need to manually install it if you would like to use it:
+```
+cp /usr/local/share/emulationstation/resources/templates/es_systems.cfg_unix_flatpak ~/.emulationstation/es_systems.cfg
+```
+
+The source path may differ from this example depending on which prefix was used when building ES-DE.
 
 As an alternative, if the emulator is not in your search path, you can either hardcode an absolute path in es_systems.cfg or use the %ESPATH% variable to set the emulator relative to the ES-DE binary location. Again, please refer to [INSTALL.md](INSTALL.md#es_systemscfg) for details regarding this.
 
diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp
index f4f6022d3..509864894 100644
--- a/es-core/src/Settings.cpp
+++ b/es-core/src/Settings.cpp
@@ -213,14 +213,15 @@ void Settings::setDefaults()
     mStringMap["EmulatorCorePath"] = { "", "" };
     #else
     const std::string emulatorCorePath =
-            "~/.config/retroarch/cores:"                        // Compiled from source
-            "~/snap/retroarch/current/.config/retroarch/cores:" // Snap package
-            // As installed via the OS repositories:
-            "/usr/lib/x86_64-linux-gnu/libretro:"               // Ubuntu and Linux Mint
-            "/usr/lib64/libretro:"                              // Fedora
-            "/usr/lib/libretro:"                                // Manjaro
-            "/usr/local/lib/libretro:"                          // FreeBSD and OpenBSD
-            "/usr/pkg/lib/libretro";                            // NetBSD
+            "~/.config/retroarch/cores:"                                // Compiled from source
+            "~/snap/retroarch/current/.config/retroarch/cores:"         // Snap package
+            "~/.var/app/org.libretro.RetroArch/config/retroarch/cores:" // Flatpak package
+            // As installed from the OS repositories:
+            "/usr/lib/x86_64-linux-gnu/libretro:"                       // Ubuntu and Linux Mint
+            "/usr/lib64/libretro:"                                      // Fedora
+            "/usr/lib/libretro:"                                        // Manjaro
+            "/usr/local/lib/libretro:"                                  // FreeBSD and OpenBSD
+            "/usr/pkg/lib/libretro";                                    // NetBSD
     mStringMap["EmulatorCorePath"] = { emulatorCorePath, emulatorCorePath };
     #endif
     mBoolMap["LaunchCommandOverride"] = { true, true };
diff --git a/resources/templates/es_systems.cfg_unix_flatpak b/resources/templates/es_systems.cfg_unix_flatpak
new file mode 100644
index 000000000..ee1319a7f
--- /dev/null
+++ b/resources/templates/es_systems.cfg_unix_flatpak
@@ -0,0 +1,1120 @@
+<?xml version="1.0"?>
+<!-- This is the EmulationStation-DE game systems configuration file for Unix, Flatpak specific. -->
+<systemList>
+  <system>
+    <name>3do</name>
+    <fullname>3DO</fullname>
+    <path>%ROMPATH%/3do</path>
+    <extension>.iso .ISO .bin .BIN .chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/4do_libretro.so %ROM%</command>
+    <platform>3do</platform>
+    <theme>3do</theme>
+  </system>
+  <system>
+    <name>ags</name>
+    <fullname>Adventure Game Studio</fullname>
+    <path>%ROMPATH%/ags</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>ags</platform>
+    <theme>ags</theme>
+  </system>
+  <system>
+    <name>amiga</name>
+    <fullname>Commodore Amiga</fullname>
+    <path>%ROMPATH%/amiga</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>flatpak run org.libretro.RetroArch -L %COREPATH%/puae_libretro.so %ROM%</command>
+    <platform>amiga</platform>
+    <theme>amiga</theme>
+  </system>
+  <system>
+    <name>amiga600</name>
+    <fullname>Commodore Amiga 600</fullname>
+    <path>%ROMPATH%/amiga600</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>flatpak run org.libretro.RetroArch -L %COREPATH%/puae_libretro.so %ROM%</command>
+    <platform>amiga</platform>
+    <theme>amiga600</theme>
+  </system>
+  <system>
+    <name>amiga1200</name>
+    <fullname>Commodore Amiga 1200</fullname>
+    <path>%ROMPATH%/amiga1200</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>flatpak run org.libretro.RetroArch -L %COREPATH%/puae_libretro.so %ROM%</command>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/puae_libretro.so %ROM%</command>
+    <platform>amigacd32</platform>
+    <theme>amigacd32</theme>
+  </system>
+  <system>
+    <name>amstradcpc</name>
+    <fullname>Amstrad CPC</fullname>
+    <path>%ROMPATH%/amstradcpc</path>
+    <extension>.dsk .DSK .sna .SNA .tap .TAR .cdt .CDT .voc .VOC .m3u .M3U .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/cap32_libretro.so %ROM%</command>
+    <platform>amstradcpc</platform>
+    <theme>amstradcpc</theme>
+  </system>
+  <system>
+    <name>apple2</name>
+    <fullname>Apple II</fullname>
+    <path>%ROMPATH%/apple2</path>
+    <extension>.nib .NIB .do .DO .po .PO .dsk .DSK .7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <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>
+    <path>%ROMPATH%/arcade</path>
+    <extension>.chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mame2016_libretro.so %ROM%</command>
+    <platform>arcade</platform>
+    <theme>arcade</theme>
+  </system>
+  <system>
+    <name>astrocade</name>
+    <fullname>Bally Astrocade</fullname>
+    <path>%ROMPATH%/astrocade</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>astrocade</platform>
+    <theme>astrocade</theme>
+  </system>
+  <system>
+    <name>atari2600</name>
+    <fullname>Atari 2600</fullname>
+    <path>%ROMPATH%/atari2600</path>
+    <extension>.a26 .A26 .bin .BIN .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/stella2014_libretro.so %ROM%</command>
+    <platform>atari2600</platform>
+    <theme>atari2600</theme>
+  </system>
+  <system>
+    <name>atari5200</name>
+    <fullname>Atari 5200</fullname>
+    <path>%ROMPATH%/atari5200</path>
+    <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/atari800_libretro.so %ROM%</command>
+    <platform>atari5200</platform>
+    <theme>atari5200</theme>
+  </system>
+  <system>
+    <name>atari7800</name>
+    <fullname>Atari 7800 ProSystem</fullname>
+    <path>%ROMPATH%/atari7800</path>
+    <extension>.a78 .A78 .bin .BIN .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/prosystem_libretro.so %ROM%</command>
+    <platform>atari7800</platform>
+    <theme>atari7800</theme>
+  </system>
+  <system>
+    <name>atari800</name>
+    <fullname>Atari 800</fullname>
+    <path>%ROMPATH%/atari800</path>
+    <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/atari800_libretro.so %ROM%</command>
+    <platform>atari800</platform>
+    <theme>atari800</theme>
+  </system>
+  <system>
+    <name>atarijaguar</name>
+    <fullname>Atari Jaguar</fullname>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/virtualjaguar_libretro.so %ROM%</command>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/virtualjaguar_libretro.so %ROM%</command>
+    <platform>atarijaguarcd</platform>
+    <theme>atarijaguarcd</theme>
+  </system>
+  <system>
+    <name>atarilynx</name>
+    <fullname>Atari Lynx</fullname>
+    <path>%ROMPATH%/atarilynx</path>
+    <extension>.lnx .LNX .o .O .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mednafen_lynx_libretro.so %ROM%</command>
+    <platform>atarilynx</platform>
+    <theme>atarilynx</theme>
+  </system>
+  <system>
+    <name>atarist</name>
+    <fullname>Atari ST</fullname>
+    <path>%ROMPATH%/atarist</path>
+    <extension>.st .ST .msa .MSA .stx .STX .dim .DIM .ipf .IPF .m3u .M3U .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/hatari_libretro.so %ROM%</command>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/atari800_libretro.so %ROM%</command>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/flycast_libretro.so %ROM%</command>
+    <platform>atomiswave</platform>
+    <theme>atomiswave</theme>
+  </system>
+  <system>
+    <name>bbcmicro</name>
+    <fullname>BBC Micro</fullname>
+    <path>%ROMPATH%/bbcmicro</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>bbcmicro</platform>
+    <theme>bbcmicro</theme>
+  </system>
+  <system>
+    <name>c64</name>
+    <fullname>Commodore 64</fullname>
+    <path>%ROMPATH%/c64</path>
+    <extension>.d64 .D64 .d71 .D71 .d80 .D80 .d81 .D81 .d82 .D82 .g64 .G64 .g41 .G41 .x64 .X64 .t64 .T64 .tap .TAP .prg .PRG .p00 .P00 .crt .CRT .bin .BIN .gz .GZ .d6z .D6Z .d7z .D7Z .d8z .D8Z .g6z .G6Z .x6z .X6Z .cmd .CMD .m3u .M3U .vsf .VSF .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/vice_x64_libretro.so %ROM%</command>
+    <platform>c64</platform>
+    <theme>c64</theme>
+  </system>
+  <system>
+    <name>cavestory</name>
+    <fullname>Cave Story (NXEngine)</fullname>
+    <path>%ROMPATH%/cavestory</path>
+    <extension>.exe .EXE .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/nxengine_libretro.so %ROM%</command>
+    <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>chailove</name>
+    <fullname>ChaiLove game engine</fullname>
+    <path>%ROMPATH%/chailove</path>
+    <extension>.chai .CHAI .chailove .CHAILOVE .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/chailove_libretro.so %ROM%</command>
+    <platform>love</platform>
+    <theme>chailove</theme>
+  </system>
+  <system>
+    <name>channelf</name>
+    <fullname>Fairchild Channel F</fullname>
+    <path>%ROMPATH%/channelf</path>
+    <extension>.bin .BIN .chf .CHF .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/freechaf_libretro.so %ROM%</command>
+    <platform>channelf</platform>
+    <theme>channelf</theme>
+  </system>
+  <system>
+    <name>coco</name>
+    <fullname>Tandy Color Computer</fullname>
+    <path>%ROMPATH%/coco</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>coco</platform>
+    <theme>coco</theme>
+  </system>
+  <system>
+    <name>coleco</name>
+    <fullname>ColecoVision</fullname>
+    <path>%ROMPATH%/coleco</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>flatpak run org.libretro.RetroArch -L %COREPATH%/bluemsx_libretro.so %ROM%</command>
+    <platform>colecovision</platform>
+    <theme>colecovision</theme>
+  </system>
+  <system>
+    <name>daphne</name>
+    <fullname>Daphne Arcade Laserdisc Emulator</fullname>
+    <path>%ROMPATH%/daphne</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/daphne_libretro.so %ROM%</command>
+    <platform>daphne</platform>
+    <theme>daphne</theme>
+  </system>
+  <system>
+    <name>desktop</name>
+    <fullname>Desktop applications</fullname>
+    <path>%ROMPATH%/desktop</path>
+    <extension>.sh .csh</extension>
+    <command>bash %ROM%</command>
+    <platform>pc</platform>
+    <theme>desktop</theme>
+  </system>
+  <system>
+    <name>doom</name>
+    <fullname>Doom</fullname>
+    <path>%ROMPATH%/doom</path>
+    <extension>.wad .WAD .iwad .IWAD .pwad .PWAD</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/prboom_libretro.so %ROM%</command>
+    <platform>pc</platform>
+    <theme>doom</theme>
+  </system>
+  <system>
+    <name>dos</name>
+    <fullname>DOS (PC)</fullname>
+    <path>%ROMPATH%/dos</path>
+    <extension>.bat .BAT .com .COM .exe .EXE .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/dosbox_core_libretro.so %ROM%</command>
+    <platform>dos</platform>
+    <theme>dos</theme>
+  </system>
+  <system>
+    <name>dragon32</name>
+    <fullname>Dragon 32</fullname>
+    <path>%ROMPATH%/dragon32</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>dragon32</platform>
+    <theme>dragon32</theme>
+  </system>
+  <system>
+    <name>dreamcast</name>
+    <fullname>Sega Dreamcast</fullname>
+    <path>%ROMPATH%/dreamcast</path>
+    <extension>.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/flycast_libretro.so %ROM%</command>
+    <platform>dreamcast</platform>
+    <theme>dreamcast</theme>
+  </system>
+  <system>
+    <name>famicom</name>
+    <fullname>Nintendo Family Computer</fullname>
+    <path>%ROMPATH%/famicom</path>
+    <extension>.nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/nestopia_libretro.so %ROM%</command>
+    <platform>nes, famicom</platform>
+    <theme>famicom</theme>
+  </system>
+  <system>
+    <name>fba</name>
+    <fullname>Final Burn Alpha</fullname>
+    <path>%ROMPATH%/fba</path>
+    <extension>.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/fbneo_libretro.so %ROM%</command>
+    <platform>arcade</platform>
+    <theme>fba</theme>
+  </system>
+  <system>
+    <name>fbneo</name>
+    <fullname>FinalBurn Neo</fullname>
+    <path>%ROMPATH%/fbneo</path>
+    <extension>.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/fbneo_libretro.so %ROM%</command>
+    <platform>arcade</platform>
+    <theme>fbneo</theme>
+  </system>
+  <system>
+    <name>fds</name>
+    <fullname>Nintendo Famicom Disk System</fullname>
+    <path>%ROMPATH%/fds</path>
+    <extension>.nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/nestopia_libretro.so %ROM%</command>
+    <platform>fds</platform>
+    <theme>fds</theme>
+  </system>
+  <system>
+    <name>gameandwatch</name>
+    <fullname>Nintendo Game and Watch</fullname>
+    <path>%ROMPATH%/gameandwatch</path>
+    <extension>.mgw .MGW .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/gw_libretro.so %ROM%</command>
+    <platform>gameandwatch</platform>
+    <theme>gameandwatch</theme>
+  </system>
+  <system>
+    <name>gamegear</name>
+    <fullname>Sega Game Gear</fullname>
+    <path>%ROMPATH%/gamegear</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>flatpak run org.libretro.RetroArch -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <platform>gamegear</platform>
+    <theme>gamegear</theme>
+  </system>
+  <system>
+    <name>gamecube</name>
+    <fullname>Nintendo GameCube</fullname>
+    <path>%ROMPATH%/gamecube</path>
+    <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .tgc .TGC .wad .WAD .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/dolphin_libretro.so %ROM%</command>
+    <platform>gamecube</platform>
+    <theme>gc</theme>
+  </system>
+  <system>
+    <name>gb</name>
+    <fullname>Nintendo Game Boy</fullname>
+    <path>%ROMPATH%/gb</path>
+    <extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/bsnes_libretro.so %ROM%</command>
+    <platform>gb</platform>
+    <theme>gb</theme>
+  </system>
+  <system>
+    <name>gba</name>
+    <fullname>Nintendo Game Boy Advance</fullname>
+    <path>%ROMPATH%/gba</path>
+    <extension>.gba .GBA .agb .AGB .bin .BIN .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mednafen_gba_libretro.so %ROM%</command>
+    <platform>gba</platform>
+    <theme>gba</theme>
+  </system>
+  <system>
+    <name>gbc</name>
+    <fullname>Nintendo Game Boy Color</fullname>
+    <path>%ROMPATH%/gbc</path>
+    <extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/bsnes_libretro.so %ROM%</command>
+    <platform>gbc</platform>
+    <theme>gbc</theme>
+  </system>
+  <system>
+    <name>genesis</name>
+    <fullname>Sega Genesis</fullname>
+    <path>%ROMPATH%/genesis</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>flatpak run org.libretro.RetroArch -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <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>
+    <path>%ROMPATH%/intellivision</path>
+    <extension>.int .INT .bin .BIN .rom .ROM .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/freeintv_libretro.so %ROM%</command>
+    <platform>intellivision</platform>
+    <theme>intellivision</theme>
+  </system>
+  <system>
+    <name>kodi</name>
+    <fullname>Kodi home theatre software</fullname>
+    <path>%ROMPATH%/kodi</path>
+    <extension>.sh .csh</extension>
+    <command>bash %ROM%</command>
+    <platform>pc</platform>
+    <theme>kodi</theme>
+  </system>
+  <system>
+    <name>lutris</name>
+    <fullname>Lutris open gaming platform</fullname>
+    <path>%ROMPATH%/lutris</path>
+    <extension>.sh .csh</extension>
+    <command>bash %ROM%</command>
+    <platform>pc</platform>
+    <theme>lutris</theme>
+  </system>
+  <system>
+    <name>lutro</name>
+    <fullname>Lutro game engine</fullname>
+    <path>%ROMPATH%/lutro</path>
+    <extension>.lua .LUA .lutro .LUTRO .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/lutro_libretro.so %ROM%</command>
+    <platform>lutro</platform>
+    <theme>lutro</theme>
+  </system>
+  <system>
+    <name>macintosh</name>
+    <fullname>Apple Macintosh</fullname>
+    <path>%ROMPATH%/macintosh</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>macintosh</platform>
+    <theme>macintosh</theme>
+  </system>
+  <system>
+    <name>mame</name>
+    <fullname>Multiple Arcade Machine Emulator</fullname>
+    <path>%ROMPATH%/mame</path>
+    <extension>.chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mame2016_libretro.so %ROM%</command>
+    <platform>arcade</platform>
+    <theme>mame</theme>
+  </system>
+  <system>
+    <name>mame-advmame</name>
+    <fullname>AdvanceMAME</fullname>
+    <path>%ROMPATH%/mame-advmame</path>
+    <extension>.chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>arcade</platform>
+    <theme>mame-advmame</theme>
+  </system>
+  <system>
+    <name>mame-libretro</name>
+    <fullname>Multiple Arcade Machine Emulator</fullname>
+    <path>%ROMPATH%/mame-libretro</path>
+    <extension>.chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mame_libretro.so %ROM%</command>
+    <platform>arcade</platform>
+    <theme>mame-libretro</theme>
+  </system>
+  <system>
+    <name>mame-mame4all</name>
+    <fullname>MAME4ALL</fullname>
+    <path>%ROMPATH%/mame-advmame</path>
+    <extension>.chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>arcade</platform>
+    <theme>mame-mame4all</theme>
+  </system>
+  <system>
+    <name>mastersystem</name>
+    <fullname>Sega Master System</fullname>
+    <path>%ROMPATH%/mastersystem</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>flatpak run org.libretro.RetroArch -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <platform>mastersystem</platform>
+    <theme>mastersystem</theme>
+  </system>
+  <system>
+    <name>megacd</name>
+    <fullname>Sega Mega-CD</fullname>
+    <path>%ROMPATH%/megacd</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>flatpak run org.libretro.RetroArch -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <platform>segacd</platform>
+    <theme>megacd</theme>
+  </system>
+  <system>
+    <name>megacdjp</name>
+    <fullname>Sega Mega-CD</fullname>
+    <path>%ROMPATH%/megacdjp</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>flatpak run org.libretro.RetroArch -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <platform>segacd</platform>
+    <theme>megacdjp</theme>
+  </system>
+  <system>
+    <name>megadrive</name>
+    <fullname>Sega Mega Drive</fullname>
+    <path>%ROMPATH%/megadrive</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>flatpak run org.libretro.RetroArch -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <platform>megadrive, genesis</platform>
+    <theme>megadrive</theme>
+  </system>
+  <system>
+    <name>mess</name>
+    <fullname>Multi Emulator Super System</fullname>
+    <path>%ROMPATH%/mess</path>
+    <extension>.chd .CHD .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mess2015_libretro.so %ROM%</command>
+    <platform>mess</platform>
+    <theme>mess</theme>
+  </system>
+  <system>
+    <name>moonlight</name>
+    <fullname>Moonlight game streaming</fullname>
+    <path>%ROMPATH%/moonlight</path>
+    <extension>.moonlight .MOONLIGHT .7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>moonlight</platform>
+    <theme>moonlight</theme>
+  </system>
+  <system>
+    <name>msx</name>
+    <fullname>MSX</fullname>
+    <path>%ROMPATH%/msx</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>flatpak run org.libretro.RetroArch -L %COREPATH%/bluemsx_libretro.so %ROM%</command>
+    <platform>msx</platform>
+    <theme>msx</theme>
+  </system>
+  <system>
+    <name>msx1</name>
+    <fullname>MSX1</fullname>
+    <path>%ROMPATH%/msx1</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>flatpak run org.libretro.RetroArch -L %COREPATH%/bluemsx_libretro.so %ROM%</command>
+    <platform>msx</platform>
+    <theme>msx1</theme>
+  </system>
+  <system>
+    <name>msx2</name>
+    <fullname>MSX2</fullname>
+    <path>%ROMPATH%/msx2</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>flatpak run org.libretro.RetroArch -L %COREPATH%/bluemsx_libretro.so %ROM%</command>
+    <platform>msx</platform>
+    <theme>msx2</theme>
+  </system>
+  <system>
+    <name>n64</name>
+    <fullname>Nintendo 64</fullname>
+    <path>%ROMPATH%/n64</path>
+    <extension>.n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mupen64plus_next_libretro.so %ROM%</command>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/flycast_libretro.so %ROM%</command>
+    <platform>naomi</platform>
+    <theme>naomi</theme>
+  </system>
+  <system>
+    <name>nds</name>
+    <fullname>Nintendo DS</fullname>
+    <path>%ROMPATH%/nds</path>
+    <extension>.nds .NDS .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/melonds_libretro.so %ROM%</command>
+    <platform>nds</platform>
+    <theme>nds</theme>
+  </system>
+  <system>
+    <name>neogeo</name>
+    <fullname>Neo Geo</fullname>
+    <path>%ROMPATH%/neogeo</path>
+    <extension>.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/fbneo_libretro.so %ROM%</command>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/neocd_libretro.so %ROM%</command>
+    <platform>neogeocd</platform>
+    <theme>neogeocd</theme>
+  </system>
+  <system>
+    <name>nes</name>
+    <fullname>Nintendo Entertainment System</fullname>
+    <path>%ROMPATH%/nes</path>
+    <extension>.nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/nestopia_libretro.so %ROM%</command>
+    <platform>nes</platform>
+    <theme>nes</theme>
+  </system>
+  <system>
+    <name>ngp</name>
+    <fullname>Neo Geo Pocket</fullname>
+    <path>%ROMPATH%/ngp</path>
+    <extension>.ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mednafen_ngp_libretro.so %ROM%</command>
+    <platform>ngp</platform>
+    <theme>ngp</theme>
+  </system>
+  <system>
+    <name>ngpc</name>
+    <fullname>Neo Geo Pocket Color</fullname>
+    <path>%ROMPATH%/ngpc</path>
+    <extension>.ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mednafen_ngp_libretro.so %ROM%</command>
+    <platform>ngpc</platform>
+    <theme>ngpc</theme>
+  </system>
+  <system>
+    <name>odyssey2</name>
+    <fullname>Magnavox Odyssey2</fullname>
+    <path>%ROMPATH%/odyssey2</path>
+    <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/o2em_libretro.so %ROM%</command>
+    <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>
+    <path>%ROMPATH%/oric</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/mu_libretro.so %ROM%</command>
+    <platform>palm</platform>
+    <theme>palm</theme>
+  </system>
+  <system>
+    <name>pc</name>
+    <fullname>IBM PC</fullname>
+    <path>%ROMPATH%/pc</path>
+    <extension>.bat .BAT .com .COM .exe .EXE .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/dosbox_core_libretro.so %ROM%</command>
+    <platform>pc</platform>
+    <theme>pc</theme>
+  </system>
+  <system>
+    <name>pcengine</name>
+    <fullname>NEC PC Engine</fullname>
+    <path>%ROMPATH%/pcengine</path>
+    <extension>.pce .PCE .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mednafen_pce_fast_libretro.so %ROM%</command>
+    <platform>pcengine</platform>
+    <theme>pcengine</theme>
+  </system>
+  <system>
+    <name>pcenginecd</name>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/mednafen_pce_libretro.so %ROM%</command>
+    <platform>pcenginecd</platform>
+    <theme>pcenginecd</theme>
+  </system>
+  <system>
+    <name>pcfx</name>
+    <fullname>NEC PC-FX</fullname>
+    <path>%ROMPATH%/pcfx</path>
+    <extension>.cue CUE .ccd .CCD .toc .TOC .chd .CHD .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mednafen_pcfx_libretro.so %ROM%</command>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/pokemini_libretro.so %ROM%</command>
+    <platform>pokemini</platform>
+    <theme>pokemini</theme>
+  </system>
+  <system>
+    <name>ports</name>
+    <fullname>Ports</fullname>
+    <path>%ROMPATH%/ports</path>
+    <extension>.sh .csh</extension>
+    <command>bash %ROM%</command>
+    <platform>pc</platform>
+    <theme>ports</theme>
+  </system>
+  <system>
+    <name>ps2</name>
+    <fullname>Sony PlayStation 2</fullname>
+    <path>%ROMPATH%/ps2</path>
+    <extension>.iso .ISO .isz .ISZ .cso .CSO .bin .BIN .elf .ELF .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/play_libretro.so %ROM%</command>
+    <platform>ps2</platform>
+    <theme>ps2</theme>
+  </system>
+  <system>
+    <name>psp</name>
+    <fullname>PlayStation Portable</fullname>
+    <path>%ROMPATH%/psp</path>
+    <extension>.elf .ELF .iso .ISO .cso .CSO .prx .PRX .pbp .PBP .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/ppsspp_libretro.so %ROM%</command>
+    <platform>psp</platform>
+    <theme>psp</theme>
+  </system>
+  <system>
+    <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>
+    <fullname>Sony PlayStation 1</fullname>
+    <path>%ROMPATH%/psx</path>
+    <extension>.cue .CUE .toc .TOC .m3u .M3U .ccd .CCD .exe .EXE .pbp .PBP .chd .CHD .cbn .CBN .img .IMG .iso .ISO .mdf .MDF .z .Z .znx .ZNX .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mednafen_psx_libretro.so %ROM%</command>
+    <platform>psx</platform>
+    <theme>psx</theme>
+  </system>
+  <system>
+    <name>residualvm</name>
+    <fullname>ResidualVM game engine</fullname>
+    <path>%ROMPATH%/residualvm</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>residualvm</platform>
+    <theme>residualvm</theme>
+  </system>
+  <system>
+    <name>samcoupe</name>
+    <fullname>SAM Coupé</fullname>
+    <path>%ROMPATH%/samcoupe</path>
+    <extension>.dsk .DSK .mgt .MGT .sbt .SBT .sad .SAD .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/simcp_libretro.so %ROM%</command>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/snes9x_libretro.so %ROM%</command>
+    <platform>satellaview</platform>
+    <theme>satellaview</theme>
+  </system>
+  <system>
+    <name>saturn</name>
+    <fullname>Sega Saturn</fullname>
+    <path>%ROMPATH%/saturn</path>
+    <extension>.ccd .CCD .chd .CHD .cue .CUE .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mednafen_saturn_libretro.so %ROM%</command>
+    <platform>saturn</platform>
+    <theme>saturn</theme>
+  </system>
+  <system>
+    <name>scummvm</name>
+    <fullname>ScummVM game engine</fullname>
+    <path>%ROMPATH%/scummvm</path>
+    <extension>.scummvm .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/scummvm_libretro.so %ROM%</command>
+    <platform>scummvm</platform>
+    <theme>scummvm</theme>
+  </system>
+  <system>
+    <name>sega32x</name>
+    <fullname>Sega Mega Drive 32X</fullname>
+    <path>%ROMPATH%/sega32x</path>
+    <extension>.bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/picodrive_libretro.so %ROM%</command>
+    <platform>sega32x</platform>
+    <theme>sega32x</theme>
+  </system>
+  <system>
+    <name>sega32xjp</name>
+    <fullname>Sega Super 32X</fullname>
+    <path>%ROMPATH%/sega32xjp</path>
+    <extension>.bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/picodrive_libretro.so %ROM%</command>
+    <platform>sega32x</platform>
+    <theme>sega32xjp</theme>
+  </system>
+  <system>
+    <name>sega32xna</name>
+    <fullname>Sega Genesis 32X</fullname>
+    <path>%ROMPATH%/sega32xna</path>
+    <extension>.bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/picodrive_libretro.so %ROM%</command>
+    <platform>sega32x</platform>
+    <theme>sega32xna</theme>
+  </system>
+  <system>
+    <name>segacd</name>
+    <fullname>Sega 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>flatpak run org.libretro.RetroArch -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <platform>segacd</platform>
+    <theme>segacd</theme>
+  </system>
+  <system>
+    <name>sg-1000</name>
+    <fullname>Sega SG-1000</fullname>
+    <path>%ROMPATH%/sg-1000</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>flatpak run org.libretro.RetroArch -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <platform>sg-1000</platform>
+    <theme>sg1000</theme>
+  </system>
+  <system>
+    <name>snes</name>
+    <fullname>Nintendo SNES (Super Nintendo)</fullname>
+    <path>%ROMPATH%/snes</path>
+    <extension>.smc .SMC .sfc .SFC .swc .SWC .fig .FIG .bs .BS .bin .BIN .mgd .MGD .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/snes9x_libretro.so %ROM%</command>
+    <platform>snes</platform>
+    <theme>snes</theme>
+  </system>
+  <system>
+    <name>snesna</name>
+    <fullname>Nintendo SNES (Super Nintendo)</fullname>
+    <path>%ROMPATH%/snesna</path>
+    <extension>.smc .SMC .sfc .SFC .swc .SWC .fig .FIG .bs .BS .bin .BIN .mgd .MGD .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/snes9x_libretro.so %ROM%</command>
+    <platform>snes</platform>
+    <theme>snesna</theme>
+  </system>
+  <system>
+    <name>solarus</name>
+    <fullname>Solarus game engine</fullname>
+    <path>%ROMPATH%/solarus</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/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>
+    <path>%ROMPATH%/stratagus</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/snes9x_libretro.so %ROM%</command>
+    <platform>sufami</platform>
+    <theme>sufami</theme>
+  </system>
+  <system>
+    <name>supergrafx</name>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/mednafen_supergrafx_libretro.so %ROM%</command>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/theodore_libretro.so %ROM%</command>
+    <platform>thomson</platform>
+    <theme>thomson</theme>
+  </system>
+  <system>
+    <name>tg16</name>
+    <fullname>NEC TurboGrafx-16</fullname>
+    <path>%ROMPATH%/tg16</path>
+    <extension>.pce .PCE .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mednafen_pce_fast_libretro.so %ROM%</command>
+    <platform>pcengine</platform>
+    <theme>tg16</theme>
+  </system>
+  <system>
+    <name>tg-cd</name>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/mednafen_pce_libretro.so %ROM%</command>
+    <platform>pcenginecd</platform>
+    <theme>tg-cd</theme>
+  </system>
+  <system>
+    <name>ti99</name>
+    <fullname>Texas Instruments TI-99</fullname>
+    <path>%ROMPATH%/ti99</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>ti99</platform>
+    <theme>ti99</theme>
+  </system>
+  <system>
+    <name>trs-80</name>
+    <fullname>Tandy TRS-80</fullname>
+    <path>%ROMPATH%/trs-80</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/uzem_libretro.so %ROM%</command>
+    <platform>uzebox</platform>
+    <theme>uzebox</theme>
+  </system>
+  <system>
+    <name>vectrex</name>
+    <fullname>Vectrex</fullname>
+    <path>%ROMPATH%/vectrex</path>
+    <extension>.bin .BIN .vec .VEC .gam .GAM .vc .VC .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/vecx_libretro.so %ROM%</command>
+    <platform>vectrex</platform>
+    <theme>vectrex</theme>
+  </system>
+  <system>
+    <name>videopac</name>
+    <fullname>Philips Videopac G7000 (Magnavox Odyssey2)</fullname>
+    <path>%ROMPATH%/videopac</path>
+    <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/o2em_libretro.so %ROM%</command>
+    <platform>videopac</platform>
+    <theme>videopac</theme>
+  </system>
+  <system>
+    <name>virtualboy</name>
+    <fullname>Nintendo Virtual Boy</fullname>
+    <path>%ROMPATH%/virtualboy</path>
+    <extension>.vb .VB .vboy .VBOY .bin .BIN .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mednafen_vb_libretro.so %ROM%</command>
+    <platform>virtualboy</platform>
+    <theme>virtualboy</theme>
+  </system>
+  <system>
+    <name>wii</name>
+    <fullname>Nintendo Wii</fullname>
+    <path>%ROMPATH%/wii</path>
+    <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .tgc .TGC .wad .WAD .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/dolphin_libretro.so %ROM%</command>
+    <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>Bandai WonderSwan</fullname>
+    <path>%ROMPATH%/wonderswan</path>
+    <extension>.ws .WS .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/mednafen_wswan_libretro.so %ROM%</command>
+    <platform>wonderswan</platform>
+    <theme>wonderswan</theme>
+  </system>
+  <system>
+    <name>wonderswancolor</name>
+    <fullname>Bandai WonderSwan Color</fullname>
+    <path>%ROMPATH%/wonderswancolor</path>
+    <extension>.ws .WS .wsc .WSC .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/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>flatpak run org.libretro.RetroArch -L %COREPATH%/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>
+    <path>%ROMPATH%/zmachine</path>
+    <extension>.7z .7Z .zip .ZIP</extension>
+    <command>PLACEHOLDER %ROM%</command>
+    <platform>zmachine</platform>
+    <theme>zmachine</theme>
+  </system>
+  <system>
+    <name>zx81</name>
+    <fullname>Sinclair ZX81</fullname>
+    <path>%ROMPATH%/zx81</path>
+    <extension>.tzx .TZX .p .P .7z .7Z .zip .ZIP</extension>
+    <command>flatpak run org.libretro.RetroArch -L %COREPATH%/81_libretro.so %ROM%</command>
+    <platform>zx81</platform>
+    <theme>zx81</theme>
+  </system>
+  <system>
+    <name>zxspectrum</name>
+    <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>flatpak run org.libretro.RetroArch -L %COREPATH%/fuse_libretro.so %ROM%</command>
+    <platform>zxspectrum</platform>
+    <theme>zxspectrum</theme>
+  </system>
+</systemList>