From 3ead3548a11e35e65623f1b1e0c7a7be5b55e195 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sun, 10 Jan 2021 23:05:20 +0100
Subject: [PATCH] (Windows) Changed the es_systems.cfg template to the
 %COREPATH% logic.

---
 es-core/src/Settings.cpp                   |   8 +-
 resources/templates/es_systems.cfg_windows | 188 ++++++++++-----------
 2 files changed, 99 insertions(+), 97 deletions(-)

diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp
index d984e254e..2fffb32f4 100644
--- a/es-core/src/Settings.cpp
+++ b/es-core/src/Settings.cpp
@@ -207,10 +207,12 @@ void Settings::setDefaults()
     mBoolMap["RunInBackground"] = { false, false };
     #endif
     mStringMap["MediaDirectory"] = { "", "" };
-    #if defined(__APPLE__) || defined(_WIN64)
+    #if defined(__APPLE__)
     mStringMap["EmulatorCorePath"] = { "", "" };
+    #elif defined (_WIN64)
+    mStringMap["EmulatorCorePath"] = { "%EMUPATH%\\cores", "%EMUPATH%\\cores" };
     #else
-    const std::string emulatorCorePaths =
+    const std::string emulatorCorePath =
             "~/.config/retroarch/cores:"                        // Compiled from source
             "~/snap/retroarch/current/.config/retroarch/cores:" // Snap package
             // As installed via the OS repositories:
@@ -219,7 +221,7 @@ void Settings::setDefaults()
             "/usr/lib/libretro:"                                // Manjaro
             "/usr/local/lib/libretro:"                          // FreeBSD and OpenBSD
             "/usr/pkg/lib/libretro";                            // NetBSD
-    mStringMap["EmulatorCorePath"] = { emulatorCorePaths, emulatorCorePaths };
+    mStringMap["EmulatorCorePath"] = { emulatorCorePath, emulatorCorePath };
     #endif
     mBoolMap["LaunchCommandOverride"] = { true, true };
     mBoolMap["ShowHiddenFiles"] = { true, true };
diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows
index f566ae0eb..f0cd2a874 100644
--- a/resources/templates/es_systems.cfg_windows
+++ b/resources/templates/es_systems.cfg_windows
@@ -6,7 +6,7 @@
     <fullname>3DO</fullname>
     <path>%ROMPATH%\3do</path>
     <extension>.iso .ISO .bin .BIN .chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\4do_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\4do_libretro.dll %ROM%</command>
     <platform>3do</platform>
     <theme>3do</theme>
   </system>
@@ -24,7 +24,7 @@
     <fullname>Commodore Amiga</fullname>
     <path>%ROMPATH%\amiga</path>
     <extension>.adf .ADF .adz .ADZ .dms .DMS .fdi .FDI .ipf .IPF .hdf .HDF .hdz .HDZ .lha .LHA .cue .CUE .ccd .CCD .nrg .NRG .mds .MDS .iso .ISO .uae .UAE .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\puae_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\puae_libretro.dll %ROM%</command>
     <platform>amiga</platform>
     <theme>amiga</theme>
   </system>
@@ -33,7 +33,7 @@
     <fullname>Commodore Amiga 600</fullname>
     <path>%ROMPATH%\amiga600</path>
     <extension>.adf .ADF .adz .ADZ .dms .DMS .fdi .FDI .ipf .IPF .hdf .HDF .hdz .HDZ .lha .LHA .cue .CUE .ccd .CCD .nrg .NRG .mds .MDS .iso .ISO .uae .UAE .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\puae_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\puae_libretro.dll %ROM%</command>
     <platform>amiga</platform>
     <theme>amiga600</theme>
   </system>
@@ -42,7 +42,7 @@
     <fullname>Commodore Amiga 1200</fullname>
     <path>%ROMPATH%\amiga1200</path>
     <extension>.adf .ADF .adz .ADZ .dms .DMS .fdi .FDI .ipf .IPF .hdf .HDF .hdz .HDZ .lha .LHA .cue .CUE .ccd .CCD .nrg .NRG .mds .MDS .iso .ISO .uae .UAE .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\puae_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\puae_libretro.dll %ROM%</command>
     <platform>amiga</platform>
     <theme>amiga1200</theme>
   </system>
