From 31d4772a42951d2f238fdeafdb49e7ff2290df93 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Mon, 20 Feb 2023 17:54:24 +0100
Subject: [PATCH] Added labels to all command tags (except placeholders) in the
 es_systems.xml files.

Also added support for the AppImage release of Rosalie's Mupen GUI.
---
 resources/systems/macos/es_systems.xml   | 62 +++++++++++-----------
 resources/systems/unix/es_find_rules.xml |  3 ++
 resources/systems/unix/es_systems.xml    | 66 ++++++++++++------------
 resources/systems/windows/es_systems.xml | 66 ++++++++++++------------
 4 files changed, 100 insertions(+), 97 deletions(-)

diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index cb29dc36a..5fa326ab4 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -15,7 +15,7 @@
         <fullname>Adventure Game Studio Game Engine</fullname>
         <path>%ROMPATH%/ags</path>
         <extension>.app</extension>
-        <command>%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Native binary">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>ags</platform>
         <theme>ags</theme>
     </system>
@@ -161,7 +161,7 @@
         <fullname>Atari 7800 ProSystem</fullname>
         <path>%ROMPATH%/atari7800</path>
         <extension>.a78 .A78 .bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.dylib %ROM%</command>
+        <command label="ProSystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.dylib %ROM%</command>
         <platform>atari7800</platform>
         <theme>atari7800</theme>
     </system>
@@ -263,7 +263,7 @@
         <fullname>Cave Story (NXEngine)</fullname>
         <path>%ROMPATH%/cavestory</path>
         <extension>.exe .EXE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.dylib %ROM%</command>
+        <command label="NXEngine">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.dylib %ROM%</command>
         <platform>cavestory</platform>
         <theme>cavestory</theme>
     </system>
@@ -292,7 +292,7 @@
         <fullname>ChaiLove Game Engine</fullname>
         <path>%ROMPATH%/chailove</path>
         <extension>.chai .CHAI .chailove .CHAILOVE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/chailove_libretro.dylib %ROM%</command>
+        <command label="ChaiLove">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/chailove_libretro.dylib %ROM%</command>
         <platform>love</platform>
         <theme>chailove</theme>
     </system>
@@ -301,7 +301,7 @@
         <fullname>Fairchild Channel F</fullname>
         <path>%ROMPATH%/channelf</path>
         <extension>.bin .BIN .chf .CHF .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freechaf_libretro.dylib %ROM%</command>
+        <command label="FreeChaF">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freechaf_libretro.dylib %ROM%</command>
         <platform>channelf</platform>
         <theme>channelf</theme>
     </system>
@@ -472,7 +472,7 @@
         <fullname>Epic Games Store</fullname>
         <path>%ROMPATH%/epic</path>
         <extension>.app .sh</extension>
-        <command>%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Epic Games Store (Standalone)">%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pcwindows</platform>
         <theme>epic</theme>
     </system>
@@ -660,7 +660,7 @@
         <fullname>Mattel Electronics Intellivision</fullname>
         <path>%ROMPATH%/intellivision</path>
         <extension>.int .INT .bin .BIN .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freeintv_libretro.dylib %ROM%</command>
+        <command label="FreeIntv">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freeintv_libretro.dylib %ROM%</command>
         <platform>intellivision</platform>
         <theme>intellivision</theme>
     </system>
@@ -678,7 +678,7 @@
         <fullname>Kodi Home Theatre Software</fullname>
         <path>%ROMPATH%/kodi</path>
         <extension>.app .sh</extension>
-        <command>%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Kodi (Standalone)">%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pc</platform>
         <theme>kodi</theme>
     </system>
@@ -707,7 +707,7 @@
         <fullname>Lutro Game Engine</fullname>
         <path>%ROMPATH%/lutro</path>
         <extension>.lua .LUA .lutro .LUTRO .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/lutro_libretro.dylib %ROM%</command>
+        <command label="Lutro">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/lutro_libretro.dylib %ROM%</command>
         <platform>lutro</platform>
         <theme>lutro</theme>
     </system>
@@ -841,7 +841,7 @@
         <fullname>Multi Emulator Super System</fullname>
         <path>%ROMPATH%/mess</path>
         <extension>.chd .CHD .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mess2015_libretro.dylib %ROM%</command>
+        <command label="MESS 2015">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mess2015_libretro.dylib %ROM%</command>
         <platform>mess</platform>
         <theme>mess</theme>
     </system>
@@ -878,7 +878,7 @@
         <fullname>Thomson MO/TO Series</fullname>
         <path>%ROMPATH%/moto</path>
         <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.dylib %ROM%</command>
+        <command label="Theodore">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.dylib %ROM%</command>
         <platform>moto</platform>
         <theme>moto</theme>
     </system>
@@ -937,7 +937,7 @@
         <fullname>M.U.G.E.N Game Engine</fullname>
         <path>%ROMPATH%/mugen</path>
         <extension>.mugen</extension>
