diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 7fb951c55..6553c8d0e 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -21,7 +21,7 @@
     </system>
     <system>
         <name>ags</name>
-        <fullname>Adventure Game Studio game engine</fullname>
+        <fullname>Adventure Game Studio Game Engine</fullname>
         <path>%ROMPATH%/ags</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -267,7 +267,7 @@
     </system>
     <system>
         <name>chailove</name>
-        <fullname>ChaiLove game engine</fullname>
+        <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>
@@ -303,16 +303,16 @@
     </system>
     <system>
         <name>daphne</name>
-        <fullname>Daphne Arcade Laserdisc Emulator</fullname>
+        <fullname>Daphne Arcade LaserDisc Emulator</fullname>
         <path>%ROMPATH%/daphne</path>
         <extension>.7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/daphne_libretro.dylib %ROM%</command>
+        <command>PLACEHOLDER %ROM%</command>
         <platform>daphne</platform>
         <theme>daphne</theme>
     </system>
     <system>
         <name>desktop</name>
-        <fullname>Desktop applications</fullname>
+        <fullname>Desktop Applications</fullname>
         <path>%ROMPATH%/desktop</path>
         <extension>.sh</extension>
         <command>zsh %ROM%</command>
@@ -520,7 +520,7 @@
     </system>
     <system>
         <name>kodi</name>
-        <fullname>Kodi home theatre software</fullname>
+        <fullname>Kodi Home Theatre Software</fullname>
         <path>%ROMPATH%/kodi</path>
         <extension>.sh</extension>
         <command>zsh %ROM%</command>
@@ -529,7 +529,7 @@
     </system>
     <system>
         <name>lutris</name>
-        <fullname>Lutris open gaming platform</fullname>
+        <fullname>Lutris Open Gaming Platform</fullname>
         <path>%ROMPATH%/lutris</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -538,7 +538,7 @@
     </system>
     <system>
         <name>lutro</name>
-        <fullname>Lutro game engine</fullname>
+        <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>
@@ -644,7 +644,7 @@
     </system>
     <system>
         <name>moonlight</name>
-        <fullname>Moonlight game streaming</fullname>
+        <fullname>Moonlight Game Streaming</fullname>
         <path>%ROMPATH%/moonlight</path>
         <extension>.moonlight .MOONLIGHT .7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -653,7 +653,7 @@
     </system>
     <system>
         <name>moto</name>
-        <fullname>Thomson MO/TO series</fullname>
+        <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>
@@ -826,7 +826,7 @@
     </system>
     <system>
         <name>openbor</name>
-        <fullname>OpenBOR game engine</fullname>
+        <fullname>OpenBOR Game Engine</fullname>
         <path>%ROMPATH%/openbor</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -865,7 +865,7 @@
     </system>
     <system>
         <name>pc88</name>
-        <fullname>NEC PC-8800 series</fullname>
+        <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>
@@ -874,7 +874,7 @@
     </system>
     <system>
         <name>pc98</name>
-        <fullname>NEC PC-9800 series</fullname>
+        <fullname>NEC PC-9800 Series</fullname>
         <path>%ROMPATH%/pc98</path>
         <extension>.2hd .2HD .88d .88D .98d .98D .d88 .D88 .d98 .D98 .cmd .CMD .dup .DUP .fdd .FDD .fdi .FDI .hdd .HDD .hdi .HDI .hdm .HDM .hdn .HDN .nhd .NHD .tfd .TFD .thd .THD . xdf .XDF .7z .7Z .zip .ZIP</extension>
         <command label="Neko Project II Kai">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/np2kai_libretro.dylib %ROM%</command>
@@ -988,7 +988,7 @@
     </system>
     <system>
         <name>residualvm</name>
-        <fullname>ResidualVM game engine</fullname>
+        <fullname>ResidualVM Game Engine</fullname>
         <path>%ROMPATH%/residualvm</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -1039,7 +1039,7 @@
     </system>
     <system>
         <name>scummvm</name>
-        <fullname>ScummVM game engine</fullname>
+        <fullname>ScummVM Game Engine</fullname>
         <path>%ROMPATH%/scummvm</path>
         <extension>.scummvm .7z .7Z .zip .ZIP</extension>
         <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.dylib %ROM%</command>
@@ -1124,7 +1124,7 @@
     </system>
     <system>
         <name>solarus</name>
-        <fullname>Solarus game engine</fullname>
+        <fullname>Solarus Game Engine</fullname>
         <path>%ROMPATH%/solarus</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -1151,7 +1151,7 @@
     </system>
     <system>
         <name>stratagus</name>
-        <fullname>Stratagus game engine</fullname>
+        <fullname>Stratagus Game Engine</fullname>
         <path>%ROMPATH%/stratagus</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -1237,7 +1237,7 @@
     </system>
     <system>
         <name>tic80</name>
-        <fullname>TIC-80 game engine</fullname>
+        <fullname>TIC-80 Game Engine</fullname>
         <path>%ROMPATH%/tic80</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 9cc9816e0..d8c6d773c 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -22,7 +22,7 @@
     </system>
     <system>
         <name>ags</name>