@@ -51,7 +51,7 @@
     <fullname>Commodore Amiga CD32</fullname>
     <path>%ROMPATH%\amigacd32</path>
     <extension>.adf .ADF .adz .ADZ .dms .DMS .fdi .FDI .ipf .IPF .hdf .HDF .hdz .HDZ .lha .LHA .cue .CUE .ccd .CCD .nrg .NRG .mds .MDS .iso .ISO .uae .UAE .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\puae_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\puae_libretro.dll %ROM%</command>
     <platform>amigacd32</platform>
     <theme>amigacd32</theme>
   </system>
@@ -60,7 +60,7 @@
     <fullname>Amstrad CPC</fullname>
     <path>%ROMPATH%\amstradcpc</path>
     <extension>.dsk .DSK .sna .SNA .tap .TAR .cdt .CDT .voc .VOC .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\cap32_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\cap32_libretro.dll %ROM%</command>
     <platform>amstradcpc</platform>
     <theme>amstradcpc</theme>
   </system>
@@ -87,7 +87,7 @@
     <fullname>Arcade</fullname>
     <path>%ROMPATH%\arcade</path>
     <extension>.chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mame2016_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mame2016_libretro.dll %ROM%</command>
     <platform>arcade</platform>
     <theme>arcade</theme>
   </system>
@@ -105,7 +105,7 @@
     <fullname>Atari 2600</fullname>
     <path>%ROMPATH%\atari2600</path>
     <extension>.a26 .A26 .bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\stella2014_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\stella2014_libretro.dll %ROM%</command>
     <platform>atari2600</platform>
     <theme>atari2600</theme>
   </system>
@@ -114,7 +114,7 @@
     <fullname>Atari 5200</fullname>
     <path>%ROMPATH%\atari5200</path>
     <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\atari800_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\atari800_libretro.dll %ROM%</command>
     <platform>atari5200</platform>
     <theme>atari5200</theme>
   </system>
@@ -123,7 +123,7 @@
     <fullname>Atari 7800 ProSystem</fullname>
     <path>%ROMPATH%\atari7800</path>
     <extension>.a78 .A78 .bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\prosystem_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\prosystem_libretro.dll %ROM%</command>
     <platform>atari7800</platform>
     <theme>atari7800</theme>
   </system>
@@ -132,7 +132,7 @@
     <fullname>Atari 800</fullname>
     <path>%ROMPATH%\atari800</path>
     <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\atari800_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\atari800_libretro.dll %ROM%</command>
     <platform>atari800</platform>
     <theme>atari800</theme>
   </system>
@@ -141,7 +141,7 @@
     <fullname>Atari Jaguar</fullname>
     <path>%ROMPATH%\atarijaguar</path>
     <extension>.j64 .J64 .jag .JAG .rom .ROM .abs .ABS .cof .COF .bin .BIN .prg .PRG .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\virtualjaguar_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\virtualjaguar_libretro.dll %ROM%</command>
     <platform>atarijaguar, atarijaguarcd</platform>
     <theme>atarijaguar</theme>
   </system>
@@ -150,7 +150,7 @@
     <fullname>Atari Jaguar CD</fullname>
     <path>%ROMPATH%\atarijaguarcd</path>
     <extension>.j64 .J64 .jag .JAG .rom .ROM .abs .ABS .cof .COF .bin .BIN .prg .PRG .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\virtualjaguar_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\virtualjaguar_libretro.dll %ROM%</command>
     <platform>atarijaguarcd</platform>
     <theme>atarijaguar</theme>
   </system>
@@ -159,7 +159,7 @@
     <fullname>Atari Lynx</fullname>
     <path>%ROMPATH%\atarilynx</path>
     <extension>.lnx .LNX .o .O .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_lynx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_lynx_libretro.dll %ROM%</command>
     <platform>atarilynx</platform>
     <theme>atarilynx</theme>
   </system>
@@ -168,7 +168,7 @@
     <fullname>Atari ST</fullname>
     <path>%ROMPATH%\atarist</path>
     <extension>.st .ST .msa .MSA .stx .STX .dim .DIM .ipf .IPF .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\hatari_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\hatari_libretro.dll %ROM%</command>
     <platform>atarist</platform>
     <theme>atarist</theme>
   </system>
@@ -177,7 +177,7 @@
     <fullname>Atari XE</fullname>
     <path>%ROMPATH%\atarixe</path>
     <extension>.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\atari800_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\atari800_libretro.dll %ROM%</command>
     <platform>atarixe</platform>
     <theme>atarixe</theme>
   </system>
@@ -186,7 +186,7 @@
     <fullname>Atomiswave</fullname>
     <path>%ROMPATH%\atomiswave</path>
     <extension>.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\flycast_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\flycast_libretro.dll %ROM%</command>
     <platform>atomiswave</platform>
     <theme>atomiswave</theme>
   </system>