-        <command>%STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <command label="Ikemen GO (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% -c "%ROM%"</command>
         <platform>mugen</platform>
         <theme>mugen</theme>
     </system>
@@ -946,7 +946,7 @@
         <fullname>Othello Multivision</fullname>
         <path>%ROMPATH%/multivision</path>
         <extension>.bin .BIN .gg .GG .rom .ROM .sg .SG .sms .SMS .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.dylib %ROM%</command>
+        <command label="Gearsystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.dylib %ROM%</command>
         <platform>sg-1000</platform>
         <theme>multivision</theme>
     </system>
@@ -1088,7 +1088,7 @@
         <fullname>Magnavox Odyssey2</fullname>
         <path>%ROMPATH%/odyssey2</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.dylib %ROM%</command>
+        <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.dylib %ROM%</command>
         <platform>odyssey2</platform>
         <theme>odyssey2</theme>
     </system>
@@ -1115,7 +1115,7 @@
         <fullname>Palm OS</fullname>
         <path>%ROMPATH%/palm</path>
         <extension>.prc .PRC .pqa .PQA .img .IMG .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mu_libretro.dylib %ROM%</command>
+        <command label="Mu">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mu_libretro.dylib %ROM%</command>
         <platform>palm</platform>
         <theme>palm</theme>
     </system>
@@ -1137,7 +1137,7 @@
         <fullname>NEC PC-8800 Series</fullname>
         <path>%ROMPATH%/pc88</path>
         <extension>.d88 .D88 .u88 .U88 .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quasi88_libretro.dylib %ROM%</command>
+        <command label="QUASI88">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quasi88_libretro.dylib %ROM%</command>
         <platform>pc88</platform>
         <theme>pc88</theme>
     </system>
@@ -1200,7 +1200,7 @@
         <fullname>Nintendo Pokémon Mini</fullname>
         <path>%ROMPATH%/pokemini</path>
         <extension>.min .MIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pokemini_libretro.dylib %ROM%</command>
+        <command label="PokeMini">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pokemini_libretro.dylib %ROM%</command>
         <platform>pokemini</platform>
         <theme>pokemini</theme>
     </system>
@@ -1209,7 +1209,7 @@
         <fullname>Ports</fullname>
         <path>%ROMPATH%/ports</path>
         <extension>.app .sh</extension>
-        <command>%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Various">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pc, pcwindows</platform>
         <theme>ports</theme>
     </system>
@@ -1282,7 +1282,7 @@
         <fullname>MGT SAM Coupé</fullname>
         <path>%ROMPATH%/samcoupe</path>
         <extension>.dsk .DSK .mgt .MGT .sbt .SBT .sad .SAD .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_SIMCOUPE% %ROM%</command>
+        <command label="SimCoupé (Standalone)">%EMULATOR_SIMCOUPE% %ROM%</command>
         <platform>samcoupe</platform>
         <theme>samcoupe</theme>
     </system>
@@ -1455,7 +1455,7 @@
         <fullname>Solarus Game Engine</fullname>
         <path>%ROMPATH%/solarus</path>
         <extension>.solarus</extension>
-        <command>%EMULATOR_SOLARUS% -fullscreen=yes %ROM%</command>
+        <command label="Solarus (Standalone)">%EMULATOR_SOLARUS% -fullscreen=yes %ROM%</command>
         <platform>solarus</platform>
         <theme>solarus</theme>
     </system>
@@ -1464,7 +1464,7 @@
         <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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.dylib %ROM%</command>
+        <command label="blueMSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.dylib %ROM%</command>
         <platform>spectravideo</platform>
         <theme>spectravideo</theme>
     </system>
@@ -1473,7 +1473,7 @@
         <fullname>Valve Steam</fullname>
         <path>%ROMPATH%/steam</path>
         <extension>.app .sh</extension>
-        <command>%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Steam (Standalone)">%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>steam</platform>
         <theme>steam</theme>
     </system>
@@ -1586,7 +1586,7 @@
         <fullname>TIC-80 Game Engine</fullname>
         <path>%ROMPATH%/tic80</path>
         <extension>.tic .TIC</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tic80_libretro.dylib %ROM%</command>
+        <command label="TIC-80">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tic80_libretro.dylib %ROM%</command>
         <platform>tic80</platform>
         <theme>tic80</theme>
     </system>
@@ -1595,7 +1595,7 @@
         <fullname>Thomson TO8</fullname>
         <path>%ROMPATH%/to8</path>
         <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.dylib %ROM%</command>
+        <command label="Theodore">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.dylib %ROM%</command>
         <platform>moto</platform>
         <theme>to8</theme>
     </system>
@@ -1613,7 +1613,7 @@
         <fullname>Uzebox Open Source Console</fullname>
         <path>%ROMPATH%/uzebox</path>
         <extension>.uze .UZE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/uzem_libretro.dylib %ROM%</command>
