Merging main (0.7.3b changes)

2024-11-22 05:55:38 +00:00 · 2023-11-15 08:51:14 +01:00 · 2023-11-15 08:51:14 +01:00 · ed404ebb98
parent 3601da15b1 355f357c40
commit ed404ebb98
10 changed files with 678 additions and 199 deletions
--- a/.gitignore
+++ b/.gitignore
@ -17,6 +17,7 @@ backup
 .old
 tmp
 .godot
 rd-submodules/es-de/patches-tmp
 # Python #
 ##########
--- a/README.md
+++ b/README.md
@ -2,13 +2,6 @@
    <img src="https://github.com/XargonWan/RetroDECK/blob/main/res/logo.png?raw=true" alt="RetroDECK logo" width="600"/>
 </p>
 ![Flathub](https://img.shields.io/flathub/downloads/net.retrodeck.retrodeck)
 ![Flathub](https://img.shields.io/flathub/v/net.retrodeck.retrodeck)
 ![Discord](https://img.shields.io/discord/951662718102962256?label=discord)
 ![GitHub](https://img.shields.io/github/license/XargonWan/RetroDECK)
 [![Documentation Status](https://readthedocs.org/projects/retrodeck/badge/?version=latest)](https://retrodeck.readthedocs.io/en/latest/?badge=latest)
 # RetroDECK on your device!
 <p float="center">
@ -19,35 +12,34 @@
 </p>
 <br/>
-## What is RetroDECK?
+![Flathub](https://img.shields.io/flathub/downloads/net.retrodeck.retrodeck)
-RetroDECK is a [EmulationStation Desktop Edition](https://es-de.org) powered application that builds in a variety of emulators and other software that allows you to play your favorite retro (and even not-so-retro) games in a tidy contained flatpak sandbox environment. It's inspired by embedded emulation systems like AmberELEC, EmuELEC, CoreELEC, Lakka, and Batocera.
+![Flathub](https://img.shields.io/flathub/v/net.retrodeck.retrodeck)
 ![Discord](https://img.shields.io/discord/951662718102962256?label=discord)
 ![GitHub](https://img.shields.io/github/license/XargonWan/RetroDECK)
 [![Documentation Status](https://readthedocs.org/projects/retrodeck/badge/?version=latest)](https://retrodeck.readthedocs.io/en/latest/?badge=latest)
-You can also check out our: [Flathub Page](https://flathub.org/apps/net.retrodeck.retrodeck)<br/>
+# What is RetroDECK?
 Instead of having several different software on your system for a variety of emulators and frontends you only need to have one: RetroDECK.
-## What devices/systems does RetroDECK support: 
+RetroDECK is a [EmulationStation Desktop Edition](https://es-de.org) (ES-DE) powered flatpak application that builds in a variety of emulators and other software that allows you to play your favorite retro (and even not-so-retro) games in one complete package. 
-### Steam Deck
+It's inspired by embedded emulation systems like:
-Supported from the start and RetroDECK is tailored to the Steam Deck during the beta period. The goal is that all the configurations are ready out-of-the-box and optimized towards the Steam Deck.
+- AmberELEC
 - EmuELEC
 - CoreELEC
 - Lakka
 - Batocera
-### Linux Desktop
+The RetroDECK team consists of several veterans from some of the projects mentioned above as well as a bunch of other talented individuals.
 Technically it is working, but the user experience might not be that great it could contain desktop specific bugs and other issues.
 You will also need to manually configure the input to match your desktop and might need to tweak more settings. If you want to try it make sure that your distribution has flatpak support (else you will need to install it).<br>
 We will start to have a bigger desktop focus after the beta period is over.
-### Other SteamOS or Linux handheld gaming devices with flatpak support
+RetroDECK also adds the `RetroDECK Framework` and the `RetroDECK Configurator` on top of the emulators and ES-DE frontend that allows deeper integrations between emulators and easier exposure to a variety of features that you otherwise need to set per emulator basis to create a uniformity between them. 
 We do plan to support other SteamOS based devices in the future. But during the BETA we are focusing on the Steam Deck.<br/> 
 You can get it to run on other Linux based devices it is not just as seamless as we want it to be and does not live up to our higher standards.<br/> 
 You will need to manually configure the input to match your device and might need to tweak more settings if you try it on a none Steam Deck device. There might also be some hardware specific bugs. 
 For our long term vision you can check out the following wiki page:
-## Do you have any plans for other systems? 
+[RetroDECK: Visions and Goals](https://github.com/XargonWan/RetroDECK/wiki/RetroDECK%3A-Visions-and-Goals)
 RetroDECK does not have plans to support Windows, macOS, Android, or iOS.<br>For similar functionality on Windows you could explore [Retrobat](https://www.retrobat.org/) as an alternative.
-## How do I install RetroDECK?
+### The RetroDECK community:
 Read and follow the guide here: [Installation instructions](https://github.com/XargonWan/RetroDECK/wiki/How-to:-Getting-started) on the Wiki
 ## The RetroDECK community:
 [Website](https://retrodeck.net) <br/>
 [Wiki](https://github.com/XargonWan/RetroDECK/wiki) <br/>
@ -55,24 +47,44 @@ Read and follow the guide here: [Installation instructions](https://github.com/X
 [Lemmy](https://lemmy.zip/c/retrodeck)<br/>
 [Subreddit](https://www.reddit.com/r/retrodeck)
 # How do I start using RetroDECK?
-# Short FAQ
+We have an in depth How To on how to get started over here: 
-Please read the [Wiki](https://github.com/XargonWan/RetroDECK/wiki) for even more information.
+[How to: Start using RetroDECK](https://github.com/XargonWan/RetroDECK/wiki/How-to%3A-Start-using-RetroDECK)
 ## What devices/systems does RetroDECK support: 
 RetroDECK currently supports:
 - Steam Deck
 - Linux Desktop
 For more information read up here:
 [Supported Systems](https://github.com/XargonWan/RetroDECK/wiki/RetroDECK%3A-Supported-Systems)
 ## Is RetroDECK in Beta?
 Yes, here you can read more about the beta period:
 [RetroDECK: Beta period](https://github.com/XargonWan/RetroDECK/wiki/RetroDECK%3A-Beta-period)
 ## Do I have to partition or format my disk/sdcard to install it?
 No, partitioning or formatting is not needed at all. RetroDECK (differently from AmberELEC, Batocera and others) comes as a flatpak. Just install it as any other application and launch it from your desktop and/or Steam library. 
 ## Can I contribute to the project?
 Yes! Everybody is welcome to contribute in any way possible if it is personal time or funds, just check out our [Discord](https://discord.gg/Dz3szYsP8g)!
 - Do you know how to code and want to contribute? Please join the development team! 
 - Maybe you know graphics, art or UI & UX design? Join the discussion!
 - You can just help by helping others in the support or guide people on various social media and communication platforms.
 - You can also help by just finding and testing the best configurations for the emulators and the roms.
 - Or just help us by doing bug reports on all the issues you find (please check old issues first before submitting a new one).
 - By joining the ✨-new-helpers-start-here channel on [Discord](https://discord.gg/Mv3GZnwrE8) and keeping an eye on the [issues](https://github.com/XargonWan/RetroDECK/issues) tab as well as the [Roadmap](https://github.com/XargonWan/RetroDECK/milestones) tab, you can be up to speed on the latest developments on RetroDECK.
 - We have a [Patreon](https://www.patreon.com/RetroDECK) page if you want to help us keep our build servers running or just buy us a beverage
-###### The Steam Deck logo is a registered trademark of Valve Corporation. This project is in no way officially affiliated with Valve.<br/>
+Yes, off course! <br>
 Read up here on how to help out, there is something for everyone:
-###### All trademarks, logos and brand names are the property of their respective owners. All company, product and service names used in this project are for identification purposes only. Use of these names, trademarks and brands does not imply endorsement.
+[How to: Contribute to RetroDECK](https://github.com/XargonWan/RetroDECK/wiki/How-to%3A-Contribute-to-RetroDECK)
 # The RetroDECK Wiki
 Please check out the [Wiki](https://github.com/XargonWan/RetroDECK/wiki) for even more information.
 ## The FAQ
 The RetroDECK [FAQ](https://github.com/XargonWan/RetroDECK/wiki/FAQs%3A-Frequently-asked-questions) on the wiki has a vast variety of questions and awnsers. 
 # How to get support? 
 Use the supports channels on [Discord](https://discord.gg/Dz3szYsP8g). 
--- a/es-configs/es_find_rules.xml
+++ b/es-configs/es_find_rules.xml
@ -12,7 +12,6 @@
        <rule type="systempath">
            <entry>retroarch</entry>
            <entry>org.libretro.RetroArch</entry>
            <entry>RetroArch-Linux-x86_64.AppImage</entry>
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/RetroArch-Linux*.AppImage</entry>
@ -25,14 +24,18 @@
    </emulator>
    <core name="RETROARCH">
        <rule type="corepath">
-	    <!-- Flatpak RetroDECK -->
+            <entry>/app/share/libretro/cores</entry> <!-- RetroDECK -->
-            <entry>/app/share/libretro/cores</entry>
+            <!-- Non-portable AppImage and compiled from source -->
-            <!-- Snap package -->
+            <entry>~/.config/retroarch/cores</entry>
-            <entry>~/snap/retroarch/current/.config/retroarch/cores</entry>
+            <!-- Portable AppImage -->
            <entry>~/Applications/RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores</entry>
            <entry>~/.local/share/applications/RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores</entry>
            <entry>~/.local/bin/RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores</entry>
            <entry>~/bin/RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores</entry>
            <!-- Flatpak package -->
            <entry>~/.var/app/org.libretro.RetroArch/config/retroarch/cores</entry>
-            <!-- AppImage and compiled from source -->
+            <!-- Snap package -->
-            <entry>~/.config/retroarch/cores</entry>
+            <entry>~/snap/retroarch/current/.config/retroarch/cores</entry>
            <!-- Ubuntu and Linux Mint repository -->
            <entry>/usr/lib/x86_64-linux-gnu/libretro</entry>
            <!-- Fedora repository -->
@ -45,6 +48,27 @@
            <entry>/usr/pkg/lib/libretro</entry>
        </rule>
    </core>
    <emulator name="3DSEN-WINDOWS">
        <!-- Nintendo NES and Famicom emulator 3dSen -->
        <rule type="staticpath">
            <entry>~/Applications/3dSen/3dSen.exe</entry>
            <entry>~/.local/share/applications/3dSen/3dSen.exe</entry>
            <entry>~/.local/bin/3dSen/3dSen.exe</entry>
            <entry>~/bin/3dSen/3dSen.exe</entry>
        </rule>
    </emulator>
    <emulator name="ADVANCEMAME">
        <!-- Arcade emulator AdvanceMAME -->
        <rule type="systempath">
            <entry>advmame</entry>
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/advancemame/advmame</entry>
            <entry>~/.local/share/applications/advancemame/advmame</entry>
            <entry>~/.local/bin/advancemame/advmame</entry>
            <entry>~/bin/advancemame/advmame</entry>
        </rule>
    </emulator>
    <emulator name="ARES">
        <!-- Multi-system emulator ares -->
        <rule type="systempath">
@ -78,6 +102,15 @@
            <entry>~/.local/share/flatpak/exports/bin/net.cebix.basilisk</entry>
        </rule>
    </emulator>
    <emulator name="BIGPEMU-WINDOWS">
        <!-- Atari Jaguar emulator BigPEmu -->
        <rule type="staticpath">
            <entry>~/Applications/BigPEmu/BigPEmu.exe</entry>
            <entry>~/.local/share/applications/BigPEmu/BigPEmu.exe</entry>
            <entry>~/.local/bin/BigPEmu/BigPEmu.exe</entry>
            <entry>~/bin/BigPEmu/BigPEmu.exe</entry>
        </rule>
    </emulator>
    <emulator name="BLASTEM">
        <!-- Sega Mega Drive/Genesis emulator BlastEm -->
        <rule type="systempath">
@ -93,6 +126,7 @@
        <!-- Super Nintendo/Super Famicom emulator bsnes -->
        <rule type="systempath">
            <entry>bsnes</entry>
            <entry>dev.bsnes.bsnes</entry>
        </rule>
        <rule type="staticpath">
            <entry>/var/lib/flatpak/exports/bin/dev.bsnes.bsnes</entry>
@ -102,7 +136,7 @@
    <emulator name="CEMU">
        <!-- Nintendo Wii U emulator Cemu -->
        <rule type="systempath">
-            <entry>Cemu-wrapper</entry>
+            <entry>Cemu-wrapper</entry> <!-- RetroDECK -->
            <entry>cemu</entry>
            <entry>Cemu</entry>
        </rule>
@ -115,21 +149,25 @@
            <entry>~/.local/share/applications/Cemu/Cemu</entry>
            <entry>~/.local/bin/Cemu/Cemu</entry>
            <entry>~/bin/Cemu/Cemu</entry>
            <entry>/var/lib/flatpak/exports/bin/info.cemu.Cemu</entry>
            <entry>~/.local/share/flatpak/exports/bin/info.cemu.Cemu</entry>
        </rule>
    </emulator>
    <emulator name="CITRA">
        <!-- Nintendo 3DS emulator Citra -->
        <rule type="systempath">
-            <entry>citra-qt</entry>
+            <entry>citra-qt</entry> <!-- RetroDECK -->
-	    <entry>citra</entry>
+            <entry>citra</entry>
            <entry>citra-emu.citra-nightly</entry>
            <entry>org.citra_emu.citra</entry>
        </rule>
        <rule type="staticpath">
-            <entry>~/Applications/citra*.AppImage</entry>
+            <entry>~/Applications/citra-qt*.AppImage</entry>
-            <entry>~/.local/share/applications/citra*.AppImage</entry>
+            <entry>~/.local/share/applications/citra-qt*.AppImage</entry>
-            <entry>~/.local/bin/citra*.AppImage</entry>
+            <entry>~/.local/bin/citra-qt*.AppImage</entry>
-            <entry>~/bin/citra*.AppImage</entry>
+            <entry>~/bin/citra-qt*.AppImage</entry>
            <entry>~/.citra/canary/citra-qt.AppImage</entry>
            <entry>~/.citra/nightly/citra-qt.AppImage</entry>
            <entry>/var/lib/flatpak/exports/bin/org.citra_emu.citra</entry>
            <entry>~/.local/share/flatpak/exports/bin/org.citra_emu.citra</entry>
        </rule>
@ -170,6 +208,7 @@
        <!-- Nintendo GameCube and Wii emulator Dolphin -->
        <rule type="systempath">
            <entry>dolphin-emu</entry>
            <entry>dolphin-emulator.dolphin-emu</entry>
            <entry>org.DolphinEmu.dolphin-emu</entry>
        </rule>
        <rule type="staticpath">
@ -211,6 +250,10 @@
            <entry>org.duckstation.DuckStation</entry>
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/DuckStation*.AppImage</entry>
            <entry>~/.local/share/applications/DuckStation*.AppImage</entry>
            <entry>~/.local/bin/DuckStation*.AppImage</entry>
            <entry>~/bin/DuckStation*.AppImage</entry>
            <entry>~/Applications/duckstation-nogui*.AppImage</entry>
            <entry>~/.local/share/applications/duckstation-nogui*.AppImage</entry>
            <entry>~/.local/bin/duckstation-nogui*.AppImage</entry>
@ -235,6 +278,27 @@
            <entry>~/bin/easyrpg/easyrpg-player</entry>
        </rule>
    </emulator>
    <emulator name="EKA2L1">
        <!-- Symbian and Nokia N-Gage emulator EKA2L1 -->
        <rule type="systempath">
            <entry>eka2l1_qt</entry>
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/EKA2L1*.AppImage</entry>
            <entry>~/.local/share/applications/EKA2L1*.AppImage</entry>
            <entry>~/.local/bin/EKA2L1*.AppImage</entry>
            <entry>~/bin/EKA2L1*.AppImage</entry>
        </rule>
    </emulator>
    <emulator name="EKA2L1-WINDOWS">
        <!-- Symbian and Nokia N-Gage emulator EKA2L1 -->
        <rule type="staticpath">
            <entry>~/Applications/EKA2L1/eka2l1_qt.exe</entry>
            <entry>~/.local/share/applications/EKA2L1/eka2l1_qt.exe</entry>
            <entry>~/.local/bin/EKA2L1/eka2l1_qt.exe</entry>
            <entry>~/bin/EKA2L1/eka2l1_qt.exe</entry>
        </rule>
    </emulator>
    <emulator name="FINALBURN-NEO">
        <!-- Arcade emulator FinalBurn Neo -->
        <rule type="systempath">
@ -289,6 +353,7 @@
        <!-- Interactive fiction player Gargoyle -->
        <rule type="systempath">
            <entry>gargoyle</entry>
            <entry>io.github.garglk.Gargoyle</entry>
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/Gargoyle*.AppImage</entry>
@ -324,6 +389,7 @@
        <!-- Atari ST/STE/TT/Falcon emulator Hatari -->
        <rule type="systempath">
            <entry>hatari</entry>
            <entry>org.tuxfamily.hatari</entry>
        </rule>
        <rule type="staticpath">
            <entry>/var/lib/flatpak/exports/bin/org.tuxfamily.hatari</entry>
@ -366,6 +432,15 @@
            <entry>~/bin/linapple/linapple</entry>
        </rule>
    </emulator>
    <emulator name="M2EMULATOR-WINDOWS">
        <!-- Sega Model 2 Emulator -->
        <rule type="staticpath">
            <entry>~/Applications/m2emulator/EMULATOR.EXE</entry>
            <entry>~/.local/share/applications/m2emulator/EMULATOR.EXE</entry>
            <entry>~/.local/bin/m2emulator/EMULATOR.EXE</entry>
            <entry>~/bin/m2emulator/EMULATOR.EXE</entry>
        </rule>
    </emulator>
    <emulator name="MAME">
        <!-- Arcade emulator MAME -->
        <rule type="systempath">
@ -399,6 +474,18 @@
            <entry>~/.local/share/flatpak/exports/bin/net.kuribo64.melonDS</entry>
        </rule>
    </emulator>
    <emulator name="MESEN">
        <!-- Multi-system emulator Mesen -->
        <rule type="systempath">
            <entry>mesen2</entry>
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/Mesen*.AppImage</entry>
            <entry>~/.local/share/applications/Mesen*.AppImage</entry>
            <entry>~/.local/bin/Mesen*.AppImage</entry>
            <entry>~/bin/Mesen*.AppImage</entry>
        </rule>
    </emulator>
    <emulator name="MGBA">
        <!-- Nintendo Game Boy Advance emulator mGBA -->
        <rule type="systempath">
@ -430,6 +517,7 @@
        <!-- Nintendo NES and Famicom emulator Nestopia UE -->
        <rule type="systempath">
            <entry>nestopia</entry>
            <entry>ca._0ldsk00l.Nestopia</entry>
        </rule>
        <rule type="staticpath">
            <entry>/var/lib/flatpak/exports/bin/ca._0ldsk00l.Nestopia</entry>
@ -440,6 +528,7 @@
        <!-- MSX home computer emulator openMSX -->
        <rule type="systempath">
            <entry>openmsx</entry>
            <entry>org.openmsx.openMSX</entry>
        </rule>
        <rule type="staticpath">
            <entry>/var/lib/flatpak/exports/bin/org.openmsx.openMSX</entry>
@ -462,11 +551,15 @@
        <!-- Sony PlayStation 2 emulator PCSX2 -->
        <rule type="systempath">
            <entry>pcsx2-qt</entry>
            <entry>net.pcsx2.PCSX2</entry>
        </rule>
        <rule type="staticpath">
-            <entry>~/Applications/pcsx2*-Qt.AppImage</entry>
+            <entry>~/Applications/pcsx2*.AppImage</entry>
-            <entry>~/.local/bin/pcsx2*-Qt.AppImage</entry>
+            <entry>~/.local/share/applications/pcsx2*.AppImage</entry>
-            <entry>~/bin/pcsx2*-Qt.AppImage</entry>
+            <entry>~/.local/bin/pcsx2*.AppImage</entry>
            <entry>~/bin/pcsx2*.AppImage</entry>
            <entry>/var/lib/flatpak/exports/bin/net.pcsx2.PCSX2</entry>
            <entry>~/.local/share/flatpak/exports/bin/net.pcsx2.PCSX2</entry>
        </rule>
    </emulator>
    <emulator name="PCSX2-LEGACY">
@ -495,6 +588,9 @@
    </emulator>
    <emulator name="PLAY!">
        <!-- Sony PlayStation 2 emulator Play! -->
        <rule type="systempath">
            <entry>org.purei.Play</entry>
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/Play!*.AppImage</entry>
            <entry>~/.local/share/applications/Play!*.AppImage</entry>
@ -508,9 +604,9 @@
        <!-- Sony PlayStation Portable emulator PPSSPP -->
        <rule type="systempath">
            <entry>ppsspp-emu.ppsspp-sdl</entry>
            <entry>org.ppsspp.PPSSPP</entry>
            <entry>PPSSPPSDL</entry>
            <entry>PPSSPPQt</entry>
            <entry>org.ppsspp.PPSSPP</entry>
        </rule>
        <rule type="staticpath">
            <entry>/var/lib/flatpak/exports/bin/org.ppsspp.PPSSPP</entry>
@ -534,6 +630,15 @@
            <entry>~/.local/share/flatpak/exports/bin/io.github.shiiion.primehack</entry>
        </rule>
    </emulator>
    <emulator name="PROTON">
        <!-- Microsoft Windows compatibility layer Proton -->
        <rule type="staticpath">
            <entry>~/Applications/Proton/wine*.AppImage</entry>
            <entry>~/.local/share/applications/Proton/wine*.AppImage</entry>
            <entry>~/.local/bin/Proton/wine*.AppImage</entry>
            <entry>~/bin/Proton/wine*.AppImage</entry>
        </rule>
    </emulator>
    <emulator name="PUNES">
        <!-- Nintendo NES and Famicom emulator puNES -->
        <rule type="systempath">
@ -546,6 +651,18 @@
            <entry>~/bin/punes/punes</entry>
        </rule>
    </emulator>
    <emulator name="QUASI88">
        <!-- NEC PC-8800 series emulator QUASI88 -->
        <rule type="systempath">
            <entry>quasi88</entry>
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/quasi88/quasi88</entry>
            <entry>~/.local/share/applications/quasi88/quasi88</entry>
            <entry>~/.local/bin/quasi88/quasi88</entry>
            <entry>~/bin/quasi88/quasi88</entry>
        </rule>
    </emulator>
    <emulator name="REDREAM">
        <!-- Sega Dreamcast emulator Redream -->
        <rule type="systempath">
@ -685,13 +802,30 @@
            <entry>~/.local/share/flatpak/exports/bin/io.github.simple64.simple64</entry>
        </rule>
    </emulator>
    <emulator name="SKYEMU">
        <!-- Nintendo Game Boy, Game Boy Color, Game Boy Advance and DS emulator SkyEmu -->
        <rule type="systempath">
            <entry>SkyEmu</entry>
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/SkyEmu/SkyEmu</entry>
            <entry>~/.local/share/applications/SkyEmu/SkyEmu</entry>
            <entry>~/.local/bin/SkyEmu/SkyEmu</entry>
            <entry>~/bin/SkyEmu/SkyEmu</entry>
        </rule>
    </emulator>
    <emulator name="SNES9X">
        <!-- Super Nintendo emulator Snes9x -->
        <rule type="systempath">
            <entry>snes9x</entry>
            <entry>snes9x-gtk</entry>
            <entry>com.snes9x.Snes9x</entry>
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/Snes9x*.AppImage</entry>
            <entry>~/.local/share/applications/Snes9x*.AppImage</entry>
            <entry>~/.local/bin/Snes9x*.AppImage</entry>
            <entry>~/bin/Snes9x*.AppImage</entry>
            <entry>/var/lib/flatpak/exports/bin/com.snes9x.Snes9x</entry>
            <entry>~/.local/share/flatpak/exports/bin/com.snes9x.Snes9x</entry>
        </rule>
@ -775,8 +909,19 @@
            <entry>~/.local/share/flatpak/exports/bin/net.sf.VICE</entry>
        </rule>
    </emulator>
    <emulator name="VICE-XPLUS4">
        <!-- Commodore 8-bit computer emulator VICE (xplus4) -->
        <rule type="systempath">
            <entry>xplus4</entry>
            <entry>vice-jz.xplus4</entry>
        </rule>
        <rule type="staticpath">
            <entry>/var/lib/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xplus4 net.sf.VICE</entry>
            <entry>~/.local/share/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xplus4 net.sf.VICE</entry>
        </rule>
    </emulator>
    <emulator name="VICE-XVIC">
-        <!-- Commodore 8-bit computer emulator VICE (xvic VIC-20) -->
+        <!-- Commodore 8-bit computer emulator VICE (xvic) -->
        <rule type="systempath">
            <entry>xvic</entry>
            <entry>vice-jz.xvic</entry>
@ -786,6 +931,18 @@
            <entry>~/.local/share/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xvic net.sf.VICE</entry>
        </rule>
    </emulator>
    <emulator name="VISUAL-PINBALL">
        <!-- Pinball simulator Visual Pinball -->
        <rule type="systempath">
            <entry>VPinballX_GL</entry>
        </rule>
        <rule type="staticpath">
            <entry>~/Applications/VPinballX/VPinballX_GL</entry>
            <entry>~/.local/share/applications/VPinballX/VPinballX_GL</entry>
            <entry>~/.local/bin/VPinballX/VPinballX_GL</entry>
            <entry>~/bin/VPinballX/VPinballX_GL</entry>
        </rule>
    </emulator>
    <emulator name="VITA3K">
        <!-- Sony PlayStation Vita emulator Vita3K -->
        <rule type="systempath">
@ -814,6 +971,28 @@
            <entry>~/.local/share/flatpak/exports/bin/app.xemu.xemu</entry>
        </rule>
    </emulator>
    <emulator name="WINE">
        <!-- Microsoft Windows compatibility layer Wine -->
        <rule type="staticpath">
            <entry>~/Applications/Wine/wine*.AppImage</entry>
            <entry>~/.local/share/applications/Wine/wine*.AppImage</entry>
            <entry>~/.local/bin/Wine/wine*.AppImage</entry>
            <entry>~/bin/Wine/wine*.AppImage</entry>
        </rule>
    </emulator>
    <emulator name="XENIA-WINDOWS">
        <!-- Microsoft Xbox 360 emulator xenia -->
        <rule type="staticpath">
            <entry>~/Applications/xenia/xenia.exe</entry>
            <entry>~/.local/share/applications/xenia/xenia.exe</entry>
            <entry>~/.local/bin/xenia/xenia.exe</entry>
            <entry>~/bin/xenia/xenia.exe</entry>
            <entry>~/Applications/xenia/xenia_canary.exe</entry>
            <entry>~/.local/share/applications/xenia/xenia_canary.exe</entry>
            <entry>~/.local/bin/xenia/xenia_canary.exe</entry>
            <entry>~/bin/xenia/xenia_canary.exe</entry>
        </rule>
    </emulator>
    <emulator name="XROAR">
        <!-- Dragon and Tandy 8-bit computer emulator XRoar -->
        <rule type="systempath">
--- a/es-configs/es_systems.xml
+++ b/es-configs/es_systems.xml
@ -5,18 +5,32 @@
        <name>3do</name>
        <fullname>3DO Interactive Multiplayer</fullname>
        <path>%ROMPATH%/3do</path>
-        <extension>.bin .BIN .chd .CHD .cue .CUE .iso .ISO</extension>
+        <extension>.bin .BIN .chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
        <command label="Opera">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/opera_libretro.so %ROM%</command>
        <platform>3do</platform>
        <theme>3do</theme>
    </system>
 <!--
    <system>
        <name>adam</name>
        <fullname>Coleco Adam</fullname>
        <path>%ROMPATH%/adam</path>
        <extension>.1dd .1DD .bin .BIN .col .COL .cqi .CQI .cqm .CQM .d77 .D77 .d88 .D88 .ddp .DDP .dfi .DFI .dsk .DSK .hfe .HFE .imd .IMD .mfi .MFI .mfm .MFM .rom .ROM .td0 .TD0 .wav .WAV .7z .7Z .zip .ZIP</extension>
        <command label="MAME [Diskette] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/adam adam -flop1 %ROM%</command>
        <command label="MAME [Tape] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/adam adam -cass1 %ROM%</command>
        <command label="MAME [Cartridge] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/adam adam -cart1 %ROM%</command>
        <command label="MAME [Software list] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/adam adam %BASENAME%</command>
        <platform>adam</platform>
        <theme>adam</theme>
    </system>
 -->
 <!--
    <system>
        <name>ags</name>
        <fullname>Adventure Game Studio Game Engine</fullname>
        <path>%ROMPATH%/ags</path>
-        <extension>.desktop</extension>
+        <extension>.desktop .sh</extension>
-        <command label="Native binary">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Native binary">%STARTDIR%=%GAMEDIR% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
        <platform>ags</platform>
        <theme>ags</theme>
    </system>
@ -69,6 +83,7 @@
        <command label="Caprice32">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/cap32_libretro.so %ROM%</command>
        <command label="CrocoDS">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/crocods_libretro.so %ROM%</command>
        <command label="CPCemu (Standalone)">%STARTDIR%=~/.CPCemu %EMULATOR_CPCEMU% %ROM%</command>
        <!--<command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/amstradcpc cpc6128 -flop1 %ROM%</command>-->
        <platform>amstradcpc</platform>
        <theme>amstradcpc</theme>
    </system>
@ -98,11 +113,13 @@
        <name>apple2gs</name>
        <fullname>Apple IIGS</fullname>
        <path>%ROMPATH%/apple2gs</path>
-        <extension>.2mg .2MG</extension>
+        <extension>.2mg .2MG .7z .7z .zip .ZIP</extension>
        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "apple2gs -rompath %GAMEDIR%\;%ROMPATH%/apple2gs -flop3 \"%ROMRAW%\""</command>
        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/apple2gs apple2gs -flop3 %ROM%</command>
        <platform>apple2gs</platform>
        <theme>apple2gs</theme>
    </system>
    <system>
        <name>arcade</name>
        <fullname>Arcade</fullname>
@ -131,11 +148,25 @@
        <fullname>Emerson Arcadia 2001</fullname>
        <path>%ROMPATH%/arcadia</path>
        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "arcadia -rompath %GAMEDIR%\;%ROMPATH%/arcadia -cart \"%ROMRAW%\""</command>
        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/arcadia arcadia -cart %ROM%</command>
        <platform>arcadia</platform>
        <theme>arcadia</theme>
    </system>
-
+<!--
    <system>
        <name>archimedes</name>
        <fullname>Acorn Archimedes</fullname>
        <path>%ROMPATH%/archimedes</path>
        <extension>.1dd .1DD .360 .adf .ADF .adl .ADL .adm .ADM .ads .ADS .apd .APD .bbc .BBC .chd .CHD .cqi .CQI .cqm .CQM .d77 .D77 .d88 .D88 .dfi .DFI .dsd .DSD .dsk .DSK .hfe .HFE .ima .IMA .imd .IMD .img .IMG .ipf .IPF .jfd .JFD .mfi .MFI .mfm .MFM .msa .MSA .ssd .SSD .st .ST .td0 .TD0 .ufi .UFI .7z .7Z .zip .ZIP</extension>
        <command label="MAME [Model A440/1] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/archimedes aa4401 -flop1 %ROM%</command>
        <command label="MAME [Model A3000] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/archimedes aa3000 -flop1 %ROM%</command>
        <command label="MAME [Model A310] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/archimedes aa310 -flop1 %ROM%</command>
        <command label="MAME [Model A540] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/archimedes aa540 -flop1 %ROM%</command>
        <platform>archimedes</platform>
        <theme>archimedes</theme>
    </system>
 -->
    <system>
        <name>arduboy</name>
        <fullname>Arduboy Miniature Game System</fullname>
@ -175,7 +206,7 @@
        <extension>.a52 .A52 .atr .ATR .atx .ATX .bin .BIN .car .CAR .cas .CAS .cdm .CDM .rom .ROM .xex .XEX .xfd .XFD .7z .7Z .zip .ZIP</extension>
        <command label="a5200">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/a5200_libretro.so %ROM%</command>
        <command label="Atari800">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%</command>
-<!--        <command label="Atari800 (Standalone)">%EMULATOR_ATARI800% %ROM%</command> -->
+	<!--<command label="Atari800 (Standalone)">%EMULATOR_ATARI800% %ROM%</command> -->
        <platform>atari5200</platform>
        <theme>atari5200</theme>
    </system>
@ -185,6 +216,7 @@
        <path>%ROMPATH%/atari7800</path>
        <extension>.a78 .A78 .bin .BIN .7z .7Z .zip .ZIP</extension>
        <command label="ProSystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.so %ROM%</command>
        <!--<command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/atari7800 a7800 -cart %ROM%</command>-->
        <platform>atari7800</platform>
        <theme>atari7800</theme>
    </system>
@ -204,16 +236,20 @@
        <path>%ROMPATH%/atarijaguar</path>
        <extension>.abs .ABS .bin .BIN .cdi .CDI .cof .COF .cue .CUE .j64 .J64 .jag .JAG .prg .PRG .rom .ROM .7z .7Z .zip .ZIP</extension>
        <command label="Virtual Jaguar">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.so %ROM%</command>
-        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/atarijaguar jaguar -cart %ROM%</command>
+        <!--<command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/atarijaguar jaguar -cart %ROM%</command>-->
-        <platform>atarijaguar, atarijaguarcd</platform>
+        <!--<command label="BigPEmu (Wine)">%STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_BIGPEMU-WINDOWS% %ROM%</command>-->
        <!--<command label="BigPEmu (Proton)">%STARTDIR%=%EMUDIR% %PRECOMMAND_PROTON% %EMULATOR_BIGPEMU-WINDOWS% %ROM%</command>-->
        <platform>atarijaguar</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>
+        <extension>.abs .ABS .bin .BIN .cdi .CDI .cof .COF .cue .CUE .j64 .J64 .jag .JAG .prg .PRG .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.so %ROM%</command>
+        <!--<command label="BigPEmu (Wine)">%STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_BIGPEMU-WINDOWS% %ROM%</command>-->
        <!--<command label="BigPEmu (Proton)">%STARTDIR%=%EMUDIR% %PRECOMMAND_PROTON% %EMULATOR_BIGPEMU-WINDOWS% %ROM%</command>-->
        <platform>atarijaguarcd</platform>
        <theme>atarijaguarcd</theme>
    </system>
@ -224,7 +260,7 @@
        <extension>.lnx .LNX .o .O .7z .7Z .zip .ZIP</extension>
        <command label="Handy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/handy_libretro.so %ROM%</command>
        <command label="Beetle Lynx">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_lynx_libretro.so %ROM%</command>
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module lynx %ROM%</command> -->
+	<!-- <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module lynx %ROM%</command> -->
        <platform>atarilynx</platform>
        <theme>atarilynx</theme>
    </system>
@ -299,6 +335,7 @@
        <extension>.chd .CHD .cue .CUE .iso .ISO</extension>
        <command label="SAME CDi">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/same_cdi_libretro.so %ROM%</command>
        <command label="CDi 2015">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/cdi2015_libretro.so %ROM%</command>
        <!--<command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/cdimono1 cdimono1 -cdrom %ROM%</command>-->
        <platform>cdimono1</platform>
        <theme>cdimono1</theme>
    </system>
@ -354,6 +391,25 @@
        <platform>colecovision</platform>
        <theme>colecovision</theme>
    </system>
    <system>
        <name>consolearcade</name>
        <fullname>Console Arcade Systems</fullname>
        <path>%ROMPATH%/consolearcade</path>
        <extension>.arcadedef .desktop .iso .ISO .sh .xbe .XBE .7z .7Z .zip .ZIP</extension>
        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>
        <!--<command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/consolearcade %BASENAME%</command>-->
        <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
        <!--<command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command>-->
        <command label="Kronos">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM%</command>
        <!--<command label="Mednafen [Sega Saturn] (Standalone)">%EMULATOR_MEDNAFEN% -force_module ss %ROM%</command>-->
        <!--<command label="Play! (Standalone)">%EMULATOR_PLAY!% &ndash;&ndash;disc %ROM%</command>-->
        <command label="RPCS3 Shortcut (Standalone)">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
        <!--<command label="Triforce (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_TRIFORCE% -b -e %ROM%</command>-->
        <command label="xemu (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_XEMU% -dvd_path %ROM%</command>
        <command label="Shortcut or script">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
        <platform>arcade</platform>
        <theme>consolearcade</theme>
    </system>
    <system>
        <name>cps</name>
        <fullname>Capcom Play System</fullname>
@ -430,6 +486,7 @@
        <fullname>VTech CreatiVision</fullname>
        <path>%ROMPATH%/crvision</path>
        <extension>.bin .BIN .rom .ROM .7z .7Z .zip .ZIP</extension>
        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "crvision -rompath %GAMEDIR%\;%ROMPATH%/crvision -cart \"%ROMRAW%\""</command>
        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/crvision crvision -cart %ROM%</command>
        <platform>crvision</platform>
        <theme>crvision</theme>
@ -440,10 +497,12 @@
        <name>daphne</name>
        <fullname>Daphne Arcade LaserDisc Emulator</fullname>
        <path>%ROMPATH%/daphne</path>
-        <extension>.daphne .singe</extension>
+        <extension>.daphne .singe .7z .7Z .zip .ZIP</extension>
        <command label="Hypseus [Daphne] (Standalone)">%EMULATOR_HYPSEUS-SINGE% %BASENAME% vldp -framefile %GAMEDIR%/%BASENAME%.txt %INJECT%=%BASENAME%.commands</command>
        <command label="Hypseus [Singe] (Standalone)">%EMULATOR_HYPSEUS-SINGE% singe vldp -framefile %GAMEDIR%/%BASENAME%.txt -script %GAMEDIR%/%BASENAME%.singe %INJECT%=%BASENAME%.commands</command>
-        <platform>daphne</platform>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>
        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/daphne %BASENAME%</command>
        <platform>daphne, arcade</platform>
        <theme>daphne</theme>
    </system>
 -->
@ -506,6 +565,20 @@
        <platform>easyrpg</platform>
        <theme>easyrpg</theme>
    </system>
 <!--
    <system>
        <name>electron</name>
        <fullname>Acorn Electron</fullname>
        <path>%ROMPATH%/electron</path>
        <extension>.1dd .1DD .adf .ADF .adl .ADL .adm .ADM .ads .ADS .bbc .BBC .bin .BIN .cqi .CQI .cqm .CQM .csw .CSW .d77 .D77 .d88 .D88 .dfi .DFI .dsd .DSD .dsk .DSK .hfe .HFE .imd .IMD .img .IMG .mfi .MFI .mfm .MFM .rom .ROM .ssd .SSD .td0 .TD0 .uef .UEF .wav .WAV .7z .7Z .zip .ZIP</extension>
        <command label="MAME [Tape] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/electron electron64 -autoboot_delay "2" -autoboot_command "*T.\nCH.\"\"\n" -cass1 %ROM%</command>
        <command label="MAME [Diskette DFS] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/electron electron64 -exp plus1 -cart1 seds -autoboot_delay "2" -autoboot_command "*CAT\n\n\n\n\n\n*EXEC !BOOT\n" -flop1 %ROM%</command>
        <command label="MAME [Diskette ADFS] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/electron electron64 -exp plus3 -exp:plus3:fdc:1 35dd -autoboot_delay "2" -autoboot_command "*CAT\n\n\n\n\n\n*RUN !BOOT\n" -flop1 %ROM%</command>
        <platform>electron</platform>
        <theme>electron</theme>
    </system>
 -->
 <!--
    <system>
        <name>emulators</name>
        <fullname>Emulators</fullname>
@ -518,12 +591,14 @@
        <platform>pcwindows</platform>
        <theme>emulators</theme>
    </system>
 -->
    <system>
        <name>famicom</name>
        <fullname>Nintendo Family Computer</fullname>
        <path>%ROMPATH%/famicom</path>
-        <extension>.fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
+        <extension>.3dsen .3DSEN .fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
        <command label="Mesen">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%</command>
        <!--<command label="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command>-->
        <command label="Nestopia UE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
        <!-- <command label="Nestopia UE (Standalone)">%EMULATOR_NESTOPIA-UE% &ndash;&ndash;fullscreen %ROM%</command> -->
        <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
@ -564,6 +639,7 @@
        <path>%ROMPATH%/fds</path>
        <extension>.nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP</extension>
        <command label="Mesen">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%</command>
        <!--<command label="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command>-->
        <command label="Nestopia UE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
        <!-- <command label="Nestopia UE (Standalone)">%EMULATOR_NESTOPIA-UE% &ndash;&ndash;fullscreen %ROM%</command> -->
        <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
@ -584,13 +660,30 @@
        <theme>flash</theme>
    </system>
 -->
 <!--
    <system>
        <name>fm7</name>
        <fullname>Fujitsu FM-7</fullname>
        <path>%ROMPATH%/fm7</path>
        <extension>.1dd .1DD .cqi .CQI .cqm .CQM .d77 .D77 .d88 .D88 .dfi .DFI .dsk .DSK .hfe .HFE .imd .IMD .mfi .MFI .mfm .MFM .t77 .T77 .td0 .TD0 .wav .WAV .7z .7Z .zip .ZIP</extension>
        <command label="MAME [FM-7 Diskette] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm7 -flop1 %ROM%</command>
        <command label="MAME [FM-7 Tape] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm7 -autoboot_delay "5" -autoboot_command "load\n\n\nrun\n" -cass1 %ROM%</command>
        <command label="MAME [FM-7 Software list] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm7 %BASENAME%</command>
        <command label="MAME [FM77AV Diskette] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm77av -flop1 %ROM%</command>
        <command label="MAME [FM77AV Tape] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm77av -autoboot_delay "5" -autoboot_command "load\n\n\nrun\n" -cass1 %ROM%</command>
        <command label="MAME [FM77AV Software list] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fm7 fm77av %BASENAME%</command>
        <platform>fm7</platform>
        <theme>fm7</theme>
    </system>
 -->
 <!--
    <system>
        <name>fmtowns</name>
        <fullname>Fujitsu FM Towns</fullname>
        <path>%ROMPATH%/fmtowns</path>
-        <extension>.cue .CUE .iso .ISO</extension>
+        <extension>.cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
        <command label="Tsugaru (Standalone)">%EMULATOR_TSUGARU% %EMUDIR%/roms -HOSTSHORTCUT ESC 0 0 FORCEQUIT -FULLSCREEN -CD %ROM% %INJECT%=%BASENAME%.cfg</command>
        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fmtowns fmtowns %BASENAME%</command>
        <platform>fmtowns</platform>
        <theme>fmtowns</theme>
    </system>
@ -605,6 +698,18 @@
        <platform>fpinball</platform>
        <theme>fpinball</theme>
    </system>
 -->
 <!--
    <system>
        <name>gamate</name>
        <fullname>Bit Corporation Gamate</fullname>
        <path>%ROMPATH%/gamate</path>
        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gamate -rompath %GAMEDIR%\;%ROMPATH%/gamate -cart \"%ROMRAW%\""</command>
        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gamate gamate -cart %ROM%</command>
        <platform>gamate</platform>
        <theme>gamate</theme>
    </system>
 -->
    <system>
        <name>gameandwatch</name>
@ -623,6 +728,7 @@
        <fullname>Tiger Electronics Game.com</fullname>
        <path>%ROMPATH%/gamecom</path>
        <extension>.tgc .TGC .7z .7Z .zip .ZIP</extension>
        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gamecom -rompath %GAMEDIR%\;%ROMPATH%/gamecom -cartridge1 \"%ROMRAW%\""</command>
        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gamecom gamecom -cartridge1 %ROM%</command>
        <platform>gamecom</platform>
        <theme>gamecom</theme>
@ -637,8 +743,9 @@
        <command label="Genesis Plus GX Wide">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM%</command>
        <command label="Gearsystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM%</command>
        <command label="SMS Plus GX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM%</command>
-<!--	<command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command> -->
+	<!--<command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command> -->
-<!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module gg %ROM%</command> -->
+	<!--<command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module gg %ROM%</command> -->
 	<!--<command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Game Gear" %ROM%</command>-->
        <platform>gamegear</platform>
        <theme>gamegear</theme>
    </system>
@ -654,6 +761,7 @@
        <!-- <command label="Gearboy (Standalone)">%EMULATOR_GEARBOY% %ROM%</command> -->
        <command label="TGB Dual">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM%</command>
        <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
        <!--<command label="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command>-->
        <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
        <command label="mGBA">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM%</command>
        <!-- <command label="mGBA (Standalone)">%EMULATOR_MGBA% -f %ROM%</command> -->
@ -673,6 +781,8 @@
        <!-- <command label="VBA-M (Standalone)">%EMULATOR_VBA-M% -f %ROM%</command> -->
        <command label="VBA Next">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vba_next_libretro.so %ROM%</command>
        <command label="gpSP">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gpsp_libretro.so %ROM%</command>
        <!--<command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Game Boy Advance" %ROM%</command>-->
        <!--<command label="SkyEmu (Standalone)">%EMULATOR_SKYEMU% %ROM%</command>-->
        <platform>gba</platform>
        <theme>gba</theme>
    </system>
@ -688,6 +798,7 @@
        <!-- <command label="Gearboy (Standalone)">%EMULATOR_GEARBOY% %ROM%</command> -->
        <command label="TGB Dual">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM%</command>
        <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
        <!--<command label="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command>-->
        <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
        <command label="mGBA">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM%</command>
        <!-- <command label="mGBA (Standalone)">%EMULATOR_MGBA% -f %ROM%</command> -->
@ -729,6 +840,7 @@
        <fullname>Hartung Game Master</fullname>
        <path>%ROMPATH%/gmaster</path>
        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gmaster -rompath %GAMEDIR%\;%ROMPATH%/gmaster -cart \"%ROMRAW%\""</command>
        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gmaster gmaster -cart %ROM%</command>
        <platform>gmaster</platform>
        <theme>gmaster</theme>
@ -774,6 +886,18 @@
        <theme>kodi</theme>
    </system>
 -->
    <system>
        <name>laserdisc</name>
        <fullname>LaserDisc Games</fullname>
        <path>%ROMPATH%/laserdisc</path>
        <extension>.daphne .singe .7z .7Z .zip .ZIP</extension>
        <!--<command label="Hypseus [Daphne] (Standalone)">%EMULATOR_HYPSEUS-SINGE% %BASENAME% vldp -framefile %GAMEDIR%/%BASENAME%.txt %INJECT%=%BASENAME%.commands</command>-->
        <!--<command label="Hypseus [Singe] (Standalone)">%EMULATOR_HYPSEUS-SINGE% singe vldp -framefile %GAMEDIR%/%BASENAME%.txt -script %GAMEDIR%/%BASENAME%.singe %INJECT%=%BASENAME%.commands</command>-->
        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>
        <!--<command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/laserdisc %BASENAME%</command>-->
        <platform>daphne, arcade</platform>
        <theme>laserdisc</theme>
    </system>
    <system>
        <name>lcdgames</name>
        <fullname>LCD Handheld Games</fullname>
@ -827,24 +951,17 @@
        <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>
+        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <command label="AdvanceMAME (Standalone)">%STARTDIR%=~/.advance %EMULATOR_ADVANCEMAME% %BASENAME%</command>
        <platform>arcade</platform>
        <theme>mame-advmame</theme>
    </system>
-    <system>
+-->
        <name>mame-mame4all</name>
        <fullname>MAME4ALL</fullname>
        <path>%ROMPATH%/mame-mame4all</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>
@ -917,6 +1034,7 @@
        <platform>mess</platform>
        <theme>mess</theme>
    </system>
    <system>
        <name>model2</name>
        <fullname>Sega Model 2</fullname>
@ -924,6 +1042,9 @@
        <extension>.7z .7Z .zip .ZIP</extension>
        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>
        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/model2 %BASENAME%</command>
        <!--<command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/model2 %BASENAME%</command>-->
        <!--<command label="Model 2 Emulator (Wine)">%STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_M2EMULATOR-WINDOWS% %BASENAME%</command>-->
        <!--<command label="Model 2 Emulator (Proton)">%STARTDIR%=%EMUDIR% %PRECOMMAND_PROTON% %EMULATOR_M2EMULATOR-WINDOWS% %BASENAME%</command>-->
        <platform>arcade</platform>
        <theme>model2</theme>
    </system>
@ -1073,11 +1194,21 @@
        <platform>arcade</platform>
        <theme>naomi</theme>
    </system>
    <system>
        <name>naomi2</name>
        <fullname>Sega NAOMI 2</fullname>
        <path>%ROMPATH%/naomi2</path>
        <extension>.bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP</extension>
        <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
        <!--<command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command>-->
        <platform>arcade</platform>
        <theme>naomi2</theme>
    </system>
    <system>
        <name>naomigd</name>
        <fullname>Sega NAOMI GD-ROM</fullname>
        <path>%ROMPATH%/naomigd</path>
-        <extension>.cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
+        <extension>.bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP</extension>
        <command label="Flycast">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
        <!-- <command label="Flycast (Standalone)">%EMULATOR_FLYCAST% %ROM%</command> -->
        <platform>arcade</platform>
@ -1093,6 +1224,7 @@
        <!-- <command label="DeSmuME (Standalone)">%EMULATOR_DESMUME% %ROM%</command> -->
        <command label="melonDS">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/melonds_libretro.so %ROM%</command>
        <command label="melonDS (Standalone)">%EMULATOR_MELONDS% %ROM%</command>
        <!--<command label="SkyEmu (Standalone)">%EMULATOR_SKYEMU% %ROM%</command>-->
        <platform>nds</platform>
        <theme>nds</theme>
    </system>
@ -1137,8 +1269,9 @@
        <path>%ROMPATH%/nes</path>
        <extension>.fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
        <command label="Mesen">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%</command>
        <!--<command label="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command>-->
        <command label="Nestopia UE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
-        <!-- <command label="Nestopia UE (Standalone)">%EMULATOR_NESTOPIA-UE% &ndash;&ndashfullscreen %ROM%</command> -->
+        <!-- <command label="Nestopia UE (Standalone)">%EMULATOR_NESTOPIA-UE% &ndash;&ndash;fullscreen %ROM%</command> -->
        <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
        <command label="QuickNES">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM%</command>
        <!-- <command label="puNES (Standalone)">%EMULATOR_PUNES% -u yes %ROM%</command> -->
@ -1148,6 +1281,20 @@
        <platform>nes</platform>
        <theme>nes</theme>
    </system>
 <!--
    <system>
        <name>ngage</name>
        <fullname>Nokia N-Gage</fullname>
        <path>%ROMPATH%/ngage</path>
        <extension>.ngage .zip .ZIP</extension>
        <command label="EKA2L1 [Mounted] (Standalone)">%EMULATOR_EKA2L1% &ndash;&ndash;fullscreen &ndash;&ndash;device RH-29 &ndash;&ndash;mount %ROM% &ndash;&ndash;run "%BASENAME%"</command>
        <command label="EKA2L1 [Installed] (Standalone)">%EMULATOR_EKA2L1% &ndash;&ndash;fullscreen &ndash;&ndash;device RH-29 &ndash;&ndash;run "%BASENAME%"</command>
        <command label="EKA2L1 [Mounted] (Wine)">%STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_EKA2L1-WINDOWS% &ndash;&ndash;fullscreen &ndash;&ndash;device RH-29 &ndash;&ndash;mount %ROM% &ndash;&ndash;run "%BASENAME%"</command>
        <command label="EKA2L1 [Installed] (Wine)">%STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_EKA2L1-WINDOWS% &ndash;&ndash;fullscreen &ndash;&ndash;device RH-29 &ndash;&ndash;run "%BASENAME%"</command>
        <platform>ngage</platform>
        <theme>ngage</theme>
    </system>
 -->
    <system>
        <name>ngp</name>
        <fullname>SNK Neo Geo Pocket</fullname>
@ -1216,8 +1363,9 @@
        <name>pc88</name>
        <fullname>NEC PC-8800 Series</fullname>
        <path>%ROMPATH%/pc88</path>
-        <extension>.d88 .D88 .u88 .U88 .m3u .M3U .7z .7Z .zip .ZIP</extension>
+        <extension>.88d .88D .cmt .CMT .d88 .D88 .m3u .M3U .t88 .T88 .u88 .U88</extension>
        <command label="QUASI88">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quasi88_libretro.so %ROM%</command>
        <!--<command label="QUASI88 (Standalone)">%EMULATOR_QUASI88% -romdir ~/.quasi88 %ROM%</command>-->
        <platform>pc88</platform>
        <theme>pc88</theme>
    </system>
@ -1275,6 +1423,16 @@
        <platform>pico8</platform>
        <theme>pico8</theme>
    </system>
    <system>
        <name>plus4</name>
        <fullname>Commodore Plus/4</fullname>
        <path>%ROMPATH%/plus4</path>
        <extension>.bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP</extension>
        <command label="VICE xplus4">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xplus4_libretro.so %ROM%</command>
        <!--<command label="VICE xplus4 (Standalone)">%EMULATOR_VICE-XPLUS4% %ROM%</command>-->
        <platform>plus4</platform>
        <theme>plus4</theme>
    </system>
    <system>
        <name>pokemini</name>
        <fullname>Nintendo Pokémon Mini</fullname>
@ -1298,11 +1456,12 @@
        <name>ps2</name>
        <fullname>Sony PlayStation 2</fullname>
        <path>%ROMPATH%/ps2</path>
-        <command label="PCSX2 (Standalone)">%EMULATOR_PCSX2% -batch %ROM%</command>
+        <extension>.arcadedef .bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG</extension>
-        <extension>.bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG</extension>
+	<command label="PCSX2 (Standalone)">%EMULATOR_PCSX2% -batch %ROM%</command>
        <command label="LRPS2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM%</command>
        <command label="PCSX2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM%</command>
-        <!-- <command label="Play! (Standalone)">%EMULATOR_PLAY!% &ndash;&ndashdisc %ROM%</command> -->
+        <!--<command label="PCSX2 Legacy (Standalone)">%EMULATOR_PCSX2-LEGACY% &ndash;&ndash;nogui %ROM%</command>-->
        <!--<command label="Play! (Standalone)">%EMULATOR_PLAY!% &ndash;&ndash;disc %ROM%</command>-->
        <platform>ps2</platform>
        <theme>ps2</theme>
    </system>
@ -1412,6 +1571,8 @@
        <command label="bsnes-mercury Accuracy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%</command>
        <!--<command label="bsnes (Standalone)">%EMULATOR_BSNES% &ndash;&ndashfullscreen %ROM%</command> -->
        <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%</command>
        <!--<command label="Mesen (Standalone)">%EMULATOR_MESEN% &ndash;&ndash;fullscreen %ROM%</command>-->
        <!--<command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Super Famicom" %ROM%</command>-->
        <platform>satellaview</platform>
        <theme>satellaview</theme>
    </system>
@ -1457,6 +1618,7 @@
        <fullname>Epoch Super Cassette Vision</fullname>
        <path>%ROMPATH%/scv</path>
        <extension>.0 .bin .BIN .7z .7Z .zip .ZIP</extension>
        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "scv -rompath %GAMEDIR%\;%ROMPATH%/scv -cart \"%ROMRAW%\""</command>
        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/scv scv -cart %ROM%</command>
        <platform>scv</platform>
        <theme>scv</theme>
@ -1614,6 +1776,18 @@
        <platform>stratagus</platform>
        <theme>stratagus</theme>
    </system>
    <system>
        <name>stv</name>
        <fullname>Sega Titan Video Game System</fullname>
        <path>%ROMPATH%/stv</path>
        <extension>.7z .7Z .zip .ZIP</extension>
        <command label="Kronos">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM%</command>
        <!--<command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>-->
        <!--<command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/stv %BASENAME%</command>-->
        <!--<command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module ss %ROM%</command>-->
        <platform>arcade</platform>
        <theme>stv</theme>
    </system>
    <system>
        <name>sufami</name>
        <fullname>Bandai SuFami Turbo</fullname>
@ -1650,6 +1824,18 @@
        <platform>supervision</platform>
        <theme>supervision</theme>
    </system>
 <!--
    <system>
        <name>supracan</name>
        <fullname>Funtech Super A'Can</fullname>
        <path>%ROMPATH%/supracan</path>
        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "supracan -rompath %GAMEDIR%\;%ROMPATH%/supracan -cart \"%ROMRAW%\""</command>
        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/supracan supracan -cart %ROM%</command>
        <platform>supracan</platform>
        <theme>supracan</theme>
    </system>
 -->
    <system>
        <name>switch</name>
        <fullname>Nintendo Switch</fullname>
@ -1665,9 +1851,12 @@
        <name>symbian</name>
        <fullname>Symbian</fullname>
        <path>%ROMPATH%/symbian</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
+        <extension>.sis .SIS .sisx .SISX .symbian</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <command label="EKA2L1 [Nokia N-Gage] (Standalone)">%EMULATOR_EKA2L1% --fullscreen --device RH-29 --run "%BASENAME%"</command>
-        <platform>android</platform>
+        <command label="EKA2L1 [Nokia N70] (Standalone)">%EMULATOR_EKA2L1% --fullscreen --device RM-84 --run "%BASENAME%"</command>
        <command label="EKA2L1 [Nokia N97] (Standalone)">%EMULATOR_EKA2L1% --fullscreen --device RM-507 --run "%BASENAME%"</command>
        <command label="EKA2L1 [Custom device] (Standalone)">%EMULATOR_EKA2L1% --fullscreen --device %INJECT%=%BASENAME%.device --run "%BASENAME%"</command>
        <platform>ngage</platform>
        <theme>symbian</theme>
    </system>
 <!--
@ -1735,6 +1924,15 @@
        <theme>to8</theme>
    </system>
 <!--
    <system>
        <name>triforce</name>
        <fullname>Namco-Sega-Nintendo Triforce</fullname>
        <path>%ROMPATH%/triforce</path>
        <extension>.ciso .CISO .dff .DFF .dol .DOL .elf .ELF .gcm .GCM .gcz .GCZ .iso .ISO .json .JSON .m3u .M3U .rvz .RVZ .tgc .TGC .wad .WAD .wbfs .WBFS .wia .WIA .7z .7Z .zip .ZIP</extension>
        <command label="Triforce (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_TRIFORCE% -b -e %ROM%</command>
        <platform>arcade</platform>
        <theme>triforce</theme>
    </system>
    <system>
        <name>trs-80</name>
        <fullname>Tandy TRS-80</fullname>
@ -1746,6 +1944,18 @@
        <platform>trs-80</platform>
        <theme>trs-80</theme>
    </system>
    <system>
        <name>type-x</name>
        <fullname>Taito Type X</fullname>
        <path>%ROMPATH%/type-x</path>
        <extension>.AppImage .desktop .exe .EXE .sh</extension>
        <command label="Wine (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_WINE% %ROM%</command>
        <command label="Proton (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_PROTON% %ROM%</command>
        <command label="AppImage">%EMULATOR_OS-SHELL% -c "%ROM%"</command>
        <command label="Shortcut or script">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
        <platform>arcade</platform>
        <theme>type-x</theme>
    </system>
 -->
    <system>
        <name>uzebox</name>
@ -1800,7 +2010,7 @@
        <fullname>Visual Pinball</fullname>
        <path>%ROMPATH%/vpinball</path>
        <extension>.vpt .VPT .vpx .VPX</extension>
-        <command label="Visual Pinball (Standalone)">PLACEHOLDER %ROM%</command>
+        <command label="Visual Pinball (Standalone)">%EMULATOR_VISUAL-PINBALL% -Minimized -Play %ROM%</command>
        <platform>vpinball</platform>
        <theme>vpinball</theme>
    </system>
@ -1811,6 +2021,7 @@
        <fullname>VTech V.Smile</fullname>
        <path>%ROMPATH%/vsmile</path>
        <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "vsmile -rompath %GAMEDIR%\;%ROMPATH%/vsmile -cart \"%ROMRAW%\""</command>
        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/vsmile vsmile -cart %ROM%</command>
        <platform>vsmile</platform>
        <theme>vsmile</theme>
@ -1900,8 +2111,10 @@
        <name>xbox360</name>
        <fullname>Microsoft Xbox 360</fullname>
        <path>%ROMPATH%/xbox360</path>
-        <extension>. .iso .ISO .xex .XEX</extension>
+        <extension>. .desktop .iso .ISO .sh .xex .XEX</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <command label="xenia (Wine)">%STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_XENIA-WINDOWS% %ROM%</command>
        <command label="xenia (Proton)">%STARTDIR%=%EMUDIR% %PRECOMMAND_PROTON% %EMULATOR_XENIA-WINDOWS% %ROM%</command>
        <command label="Shortcut or script">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
        <platform>xbox360</platform>
        <theme>xbox360</theme>
    </system>
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@ -74,6 +74,20 @@
            </ul>
         </description>
      </release>
      <release version="0.7.3b" date="2023-11-14">
         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.3b</url>
         <description>
            <p>Updates:</p>
            <ul>
               <li>All standalone emulators</li>
               <li>EmulationStation Desktop Edition (ES-DE)</li>
            </ul>
            <p>Known issues:</p>
            <ul>
               <li>Please check the know issues in the Wiki under General Infomration.</li>
            </ul>
         </description>
      </release>
      <release version="0.7.2b" date="2023-09-27">
         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.7.2b</url>
         <description>
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@ -3,7 +3,7 @@ runtime: org.kde.Platform
 runtime-version: "6.5"
 sdk: org.kde.Sdk
 sdk-extensions:
-  - org.freedesktop.Sdk.Extension.llvm14      # Needed for rpcs3
+  - org.freedesktop.Sdk.Extension.llvm16      # Needed for rpcs3 (llvm15) but llvm16 for CITRA
 # base: io.qt.qtwebengine.BaseApp             # Needed for Yuzu - Disabled as we're using AppImage for Yuzu
 # base-version: "6.5"                         # Needed for Yuzu - Disabled as we're using AppImage for Yuzu
 command: retrodeck.sh
@ -41,6 +41,8 @@ finish-args:
  # It allows an SDL application to specify its window class, which can be useful for window managers and desktop environments to identify and group similar windows
  - --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.retrodeck
  - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.retrodeck
  # XEMU - Fixes issues with openSUSE systems, QEMU_AUDIO_DRV is defined as "pa" causing xemu to not launch
  - --unset-env=QEMU_AUDIO_DRV
 cleanup:
  # ES-DE
@ -85,9 +87,9 @@ modules:
    build-commands:
      - |
-        # on main please update this with the version variable, eg: VERSION='0.7.0b'
+        # on main please update this with the version variable, eg: VERSION='0.7.3b'
        # on cooker will be THISBRANCH
-        VERSION=THISBRANCH
+        VERSION=0.7.3b
        git checkout ${GITHUB_REF_NAME}
        mkdir -p ${FLATPAK_DEST}/retrodeck/
@ -120,10 +122,10 @@ modules:
      - ln -s "xml" "${FLATPAK_DEST}/bin/xmlstarlet" ||:
  # mesa repo got a double certificate issue and gnutils cannot handle that so GLU download fails,
-  # this affects even the shared-modules's glu so I have to replace it temporarly
+  # this affects even the shared-modules's libglu so I have to replace it temporarly
  # more info there: https://gitlab.com/gnutls/gnutls/-/issues/1335
-  # dependency of: RETROARCH, CEMU, RPCS3
+  # dependency of: RETROARCH, CEMU, RPCS3, XEMU
-  - name: glu
+  - name: libglu
    buildsystem: meson
    cleanup:
      - /include
@ -132,8 +134,16 @@ modules:
      - /lib/*.a
    sources:
      - type: archive
-        url: https://ftp.osuosl.org/pub/blfs/conglomeration/glu/glu-9.0.2.tar.xz
+        url: https://ftp.osuosl.org/pub/blfs/conglomeration/glu/glu-9.0.3.tar.xz
-        sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4
+        sha256: bd43fe12f374b1192eb15fe20e45ff456b9bc26ab57f0eee919f96ca0f8a330f
      # - type: archive
      #   url: https://mesa.freedesktop.org/archive/glu/glu-9.0.3.tar.xz
      #   sha256: bd43fe12f374b1192eb15fe20e45ff456b9bc26ab57f0eee919f96ca0f8a330f
      #   x-checker-data:
      #     type: anitya
      #     project-id: 13518
      #     stable-only: true
      #     url-template: https://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz
  - name: libgudev
    buildsystem: meson
@ -221,24 +231,36 @@ modules:
        url: https://github.com/mikefarah/yq/releases/download/v4.33.3/yq_linux_amd64
        sha256: 4ee662847c588c3ef2fec8bfb304e8739e3dbaba87ccb9a608d691c88f5b64dc
-  # dependency of: CEMU, CITRA <-(13.0.0)
+  # dependency of: CEMU (13.1.1), CITRA (13.0.0)
  - name: glslang
    buildsystem: cmake-ninja
    config-opts:
      - -DCMAKE_BUILD_TYPE=Release
      - -DENABLE_CTEST=OFF
      # TODO: Does Cemu benefit from SPIRV-Tools-opt
      - -DENABLE_OPT=OFF
    cleanup:
      - /include
      - /lib/cmake
    sources:
      - type: archive
-        url: https://github.com/KhronosGroup/glslang/archive/13.0.0.tar.gz
+        url: https://github.com/KhronosGroup/glslang/archive/13.1.1.tar.gz
-        sha256: bcda732434f829aa74414ea0e06d329ec8ac28637c38a0de45e17c8fd25a4715
+        sha256: 1c4d0a5a38c8aaf89a2d7e6093be734320599f5a6775b2726beeb05b0c054e66
        # url: https://github.com/KhronosGroup/glslang/archive/13.0.0.tar.gz
        # sha256: bcda732434f829aa74414ea0e06d329ec8ac28637c38a0de45e17c8fd25a4715
        x-checker-data:
          type: anitya
          stable-only: true
          project-id: 205796
          url-template: https://github.com/KhronosGroup/glslang/archive/$version.tar.gz
      # - type: git
      #   url: https://github.com/KhronosGroup/SPIRV-Tools.git
      #   tag: sdk-1.3.261.1
      #   dest: External/spirv-tools
      # - type: git
      #   url: https://github.com/KhronosGroup/SPIRV-Headers.git
      #   tag: sdk-1.3.261.1
      #   dest: External/spirv-tools/external/spirv-headers
  # enables motion controls on non-wii controllers (switch, ps4, etc)
  # dependency of: DOLPHIN, RPCS3
@ -295,9 +317,35 @@ modules:
        url: https://github.com/g-truc/glm/releases/download/0.9.9.8/glm-0.9.9.8.zip
        sha256: 37e2a3d62ea3322e43593c34bae29f57e3e251ea89f4067506c94043769ade4c
  # dependency of: CEMU, ES-DE
  - name: pugixml
    buildsystem: cmake-ninja
    config-opts:
      - -DBUILD_SHARED_LIBS=ON
    cleanup:
      - /include
      - /lib/cmake
      - /lib/pkgconfig
    sources:
      - type: archive
        url: https://github.com/zeux/pugixml/releases/download/v1.14/pugixml-1.14.tar.gz
        sha256: 2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015
        x-checker-data:
          type: anitya
          project-id: 3728
          url-template: https://github.com/zeux/pugixml/releases/download/v$version/pugixml-$version.tar.gz
  # dependency of: CEMU, RPCS3
  - rd-submodules/shared-modules/glew/glew.json
  # dependency of: XEMU, MelonDS
  - name: libslirp
    buildsystem: meson
    sources:
      - type: git
        url: https://gitlab.freedesktop.org/slirp/libslirp.git
        tag: v4.7.0
  # ES-DE - START
  # https://gitlab.com/es-de/emulationstation-de
@ -333,24 +381,6 @@ modules:
          - sed -i 's|-o root -g root ||' ./Makefile.gnu
          - sed -i 's|/usr|/app|' ./Makefile.gnu
  # dependency of: CEMU
  - name: pugixml
    buildsystem: cmake-ninja
    config-opts:
      - -DBUILD_SHARED_LIBS=ON
    cleanup:
      - /include
      - /lib/cmake
      - /lib/pkgconfig
    sources:
      - type: archive
        url: https://github.com/zeux/pugixml/releases/download/v1.13/pugixml-1.13.tar.gz
        sha256: 40c0b3914ec131485640fa57e55bf1136446026b41db91c1bef678186a12abbe
        x-checker-data:
          type: anitya
          project-id: 3728
          url-template: https://github.com/zeux/pugixml/releases/download/v$version/pugixml-$version.tar.gz
  - name: libgit2
    buildsystem: cmake-ninja
    config-opts:
@ -390,7 +420,7 @@ modules:
    sources:
      - type: git
        url: https://gitlab.com/es-de/emulationstation-de
-        branch: 5545187d82fabf93256b7d176f39a0a98bcd6c54
+        branch: 77bf5ed8a03c5d065512cded36e4fb3bea90f4df
      - type: shell
        commands:
          - sed -i 's#"EMULATIONSTATION-DE  V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK
@ -603,10 +633,8 @@ modules:
      - -DUSE_SYSTEM_FFMPEG=OFF
      - -DUSE_SYSTEM_LIBZIP=ON
      - -DUSE_SYSTEM_ZSTD=ON
      - -DUSE_WAYLAND_WSI=ON
      - -DUSING_QT_UI=OFF
      - -DBUILD_TESTING=OFF
      - -DOpenGL_GL_PREFERENCE=GLVND
    build-options:
@ -622,8 +650,8 @@ modules:
    sources:
      - type: git
        url: &ppsspp-url https://github.com/hrydgard/ppsspp.git
-        tag: v1.16.3
+        tag: v1.16.6
-        commit: a9b6421dfde68be9d065b51e9d519699ce2e9053
+        commit: ba0ce344937d17e177ec8656ab957f6b82facdda
        x-checker-data:
          type: json
          url: https://api.github.com/repos/hrydgard/ppsspp/releases/latest
@ -662,8 +690,8 @@ modules:
      - ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu"
    sources:
      - type: file
-        url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1567/yuzu-mainline-20230923-ace91dd0c.AppImage
+        url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1618/yuzu-mainline-20231112-3cff94a38.AppImage
-        sha256: 965bdfa63e713a0672fb5a037ecb527b4860600c6a2526f7c053bfe082b5a9d8
+        sha256: 4e92d6daeb1f288ca18950ed47b068fb971766ee386b012b9400b5caecad4246
  # Yuzu - END
@ -672,11 +700,26 @@ modules:
  - rd-submodules/shared-modules/SDL2/SDL2-with-libdecor.json
  - rd-submodules/shared-modules/SDL2/SDL2-with-libdecor.json
  - name: citra
    buildsystem: cmake-ninja
    builddir: true
    build-options:
      env:
        CI: '1'
        GITHUB_ACTIONS: '1'
        GITHUB_REPOSITORY: citra-emu/citra-nightly
        GITHUB_REF_NAME: nightly-2025
      append-path: /usr/lib/sdk/llvm16/bin
      prepend-ld-library-path: /usr/lib/sdk/llvm16/lib
      cflags: '-Wno-unused-command-line-argument'
      cxxflags: '-Wno-unused-command-line-argument'
    config-opts:
      - '-DCMAKE_BUILD_TYPE=Release'
      - '-DCMAKE_C_COMPILER=clang'
      - '-DCMAKE_CXX_COMPILER=clang++'
      - '-DCMAKE_LINKER=lld'
      - '-DENABLE_QT_TRANSLATION=ON'
      - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON'
      - '-DUSE_DISCORD_PRESENCE=ON'
@ -702,8 +745,8 @@ modules:
    sources:
      - type: archive
        url: >-
-          https://github.com/citra-emu/citra-nightly/releases/download/nightly-2009/citra-unified-source-20231012-40ba522.tar.xz
+          https://github.com/citra-emu/citra-nightly/releases/download/nightly-2025/citra-unified-source-20231105-998b9a9.tar.xz
-        sha256: 927739892fff5d1b325b07182ab29a7355f58866debe60da1d6620680773ac97
+        sha256: ebf52af66c6ef729688a29d093d9139baa76973b698c0630a295f38d126cf118
        x-checker-data:
          type: json
          url: https://api.github.com/repos/citra-emu/citra-nightly/releases/latest
@ -734,8 +777,8 @@ modules:
      - ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt"
    sources:
      - type: file
-        url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.5059/pcsx2-v1.7.5059-linux-appimage-x64-Qt.AppImage
+        url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.5186/pcsx2-v1.7.5186-linux-appimage-x64-Qt.AppImage
-        sha256: a51addc9bd15b77e842160acecb1f18486f8a024e5e73e8aea5de71de2b164c7
+        sha256: 9fd8108c11fd273a4a0c801a6ee2da802643966e61e0a53528f7dd023ece55dd
  # PCSX2 - END
@ -865,8 +908,8 @@ modules:
    sources:
      - type: git
        url: https://github.com/xemu-project/xemu.git
-        tag: v0.7.98
+        tag: v0.7.116
-        commit: 7bfb7c85378f64f93556c365ea0cc18cb2181dc8
+        commit: b3fc80b3a83fa99aeb541a0c665cfb596cedd71c
        x-checker-data:
          type: json
          url: https://api.github.com/repos/xemu-project/xemu/releases/latest
@ -890,13 +933,6 @@ modules:
  # https://github.com/flathub/net.kuribo64.melonDS
  # ちっちゃい、かわいい！
  - name: libslirp
    buildsystem: meson
    sources:
      - type: git
        url: https://gitlab.freedesktop.org/slirp/libslirp.git
        tag: v4.7.0
  - name: melonds
    buildsystem: cmake-ninja
    builddir: true
@ -1129,8 +1165,8 @@ modules:
        x-checker-data:
          type: git
          tag-pattern: ^v([\d.]+-\d+)$
-        tag: v2.0-47
+        tag: v2.0-59
-        commit: 85aa4f095b119e98620451a0c19c80f656d944a6
+        commit: f3c95f72e74d8a5f5873061fbb994643c63ec9c5
      - type: shell
        commands:
          - sed "s/set(EXPERIMENTAL_VERSION.*/set(EXPERIMENTAL_VERSION \"$(git describe
--- a/rd-submodules/es-de/GuiThemeDownloader.cpp.patch
+++ b/rd-submodules/es-de/GuiThemeDownloader.cpp.patch
@ -0,0 +1,10 @@
 diff -au1r emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp
 --- emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp	2023-11-03 16:25:01.115126901 +0100
 +++ emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp	2023-11-03 16:26:18.882607724 +0100
@@ -602,4 +602,4 @@
                 getHelpStyle(),
 -                "IT SEEMS AS IF YOU'RE NOT RUNNING THE LATEST ES-DE RELEASE, PLEASE UPGRADE BEFORE "
 -                "PROCEEDING AS THESE THEMES MAY NOT BE COMPATIBLE WITH YOUR VERSION",
 +                "ES-DE THEME ENGINE WAS UPDATED UPSTREAM. THESE THEMES MAY NOT BE COMPATIBLE WITH THE CURRENT RETRODECK VERSION."
 +                "CHECK IF A NEW RETRODECK UPDATE IS AVAILABLE, ELSE PLEASE WAIT FOR IT OR PROCEED AT YOUR OWN RISK.",
                 "OK", [] { return; }, "", nullptr, "", nullptr, nullptr, true));
--- a/rd-submodules/es-de/ViewController.cpp.patch
+++ b/rd-submodules/es-de/ViewController.cpp.patch
@ -1,22 +1,7 @@
 diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp
--- emulationstation-de/es-app/src/views/ViewController.cpp	2023-08-23 13:12:15.625292630 +0200
+--- emulationstation-de/es-app/src/views/ViewController.cpp	2023-11-04 15:09:24.332178777 -0400
-+++ emulationstation-de/es-app/src/views/ViewController.cpp	2023-08-23 14:29:23.547223951 +0200
+++ emulationstation-de/es-app/src/views/ViewController.cpp	2023-11-04 15:13:59.015780009 -0400
-@@ -164,9 +164,7 @@
+@@ -195,91 +195,3 @@
 {
 -    mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN "
 -                           "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE "
 -                           "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM "
 -                           "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL "
 -                           "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME "
 -                           "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n"
 -                           "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n";
 +    mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. "
 +                           "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE "
 +                           "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY "
 +                           "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n"
 +                           "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n";
@@ -179,90 +177,3 @@
     mNoGamesMessageBox = new GuiMsgBox(
 -        HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY",
 -        [this] {
@ -29,22 +14,24 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat
 -            if (Settings::getInstance()->getBool("VirtualKeyboard")) {
 -                mWindow->pushGui(new GuiTextEditKeyboardPopup(
 -                    HelpStyle(), 0.0f, "ENTER ROM DIRECTORY PATH", currentROMDirectory,
-                    [this](const std::string& newROMDirectory) {
+-                    [this, currentROMDirectory](const std::string& newROMDirectory) {
-                        Settings::getInstance()->setString("ROMDirectory",
+-                        if (currentROMDirectory != newROMDirectory) {
-                                                           Utils::String::trim(newROMDirectory));
+-                            Settings::getInstance()->setString(
-                        Settings::getInstance()->saveFile();
+-                                "ROMDirectory", Utils::String::trim(newROMDirectory));
 -                            Settings::getInstance()->saveFile();
 -#if defined(_WIN64)
-                        mRomDirectory =
+-                            mRomDirectory =
-                            Utils::String::replace(FileData::getROMDirectory(), "/", "\\");
+-                                Utils::String::replace(FileData::getROMDirectory(), "/", "\\");
 -#else
-                        mRomDirectory = FileData::getROMDirectory();
+-                            mRomDirectory = FileData::getROMDirectory();
 -#endif
-                        mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory);
+-                            mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory);
-                        mWindow->pushGui(new GuiMsgBox(HelpStyle(),
+-                            mWindow->pushGui(new GuiMsgBox(HelpStyle(),
-                                                       "ROM DIRECTORY SETTING SAVED, RESTART\n"
+-                                                           "ROM DIRECTORY SETTING SAVED, RESTART\n"
-                                                       "THE APPLICATION TO RESCAN THE SYSTEMS",
+-                                                           "THE APPLICATION TO RESCAN THE SYSTEMS",
-                                                       "OK", nullptr, "", nullptr, "", nullptr,
+-                                                           "OK", nullptr, "", nullptr, "", nullptr,
-                                                       true, true));
+-                                                           nullptr, true, true));
 -                        }
 -                    },
 -                    false, "SAVE", "SAVE CHANGES?", "Currently configured path:",
 -                    currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH",
@ -68,7 +55,7 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat
 -                                                       "ROM DIRECTORY SETTING SAVED, RESTART\n"
 -                                                       "THE APPLICATION TO RESCAN THE SYSTEMS",
 -                                                       "OK", nullptr, "", nullptr, "", nullptr,
-                                                       true));
+-                                                       nullptr, true));
 -                    },
 -                    false, "SAVE", "SAVE CHANGES?", "Currently configured path:",
 -                    currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH",
@ -82,9 +69,8 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat
 -                "THIS WILL CREATE DIRECTORIES FOR ALL THE\n"
 -                "GAME SYSTEMS DEFINED IN es_systems.xml\n\n"
 -                "THIS MAY CREATE A LOT OF FOLDERS SO IT'S\n"
-                "ADVICED TO REMOVE THE ONES YOU DON'T NEED\n\n"
+-                "ADVICED TO REMOVE THE ONES YOU DON'T NEED",
-                "PROCEED?",
+-                "PROCEED",
 -                "YES",
 -                [this] {
 -                    if (!SystemData::createSystemDirectories()) {
 -                        mWindow->pushGui(new GuiMsgBox(HelpStyle(),
@ -92,7 +78,7 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat
 -                                                       "GENERATED, EXIT THE APPLICATION AND PLACE\n"
 -                                                       "YOUR GAMES IN THE NEWLY CREATED FOLDERS",
 -                                                       "OK", nullptr, "", nullptr, "", nullptr,
-                                                       true));
+-                                                       nullptr, true));
 -                    }
 -                    else {
 -                        mWindow->pushGui(new GuiMsgBox(HelpStyle(),
@ -100,19 +86,16 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat
 -                                                       "PERMISSION PROBLEMS OR DISK FULL?\n\n"
 -                                                       "SEE THE LOG FILE FOR MORE DETAILS",
 -                                                       "OK", nullptr, "", nullptr, "", nullptr,
-                                                       true));
+-                                                       nullptr, true));
 -                    }
 -                },
-                "NO", nullptr, "", nullptr, true));
+-                "CANCEL", nullptr, "", nullptr, nullptr, false));
 -        },
 -        "QUIT",
 +        HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT",
         [] {
-@@ -272,3 +183,3 @@
+@@ -289,3 +201,3 @@
         },
-        true, false,
+-        nullptr, true, false,
-+        "", nullptr, "", nullptr, true, false,
+        "", nullptr, "", nullptr, nullptr, true, true,
         (mRenderer->getIsVerticalOrientation() ?
@@ -1446 +1357,2 @@
 }
 +
--- a/rd-submodules/es-de/patch_helper.sh
+++ b/rd-submodules/es-de/patch_helper.sh
@ -0,0 +1,31 @@
 #!/bin/bash
 mkdir /tmp
 branch="00a226062fff37209d98e0ab048ac89af50ecacc"
 git clone "https://gitlab.com/es-de/emulationstation-de.git" /tmp/emulationstation-de
 pushd .
 cd /tmp/emulationstation-de
 git checkout $branch
 popd
 mkdir patches-tmp
 cp /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp             ./patches-tmp
 cp /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h               ./patches-tmp
 cp /tmp/emulationstation-de/es-app/src/views/ViewController.cpp     ./patches-tmp
 cp /tmp/emulationstation-de/es-core/src/Window.cpp                  ./patches-tmp
 cp /tmp/emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp  ./patches-tmp
 read -p "Please edit the files in \"patches-tmp\" and press enter to continue."
 diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp             ./patches-tmp/GuiMenu.cpp               > GuiMenu.cpp.patch
 diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h               ./patches-tmp/GuiMenu.h                 > GuiMenu.h.patch 
 diff -au1r /tmp/emulationstation-de/es-app/src/views/ViewController.cpp     ./patches-tmp/ViewController.cpp        > ViewController.cpp.patch            
 diff -au1r /tmp/emulationstation-de/es-core/src/Window.cpp                  ./patches-tmp/Window.cpp                > Window.cpp.patch
 diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp  ./patches-tmp/GuiThemeDownloader.cpp    > GuiThemeDownloader.cpp.patch
 rm -rf patches-tmp
 echo "Done, now please remeber to edit the headers of the patch files with the correct paths."
--- a/wiki-rtd/index.md
+++ b/wiki-rtd/index.md
@ -47,7 +47,7 @@ Please read the [How to: Getting started](https://github.com/XargonWan/RetroDECK
 - What does "currently in beta" mean?, It means that the software is still under heavy development and big updates can be made that change, add, or remove features.
 - RetroDECK is missing some minor and major; emulators, features and configurations. The goal is to have them added over time.<br>
- Please check the [Known Issues](https://github.com/XargonWan/RetroDECK/wiki/Known-Issues) page and the [Issue tracker](https://github.com/XargonWan/RetroDECK/issues) for more information. 
+ Please check the [[RetroDECK: Known Issues]] page and the [Issue tracker](https://github.com/XargonWan/RetroDECK/issues) for more information. 
 - RetroDECK during the BETA period only supports the Steam Deck, but for the full release we should have full Linux Desktop support read more at [FAQs: General questions](https://github.com/XargonWan/RetroDECK/wiki/FAQs-Frequently-asked-questions#general-questions).
 - The "b" in the versioning stands for BETA but RetroDECK is perfectly fine for daily use even during the beta phase, albeit some features are missing. To see what features are missing check the: [Known Issues page](https://github.com/XargonWan/RetroDECK/wiki/Known-Issues).  
@ -80,13 +80,13 @@ The long term vision and goals of the project is an all-in-one application to ma
 - Should have an easy way to mange external controllers and other inputs.
- Should support a majority of all supported Emulators in ES-DE
+- Should support a majority of all supported Emulators in ES-DE, so at least you have one good option per system.
- Should in the long run support applications outside of the scope of ES-DE
+- Should in the long run support applications outside of the scope of ES-DE via a ports manager.
 - Should be plug and play and fill the need for a portable retro gaming solution that you can bring on the go to a friend’s/family/others house. Just dock into the TV and get going!
- Should fully support Steam Deck, SteamOS based devices and the Linux Desktop.
+- Should fully support Steam Deck, Linux Desktop, other SteamOS or Linux based devices.
 - AND MORE