@@ -204,7 +204,7 @@
     <fullname>Commodore 64</fullname>
     <path>%ROMPATH%\c64</path>
     <extension>.d64 .D64 .d71 .D71 .d80 .D80 .d81 .D81 .d82 .D82 .g64 .G64 .g41 .G41 .x64 .X64 .t64 .T64 .tap .TAP .prg .PRG .p00 .P00 .crt .CRT .bin .BIN .gz .GZ .d6z .D6Z .d7z .D7Z .d8z .D8Z .g6z .G6Z .x6z .X6Z .cmd .CMD .m3u .M3U .vsf .VSF .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\vice_x64_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\vice_x64_libretro.dll %ROM%</command>
     <platform>c64</platform>
     <theme>c64</theme>
   </system>
@@ -213,7 +213,7 @@
     <fullname>Cave Story (NXEngine)</fullname>
     <path>%ROMPATH%\cavestory</path>
     <extension>.exe .EXE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\nxengine_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\nxengine_libretro.dll %ROM%</command>
     <platform>cavestory</platform>
     <theme>cavestory</theme>
   </system>
@@ -231,7 +231,7 @@
     <fullname>ChaiLove game engine</fullname>
     <path>%ROMPATH%\chailove</path>
     <extension>.chai .CHAI .chailove .CHAILOVE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\chailove_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\chailove_libretro.dll %ROM%</command>
     <platform>love</platform>
     <theme>chailove</theme>
   </system>
@@ -240,7 +240,7 @@
     <fullname>Fairchild Channel F</fullname>
     <path>%ROMPATH%\channelf</path>
     <extension>.bin .BIN .chf .CHF .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\freechaf_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\freechaf_libretro.dll %ROM%</command>
     <platform>channelf</platform>
     <theme>channelf</theme>
   </system>
@@ -258,7 +258,7 @@
     <fullname>ColecoVision</fullname>
     <path>%ROMPATH%\coleco</path>
     <extension>.rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\bluemsx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\bluemsx_libretro.dll %ROM%</command>
     <platform>colecovision</platform>
     <theme>colecovision</theme>
   </system>
@@ -267,7 +267,7 @@
     <fullname>Daphne Arcade Laserdisc Emulator</fullname>
     <path>%ROMPATH%\daphne</path>
     <extension>.7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\daphne_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\daphne_libretro.dll %ROM%</command>
     <platform>daphne</platform>
     <theme>daphne</theme>
   </system>
@@ -285,7 +285,7 @@
     <fullname>Doom</fullname>
     <path>%ROMPATH%\doom</path>
     <extension>.wad .WAD .iwad .IWAD .pwad .PWAD</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\prboom_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\prboom_libretro.dll %ROM%</command>
     <platform>pc</platform>
     <theme>doom</theme>
   </system>
@@ -294,7 +294,7 @@
     <fullname>DOS (PC)</fullname>
     <path>%ROMPATH%\dos</path>
     <extension>.bat .BAT .com .COM .exe .EXE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\dosbox_core_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\dosbox_core_libretro.dll %ROM%</command>
     <platform>dos</platform>
     <theme>dos</theme>
   </system>
@@ -312,7 +312,7 @@
     <fullname>Sega Dreamcast</fullname>
     <path>%ROMPATH%\dreamcast</path>
     <extension>.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\flycast_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\flycast_libretro.dll %ROM%</command>
     <platform>dreamcast</platform>
     <theme>dreamcast</theme>
   </system>
@@ -321,7 +321,7 @@
     <fullname>Nintendo Family Computer</fullname>
     <path>%ROMPATH%\famicom</path>
     <extension>.nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\nestopia_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\nestopia_libretro.dll %ROM%</command>
     <platform>nes, famicom</platform>
     <theme>famicom</theme>
   </system>
@@ -330,7 +330,7 @@
     <fullname>Final Burn Alpha</fullname>
     <path>%ROMPATH%\fba</path>
     <extension>.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\fbneo_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\fbneo_libretro.dll %ROM%</command>
     <platform>arcade</platform>
     <theme>fba</theme>
   </system>
@@ -339,7 +339,7 @@
     <fullname>FinalBurn Neo</fullname>
     <path>%ROMPATH%\fbneo</path>
     <extension>.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\fbneo_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\fbneo_libretro.dll %ROM%</command>
     <platform>arcade</platform>
     <theme>fbneo</theme>
   </system>