+        <command label="Uzem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/uzem_libretro.dylib %ROM%</command>
         <platform>uzebox</platform>
         <theme>uzebox</theme>
     </system>
@@ -1622,7 +1622,7 @@
         <fullname>Smith Engineering Vectrex</fullname>
         <path>%ROMPATH%/vectrex</path>
         <extension>.bin .BIN .vec .VEC .gam .GAM .vc .VC .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vecx_libretro.dylib %ROM%</command>
+        <command label="vecx">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vecx_libretro.dylib %ROM%</command>
         <platform>vectrex</platform>
         <theme>vectrex</theme>
     </system>
@@ -1641,7 +1641,7 @@
         <fullname>Philips Videopac G7000</fullname>
         <path>%ROMPATH%/videopac</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.dylib %ROM%</command>
+        <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.dylib %ROM%</command>
         <platform>videopac</platform>
         <theme>videopac</theme>
     </system>
@@ -1720,7 +1720,7 @@
         <fullname>Sharp X1</fullname>
         <path>%ROMPATH%/x1</path>
         <extension>.dx1 .DX1 .2d .2D .2hd .2HD .tfd .TFD .d88 .D88 .88d .88D .hdm .HDM .xdf .XDF .dup .DUP .tap .TAP .cmd .CMD .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/x1_libretro.dylib %ROM%</command>
+        <command label="x1">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/x1_libretro.dylib %ROM%</command>
         <platform>x1</platform>
         <theme>x1</theme>
     </system>
@@ -1729,7 +1729,7 @@
         <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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.dylib %ROM%</command>
+        <command label="PX68k">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.dylib %ROM%</command>
         <platform>x68000</platform>
         <theme>x68000</theme>
     </system>
@@ -1765,7 +1765,7 @@
         <fullname>Sinclair ZX81</fullname>
         <path>%ROMPATH%/zx81</path>
         <extension>.tzx .TZX .p .P .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/81_libretro.dylib %ROM%</command>
+        <command label="EightyOne">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/81_libretro.dylib %ROM%</command>
         <platform>zx81</platform>
         <theme>zx81</theme>
     </system>
@@ -1774,7 +1774,7 @@
         <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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fuse_libretro.dylib %ROM%</command>
+        <command label="Fuse">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fuse_libretro.dylib %ROM%</command>
         <platform>zxspectrum</platform>
         <theme>zxspectrum</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 7f6bbc835..6c7f677c9 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -489,6 +489,9 @@
         <rule type="staticpath">
             <entry>/var/lib/flatpak/exports/bin/com.github.Rosalie241.RMG</entry>
             <entry>~/.local/share/flatpak/exports/bin/com.github.Rosalie241.RMG</entry>
+            <entry>~/Applications/RMG*.AppImage</entry>
+            <entry>~/.local/bin/RMG*.AppImage</entry>
+            <entry>~/bin/RMG*.AppImage</entry>
         </rule>
     </emulator>
     <emulator name="RPCS3">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index bd6b63868..20e953eb7 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -15,7 +15,7 @@
         <fullname>Adventure Game Studio Game Engine</fullname>
         <path>%ROMPATH%/ags</path>
         <extension>.desktop</extension>
-        <command>%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Native binary">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>ags</platform>
         <theme>ags</theme>
     </system>
@@ -166,7 +166,7 @@
         <fullname>Atari 7800 ProSystem</fullname>
         <path>%ROMPATH%/atari7800</path>
         <extension>.a78 .A78 .bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.so %ROM%</command>
+        <command label="ProSystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.so %ROM%</command>
         <platform>atari7800</platform>
         <theme>atari7800</theme>
     </system>
@@ -268,7 +268,7 @@
         <fullname>Cave Story (NXEngine)</fullname>
         <path>%ROMPATH%/cavestory</path>
         <extension>.exe .EXE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.so %ROM%</command>
+        <command label="NXEngine">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.so %ROM%</command>
         <platform>cavestory</platform>
         <theme>cavestory</theme>
     </system>
@@ -297,7 +297,7 @@
         <fullname>ChaiLove Game Engine</fullname>
         <path>%ROMPATH%/chailove</path>
         <extension>.chai .CHAI .chailove .CHAILOVE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/chailove_libretro.so %ROM%</command>
+        <command label="ChaiLove">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/chailove_libretro.so %ROM%</command>
         <platform>love</platform>
         <theme>chailove</theme>
     </system>
@@ -306,7 +306,7 @@
         <fullname>Fairchild Channel F</fullname>
         <path>%ROMPATH%/channelf</path>
         <extension>.bin .BIN .chf .CHF .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freechaf_libretro.so %ROM%</command>
+        <command label="FreeChaF">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freechaf_libretro.so %ROM%</command>
         <platform>channelf</platform>
         <theme>channelf</theme>
     </system>
@@ -483,7 +483,7 @@
         <fullname>Epic Games Store</fullname>
         <path>%ROMPATH%/epic</path>
         <extension>.desktop .sh</extension>