-        <fullname>Adventure Game Studio game engine</fullname>
+        <fullname>Adventure Game Studio Game Engine</fullname>
         <path>%ROMPATH%/ags</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -268,7 +268,7 @@
     </system>
     <system>
         <name>chailove</name>
-        <fullname>ChaiLove game engine</fullname>
+        <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>
@@ -304,16 +304,16 @@
     </system>
     <system>
         <name>daphne</name>
-        <fullname>Daphne Arcade Laserdisc Emulator</fullname>
+        <fullname>Daphne Arcade LaserDisc Emulator</fullname>
         <path>%ROMPATH%/daphne</path>
         <extension>.7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/daphne_libretro.so %ROM%</command>
+        <command>PLACEHOLDER %ROM%</command>
         <platform>daphne</platform>
         <theme>daphne</theme>
     </system>
     <system>
         <name>desktop</name>
-        <fullname>Desktop applications</fullname>
+        <fullname>Desktop Applications</fullname>
         <path>%ROMPATH%/desktop</path>
         <extension>.sh</extension>
         <command>bash %ROM%</command>
@@ -522,7 +522,7 @@
     </system>
     <system>
         <name>kodi</name>
-        <fullname>Kodi home theatre software</fullname>
+        <fullname>Kodi Home Theatre Software</fullname>
         <path>%ROMPATH%/kodi</path>
         <extension>.sh</extension>
         <command>bash %ROM%</command>
@@ -531,7 +531,7 @@
     </system>
     <system>
         <name>lutris</name>
-        <fullname>Lutris open gaming platform</fullname>
+        <fullname>Lutris Open Gaming Platform</fullname>
         <path>%ROMPATH%/lutris</path>
         <extension>.sh</extension>
         <command>bash %ROM%</command>
@@ -540,7 +540,7 @@
     </system>
     <system>
         <name>lutro</name>
-        <fullname>Lutro game engine</fullname>
+        <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>
@@ -646,7 +646,7 @@
     </system>
     <system>
         <name>moonlight</name>
-        <fullname>Moonlight game streaming</fullname>
+        <fullname>Moonlight Game Streaming</fullname>
         <path>%ROMPATH%/moonlight</path>
         <extension>.moonlight .MOONLIGHT .7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -655,7 +655,7 @@
     </system>
     <system>
         <name>moto</name>
-        <fullname>Thomson MO/TO series</fullname>
+        <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>
@@ -829,7 +829,7 @@
     </system>
     <system>
         <name>openbor</name>
-        <fullname>OpenBOR game engine</fullname>
+        <fullname>OpenBOR Game Engine</fullname>
         <path>%ROMPATH%/openbor</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -868,7 +868,7 @@
     </system>
     <system>
         <name>pc88</name>
-        <fullname>NEC PC-8800 series</fullname>
+        <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>
@@ -877,7 +877,7 @@
     </system>
     <system>
         <name>pc98</name>
-        <fullname>NEC PC-9800 series</fullname>
+        <fullname>NEC PC-9800 Series</fullname>
         <path>%ROMPATH%/pc98</path>
         <extension>.2hd .2HD .88d .88D .98d .98D .d88 .D88 .d98 .D98 .cmd .CMD .dup .DUP .fdd .FDD .fdi .FDI .hdd .HDD .hdi .HDI .hdm .HDM .hdn .HDN .nhd .NHD .tfd .TFD .thd .THD . xdf .XDF .7z .7Z .zip .ZIP</extension>
         <command label="Neko Project II Kai">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/np2kai_libretro.so %ROM%</command>
@@ -991,7 +991,7 @@
     </system>
     <system>
         <name>residualvm</name>
-        <fullname>ResidualVM game engine</fullname>
+        <fullname>ResidualVM Game Engine</fullname>
         <path>%ROMPATH%/residualvm</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -1046,7 +1046,7 @@
     </system>
     <system>
         <name>scummvm</name>
-        <fullname>ScummVM game engine</fullname>
+        <fullname>ScummVM Game Engine</fullname>
         <path>%ROMPATH%/scummvm</path>
         <extension>.scummvm .7z .7Z .zip .ZIP</extension>
         <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.so %ROM%</command>
@@ -1133,7 +1133,7 @@
     </system>
     <system>
         <name>solarus</name>
-        <fullname>Solarus game engine</fullname>
+        <fullname>Solarus Game Engine</fullname>
         <path>%ROMPATH%/solarus</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -1160,7 +1160,7 @@
     </system>
     <system>
         <name>stratagus</name>
-        <fullname>Stratagus game engine</fullname>
+        <fullname>Stratagus Game Engine</fullname>
         <path>%ROMPATH%/stratagus</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -1247,7 +1247,7 @@
     </system>
     <system>
         <name>tic80</name>
-        <fullname>TIC-80 game engine</fullname>
+        <fullname>TIC-80 Game Engine</fullname>
         <path>%ROMPATH%/tic80</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 4af724a6e..b9b1ef7b3 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -22,7 +22,7 @@
     </system>
     <system>
         <name>ags</name>