@@ -348,7 +348,7 @@
     <fullname>Nintendo Famicom Disk System</fullname>
     <path>%ROMPATH%\fds</path>
     <extension>.nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\nestopia_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\nestopia_libretro.dll %ROM%</command>
     <platform>fds</platform>
     <theme>fds</theme>
   </system>
@@ -357,7 +357,7 @@
     <fullname>Nintendo Game and Watch</fullname>
     <path>%ROMPATH%\gameandwatch</path>
     <extension>.mgw .MGW .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\gw_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\gw_libretro.dll %ROM%</command>
     <platform>gameandwatch</platform>
     <theme>gameandwatch</theme>
   </system>
@@ -366,7 +366,7 @@
     <fullname>Sega Game Gear</fullname>
     <path>%ROMPATH%\gamegear</path>
     <extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\genesis_plus_gx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\genesis_plus_gx_libretro.dll %ROM%</command>
     <platform>gamegear</platform>
     <theme>gamegear</theme>
   </system>
@@ -375,7 +375,7 @@
     <fullname>Nintendo GameCube</fullname>
     <path>%ROMPATH%\gamecube</path>
     <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .tgc .TGC .wad .WAD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\dolphin_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\dolphin_libretro.dll %ROM%</command>
     <platform>gamecube</platform>
     <theme>gc</theme>
   </system>
@@ -384,7 +384,7 @@
     <fullname>Nintendo Game Boy</fullname>
     <path>%ROMPATH%\gb</path>
     <extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\bsnes_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\bsnes_libretro.dll %ROM%</command>
     <platform>gb</platform>
     <theme>gb</theme>
   </system>
@@ -393,7 +393,7 @@
     <fullname>Nintendo Game Boy Advance</fullname>
     <path>%ROMPATH%\gba</path>
     <extension>.gba .GBA .agb .AGB .bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_gba_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_gba_libretro.dll %ROM%</command>
     <platform>gba</platform>
     <theme>gba</theme>
   </system>
@@ -402,7 +402,7 @@
     <fullname>Nintendo Game Boy Color</fullname>
     <path>%ROMPATH%\gbc</path>
     <extension>.sfc .SFC .smc .SMC .gb .GB .gbc .GBC .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\bsnes_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\bsnes_libretro.dll %ROM%</command>
     <platform>gbc</platform>
     <theme>gbc</theme>
   </system>
@@ -411,7 +411,7 @@
     <fullname>Sega Genesis</fullname>
     <path>%ROMPATH%\genesis</path>
     <extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\genesis_plus_gx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\genesis_plus_gx_libretro.dll %ROM%</command>
     <platform>genesis, megadrive</platform>
     <theme>genesis</theme>
   </system>
@@ -429,7 +429,7 @@
     <fullname>Mattel Electronics Intellivision</fullname>
     <path>%ROMPATH%\intellivision</path>
     <extension>.int .INT .bin .BIN .rom .ROM .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\freeintv_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\freeintv_libretro.dll %ROM%</command>
     <platform>intellivision</platform>
     <theme>intellivision</theme>
   </system>
@@ -456,7 +456,7 @@
     <fullname>Lutro game engine</fullname>
     <path>%ROMPATH%\lutro</path>
     <extension>.lua .LUA .lutro .LUTRO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\lutro_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\lutro_libretro.dll %ROM%</command>
     <platform>lutro</platform>
     <theme>lutro</theme>
   </system>
@@ -474,7 +474,7 @@
     <fullname>Multiple Arcade Machine Emulator</fullname>
     <path>%ROMPATH%\mame</path>
     <extension>.chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mame2016_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mame2016_libretro.dll %ROM%</command>
     <platform>arcade</platform>
     <theme>mame</theme>
   </system>
@@ -492,7 +492,7 @@
     <fullname>Multiple Arcade Machine Emulator</fullname>
     <path>%ROMPATH%\mame-libretro</path>
     <extension>.chd .cue .CUE .CHD .cmd .CMD .fba .FBA .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mame_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mame_libretro.dll %ROM%</command>
     <platform>arcade</platform>
     <theme>mame-libretro</theme>
   </system>
@@ -510,7 +510,7 @@
     <fullname>Sega Master System</fullname>
     <path>%ROMPATH%\mastersystem</path>
     <extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\genesis_plus_gx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\genesis_plus_gx_libretro.dll %ROM%</command>
     <platform>mastersystem</platform>
     <theme>mastersystem</theme>
   </system>