-        <command>%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Epic Games Store (Standalone)">%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pcwindows</platform>
         <theme>epic</theme>
     </system>
@@ -681,7 +681,7 @@
         <fullname>Mattel Electronics Intellivision</fullname>
         <path>%ROMPATH%/intellivision</path>
         <extension>.int .INT .bin .BIN .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freeintv_libretro.so %ROM%</command>
+        <command label="FreeIntv">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freeintv_libretro.so %ROM%</command>
         <platform>intellivision</platform>
         <theme>intellivision</theme>
     </system>
@@ -699,7 +699,7 @@
         <fullname>Kodi Home Theatre Software</fullname>
         <path>%ROMPATH%/kodi</path>
         <extension>.desktop .sh</extension>
-        <command>%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Kodi (Standalone)">%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pc</platform>
         <theme>kodi</theme>
     </system>
@@ -719,7 +719,7 @@
         <fullname>Lutris Open Gaming Platform</fullname>
         <path>%ROMPATH%/lutris</path>
         <extension>.desktop .sh</extension>
-        <command>%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Lutris (Standalone)">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pc, pcwindows</platform>
         <theme>lutris</theme>
     </system>
@@ -728,7 +728,7 @@
         <fullname>Lutro Game Engine</fullname>
         <path>%ROMPATH%/lutro</path>
         <extension>.lua .LUA .lutro .LUTRO .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/lutro_libretro.so %ROM%</command>
+        <command label="Lutro">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/lutro_libretro.so %ROM%</command>
         <platform>lutro</platform>
         <theme>lutro</theme>
     </system>
@@ -868,7 +868,7 @@
         <fullname>Multi Emulator Super System</fullname>
         <path>%ROMPATH%/mess</path>
         <extension>.chd .CHD .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mess2015_libretro.so %ROM%</command>
+        <command label="MESS 2015">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mess2015_libretro.so %ROM%</command>
         <platform>mess</platform>
         <theme>mess</theme>
     </system>
@@ -906,7 +906,7 @@
         <fullname>Thomson MO/TO Series</fullname>
         <path>%ROMPATH%/moto</path>
         <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM%</command>
+        <command label="Theodore">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM%</command>
         <platform>moto</platform>
         <theme>moto</theme>
     </system>
@@ -965,7 +965,7 @@
         <fullname>M.U.G.E.N Game Engine</fullname>
         <path>%ROMPATH%/mugen</path>
         <extension>.mugen</extension>
-        <command>%STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <command label="Ikemen GO (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% -c "%ROM%"</command>
         <platform>mugen</platform>
         <theme>mugen</theme>
     </system>
@@ -974,7 +974,7 @@
         <fullname>Othello Multivision</fullname>
         <path>%ROMPATH%/multivision</path>
         <extension>.bin .BIN .gg .GG .rom .ROM .sg .SG .sms .SMS .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM%</command>
+        <command label="Gearsystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM%</command>
         <platform>sg-1000</platform>
         <theme>multivision</theme>
     </system>
@@ -1128,7 +1128,7 @@
         <fullname>Magnavox Odyssey2</fullname>
         <path>%ROMPATH%/odyssey2</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM%</command>
+        <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM%</command>
         <platform>odyssey2</platform>
         <theme>odyssey2</theme>
     </system>
@@ -1137,7 +1137,7 @@
         <fullname>OpenBOR Game Engine</fullname>
         <path>%ROMPATH%/openbor</path>
         <extension>.AppImage</extension>
-        <command>%STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% -c "%ROM%"</command>
+        <command label="OpenBOR (Standalone)">%STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% -c "%ROM%"</command>
         <platform>openbor</platform>
         <theme>openbor</theme>
     </system>
@@ -1155,7 +1155,7 @@
         <fullname>Palm OS</fullname>
         <path>%ROMPATH%/palm</path>
         <extension>.prc .PRC .pqa .PQA .img .IMG .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mu_libretro.so %ROM%</command>
+        <command label="Mu">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mu_libretro.so %ROM%</command>
         <platform>palm</platform>
         <theme>palm</theme>
     </system>
@@ -1177,7 +1177,7 @@
         <fullname>NEC PC-8800 Series</fullname>
         <path>%ROMPATH%/pc88</path>
         <extension>.d88 .D88 .u88 .U88 .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quasi88_libretro.so %ROM%</command>
+        <command label="QUASI88">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quasi88_libretro.so %ROM%</command>
         <platform>pc88</platform>
         <theme>pc88</theme>
     </system>
@@ -1240,7 +1240,7 @@
         <fullname>Nintendo Pokémon Mini</fullname>
         <path>%ROMPATH%/pokemini</path>
         <extension>.min .MIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pokemini_libretro.so %ROM%</command>
+        <command label="PokeMini">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pokemini_libretro.so %ROM%</command>
         <platform>pokemini</platform>
         <theme>pokemini</theme>
     </system>