-        <fullname>Adventure Game Studio game engine</fullname>
+        <fullname>Adventure Game Studio Game Engine</fullname>
         <path>%ROMPATH%\ags</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -268,7 +268,7 @@
     </system>
     <system>
         <name>chailove</name>
-        <fullname>ChaiLove game engine</fullname>
+        <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>
@@ -304,16 +304,16 @@
     </system>
     <system>
         <name>daphne</name>
-        <fullname>Daphne Arcade Laserdisc Emulator</fullname>
+        <fullname>Daphne Arcade LaserDisc Emulator</fullname>
         <path>%ROMPATH%\daphne</path>
         <extension>.7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\daphne_libretro.dll %ROM%</command>
+        <command>PLACEHOLDER %ROM%</command>
         <platform>daphne</platform>
         <theme>daphne</theme>
     </system>
     <system>
         <name>desktop</name>
-        <fullname>Desktop applications</fullname>
+        <fullname>Desktop Applications</fullname>
         <path>%ROMPATH%\desktop</path>
         <extension>.bat</extension>
         <command>%HIDEWINDOW% cmd.exe /C %ROM%</command>
@@ -521,7 +521,7 @@
     </system>
     <system>
         <name>kodi</name>
-        <fullname>Kodi home theatre software</fullname>
+        <fullname>Kodi Home Theatre Software</fullname>
         <path>%ROMPATH%\kodi</path>
         <extension>.bat</extension>
         <command>%HIDEWINDOW% cmd.exe /C %ROM%</command>
@@ -530,7 +530,7 @@
     </system>
     <system>
         <name>lutris</name>
-        <fullname>Lutris open gaming platform</fullname>
+        <fullname>Lutris Open Gaming Platform</fullname>
         <path>%ROMPATH%\lutris</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -539,7 +539,7 @@
     </system>
     <system>
         <name>lutro</name>
-        <fullname>Lutro game engine</fullname>
+        <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>
@@ -645,7 +645,7 @@
     </system>
     <system>
         <name>moonlight</name>
-        <fullname>Moonlight game streaming</fullname>
+        <fullname>Moonlight Game Streaming</fullname>
         <path>%ROMPATH%\moonlight</path>
         <extension>.moonlight .MOONLIGHT .7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -654,7 +654,7 @@
     </system>
     <system>
         <name>moto</name>
-        <fullname>Thomson MO/TO series</fullname>
+        <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>
@@ -828,7 +828,7 @@
     </system>
     <system>
         <name>openbor</name>
-        <fullname>OpenBOR game engine</fullname>
+        <fullname>OpenBOR Game Engine</fullname>
         <path>%ROMPATH%\openbor</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -866,7 +866,7 @@
     </system>
     <system>
         <name>pc88</name>
-        <fullname>NEC PC-8800 series</fullname>
+        <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>
@@ -875,7 +875,7 @@
     </system>
     <system>
         <name>pc98</name>
-        <fullname>NEC PC-9800 series</fullname>
+        <fullname>NEC PC-9800 Series</fullname>
         <path>%ROMPATH%\pc98</path>
         <extension>.2hd .2HD .88d .88D .98d .98D .d88 .D88 .d98 .D98 .cmd .CMD .dup .DUP .fdd .FDD .fdi .FDI .hdd .HDD .hdi .HDI .hdm .HDM .hdn .HDN .nhd .NHD .tfd .TFD .thd .THD . xdf .XDF .7z .7Z .zip .ZIP</extension>
         <command label="Neko Project II Kai">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\np2kai_libretro.dll %ROM%</command>
@@ -989,7 +989,7 @@
     </system>
     <system>
         <name>residualvm</name>
-        <fullname>ResidualVM game engine</fullname>
+        <fullname>ResidualVM Game Engine</fullname>
         <path>%ROMPATH%\residualvm</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -1044,7 +1044,7 @@
     </system>
     <system>
         <name>scummvm</name>
-        <fullname>ScummVM game engine</fullname>
+        <fullname>ScummVM Game Engine</fullname>
         <path>%ROMPATH%\scummvm</path>
         <extension>.scummvm .7z .7Z .zip .ZIP</extension>
         <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\scummvm_libretro.dll %ROM%</command>
@@ -1131,7 +1131,7 @@
     </system>
     <system>
         <name>solarus</name>
-        <fullname>Solarus game engine</fullname>
+        <fullname>Solarus Game Engine</fullname>
         <path>%ROMPATH%\solarus</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -1158,7 +1158,7 @@
     </system>
     <system>
         <name>stratagus</name>
-        <fullname>Stratagus game engine</fullname>
+        <fullname>Stratagus Game Engine</fullname>
         <path>%ROMPATH%\stratagus</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>
@@ -1245,7 +1245,7 @@
     </system>
     <system>
         <name>tic80</name>
-        <fullname>TIC-80 game engine</fullname>
+        <fullname>TIC-80 Game Engine</fullname>
         <path>%ROMPATH%\tic80</path>
         <extension>.7z .7Z .zip .ZIP</extension>
         <command>PLACEHOLDER %ROM%</command>