@@ -519,7 +519,7 @@
     <fullname>Sega Mega-CD</fullname>
     <path>%ROMPATH%\megacd</path>
     <extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\genesis_plus_gx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\genesis_plus_gx_libretro.dll %ROM%</command>
     <platform>segacd</platform>
     <theme>megacd</theme>
   </system>
@@ -528,7 +528,7 @@
     <fullname>Sega Mega-CD</fullname>
     <path>%ROMPATH%\megacdjp</path>
     <extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\genesis_plus_gx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\genesis_plus_gx_libretro.dll %ROM%</command>
     <platform>segacd</platform>
     <theme>megacdjp</theme>
   </system>
@@ -537,7 +537,7 @@
     <fullname>Sega Mega Drive</fullname>
     <path>%ROMPATH%\megadrive</path>
     <extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\genesis_plus_gx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\genesis_plus_gx_libretro.dll %ROM%</command>
     <platform>megadrive, genesis</platform>
     <theme>megadrive</theme>
   </system>
@@ -546,7 +546,7 @@
     <fullname>Multi Emulator Super System</fullname>
     <path>%ROMPATH%\mess</path>
     <extension>.chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mess2015_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mess2015_libretro.dll %ROM%</command>
     <platform>mess</platform>
     <theme>mess</theme>
   </system>
@@ -564,7 +564,7 @@
     <fullname>MSX</fullname>
     <path>%ROMPATH%\msx</path>
     <extension>.rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\bluemsx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\bluemsx_libretro.dll %ROM%</command>
     <platform>msx</platform>
     <theme>msx</theme>
   </system>
@@ -573,7 +573,7 @@
     <fullname>MSX1</fullname>
     <path>%ROMPATH%\msx1</path>
     <extension>.rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\bluemsx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\bluemsx_libretro.dll %ROM%</command>
     <platform>msx</platform>
     <theme>msx1</theme>
   </system>
@@ -582,7 +582,7 @@
     <fullname>MSX2</fullname>
     <path>%ROMPATH%\msx2</path>
     <extension>.rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\bluemsx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\bluemsx_libretro.dll %ROM%</command>
     <platform>msx</platform>
     <theme>msx2</theme>
   </system>
@@ -591,7 +591,7 @@
     <fullname>Nintendo 64</fullname>
     <path>%ROMPATH%\n64</path>
     <extension>.n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\parallel_n64_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\parallel_n64_libretro.dll %ROM%</command>
     <platform>n64</platform>
     <theme>n64</theme>
   </system>
@@ -600,7 +600,7 @@
     <fullname>Sega NAOMI</fullname>
     <path>%ROMPATH%\naomi</path>
     <extension>.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\flycast_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\flycast_libretro.dll %ROM%</command>
     <platform>naomi</platform>
     <theme>naomi</theme>
   </system>
@@ -609,7 +609,7 @@
     <fullname>Nintendo DS</fullname>
     <path>%ROMPATH%\nds</path>
     <extension>.nds .NDS .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\melonds_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\melonds_libretro.dll %ROM%</command>
     <platform>nds</platform>
     <theme>nds</theme>
   </system>
@@ -618,7 +618,7 @@
     <fullname>Neo Geo</fullname>
     <path>%ROMPATH%\neogeo</path>
     <extension>.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\fbneo_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\fbneo_libretro.dll %ROM%</command>
     <platform>neogeo</platform>
     <theme>neogeo</theme>
   </system>
@@ -627,7 +627,7 @@
     <fullname>Neo Geo CD</fullname>
     <path>%ROMPATH%\neogeocd</path>
     <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\neocd_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\neocd_libretro.dll %ROM%</command>
     <platform>neogeocd</platform>
     <theme>neogeocd</theme>
   </system>
@@ -636,7 +636,7 @@
     <fullname>Nintendo Entertainment System</fullname>
     <path>%ROMPATH%\nes</path>
     <extension>.nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\nestopia_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\nestopia_libretro.dll %ROM%</command>
     <platform>nes</platform>
     <theme>nes</theme>
   </system>
@@ -645,7 +645,7 @@
     <fullname>Neo Geo Pocket</fullname>
     <path>%ROMPATH%\ngp</path>
     <extension>.ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_ngp_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_ngp_libretro.dll %ROM%</command>
     <platform>ngp</platform>
     <theme>ngp</theme>
   </system>
@@ -654,7 +654,7 @@
     <fullname>Neo Geo Pocket Color</fullname>
     <path>%ROMPATH%\ngpc</path>
     <extension>.ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_ngp_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_ngp_libretro.dll %ROM%</command>
     <platform>ngpc</platform>
     <theme>ngpc</theme>
   </system>