@@ -1249,7 +1249,7 @@
         <fullname>Ports</fullname>
         <path>%ROMPATH%/ports</path>
         <extension>.desktop .sh</extension>
-        <command>%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Various">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>pc, pcwindows</platform>
         <theme>ports</theme>
     </system>
@@ -1322,7 +1322,7 @@
         <fullname>MGT SAM Coupé</fullname>
         <path>%ROMPATH%/samcoupe</path>
         <extension>.dsk .DSK .mgt .MGT .sbt .SBT .sad .SAD .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_SIMCOUPE% %ROM%</command>
+        <command label="SimCoupé (Standalone)">%EMULATOR_SIMCOUPE% %ROM%</command>
         <platform>samcoupe</platform>
         <theme>samcoupe</theme>
     </system>
@@ -1506,7 +1506,7 @@
         <fullname>Solarus Game Engine</fullname>
         <path>%ROMPATH%/solarus</path>
         <extension>.solarus</extension>
-        <command>%EMULATOR_SOLARUS% %ROM%</command>
+        <command label="Solarus (Standalone)">%EMULATOR_SOLARUS% %ROM%</command>
         <platform>solarus</platform>
         <theme>solarus</theme>
     </system>
@@ -1515,7 +1515,7 @@
         <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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
+        <command label="blueMSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
         <platform>spectravideo</platform>
         <theme>spectravideo</theme>
     </system>
@@ -1524,7 +1524,7 @@
         <fullname>Valve Steam</fullname>
         <path>%ROMPATH%/steam</path>
         <extension>.desktop .sh</extension>
-        <command>%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="Steam (Standalone)">%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>steam</platform>
         <theme>steam</theme>
     </system>
@@ -1639,7 +1639,7 @@
         <fullname>TIC-80 Game Engine</fullname>
         <path>%ROMPATH%/tic80</path>
         <extension>.tic .TIC</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tic80_libretro.so %ROM%</command>
+        <command label="TIC-80">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tic80_libretro.so %ROM%</command>
         <platform>tic80</platform>
         <theme>tic80</theme>
     </system>
@@ -1648,7 +1648,7 @@
         <fullname>Thomson TO8</fullname>
         <path>%ROMPATH%/to8</path>
         <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM%</command>
+        <command label="Theodore">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM%</command>
         <platform>moto</platform>
         <theme>to8</theme>
     </system>
@@ -1668,7 +1668,7 @@
         <fullname>Uzebox Open Source Console</fullname>
         <path>%ROMPATH%/uzebox</path>
         <extension>.uze .UZE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/uzem_libretro.so %ROM%</command>
+        <command label="Uzem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/uzem_libretro.so %ROM%</command>
         <platform>uzebox</platform>
         <theme>uzebox</theme>
     </system>
@@ -1677,7 +1677,7 @@
         <fullname>Smith Engineering Vectrex</fullname>
         <path>%ROMPATH%/vectrex</path>
         <extension>.bin .BIN .vec .VEC .gam .GAM .vc .VC .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vecx_libretro.so %ROM%</command>
+        <command label="vecx">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vecx_libretro.so %ROM%</command>
         <platform>vectrex</platform>
         <theme>vectrex</theme>
     </system>
@@ -1696,7 +1696,7 @@
         <fullname>Philips Videopac G7000</fullname>
         <path>%ROMPATH%/videopac</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM%</command>
+        <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM%</command>
         <platform>videopac</platform>
         <theme>videopac</theme>
     </system>
@@ -1776,7 +1776,7 @@
         <fullname>Sharp X1</fullname>
         <path>%ROMPATH%/x1</path>
         <extension>.dx1 .DX1 .2d .2D .2hd .2HD .tfd .TFD .d88 .D88 .88d .88D .hdm .HDM .xdf .XDF .dup .DUP .tap .TAP .cmd .CMD .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/x1_libretro.so %ROM%</command>
+        <command label="x1">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/x1_libretro.so %ROM%</command>
         <platform>x1</platform>
         <theme>x1</theme>
     </system>
@@ -1785,7 +1785,7 @@
         <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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.so %ROM%</command>
+        <command label="PX68k">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.so %ROM%</command>
         <platform>x68000</platform>
         <theme>x68000</theme>
     </system>
@@ -1821,7 +1821,7 @@
         <fullname>Sinclair ZX81</fullname>
         <path>%ROMPATH%/zx81</path>
         <extension>.tzx .TZX .p .P .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/81_libretro.so %ROM%</command>
+        <command label="EightyOne">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/81_libretro.so %ROM%</command>
         <platform>zx81</platform>
         <theme>zx81</theme>
     </system>
@@ -1830,7 +1830,7 @@
         <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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fuse_libretro.so %ROM%</command>