@@ -663,7 +663,7 @@
     <fullname>Magnavox Odyssey2</fullname>
     <path>%ROMPATH%\odyssey2</path>
     <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\o2em_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\o2em_libretro.dll %ROM%</command>
     <platform>odyssey2</platform>
     <theme>odyssey2</theme>
   </system>
@@ -690,7 +690,7 @@
     <fullname>Palm OS</fullname>
     <path>%ROMPATH%\palm</path>
     <extension>.prc .PRC .pqa .PQA .img .IMG .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mu_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mu_libretro.dll %ROM%</command>
     <platform>palm</platform>
     <theme>palm</theme>
   </system>
@@ -699,7 +699,7 @@
     <fullname>IBM PC</fullname>
     <path>%ROMPATH%\pc</path>
     <extension>.bat .BAT .com .COM .exe .EXE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\dosbox_core_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\dosbox_core_libretro.dll %ROM%</command>
     <platform>pc</platform>
     <theme>pc</theme>
   </system>
@@ -708,7 +708,7 @@
     <fullname>NEC PC Engine</fullname>
     <path>%ROMPATH%\pcengine</path>
     <extension>.pce .PCE .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_pce_fast_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_pce_fast_libretro.dll %ROM%</command>
     <platform>pcengine</platform>
     <theme>pcengine</theme>
   </system>
@@ -717,7 +717,7 @@
     <fullname>NEC PC Engine CD</fullname>
     <path>%ROMPATH%\pcenginecd</path>
     <extension>.pce .PCE .cue .CUE .ccd .CCD .iso .ISO .img .IMG .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_pce_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_pce_libretro.dll %ROM%</command>
     <platform>pcenginecd</platform>
     <theme>pcenginecd</theme>
   </system>
@@ -726,7 +726,7 @@
     <fullname>NEC PC-FX</fullname>
     <path>%ROMPATH%\pcfx</path>
     <extension>.cue CUE .ccd .CCD .toc .TOC .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_pcfx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_pcfx_libretro.dll %ROM%</command>
     <platform>pcfx</platform>
     <theme>pcfx</theme>
   </system>
@@ -735,7 +735,7 @@
     <fullname>Nintendo Pokémon Mini</fullname>
     <path>%ROMPATH%\pokemini</path>
     <extension>.min .MIN .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\pokemini_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\pokemini_libretro.dll %ROM%</command>
     <platform>pokemini</platform>
     <theme>pokemini</theme>
   </system>
@@ -753,7 +753,7 @@
     <fullname>Sony PlayStation 2</fullname>
     <path>%ROMPATH%\ps2</path>
     <extension>.iso .ISO .isz .ISZ .cso .CSO .bin .BIN .elf .ELF .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\play_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\play_libretro.dll %ROM%</command>
     <platform>ps2</platform>
     <theme>ps2</theme>
   </system>
@@ -762,7 +762,7 @@
     <fullname>PlayStation Portable</fullname>
     <path>%ROMPATH%\psp</path>
     <extension>.elf .ELF .iso .ISO .cso .CSO .prx .PRX .pbp .PBP .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\ppsspp_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\ppsspp_libretro.dll %ROM%</command>
     <platform>psp</platform>
     <theme>psp</theme>
   </system>
@@ -780,7 +780,7 @@
     <fullname>Sony PlayStation 1</fullname>
     <path>%ROMPATH%\psx</path>
     <extension>.cue .CUE .toc .TOC .m3u .M3U .ccd .CCD .exe .EXE .pbp .PBP .chd .CHD .cbn .CBN .img .IMG .iso .ISO .mdf .MDF .z .Z .znx .ZNX .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_psx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_psx_libretro.dll %ROM%</command>
     <platform>psx</platform>
     <theme>psx</theme>
   </system>
@@ -798,7 +798,7 @@
     <fullname>SAM Coupé</fullname>
     <path>%ROMPATH%\samcoupe</path>
     <extension>.dsk .DSK .mgt .MGT .sbt .SBT .sad .SAD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\simcp_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\simcp_libretro.dll %ROM%</command>
     <platform>samcoupe</platform>
     <theme>samcoupe</theme>
   </system>
@@ -807,7 +807,7 @@
     <fullname>Nintendo Satellaview</fullname>
     <path>%ROMPATH%\satellaview</path>
     <extension>.smc .SMC .sfc .SFC .swc .SWC .fig .FIG .bs .BS .bin .BIN .mgd .MGD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\snes9x_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\snes9x_libretro.dll %ROM%</command>
     <platform>satellaview</platform>
     <theme>satellaview</theme>
   </system>
@@ -816,7 +816,7 @@
     <fullname>Sega Saturn</fullname>
     <path>%ROMPATH%\saturn</path>
     <extension>.ccd .CCD .chd .CHD .cue .CUE .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_saturn_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_saturn_libretro.dll %ROM%</command>
     <platform>saturn</platform>
     <theme>saturn</theme>
   </system>
@@ -825,7 +825,7 @@
     <fullname>ScummVM game engine</fullname>
     <path>%ROMPATH%\scummvm</path>
     <extension>.scummvm .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\scummvm_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\scummvm_libretro.dll %ROM%</command>
     <platform>scummvm</platform>
     <theme>scummvm</theme>
   </system>
@@ -834,7 +834,7 @@
     <fullname>Sega Mega Drive 32X</fullname>
     <path>%ROMPATH%\sega32x</path>
     <extension>.bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\picodrive_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\picodrive_libretro.dll %ROM%</command>
     <platform>sega32x</platform>
     <theme>sega32x</theme>
   </system>
@@ -843,7 +843,7 @@
     <fullname>Sega Super 32X</fullname>
     <path>%ROMPATH%\sega32xjp</path>
     <extension>.bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\picodrive_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\picodrive_libretro.dll %ROM%</command>
     <platform>sega32x</platform>
     <theme>sega32xjp</theme>
   </system>
@@ -852,7 +852,7 @@
     <fullname>Sega Genesis 32X</fullname>
     <path>%ROMPATH%\sega32xna</path>
     <extension>.bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\picodrive_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\picodrive_libretro.dll %ROM%</command>
     <platform>sega32x</platform>
     <theme>sega32xna</theme>
   </system>
@@ -861,7 +861,7 @@
     <fullname>Sega CD</fullname>
     <path>%ROMPATH%\segacd</path>
     <extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\genesis_plus_gx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\genesis_plus_gx_libretro.dll %ROM%</command>
     <platform>segacd</platform>
     <theme>segacd</theme>
   </system>
@@ -870,7 +870,7 @@
     <fullname>Sega SG-1000</fullname>
     <path>%ROMPATH%\sg-1000</path>
     <extension>.mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\genesis_plus_gx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\genesis_plus_gx_libretro.dll %ROM%</command>
     <platform>sg-1000</platform>
     <theme>sg1000</theme>
   </system>
@@ -879,7 +879,7 @@
     <fullname>Nintendo SNES (Super Nintendo)</fullname>
     <path>%ROMPATH%\snes</path>
     <extension>.smc .SMC .sfc .SFC .swc .SWC .fig .FIG .bs .BS .bin .BIN .mgd .MGD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\snes9x_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\snes9x_libretro.dll %ROM%</command>
     <platform>snes</platform>
     <theme>snes</theme>
   </system>
@@ -888,7 +888,7 @@
     <fullname>Nintendo SNES (Super Nintendo)</fullname>
     <path>%ROMPATH%\snesna</path>
     <extension>.smc .SMC .sfc .SFC .swc .SWC .fig .FIG .bs .BS .bin .BIN .mgd .MGD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\snes9x_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\snes9x_libretro.dll %ROM%</command>
     <platform>snes</platform>
     <theme>snesna</theme>
   </system>
@@ -906,7 +906,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>retroarch.exe -L "%EMUPATH%\cores\bluemsx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\bluemsx_libretro.dll %ROM%</command>
     <platform>spectravideo</platform>
     <theme>spectravideo</theme>
   </system>
@@ -933,7 +933,7 @@
     <fullname>Bandai SuFami Turbo</fullname>
     <path>%ROMPATH%\sufami</path>
     <extension>.smc .SMC .sfc .SFC .swc .SWC .fig .FIG .bs .BS .bin .BIN .mgd .MGD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\snes9x_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\snes9x_libretro.dll %ROM%</command>
     <platform>sufami</platform>
     <theme>sufami</theme>
   </system>
@@ -942,7 +942,7 @@
     <fullname>NEC SuperGrafx</fullname>
     <path>%ROMPATH%\supergrafx</path>
     <extension>.pce .PCE .sgx .SGX .cue .CUE .ccd .CCD .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_supergrafx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_supergrafx_libretro.dll %ROM%</command>
     <platform>supergrafx</platform>
     <theme>supergrafx</theme>
   </system>