+        <command label="Fuse">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fuse_libretro.so %ROM%</command>
         <platform>zxspectrum</platform>
         <theme>zxspectrum</theme>
     </system>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 9ab56f45d..571753dd2 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -15,7 +15,7 @@
         <fullname>Adventure Game Studio Game Engine</fullname>
         <path>%ROMPATH%\ags</path>
         <extension>.lnk .LNK</extension>
-        <command>%HIDEWINDOW% %ESCAPESPECIALS% %EMULATOR_OS-SHELL% /C %ROM%</command>
+        <command label="Native binary">%HIDEWINDOW% %ESCAPESPECIALS% %EMULATOR_OS-SHELL% /C %ROM%</command>
         <platform>ags</platform>
         <theme>ags</theme>
     </system>
@@ -75,7 +75,7 @@
         <fullname>Google Android</fullname>
         <path>%ROMPATH%\android</path>
         <extension>.lnk .LNK</extension>
-        <command>%HIDEWINDOW% %ESCAPESPECIALS% %STARTDIR%=%EMUDIR% %EMULATOR_OS-SHELL% /C %ROM%</command>
+        <command label="BlueStacks (Standalone)">%HIDEWINDOW% %ESCAPESPECIALS% %STARTDIR%=%EMUDIR% %EMULATOR_OS-SHELL% /C %ROM%</command>
         <platform>android</platform>
         <theme>android</theme>
     </system>
@@ -168,7 +168,7 @@
         <fullname>Atari 7800 ProSystem</fullname>
         <path>%ROMPATH%\atari7800</path>
         <extension>.a78 .A78 .bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\prosystem_libretro.dll %ROM%</command>
+        <command label="ProSystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\prosystem_libretro.dll %ROM%</command>
         <platform>atari7800</platform>
         <theme>atari7800</theme>
     </system>
@@ -271,7 +271,7 @@
         <fullname>Cave Story (NXEngine)</fullname>
         <path>%ROMPATH%\cavestory</path>
         <extension>.exe .EXE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\nxengine_libretro.dll %ROM%</command>
+        <command label="NXEngine">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\nxengine_libretro.dll %ROM%</command>
         <platform>cavestory</platform>
         <theme>cavestory</theme>
     </system>
@@ -300,7 +300,7 @@
         <fullname>ChaiLove Game Engine</fullname>
         <path>%ROMPATH%\chailove</path>
         <extension>.chai .CHAI .chailove .CHAILOVE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\chailove_libretro.dll %ROM%</command>
+        <command label="ChaiLove">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\chailove_libretro.dll %ROM%</command>
         <platform>love</platform>
         <theme>chailove</theme>
     </system>
@@ -309,7 +309,7 @@
         <fullname>Fairchild Channel F</fullname>
         <path>%ROMPATH%\channelf</path>
         <extension>.bin .BIN .chf .CHF .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\freechaf_libretro.dll %ROM%</command>
+        <command label="FreeChaF">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\freechaf_libretro.dll %ROM%</command>
         <platform>channelf</platform>
         <theme>channelf</theme>
     </system>
@@ -486,7 +486,7 @@
         <fullname>Epic Games Store</fullname>
         <path>%ROMPATH%\epic</path>
         <extension>.bat .BAT .lnk .LNK</extension>
-        <command>%HIDEWINDOW% %ESCAPESPECIALS% %EMULATOR_OS-SHELL% /C %ROM%</command>
+        <command label="Epic Games Store (Standalone)">%HIDEWINDOW% %ESCAPESPECIALS% %EMULATOR_OS-SHELL% /C %ROM%</command>
         <platform>pcwindows</platform>
         <theme>epic</theme>
     </system>
@@ -681,7 +681,7 @@
         <fullname>Mattel Electronics Intellivision</fullname>
         <path>%ROMPATH%\intellivision</path>
         <extension>.int .INT .bin .BIN .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\freeintv_libretro.dll %ROM%</command>
+        <command label="FreeIntv">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\freeintv_libretro.dll %ROM%</command>
         <platform>intellivision</platform>
         <theme>intellivision</theme>
     </system>
@@ -700,7 +700,7 @@
         <fullname>Kodi Home Theatre Software</fullname>
         <path>%ROMPATH%\kodi</path>
         <extension>.bat .BAT .lnk .LNK</extension>
-        <command>%HIDEWINDOW% %ESCAPESPECIALS% %RUNINBACKGROUND% %EMULATOR_OS-SHELL% /C %ROM%</command>
+        <command label="Kodi (Standalone)">%HIDEWINDOW% %ESCAPESPECIALS% %RUNINBACKGROUND% %EMULATOR_OS-SHELL% /C %ROM%</command>
         <platform>pc</platform>
         <theme>kodi</theme>
     </system>
@@ -729,7 +729,7 @@
         <fullname>Lutro Game Engine</fullname>
         <path>%ROMPATH%\lutro</path>
         <extension>.lua .LUA .lutro .LUTRO .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\lutro_libretro.dll %ROM%</command>
+        <command label="Lutro">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\lutro_libretro.dll %ROM%</command>
         <platform>lutro</platform>
         <theme>lutro</theme>
     </system>