@@ -951,7 +951,7 @@
     <fullname>Thomson TO/MO series</fullname>
     <path>%ROMPATH%\thomson</path>
     <extension>.fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\theodore_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\theodore_libretro.dll %ROM%</command>
     <platform>thomson</platform>
     <theme>thomson</theme>
   </system>
@@ -960,7 +960,7 @@
     <fullname>NEC TurboGrafx-16</fullname>
     <path>%ROMPATH%\tg16</path>
     <extension>.pce .PCE .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_pce_fast_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_pce_fast_libretro.dll %ROM%</command>
     <platform>pcengine</platform>
     <theme>tg16</theme>
   </system>
@@ -969,7 +969,7 @@
     <fullname>NEC TurboGrafx-CD</fullname>
     <path>%ROMPATH%\tg-cd</path>
     <extension>.pce .PCE .cue .CUE .ccd .CCD .iso .ISO .img .IMG .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_pce_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_pce_libretro.dll %ROM%</command>
     <platform>pcenginecd</platform>
     <theme>tg-cd</theme>
   </system>
@@ -996,7 +996,7 @@
     <fullname>Uzebox</fullname>
     <path>%ROMPATH%\uzebox</path>
     <extension>.uze .UZE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\uzem_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\uzem_libretro.dll %ROM%</command>
     <platform>uzebox</platform>
     <theme>uzebox</theme>
   </system>
@@ -1005,7 +1005,7 @@
     <fullname>Vectrex</fullname>
     <path>%ROMPATH%\vectrex</path>
     <extension>.bin .BIN .vec .VEC .gam .GAM .vc .VC .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\vecx_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\vecx_libretro.dll %ROM%</command>
     <platform>vectrex</platform>
     <theme>vectrex</theme>
   </system>
@@ -1014,7 +1014,7 @@
     <fullname>Philips Videopac G7000 (Magnavox Odyssey2)</fullname>
     <path>%ROMPATH%\videopac</path>
     <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\o2em_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\o2em_libretro.dll %ROM%</command>
     <platform>videopac</platform>
     <theme>videopac</theme>
   </system>
@@ -1023,7 +1023,7 @@
     <fullname>Nintendo Virtual Boy</fullname>
     <path>%ROMPATH%\virtualboy</path>
     <extension>.vb .VB .vboy .VBOY .bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_vb_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_vb_libretro.dll %ROM%</command>
     <platform>virtualboy</platform>
     <theme>virtualboy</theme>
   </system>
@@ -1032,7 +1032,7 @@
     <fullname>Nintendo Wii</fullname>
     <path>%ROMPATH%\wii</path>
     <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .tgc .TGC .wad .WAD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\dolphin_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\dolphin_libretro.dll %ROM%</command>
     <platform>wii</platform>
     <theme>wii</theme>
   </system>
@@ -1050,7 +1050,7 @@
     <fullname>Bandai WonderSwan</fullname>
     <path>%ROMPATH%\wonderswan</path>
     <extension>.ws .WS .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_wswan_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_wswan_libretro.dll %ROM%</command>
     <platform>wonderswan</platform>
     <theme>wonderswan</theme>
   </system>
@@ -1059,7 +1059,7 @@
     <fullname>Bandai WonderSwan Color</fullname>
     <path>%ROMPATH%\wonderswancolor</path>
     <extension>.ws .WS .wsc .WSC .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\mednafen_wswan_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\mednafen_wswan_libretro.dll %ROM%</command>
     <platform>wonderswancolor</platform>
     <theme>wonderswancolor</theme>
   </system>
@@ -1068,7 +1068,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>retroarch.exe -L "%EMUPATH%\cores\px68k_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\px68k_libretro.dll %ROM%</command>
     <platform>x68000</platform>
     <theme>x68000</theme>
   </system>
@@ -1104,7 +1104,7 @@
     <fullname>Sinclair ZX81</fullname>
     <path>%ROMPATH%\zx81</path>
     <extension>.tzx .TZX .p .P .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L "%EMUPATH%\cores\81_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\81_libretro.dll %ROM%</command>
     <platform>zx81</platform>
     <theme>zx81</theme>
   </system>
@@ -1113,7 +1113,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>retroarch.exe -L "%EMUPATH%\cores\fuse_libretro.dll" %ROM%</command>
+    <command>retroarch.exe -L %COREPATH%\fuse_libretro.dll %ROM%</command>
     <platform>zxspectrum</platform>
     <theme>zxspectrum</theme>
   </system>