@@ -869,7 +869,7 @@
         <fullname>Multi Emulator Super System</fullname>
         <path>%ROMPATH%\mess</path>
         <extension>.chd .CHD .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mess2015_libretro.dll %ROM%</command>
+        <command label="MESS 2015">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mess2015_libretro.dll %ROM%</command>
         <platform>mess</platform>
         <theme>mess</theme>
     </system>
@@ -909,7 +909,7 @@
         <fullname>Thomson MO/TO Series</fullname>
         <path>%ROMPATH%\moto</path>
         <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\theodore_libretro.dll %ROM%</command>
+        <command label="Theodore">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\theodore_libretro.dll %ROM%</command>
         <platform>moto</platform>
         <theme>moto</theme>
     </system>
@@ -968,7 +968,7 @@
         <fullname>M.U.G.E.N Game Engine</fullname>
         <path>%ROMPATH%\mugen</path>
         <extension>.lnk .LNK</extension>
-        <command>%HIDEWINDOW% %ESCAPESPECIALS% %STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% /C %ROM%</command>
+        <command label="Ikemen GO (Standalone)">%HIDEWINDOW% %ESCAPESPECIALS% %STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% /C %ROM%</command>
         <platform>mugen</platform>
         <theme>mugen</theme>
     </system>
@@ -977,7 +977,7 @@
         <fullname>Othello Multivision</fullname>
         <path>%ROMPATH%\multivision</path>
         <extension>.bin .BIN .gg .GG .rom .ROM .sg .SG .sms .SMS .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\gearsystem_libretro.dll %ROM%</command>
+        <command label="Gearsystem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\gearsystem_libretro.dll %ROM%</command>
         <platform>sg-1000</platform>
         <theme>multivision</theme>
     </system>
@@ -1128,7 +1128,7 @@
         <fullname>Magnavox Odyssey2</fullname>
         <path>%ROMPATH%\odyssey2</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\o2em_libretro.dll %ROM%</command>
+        <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\o2em_libretro.dll %ROM%</command>
         <platform>odyssey2</platform>
         <theme>odyssey2</theme>
     </system>
@@ -1137,7 +1137,7 @@
         <fullname>OpenBOR Game Engine</fullname>
         <path>%ROMPATH%\openbor</path>
         <extension>.exe .EXE .lnk .LNK</extension>
-        <command>%HIDEWINDOW% %ESCAPESPECIALS% %STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% /C %ROM%</command>
+        <command label="OpenBOR (Standalone)">%HIDEWINDOW% %ESCAPESPECIALS% %STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% /C %ROM%</command>
         <platform>openbor</platform>
         <theme>openbor</theme>
     </system>
@@ -1155,7 +1155,7 @@
         <fullname>Palm OS</fullname>
         <path>%ROMPATH%\palm</path>
         <extension>.prc .PRC .pqa .PQA .img .IMG .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mu_libretro.dll %ROM%</command>
+        <command label="Mu">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mu_libretro.dll %ROM%</command>
         <platform>palm</platform>
         <theme>palm</theme>
     </system>
@@ -1177,7 +1177,7 @@
         <fullname>NEC PC-8800 Series</fullname>
         <path>%ROMPATH%\pc88</path>
         <extension>.d88 .D88 .u88 .U88 .m3u .M3U .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\quasi88_libretro.dll %ROM%</command>
+        <command label="QUASI88">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\quasi88_libretro.dll %ROM%</command>
         <platform>pc88</platform>
         <theme>pc88</theme>
     </system>
@@ -1240,7 +1240,7 @@
         <fullname>Nintendo Pokémon Mini</fullname>
         <path>%ROMPATH%\pokemini</path>
         <extension>.min .MIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\pokemini_libretro.dll %ROM%</command>
+        <command label="PokeMini">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\pokemini_libretro.dll %ROM%</command>
         <platform>pokemini</platform>
         <theme>pokemini</theme>
     </system>
@@ -1249,7 +1249,7 @@
         <fullname>Ports</fullname>
         <path>%ROMPATH%\ports</path>
         <extension>.bat .BAT .lnk .LNK</extension>
-        <command>%HIDEWINDOW% %ESCAPESPECIALS% %EMULATOR_OS-SHELL% /C %ROM%</command>
+        <command label="Various">%HIDEWINDOW% %ESCAPESPECIALS% %EMULATOR_OS-SHELL% /C %ROM%</command>
         <platform>pc, pcwindows</platform>
         <theme>ports</theme>
     </system>
@@ -1322,7 +1322,7 @@
         <fullname>MGT SAM Coupé</fullname>
         <path>%ROMPATH%\samcoupe</path>
         <extension>.dsk .DSK .mgt .MGT .sbt .SBT .sad .SAD .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_SIMCOUPE% %ROM%</command>
+        <command label="SimCoupé (Standalone)">%EMULATOR_SIMCOUPE% %ROM%</command>
         <platform>samcoupe</platform>
         <theme>samcoupe</theme>
     </system>
@@ -1508,7 +1508,7 @@
         <fullname>Solarus Game Engine</fullname>
         <path>%ROMPATH%\solarus</path>
         <extension>.solarus</extension>
-        <command>%STARTDIR%=%EMUDIR% %EMULATOR_SOLARUS% %ROM%</command>
+        <command label="Solarus (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_SOLARUS% %ROM%</command>
         <platform>solarus</platform>
         <theme>solarus</theme>
     </system>
@@ -1517,7 +1517,7 @@
         <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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bluemsx_libretro.dll %ROM%</command>
+        <command label="blueMSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bluemsx_libretro.dll %ROM%</command>
         <platform>spectravideo</platform>
         <theme>spectravideo</theme>
     </system>
@@ -1526,7 +1526,7 @@
         <fullname>Valve Steam</fullname>
         <path>%ROMPATH%\steam</path>
         <extension>.bat .BAT .url .URL</extension>
-        <command>%HIDEWINDOW% %ESCAPESPECIALS% %RUNINBACKGROUND% %EMULATOR_OS-SHELL% /C %ROM%</command>
+        <command label="Steam (Standalone)">%HIDEWINDOW% %ESCAPESPECIALS% %RUNINBACKGROUND% %EMULATOR_OS-SHELL% /C %ROM%</command>
         <platform>steam</platform>
         <theme>steam</theme>
     </system>
@@ -1641,7 +1641,7 @@
         <fullname>TIC-80 Game Engine</fullname>
         <path>%ROMPATH%\tic80</path>
         <extension>.tic .TIC</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\tic80_libretro.dll %ROM%</command>
+        <command label="TIC-80">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\tic80_libretro.dll %ROM%</command>
         <platform>tic80</platform>
         <theme>tic80</theme>
     </system>
@@ -1650,7 +1650,7 @@
         <fullname>Thomson TO8</fullname>
         <path>%ROMPATH%\to8</path>
         <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\theodore_libretro.dll %ROM%</command>
+        <command label="Theodore">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\theodore_libretro.dll %ROM%</command>
         <platform>moto</platform>
         <theme>to8</theme>
     </system>
@@ -1670,7 +1670,7 @@
         <fullname>Uzebox Open Source Console</fullname>
         <path>%ROMPATH%\uzebox</path>
         <extension>.uze .UZE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\uzem_libretro.dll %ROM%</command>
+        <command label="Uzem">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\uzem_libretro.dll %ROM%</command>
         <platform>uzebox</platform>
         <theme>uzebox</theme>
     </system>
@@ -1679,7 +1679,7 @@
         <fullname>Smith Engineering Vectrex</fullname>
         <path>%ROMPATH%\vectrex</path>
         <extension>.bin .BIN .vec .VEC .gam .GAM .vc .VC .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vecx_libretro.dll %ROM%</command>
+        <command label="vecx">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vecx_libretro.dll %ROM%</command>
         <platform>vectrex</platform>
         <theme>vectrex</theme>
     </system>
@@ -1698,7 +1698,7 @@
         <fullname>Philips Videopac G7000</fullname>
         <path>%ROMPATH%\videopac</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\o2em_libretro.dll %ROM%</command>
+        <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\o2em_libretro.dll %ROM%</command>
         <platform>videopac</platform>
         <theme>videopac</theme>
     </system>
@@ -1778,7 +1778,7 @@
         <fullname>Sharp X1</fullname>
         <path>%ROMPATH%\x1</path>
         <extension>.dx1 .DX1 .2d .2D .2hd .2HD .tfd .TFD .d88 .D88 .88d .88D .hdm .HDM .xdf .XDF .dup .DUP .tap .TAP .cmd .CMD .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\x1_libretro.dll %ROM%</command>
+        <command label="x1">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\x1_libretro.dll %ROM%</command>
         <platform>x1</platform>
         <theme>x1</theme>
     </system>
@@ -1787,7 +1787,7 @@
         <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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\px68k_libretro.dll %ROM%</command>
+        <command label="PX68k">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\px68k_libretro.dll %ROM%</command>
         <platform>x68000</platform>
         <theme>x68000</theme>
     </system>
@@ -1824,7 +1824,7 @@
         <fullname>Sinclair ZX81</fullname>
         <path>%ROMPATH%\zx81</path>
         <extension>.tzx .TZX .p .P .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\81_libretro.dll %ROM%</command>
+        <command label="EightyOne">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\81_libretro.dll %ROM%</command>
         <platform>zx81</platform>
         <theme>zx81</theme>
     </system>
@@ -1833,7 +1833,7 @@
         <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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fuse_libretro.dll %ROM%</command>
+        <command label="Fuse">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fuse_libretro.dll %ROM%</command>
         <platform>zxspectrum</platform>
         <theme>zxspectrum</theme>
     </system>