Implemented a new mechanism for finding emulators and cores.

2025-03-06 14:27:43 +00:00 · 2021-06-19 14:09:14 +02:00 · 2021-06-19 14:09:14 +02:00 · 183cdddfa0
parent b5eb945f40
commit 183cdddfa0
11 changed files with 736 additions and 1638 deletions
--- a/es-app/src/FileData.cpp
+++ b/es-app/src/FileData.cpp
@ -783,7 +783,27 @@ void FileData::launchGame(Window* window)
    const std::string baseName = Utils::FileSystem::getStem(getPath());
    const std::string romRaw = Utils::FileSystem::getPreferredPath(getPath());
    const std::string esPath = Utils::FileSystem::getExePath();
-    const std::string emulatorCorePath = Settings::getInstance()->getString("EmulatorCorePath");
+
+    std::string coreEntry;
+    std::string coreName;
+    size_t coreEntryPos = 0;
+    size_t coreFilePos = 0;
+    bool foundCoreFile = false;
+    std::vector<std::string> emulatorCorePaths;
+
+    // If there's a quotation mark before the %CORE_ variable, then remove it.
+    // The closing quotation mark will be removed later below.
+    command = Utils::String::replace(command, "\"%CORE_", "%CORE_");
+
+    coreEntryPos = command.find("%CORE_");
+    if (coreEntryPos != std::string::npos) {
+        coreFilePos = command.find("%", coreEntryPos + 6);
+        if (coreFilePos != std::string::npos)
+            coreEntry = command.substr(coreEntryPos + 6, coreFilePos - (coreEntryPos + 6));
+    }
+
+    if (coreEntry != "")
+        emulatorCorePaths = SystemData::sFindRules.get()->mCores[coreEntry].corePaths;

    command = Utils::String::replace(command, "%ROM%", romPath);
    command = Utils::String::replace(command, "%BASENAME%", baseName);
@ -792,14 +812,25 @@ void FileData::launchGame(Window* window)

    // Expand home path if ~ is used.
    command = Utils::FileSystem::expandHomePath(command);
-    // If there's a quotation mark before the %COREPATH% variable, then remove it.
-    // The closing quotation mark will be removed later below.
-    command = Utils::String::replace(command, "\"%COREPATH%", "%COREPATH%");

-    // Get the emulator path, which will be used to check that the emulator binary actually
-    // exists, as well as for expanding the %EMUPATH% variable.
+    // Check that the emulator binary actually exists, and if so, get its path.
    std::string emuPath = findEmulatorPath(command);
-    if (emuPath.empty()) {
+
+    // Hack to show an error message if there was no emulator entry in es_find_rules.xml.
+    if (emuPath.substr(0, 18) == "NO EMULATOR RULE: ") {
+        std::string emulatorEntry = emuPath.substr(18, emuPath.size() - 18);
+        LOG(LogError) << "Couldn't launch game, either there is no emulator entry for \"" <<
+            emulatorEntry << "\" in es_find_rules.xml or there are no systempath or staticpath "
+            "rules defined";
+        LOG(LogError) << "Raw emulator launch command:";
+        LOG(LogError) << commandRaw;
+
+        GuiInfoPopup* s = new GuiInfoPopup(window, "ERROR: MISSING EMULATOR CONFIGURATION FOR '" +
+                emulatorEntry + "'", 6000);
+        window->setInfoPopup(s);
+        return;
+    }
+    else if (emuPath.empty()) {
        LOG(LogError) << "Couldn't launch game, emulator binary not found";
        LOG(LogError) << "Raw emulator launch command:";
        LOG(LogError) << commandRaw;
@ -810,9 +841,9 @@ void FileData::launchGame(Window* window)
        return;
    }

-    // If %EMUPATH% is used in es_systems.xml for this system, then check that the core file
-    // actually exists.
-    auto emuPathPos = command.find("%EMUPATH%");
+    // If %EMUPATH% is used in es_systems.xml for this system, then check that the core
+    // file actually exists.
+    size_t emuPathPos = command.find("%EMUPATH%");
    if (emuPathPos != std::string::npos) {
        bool hasQuotationMark = false;
        unsigned int quotationMarkPos = 0;
@ -821,12 +852,13 @@ void FileData::launchGame(Window* window)
            quotationMarkPos = static_cast<unsigned int>(
                    command.find("\"", emuPathPos + 9) - emuPathPos);
        }
-        auto spacePos = command.find(" ", emuPathPos + quotationMarkPos);
+        size_t spacePos = command.find(" ", emuPathPos + quotationMarkPos);
        std::string coreRaw;
        std::string coreFile;
        if (spacePos != std::string::npos) {
            coreRaw = command.substr(emuPathPos, spacePos - emuPathPos);
-            coreFile = emuPath + command.substr(emuPathPos + 9, spacePos - emuPathPos - 9);
+            coreFile = Utils::FileSystem::getParent(emuPath) +
+                    command.substr(emuPathPos + 9, spacePos - emuPathPos - 9);
            if (hasQuotationMark) {
                coreRaw.pop_back();
                coreFile.pop_back();
@ -834,7 +866,7 @@ void FileData::launchGame(Window* window)
            if (!Utils::FileSystem::isRegularFile(coreFile) &&
                    !Utils::FileSystem::isSymlink(coreFile)) {
                LOG(LogError) << "Couldn't launch game, emulator core file \"" <<
-                        Utils::FileSystem::getFileName(coreFile) << "\" does not exist";
+                        Utils::FileSystem::getFileName(coreFile) << "\" not found";
                LOG(LogError) << "Raw emulator launch command:";
                LOG(LogError) << commandRaw;

@ -867,50 +899,61 @@ void FileData::launchGame(Window* window)
        }
    }

-    // If %COREPATH% is used in es_systems.xml for this system, try to find the emulator
-    // core using the core paths defined in the setting EmulatorCorePath.
-    auto corePos = command.find("%COREPATH%");
-    if (corePos != std::string::npos && emulatorCorePath.size() > 0) {
-        std::string coreName;
-        bool foundCoreFile = false;
-        #if defined(_WIN64)
-        std::vector<std::string> corePaths =
-                Utils::String::delimitedStringToVector(emulatorCorePath, ";");
-        #else
-        std::vector<std::string> corePaths =
-                Utils::String::delimitedStringToVector(emulatorCorePath, ":");
-        #endif
-        auto spacePos = command.find(" ", corePos);
-        if (spacePos != std::string::npos) {
-            coreName = command.substr(corePos + 10, spacePos - corePos - 10);
-            for (auto path : corePaths) {
-                std::string coreFile = Utils::FileSystem::expandHomePath(path + coreName);
-                // Expand %EMUPATH% if it has been used in the %COREPATH% variable.
-                auto stringPos = coreFile.find("%EMUPATH%");
-                if (stringPos != std::string::npos)
-                    coreFile = coreFile.replace(stringPos, 9, emuPath);
+    // Error handling in case of no core find rule.
+    if (coreEntry != "" && emulatorCorePaths.empty()) {
+        LOG(LogError) << "Couldn't launch game, either there is no core entry for \"" <<
+                coreEntry << "\" in es_find_rules.xml or there are no corepath rules defined";
+        LOG(LogError) << "Raw emulator launch command:";
+        LOG(LogError) << commandRaw;

-                // Expand %ESPATH% if it has been used in the %COREPATH% variable.
-                stringPos = coreFile.find("%ESPATH%");
-                if (stringPos != std::string::npos) {
-                    coreFile = coreFile.replace(stringPos, 8, esPath);
-                    #if defined(_WIN64)
-                    coreFile = Utils::String::replace(coreFile, "/", "\\");
-                    #endif
-                }
+        GuiInfoPopup* s = new GuiInfoPopup(window, "ERROR: MISSING CORE CONFIGURATION FOR '" +
+                coreEntry + "'", 6000);
+        window->setInfoPopup(s);
+        return;
+    }

-                // Remove any quotation mark as it will make the file functions fail.
-                if (coreFile.find("\"") != std::string::npos)
-                    coreFile = Utils::String::replace(coreFile, "\"", "");
-                if (Utils::FileSystem::isRegularFile(coreFile) ||
-                        Utils::FileSystem::isSymlink(coreFile)) {
-                    foundCoreFile = true;
-                    // Escape any blankspaces.
-                    if (coreFile.find(" ") != std::string::npos)
-                        coreFile = Utils::FileSystem::getEscapedPath(coreFile);
-                    command.replace(corePos, spacePos - corePos, coreFile);
-                    break;
-                }
+    // If a %CORE_ find rule entry is used in es_systems.xml for this system, then try to find
+    // the emulator core using the rules defined in es_find_rules.xml.
+    for (std::string path : emulatorCorePaths) {
+        if (path.back() != '/')
+            path += "/";
+        size_t separatorPos;
+        size_t quotePos = command.find("\"", coreFilePos);
+        if (quotePos == std::string::npos)
+            separatorPos = command.find(" ", coreFilePos);
+        else
+            separatorPos = quotePos;
+
+        if (separatorPos != std::string::npos) {
+                coreName = command.substr(coreFilePos + 1, separatorPos - (coreFilePos + 1));
+
+            std::string coreFile = Utils::FileSystem::expandHomePath(path + coreName);
+
+            // Expand %EMUPATH% if it has been used in the %CORE_ variable.
+            size_t stringPos = coreFile.find("%EMUPATH%");
+            if (stringPos != std::string::npos)
+                coreFile = coreFile.replace(stringPos, 9, Utils::FileSystem::getParent(emuPath));
+
+            // Expand %ESPATH% if it has been used in the %CORE_ variable.
+            stringPos = coreFile.find("%ESPATH%");
+            if (stringPos != std::string::npos) {
+                coreFile = coreFile.replace(stringPos, 8, esPath);
+                #if defined(_WIN64)
+                coreFile = Utils::String::replace(coreFile, "/", "\\");
+                #endif
+            }
+
+            if (Utils::FileSystem::isRegularFile(coreFile) ||
+                    Utils::FileSystem::isSymlink(coreFile)) {
+                foundCoreFile = true;
+                // Escape any blankspaces.
+                if (coreFile.find(" ") != std::string::npos)
+                    coreFile = Utils::FileSystem::getEscapedPath(coreFile);
+                command.replace(coreEntryPos - 1, separatorPos - coreEntryPos + 1, coreFile);
+                // Remove any quotation marks as it would make the launch function fail.
+                if (command.find("\"") != std::string::npos)
+                    command = Utils::String::replace(command, "\"", "");
+                break;
            }
        }
        else {
@ -923,25 +966,18 @@ void FileData::launchGame(Window* window)
            window->setInfoPopup(s);
            return;
        }
-        if (!foundCoreFile && coreName.size() > 0) {
-            LOG(LogError) << "Couldn't launch game, emulator core file \"" <<
-                    coreName.substr(1, coreName.size() - 1) << "\" does not exist";
-            LOG(LogError) << "Raw emulator launch command:";
-            LOG(LogError) << commandRaw;
-            LOG(LogError) << "Configured core path:";
-            LOG(LogError) << emulatorCorePath;
-
-            GuiInfoPopup* s = new GuiInfoPopup(window, "ERROR: COULDN'T FIND EMULATOR CORE FILE '" +
-                    Utils::String::toUpper(coreName.substr(1, coreName.size() - 1) + "'"), 6000);
-            window->setInfoPopup(s);
-            return;
-        }
    }
-    else if (corePos != std::string::npos) {
-        LOG(LogError) << "The variable %COREPATH% is used in es_systems.xml but " \
-                "no paths are defined using the setting EmulatorCorePath";
-        GuiInfoPopup* s = new GuiInfoPopup(window, "ERROR: NO CORE PATHS CONFIGURED, " \
-                "CAN'T LOCATE EMULATOR CORE", 6000);
+    if (!foundCoreFile && coreName.size() > 0) {
+        LOG(LogError) << "Couldn't launch game, emulator core file \"" <<
+                coreName.substr(0, coreName.size()) << "\" not found";
+        LOG(LogError) << "Raw emulator launch command:";
+        LOG(LogError) << commandRaw;
+        LOG(LogError) <<
+                "Tried to find the core file using these paths as defined by es_find_rules.xml:";
+        LOG(LogError) << Utils::String::vectorToDelimitedString(emulatorCorePaths, ", ");
+
+        GuiInfoPopup* s = new GuiInfoPopup(window, "ERROR: COULDN'T FIND EMULATOR CORE FILE '" +
+                Utils::String::toUpper(coreName.substr(0, coreName.size()) + "'"), 6000);
        window->setInfoPopup(s);
        return;
    }
@ -1027,16 +1063,80 @@ void FileData::launchGame(Window* window)
    gameToUpdate->mSystem->onMetaDataSavePoint();
 }

-std::string FileData::findEmulatorPath(const std::string& command)
+std::string FileData::findEmulatorPath(std::string& command)
 {
-    // Extract the emulator executable from the launch command string. This could either be
-    // just the program name, assuming the binary is in the PATH variable of the operating
-    // system, or it could be an absolute path to the emulator. (In the latter case, if
-    // there is a space in the the path, it needs to be enclosed by quotation marks in
-    // es_systems.xml.)
+    // Extract the emulator executable from the launch command string. There are two ways
+    // that the emulator can be defined in es_systems.xml, either using the find rules in
+    // es_find_rules.xml or via the exact emulator binary name. In the former case, we
+    // need to process any configured systempath and staticpath rules, and in the latter
+    // we simply search for the emulator binary in the system path.
+
    std::string emuExecutable;
    std::string exePath;

+    // Method 1, emulator binary is defined using find rules:
+
+    std::vector<std::string> emulatorSystemPaths;
+    std::vector<std::string> emulatorStaticPaths;
+    std::string emulatorEntry;
+    size_t endPos = 0;
+
+    if (command.find("%EMULATOR_", 0) == 0) {
+        endPos = command.find("%", 1);
+        if (endPos != std::string::npos)
+            emulatorEntry = command.substr(10, endPos - 10);
+    }
+
+    if (emulatorEntry != "") {
+        emulatorSystemPaths = SystemData::sFindRules.get()->mEmulators[emulatorEntry].systemPaths;
+        emulatorStaticPaths = SystemData::sFindRules.get()->mEmulators[emulatorEntry].staticPaths;
+    }
+
+    // Error handling in case of no emulator find rule.
+    if (emulatorEntry != "" && emulatorSystemPaths.empty() && emulatorStaticPaths.empty())
+        return "NO EMULATOR RULE: " + emulatorEntry;
+
+    for (std::string path : emulatorSystemPaths) {
+        #if defined(_WIN64)
+        std::wstring pathWide = Utils::String::stringToWideString(path);
+        // Search for the emulator using the PATH environmental variable.
+        DWORD size = SearchPathW(nullptr, pathWide.c_str(), L".exe", 0, nullptr, nullptr);
+
+        if (size) {
+            std::vector<wchar_t> pathBuffer(static_cast<size_t>(size) + 1 );
+            wchar_t* fileName = nullptr;
+
+            SearchPathW(nullptr, pathWide.c_str(), L".exe", size + 1 ,
+                    pathBuffer.data(), &fileName);
+            std::wstring pathString = pathBuffer.data();
+
+            if (pathString.length()) {
+                exePath = Utils::String::wideStringToString(pathString.substr(0,
+                        pathString.size() - std::wstring(fileName).size()));
+                exePath.pop_back();
+            }
+        }
+        return exePath;
+        #else
+        exePath = Utils::FileSystem::getPathToBinary(path);
+        if (exePath != "") {
+            exePath += "/" + path;
+            command.replace(0, endPos + 1, exePath);
+            return exePath;
+        }
+        #endif
+    }
+
+    for (std::string path : emulatorStaticPaths) {
+        if (Utils::FileSystem::isRegularFile(path) ||
+                Utils::FileSystem::isSymlink(path)) {
+            command.replace(0, endPos + 1, path);
+            return Utils::FileSystem::getParent(path);
+        }
+    }
+
+    // Method 2, exact emulator binary name:
+
    // If the first character is a quotation mark, then we need to extract up to the
    // next quotation mark, otherwise we'll only extract up to the first space character.
    if (command.front() == '\"') {
--- a/es-app/src/FileData.h
+++ b/es-app/src/FileData.h
@ -97,7 +97,7 @@ public:
    std::string getCleanName() const;

    void launchGame(Window* window);
-    std::string findEmulatorPath(const std::string& command);
+    std::string findEmulatorPath(std::string& command);

    typedef bool ComparisonFunction(const FileData* a, const FileData* b);
    struct SortType {
--- a/es-app/src/SystemData.cpp
+++ b/es-app/src/SystemData.cpp
@ -31,6 +31,144 @@
 #include <random>

 std::vector<SystemData*> SystemData::sSystemVector;
+std::unique_ptr<FindRules> SystemData::sFindRules;
+
+FindRules::FindRules()
+{
+    LOG(LogInfo) << "Loading emulator find rules...";
+    loadFindRules();
+}
+
+FindRules::~FindRules()
+{
+}
+
+void FindRules::loadFindRules()
+{
+    std::string customSystemsDirectory =
+            Utils::FileSystem::getHomePath() + "/.emulationstation/custom_systems";
+
+    std::string path = customSystemsDirectory + "/es_find_rules.xml";
+
+    if (Utils::FileSystem::exists(path)) {
+        LOG(LogInfo) << "Found custom find rules configuration file";
+    }
+    else {
+        #if defined(_WIN64)
+        path = ResourceManager::getInstance()->
+                getResourcePath(":/systems/windows/es_find_rules.xml", false);
+        #elif defined(__APPLE__)
+        path = ResourceManager::getInstance()->
+                getResourcePath(":/systems/macos/es_find_rules.xml", false);
+        #else
+        path = ResourceManager::getInstance()->
+                getResourcePath(":/systems/unix/es_find_rules.xml", false);
+        #endif
+    }
+
+    if (path == "") {
+        LOG(LogWarning) << "No find rules configuration file found";
+        return;
+    }
+
+    LOG(LogInfo) << "Parsing find rules configuration file \"" << path << "\"...";
+
+    pugi::xml_document doc;
+    #if defined(_WIN64)
+    pugi::xml_parse_result res = doc.load_file(Utils::String::stringToWideString(path).c_str());
+    #else
+    pugi::xml_parse_result res = doc.load_file(path.c_str());
+    #endif
+
+    if (!res) {
+        LOG(LogError) << "Couldn't parse es_find_rules.xml: " << res.description();
+        return;
+    }
+
+    // Actually read the file.
+    pugi::xml_node ruleList = doc.child("ruleList");
+
+    if (!ruleList) {
+        LOG(LogError) << "es_find_rules.xml is missing the <ruleList> tag";
+        return;
+    }
+
+    EmulatorRules emulatorRules;
+    CoreRules coreRules;
+
+    for (pugi::xml_node emulator = ruleList.child("emulator"); emulator;
+            emulator = emulator.next_sibling("emulator")) {
+        std::string emulatorName = emulator.attribute("name").as_string();
+        if (emulatorName.empty()) {
+            LOG(LogWarning) << "Found emulator tag without name attribute, skipping entry";
+            continue;
+        }
+        if (mEmulators.find(emulatorName) != mEmulators.end()) {
+            LOG(LogWarning) << "Found repeating emulator tag \"" << emulatorName <<
+                    "\", skipping entry";
+            continue;
+        }
+        for (pugi::xml_node rule = emulator.child("rule"); rule; rule = rule.next_sibling("rule")) {
+            std::string ruleType = rule.attribute("type").as_string();
+            if (ruleType.empty()) {
+                LOG(LogWarning) << "Found rule tag without type attribute for emulator \"" <<
+                        emulatorName << "\", skipping entry";
+                continue;
+            }
+            if (ruleType != "systempath" && ruleType != "staticpath") {
+                LOG(LogWarning) << "Found invalid rule type \"" << ruleType <<
+                        "\" for emulator \"" << emulatorName << "\", skipping entry";
+                continue;
+            }
+            for (pugi::xml_node entry = rule.child("entry"); entry;
+                    entry = entry.next_sibling("entry")) {
+                std::string entryValue = entry.text().get();
+                if (ruleType == "systempath")
+                    emulatorRules.systemPaths.push_back(entryValue);
+                else if (ruleType == "staticpath")
+                    emulatorRules.staticPaths.push_back(entryValue);
+            }
+        }
+        mEmulators[emulatorName] = emulatorRules;
+        emulatorRules.systemPaths.clear();
+        emulatorRules.staticPaths.clear();
+    }
+
+    for (pugi::xml_node core = ruleList.child("core"); core;
+            core = core.next_sibling("core")) {
+        std::string coreName = core.attribute("name").as_string();
+        if (coreName.empty()) {
+            LOG(LogWarning) << "Found core tag without name attribute, skipping entry";
+            continue;
+        }
+        if (mCores.find(coreName) != mCores.end()) {
+            LOG(LogWarning) << "Found repeating core tag \"" << coreName <<
+                    "\", skipping entry";
+            continue;
+        }
+        for (pugi::xml_node rule = core.child("rule"); rule; rule = rule.next_sibling("rule")) {
+            std::string ruleType = rule.attribute("type").as_string();
+            if (ruleType.empty()) {
+                LOG(LogWarning) << "Found rule tag without type attribute for core \"" <<
+                        coreName << "\", skipping entry";
+                continue;
+            }
+            if (ruleType != "corepath") {
+                LOG(LogWarning) << "Found invalid rule type \"" << ruleType <<
+                        "\" for core \"" << coreName << "\", skipping entry";
+                continue;
+            }
+            for (pugi::xml_node entry = rule.child("entry"); entry;
+                    entry = entry.next_sibling("entry")) {
+                std::string entryValue = entry.text().get();
+                if (ruleType == "corepath")
+                    coreRules.corePaths.push_back(entryValue);
+            }
+        }
+        mCores[coreName] = coreRules;
+        coreRules.corePaths.clear();
+    }
+}

 SystemData::SystemData(
        const std::string& name,
@ -230,6 +368,11 @@ bool SystemData::loadConfig()
 {
    deleteSystems();

+    if (sFindRules.get() == nullptr)
+        sFindRules = std::make_unique<FindRules>();
+
+    LOG(LogInfo) << "Populating game systems...";
+
    std::string path = getConfigPath(true);
    const std::string rompath = FileData::getROMDirectory();

--- a/es-app/src/SystemData.h
+++ b/es-app/src/SystemData.h
@ -15,6 +15,7 @@
 #include "PlatformId.h"

 #include <algorithm>
+#include <map>
 #include <memory>
 #include <string>
 #include <vector>
@ -30,6 +31,30 @@ struct SystemEnvironmentData {
    std::vector<PlatformIds::PlatformId> mPlatformIds;
 };

+class FindRules
+{
+public:
+    FindRules();
+    ~FindRules();
+
+    void loadFindRules();
+
+private:
+    struct EmulatorRules {
+        std::vector<std::string> systemPaths;
+        std::vector<std::string> staticPaths;
+    };
+
+    struct CoreRules {
+        std::vector<std::string> corePaths;
+    };
+
+    std::map<std::string, struct EmulatorRules> mEmulators;
+    std::map<std::string, struct CoreRules> mCores;
+
+    friend FileData;
+};
+
 class SystemData
 {
 public:
@ -76,6 +101,7 @@ public:
    static bool createSystemDirectories();

    static std::vector<SystemData*> sSystemVector;
+    static std::unique_ptr<FindRules> sFindRules;

    inline std::vector<SystemData*>::const_iterator getIterator() const
            { return std::find(sSystemVector.cbegin(), sSystemVector.cend(), this); };
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!-- This is the ES-DE find rules configuration file for macOS. -->
+<ruleList>
+  <emulator name="RETROARCH">
+    <rule type="staticpath">
+      <entry>/Applications/RetroArch.app/Contents/MacOS/RetroArch</entry>
+    </rule>
+  </emulator>
+  <core name="RETROARCH">
+    <rule type="corepath">
+      <!-- RetroArch >= v1.9.2 -->
+      <entry>~/Library/Application Support/RetroArch/cores</entry>
+      <!-- RetroArch < v1.9.2 -->
+      <entry>/Applications/RetroArch.app/Contents/Resources/cores</entry>
+    </rule>
+  </core>
+</ruleList>
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@ -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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/4do_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/4do_libretro.dylib %ROM%</command>
    <platform>3do</platform>
    <theme>3do</theme>
  </system>
@ -15,7 +15,7 @@
    <fullname>Nintendo 64DD</fullname>
    <path>%ROMPATH%/64dd</path>
    <extension>.n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/parallel_n64_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.dylib %ROM%</command>
    <platform>n64</platform>
    <theme>64dd</theme>
  </system>
@ -33,7 +33,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/puae_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.dylib %ROM%</command>
    <platform>amiga</platform>
    <theme>amiga</theme>
  </system>
@ -42,7 +42,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/puae_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.dylib %ROM%</command>
    <platform>amiga</platform>
    <theme>amiga600</theme>
  </system>
@ -51,7 +51,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/puae_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.dylib %ROM%</command>
    <platform>amiga</platform>
    <theme>amiga1200</theme>
  </system>
@ -60,7 +60,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/puae_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.dylib %ROM%</command>
    <platform>amigacd32</platform>
    <theme>amigacd32</theme>
  </system>
@ -69,7 +69,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/cap32_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/cap32_libretro.dylib %ROM%</command>
    <platform>amstradcpc</platform>
    <theme>amstradcpc</theme>
  </system>
@ -96,7 +96,7 @@
    <fullname>Arcade</fullname>
    <path>%ROMPATH%/arcade</path>
    <extension>.cmd .CMD .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mame_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.dylib %ROM%</command>
    <platform>arcade</platform>
    <theme>arcade</theme>
  </system>
@ -114,7 +114,7 @@
    <fullname>Atari 2600</fullname>
    <path>%ROMPATH%/atari2600</path>
    <extension>.a26 .A26 .bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/stella_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/stella_libretro.dylib %ROM%</command>
    <platform>atari2600</platform>
    <theme>atari2600</theme>
  </system>
@ -123,7 +123,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/atari800_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.dylib %ROM%</command>
    <platform>atari5200</platform>
    <theme>atari5200</theme>
  </system>
@ -132,7 +132,7 @@
    <fullname>Atari 7800 ProSystem</fullname>
    <path>%ROMPATH%/atari7800</path>
    <extension>.a78 .A78 .bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/prosystem_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.dylib %ROM%</command>
    <platform>atari7800</platform>
    <theme>atari7800</theme>
  </system>
@ -141,7 +141,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/atari800_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.dylib %ROM%</command>
    <platform>atari800</platform>
    <theme>atari800</theme>
  </system>
@ -150,7 +150,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/virtualjaguar_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.dylib %ROM%</command>
    <platform>atarijaguar, atarijaguarcd</platform>
    <theme>atarijaguar</theme>
  </system>
@ -159,7 +159,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/virtualjaguar_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.dylib %ROM%</command>
    <platform>atarijaguarcd</platform>
    <theme>atarijaguarcd</theme>
  </system>
@ -168,7 +168,7 @@
    <fullname>Atari Lynx</fullname>
    <path>%ROMPATH%/atarilynx</path>
    <extension>.lnx .LNX .o .O .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_lynx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_lynx_libretro.dylib %ROM%</command>
    <platform>atarilynx</platform>
    <theme>atarilynx</theme>
  </system>
@ -177,7 +177,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/hatari_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/hatari_libretro.dylib %ROM%</command>
    <platform>atarist</platform>
    <theme>atarist</theme>
  </system>
@ -186,7 +186,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/atari800_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.dylib %ROM%</command>
    <platform>atarixe</platform>
    <theme>atarixe</theme>
  </system>
@ -195,7 +195,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/flycast_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.dylib %ROM%</command>
    <platform>atomiswave</platform>
    <theme>atomiswave</theme>
  </system>
@ -213,7 +213,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/vice_x64sc_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64sc_libretro.dylib %ROM%</command>
    <platform>c64</platform>
    <theme>c64</theme>
  </system>
@ -222,7 +222,7 @@
    <fullname>Cave Story (NXEngine)</fullname>
    <path>%ROMPATH%/cavestory</path>
    <extension>.exe .EXE .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/nxengine_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.dylib %ROM%</command>
    <platform>cavestory</platform>
    <theme>cavestory</theme>
  </system>
@ -240,7 +240,7 @@
    <fullname>ChaiLove game engine</fullname>
    <path>%ROMPATH%/chailove</path>
    <extension>.chai .CHAI .chailove .CHAILOVE .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/chailove_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/chailove_libretro.dylib %ROM%</command>
    <platform>love</platform>
    <theme>chailove</theme>
  </system>
@ -249,7 +249,7 @@
    <fullname>Fairchild Channel F</fullname>
    <path>%ROMPATH%/channelf</path>
    <extension>.bin .BIN .chf .CHF .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/freechaf_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freechaf_libretro.dylib %ROM%</command>
    <platform>channelf</platform>
    <theme>channelf</theme>
  </system>
@ -267,7 +267,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/bluemsx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.dylib %ROM%</command>
    <platform>colecovision</platform>
    <theme>colecovision</theme>
  </system>
@ -276,7 +276,7 @@
    <fullname>Daphne Arcade Laserdisc Emulator</fullname>
    <path>%ROMPATH%/daphne</path>
    <extension>.7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/daphne_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/daphne_libretro.dylib %ROM%</command>
    <platform>daphne</platform>
    <theme>daphne</theme>
  </system>
@ -294,7 +294,7 @@
    <fullname>Doom</fullname>
    <path>%ROMPATH%/doom</path>
    <extension>.wad .WAD .iwad .IWAD .pwad .PWAD</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/prboom_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prboom_libretro.dylib %ROM%</command>
    <platform>pc</platform>
    <theme>doom</theme>
  </system>
@ -303,7 +303,7 @@
    <fullname>DOS (PC)</fullname>
    <path>%ROMPATH%/dos</path>
    <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/dosbox_core_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.dylib %ROM%</command>
    <platform>dos</platform>
    <theme>dos</theme>
  </system>
@ -321,7 +321,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/flycast_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.dylib %ROM%</command>
    <platform>dreamcast</platform>
    <theme>dreamcast</theme>
  </system>
@ -330,7 +330,7 @@
    <fullname>Nintendo Family Computer</fullname>
    <path>%ROMPATH%/famicom</path>
    <extension>.nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/nestopia_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.dylib %ROM%</command>
    <platform>nes, famicom</platform>
    <theme>famicom</theme>
  </system>
@ -339,7 +339,7 @@
    <fullname>FinalBurn Alpha</fullname>
    <path>%ROMPATH%/fba</path>
    <extension>.iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/fbalpha2012_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.dylib %ROM%</command>
    <platform>arcade</platform>
    <theme>fba</theme>
  </system>
@ -348,7 +348,7 @@
    <fullname>FinalBurn Neo</fullname>
    <path>%ROMPATH%/fbneo</path>
    <extension>.ccd .CCD .cue .CUE .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/fbneo_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.dylib %ROM%</command>
    <platform>arcade</platform>
    <theme>fbneo</theme>
  </system>
@ -357,7 +357,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/nestopia_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.dylib %ROM%</command>
    <platform>fds</platform>
    <theme>fds</theme>
  </system>
@ -366,7 +366,7 @@
    <fullname>Nintendo Game and Watch</fullname>
    <path>%ROMPATH%/gameandwatch</path>
    <extension>.mgw .MGW .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/gw_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gw_libretro.dylib %ROM%</command>
    <platform>gameandwatch</platform>
    <theme>gameandwatch</theme>
  </system>
@ -375,7 +375,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/genesis_plus_gx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %ROM%</command>
    <platform>gamegear</platform>
    <theme>gamegear</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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/bsnes_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.dylib %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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_gba_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_gba_libretro.dylib %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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/bsnes_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.dylib %ROM%</command>
    <platform>gbc</platform>
    <theme>gbc</theme>
  </system>
@ -411,7 +411,7 @@
    <fullname>Nintendo GameCube</fullname>
    <path>%ROMPATH%/gc</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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/dolphin_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.dylib %ROM%</command>
    <platform>gc</platform>
    <theme>gc</theme>
  </system>
@ -420,7 +420,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/genesis_plus_gx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %ROM%</command>
    <platform>genesis, megadrive</platform>
    <theme>genesis</theme>
  </system>
@ -438,7 +438,7 @@
    <fullname>Mattel Electronics Intellivision</fullname>
    <path>%ROMPATH%/intellivision</path>
    <extension>.int .INT .bin .BIN .rom .ROM .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/freeintv_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freeintv_libretro.dylib %ROM%</command>
    <platform>intellivision</platform>
    <theme>intellivision</theme>
  </system>
@ -465,7 +465,7 @@
    <fullname>Lutro game engine</fullname>
    <path>%ROMPATH%/lutro</path>
    <extension>.lua .LUA .lutro .LUTRO .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/lutro_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/lutro_libretro.dylib %ROM%</command>
    <platform>lutro</platform>
    <theme>lutro</theme>
  </system>
@ -483,7 +483,7 @@
    <fullname>Multiple Arcade Machine Emulator</fullname>
    <path>%ROMPATH%/mame</path>
    <extension>.zip .ZIP .7z .7Z</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mame2003_plus_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.dylib %ROM%</command>
    <platform>arcade</platform>
    <theme>mame</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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/genesis_plus_gx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/genesis_plus_gx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/genesis_plus_gx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/genesis_plus_gx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mess2015_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mess2015_libretro.dylib %ROM%</command>
    <platform>mess</platform>
    <theme>mess</theme>
  </system>
@ -564,7 +564,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/theodore_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.dylib %ROM%</command>
    <platform>moto</platform>
    <theme>moto</theme>
  </system>
@ -573,7 +573,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/bluemsx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.dylib %ROM%</command>
    <platform>msx</platform>
    <theme>msx</theme>
  </system>
@ -582,7 +582,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/bluemsx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.dylib %ROM%</command>
    <platform>msx</platform>
    <theme>msx1</theme>
  </system>
@ -591,7 +591,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/bluemsx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.dylib %ROM%</command>
    <platform>msx2</platform>
    <theme>msx2</theme>
  </system>
@ -600,7 +600,7 @@
    <fullname>MSX Turbo R</fullname>
    <path>%ROMPATH%/msxturbor</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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/bluemsx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.dylib %ROM%</command>
    <platform>msxturbor</platform>
    <theme>msxturbor</theme>
  </system>
@ -609,7 +609,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/gearsystem_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.dylib %ROM%</command>
    <platform>sg-1000</platform>
    <theme>multivision</theme>
  </system>
@ -618,7 +618,7 @@
    <fullname>Nintendo 3DS</fullname>
    <path>%ROMPATH%/n3ds</path>
    <extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/citra_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.dylib %ROM%</command>
    <platform>n3ds</platform>
    <theme>n3ds</theme>
  </system>
@ -627,7 +627,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/parallel_n64_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.dylib %ROM%</command>
    <platform>n64</platform>
    <theme>n64</theme>
  </system>
@ -636,7 +636,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/flycast_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.dylib %ROM%</command>
    <platform>naomi</platform>
    <theme>naomi</theme>
  </system>
@ -645,7 +645,7 @@
    <fullname>Sega NAOMI GD-ROM</fullname>
    <path>%ROMPATH%/naomigd</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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/flycast_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.dylib %ROM%</command>
    <platform>naomi</platform>
    <theme>naomigd</theme>
  </system>
@ -654,7 +654,7 @@
    <fullname>Nintendo DS</fullname>
    <path>%ROMPATH%/nds</path>
    <extension>.nds .NDS .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/melonds_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/melonds_libretro.dylib %ROM%</command>
    <platform>nds</platform>
    <theme>nds</theme>
  </system>
@ -663,7 +663,7 @@
    <fullname>SNK Neo Geo</fullname>
    <path>%ROMPATH%/neogeo</path>
    <extension>.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/fbneo_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.dylib %ROM%</command>
    <platform>neogeo</platform>
    <theme>neogeo</theme>
  </system>
@ -672,7 +672,7 @@
    <fullname>SNK Neo Geo CD</fullname>
    <path>%ROMPATH%/neogeocd</path>
    <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/neocd_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.dylib %ROM%</command>
    <platform>neogeocd</platform>
    <theme>neogeocd</theme>
  </system>
@ -681,7 +681,7 @@
    <fullname>SNK Neo Geo CD</fullname>
    <path>%ROMPATH%/neogeocdjp</path>
    <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/neocd_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.dylib %ROM%</command>
    <platform>neogeocd</platform>
    <theme>neogeocdjp</theme>
  </system>
@ -690,7 +690,7 @@
    <fullname>Nintendo Entertainment System</fullname>
    <path>%ROMPATH%/nes</path>
    <extension>.nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/nestopia_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.dylib %ROM%</command>
    <platform>nes</platform>
    <theme>nes</theme>
  </system>
@ -699,7 +699,7 @@
    <fullname>SNK Neo Geo Pocket</fullname>
    <path>%ROMPATH%/ngp</path>
    <extension>.ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_ngp_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_ngp_libretro.dylib %ROM%</command>
    <platform>ngp</platform>
    <theme>ngp</theme>
  </system>
@ -708,7 +708,7 @@
    <fullname>SNK Neo Geo Pocket Color</fullname>
    <path>%ROMPATH%/ngpc</path>
    <extension>.ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_ngp_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_ngp_libretro.dylib %ROM%</command>
    <platform>ngpc</platform>
    <theme>ngpc</theme>
  </system>
@ -717,7 +717,7 @@
    <fullname>Magnavox Odyssey2</fullname>
    <path>%ROMPATH%/odyssey2</path>
    <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/o2em_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.dylib %ROM%</command>
    <platform>odyssey2</platform>
    <theme>odyssey2</theme>
  </system>
@ -744,7 +744,7 @@
    <fullname>Palm OS</fullname>
    <path>%ROMPATH%/palm</path>
    <extension>.prc .PRC .pqa .PQA .img .IMG .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mu_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mu_libretro.dylib %ROM%</command>
    <platform>palm</platform>
    <theme>palm</theme>
  </system>
@ -753,7 +753,7 @@
    <fullname>IBM PC</fullname>
    <path>%ROMPATH%/pc</path>
    <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/dosbox_core_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.dylib %ROM%</command>
    <platform>pc</platform>
    <theme>pc</theme>
  </system>
@ -762,7 +762,7 @@
    <fullname>NEC PC-8800 series</fullname>
    <path>%ROMPATH%/pc88</path>
    <extension>.d88 .D88 .u88 .U88 .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/quasi88_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quasi88_libretro.dylib %ROM%</command>
    <platform>pc88</platform>
    <theme>pc88</theme>
  </system>
@ -771,7 +771,7 @@
    <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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/np2kai_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/np2kai_libretro.dylib %ROM%</command>
    <platform>pc98</platform>
    <theme>pc98</theme>
  </system>
@ -780,7 +780,7 @@
    <fullname>NEC PC Engine</fullname>
    <path>%ROMPATH%/pcengine</path>
    <extension>.pce .PCE .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_pce_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.dylib %ROM%</command>
    <platform>pcengine</platform>
    <theme>pcengine</theme>
  </system>
@ -789,7 +789,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_pce_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.dylib %ROM%</command>
    <platform>pcenginecd</platform>
    <theme>pcenginecd</theme>
  </system>
@ -798,7 +798,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_pcfx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pcfx_libretro.dylib %ROM%</command>
    <platform>pcfx</platform>
    <theme>pcfx</theme>
  </system>
@ -807,7 +807,7 @@
    <fullname>Nintendo Pokémon Mini</fullname>
    <path>%ROMPATH%/pokemini</path>
    <extension>.min .MIN .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/pokemini_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pokemini_libretro.dylib %ROM%</command>
    <platform>pokemini</platform>
    <theme>pokemini</theme>
  </system>
@ -825,7 +825,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/play_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/play_libretro.dylib %ROM%</command>
    <platform>ps2</platform>
    <theme>ps2</theme>
  </system>
@ -852,7 +852,7 @@
    <fullname>Sony PlayStation Portable</fullname>
    <path>%ROMPATH%/psp</path>
    <extension>.elf .ELF .iso .ISO .cso .CSO .prx .PRX .pbp .PBP .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/ppsspp_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/ppsspp_libretro.dylib %ROM%</command>
    <platform>psp</platform>
    <theme>psp</theme>
  </system>
@ -870,7 +870,7 @@
    <fullname>Sony PlayStation</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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_psx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_libretro.dylib %ROM%</command>
    <platform>psx</platform>
    <theme>psx</theme>
  </system>
@ -888,7 +888,7 @@
    <fullname>SAM Coupé</fullname>
    <path>%ROMPATH%/samcoupe</path>
    <extension>.dsk .DSK .mgt .MGT .sbt .SBT .sad .SAD .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/simcp_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/simcp_libretro.dylib %ROM%</command>
    <platform>samcoupe</platform>
    <theme>samcoupe</theme>
  </system>
@ -897,7 +897,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/snes9x_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.dylib %ROM%</command>
    <platform>satellaview</platform>
    <theme>satellaview</theme>
  </system>
@ -906,7 +906,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_saturn_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_saturn_libretro.dylib %ROM%</command>
    <platform>saturn</platform>
    <theme>saturn</theme>
  </system>
@ -915,7 +915,7 @@
    <fullname>Sega Saturn</fullname>
    <path>%ROMPATH%/saturnjp</path>
    <extension>.ccd .CCD .chd .CHD .cue .CUE .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_saturn_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_saturn_libretro.dylib %ROM%</command>
    <platform>saturn</platform>
    <theme>saturnjp</theme>
  </system>
@ -924,7 +924,7 @@
    <fullname>ScummVM game engine</fullname>
    <path>%ROMPATH%/scummvm</path>
    <extension>.scummvm .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/scummvm_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.dylib %ROM%</command>
    <platform>scummvm</platform>
    <theme>scummvm</theme>
  </system>
@ -933,7 +933,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/picodrive_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.dylib %ROM%</command>
    <platform>sega32x</platform>
    <theme>sega32x</theme>
  </system>
@ -942,7 +942,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/picodrive_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.dylib %ROM%</command>
    <platform>sega32x</platform>
    <theme>sega32xjp</theme>
  </system>
@ -951,7 +951,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/picodrive_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.dylib %ROM%</command>
    <platform>sega32x</platform>
    <theme>sega32xna</theme>
  </system>
@ -960,7 +960,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/genesis_plus_gx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %ROM%</command>
    <platform>segacd</platform>
    <theme>segacd</theme>
  </system>
@ -969,7 +969,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/genesis_plus_gx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %ROM%</command>
    <platform>sg-1000</platform>
    <theme>sg-1000</theme>
  </system>
@ -978,7 +978,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/snes9x_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.dylib %ROM%</command>
    <platform>snes</platform>
    <theme>snes</theme>
  </system>
@ -987,7 +987,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/snes9x_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.dylib %ROM%</command>
    <platform>snes</platform>
    <theme>snesna</theme>
  </system>
@ -1005,7 +1005,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/bluemsx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.dylib %ROM%</command>
    <platform>spectravideo</platform>
    <theme>spectravideo</theme>
  </system>
@ -1032,7 +1032,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/snes9x_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.dylib %ROM%</command>
    <platform>sufami</platform>
    <theme>sufami</theme>
  </system>
@ -1041,7 +1041,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_supergrafx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supergrafx_libretro.dylib %ROM%</command>
    <platform>supergrafx</platform>
    <theme>supergrafx</theme>
  </system>
@ -1059,7 +1059,7 @@
    <fullname>NEC TurboGrafx-16</fullname>
    <path>%ROMPATH%/tg16</path>
    <extension>.pce .PCE .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_pce_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.dylib %ROM%</command>
    <platform>pcengine</platform>
    <theme>tg16</theme>
  </system>
@ -1068,7 +1068,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_pce_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.dylib %ROM%</command>
    <platform>pcenginecd</platform>
    <theme>tg-cd</theme>
  </system>
@ -1095,7 +1095,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/theodore_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.dylib %ROM%</command>
    <platform>moto</platform>
    <theme>to8</theme>
  </system>
@ -1113,7 +1113,7 @@
    <fullname>Uzebox</fullname>
    <path>%ROMPATH%/uzebox</path>
    <extension>.uze .UZE .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/uzem_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/uzem_libretro.dylib %ROM%</command>
    <platform>uzebox</platform>
    <theme>uzebox</theme>
  </system>
@ -1122,7 +1122,7 @@
    <fullname>Vectrex</fullname>
    <path>%ROMPATH%/vectrex</path>
    <extension>.bin .BIN .vec .VEC .gam .GAM .vc .VC .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/vecx_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vecx_libretro.dylib %ROM%</command>
    <platform>vectrex</platform>
    <theme>vectrex</theme>
  </system>
@ -1131,7 +1131,7 @@
    <fullname>Philips Videopac G7000 (Magnavox Odyssey2)</fullname>
    <path>%ROMPATH%/videopac</path>
    <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/o2em_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.dylib %ROM%</command>
    <platform>videopac</platform>
    <theme>videopac</theme>
  </system>
@ -1140,7 +1140,7 @@
    <fullname>Nintendo Virtual Boy</fullname>
    <path>%ROMPATH%/virtualboy</path>
    <extension>.vb .VB .vboy .VBOY .bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_vb_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_vb_libretro.dylib %ROM%</command>
    <platform>virtualboy</platform>
    <theme>virtualboy</theme>
  </system>
@ -1149,7 +1149,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/dolphin_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.dylib %ROM%</command>
    <platform>wii</platform>
    <theme>wii</theme>
  </system>
@ -1167,7 +1167,7 @@
    <fullname>Bandai WonderSwan</fullname>
    <path>%ROMPATH%/wonderswan</path>
    <extension>.ws .WS .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_wswan_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.dylib %ROM%</command>
    <platform>wonderswan</platform>
    <theme>wonderswan</theme>
  </system>
@ -1176,7 +1176,7 @@
    <fullname>Bandai WonderSwan Color</fullname>
    <path>%ROMPATH%/wonderswancolor</path>
    <extension>.ws .WS .wsc .WSC .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/mednafen_wswan_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.dylib %ROM%</command>
    <platform>wonderswancolor</platform>
    <theme>wonderswancolor</theme>
  </system>
@ -1185,7 +1185,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/x1_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/x1_libretro.dylib %ROM%</command>
    <platform>x1</platform>
    <theme>x1</theme>
  </system>
@ -1194,7 +1194,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/px68k_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.dylib %ROM%</command>
    <platform>x68000</platform>
    <theme>x68000</theme>
  </system>
@ -1230,7 +1230,7 @@
    <fullname>Sinclair ZX81</fullname>
    <path>%ROMPATH%/zx81</path>
    <extension>.tzx .TZX .p .P .7z .7Z .zip .ZIP</extension>
-    <command>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/81_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/81_libretro.dylib %ROM%</command>
    <platform>zx81</platform>
    <theme>zx81</theme>
  </system>
@ -1239,7 +1239,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>/Applications/RetroArch.app/Contents/MacOS/RetroArch -L %COREPATH%/fuse_libretro.dylib %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fuse_libretro.dylib %ROM%</command>
    <platform>zxspectrum</platform>
    <theme>zxspectrum</theme>
  </system>
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!-- This is the ES-DE find rules configuration file for Unix. -->
+<ruleList>
+  <emulator name="RETROARCH">
+    <rule type="systempath">
+      <entry>retroarch</entry>
+    </rule>
+    <rule type="staticpath">
+      <entry>/var/lib/flatpak/exports/bin/org.libretro.RetroArch</entry>
+    </rule>
+  </emulator>
+  <core name="RETROARCH">
+    <rule type="corepath">
+      <!-- Compiled from source -->
+      <entry>~/.config/retroarch/cores</entry>
+      <!-- Snap package -->
+      <entry>~/snap/retroarch/current/.config/retroarch/cores</entry>
+      <!-- Flatpak package -->
+      <entry>~/.var/app/org.libretro.RetroArch/config/retroarch/cores</entry>
+      <!-- Ubuntu and Linux Mint repository -->
+      <entry>/usr/lib/x86_64-linux-gnu/libretro</entry>
+      <!-- Fedora repository -->
+      <entry>/usr/lib64/libretro</entry>
+      <!-- Manjaro repository -->
+      <entry>/usr/lib/libretro</entry>
+      <!-- FreeBSD and OpenBSD repository -->
+      <entry>/usr/local/lib/libretro</entry>
+      <!-- NetBSD repository -->
+      <entry>/usr/pkg/lib/libretro</entry>
+    </rule>
+  </core>
+</ruleList>
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@ -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 -L %COREPATH%/4do_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/4do_libretro.so %ROM%</command>
    <platform>3do</platform>
    <theme>3do</theme>
  </system>
@ -15,7 +15,7 @@
    <fullname>Nintendo 64DD</fullname>
    <path>%ROMPATH%/64dd</path>
    <extension>.n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/mupen64plus_next_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM%</command>
    <platform>n64</platform>
    <theme>64dd</theme>
  </system>
@ -33,7 +33,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 -L %COREPATH%/puae_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM%</command>
    <platform>amiga</platform>
    <theme>amiga</theme>
  </system>
@ -42,7 +42,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 -L %COREPATH%/puae_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM%</command>
    <platform>amiga</platform>
    <theme>amiga600</theme>
  </system>
@ -51,7 +51,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 -L %COREPATH%/puae_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM%</command>
    <platform>amiga</platform>
    <theme>amiga1200</theme>
  </system>
@ -60,7 +60,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 -L %COREPATH%/puae_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM%</command>
    <platform>amigacd32</platform>
    <theme>amigacd32</theme>
  </system>
@ -69,7 +69,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 -L %COREPATH%/cap32_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/cap32_libretro.so %ROM%</command>
    <platform>amstradcpc</platform>
    <theme>amstradcpc</theme>
  </system>
@ -96,7 +96,7 @@
    <fullname>Arcade</fullname>
    <path>%ROMPATH%/arcade</path>
    <extension>.cmd .CMD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/mame_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM%</command>
    <platform>arcade</platform>
    <theme>arcade</theme>
  </system>
@ -114,7 +114,7 @@
    <fullname>Atari 2600</fullname>
    <path>%ROMPATH%/atari2600</path>
    <extension>.a26 .A26 .bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/stella_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/stella_libretro.so %ROM%</command>
    <platform>atari2600</platform>
    <theme>atari2600</theme>
  </system>
@ -123,7 +123,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 -L %COREPATH%/atari800_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%</command>
    <platform>atari5200</platform>
    <theme>atari5200</theme>
  </system>
@ -132,7 +132,7 @@
    <fullname>Atari 7800 ProSystem</fullname>
    <path>%ROMPATH%/atari7800</path>
    <extension>.a78 .A78 .bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/prosystem_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.so %ROM%</command>
    <platform>atari7800</platform>
    <theme>atari7800</theme>
  </system>
@ -141,7 +141,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 -L %COREPATH%/atari800_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%</command>
    <platform>atari800</platform>
    <theme>atari800</theme>
  </system>
@ -150,7 +150,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 -L %COREPATH%/virtualjaguar_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.so %ROM%</command>
    <platform>atarijaguar, atarijaguarcd</platform>
    <theme>atarijaguar</theme>
  </system>
@ -159,7 +159,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 -L %COREPATH%/virtualjaguar_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.so %ROM%</command>
    <platform>atarijaguarcd</platform>
    <theme>atarijaguarcd</theme>
  </system>
@ -168,7 +168,7 @@
    <fullname>Atari Lynx</fullname>
    <path>%ROMPATH%/atarilynx</path>
    <extension>.lnx .LNX .o .O .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/mednafen_lynx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_lynx_libretro.so %ROM%</command>
    <platform>atarilynx</platform>
    <theme>atarilynx</theme>
  </system>
@ -177,7 +177,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 -L %COREPATH%/hatari_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/hatari_libretro.so %ROM%</command>
    <platform>atarist</platform>
    <theme>atarist</theme>
  </system>
@ -186,7 +186,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 -L %COREPATH%/atari800_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%</command>
    <platform>atarixe</platform>
    <theme>atarixe</theme>
  </system>
@ -195,7 +195,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 -L %COREPATH%/flycast_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
    <platform>atomiswave</platform>
    <theme>atomiswave</theme>
  </system>
@ -213,7 +213,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 -L %COREPATH%/vice_x64sc_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64sc_libretro.so %ROM%</command>
    <platform>c64</platform>
    <theme>c64</theme>
  </system>
@ -222,7 +222,7 @@
    <fullname>Cave Story (NXEngine)</fullname>
    <path>%ROMPATH%/cavestory</path>
    <extension>.exe .EXE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/nxengine_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.so %ROM%</command>
    <platform>cavestory</platform>
    <theme>cavestory</theme>
  </system>
@ -240,7 +240,7 @@
    <fullname>ChaiLove game engine</fullname>
    <path>%ROMPATH%/chailove</path>
    <extension>.chai .CHAI .chailove .CHAILOVE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/chailove_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/chailove_libretro.so %ROM%</command>
    <platform>love</platform>
    <theme>chailove</theme>
  </system>
@ -249,7 +249,7 @@
    <fullname>Fairchild Channel F</fullname>
    <path>%ROMPATH%/channelf</path>
    <extension>.bin .BIN .chf .CHF .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/freechaf_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freechaf_libretro.so %ROM%</command>
    <platform>channelf</platform>
    <theme>channelf</theme>
  </system>
@ -267,7 +267,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 -L %COREPATH%/bluemsx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
    <platform>colecovision</platform>
    <theme>colecovision</theme>
  </system>
@ -276,7 +276,7 @@
    <fullname>Daphne Arcade Laserdisc Emulator</fullname>
    <path>%ROMPATH%/daphne</path>
    <extension>.7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/daphne_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/daphne_libretro.so %ROM%</command>
    <platform>daphne</platform>
    <theme>daphne</theme>
  </system>
@ -294,7 +294,7 @@
    <fullname>Doom</fullname>
    <path>%ROMPATH%/doom</path>
    <extension>.wad .WAD .iwad .IWAD .pwad .PWAD</extension>
-    <command>retroarch -L %COREPATH%/prboom_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prboom_libretro.so %ROM%</command>
    <platform>pc</platform>
    <theme>doom</theme>
  </system>
@ -303,7 +303,7 @@
    <fullname>DOS (PC)</fullname>
    <path>%ROMPATH%/dos</path>
    <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/dosbox_core_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM%</command>
    <platform>dos</platform>
    <theme>dos</theme>
  </system>
@ -321,7 +321,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 -L %COREPATH%/flycast_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
    <platform>dreamcast</platform>
    <theme>dreamcast</theme>
  </system>
@ -330,7 +330,7 @@
    <fullname>Nintendo Family Computer</fullname>
    <path>%ROMPATH%/famicom</path>
    <extension>.nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/nestopia_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
    <platform>nes, famicom</platform>
    <theme>famicom</theme>
  </system>
@ -339,7 +339,7 @@
    <fullname>FinalBurn Alpha</fullname>
    <path>%ROMPATH%/fba</path>
    <extension>.iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/fbalpha2012_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM%</command>
    <platform>arcade</platform>
    <theme>fba</theme>
  </system>
@ -348,7 +348,7 @@
    <fullname>FinalBurn Neo</fullname>
    <path>%ROMPATH%/fbneo</path>
    <extension>.ccd .CCD .cue .CUE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/fbneo_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
    <platform>arcade</platform>
    <theme>fbneo</theme>
  </system>
@ -357,7 +357,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 -L %COREPATH%/nestopia_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
    <platform>fds</platform>
    <theme>fds</theme>
  </system>
@ -366,7 +366,7 @@
    <fullname>Nintendo Game and Watch</fullname>
    <path>%ROMPATH%/gameandwatch</path>
    <extension>.mgw .MGW .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/gw_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gw_libretro.so %ROM%</command>
    <platform>gameandwatch</platform>
    <theme>gameandwatch</theme>
  </system>
@ -375,7 +375,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 -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM%</command>
    <platform>gamegear</platform>
    <theme>gamegear</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 -L %COREPATH%/bsnes_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %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 -L %COREPATH%/mednafen_gba_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_gba_libretro.so %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 -L %COREPATH%/bsnes_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%</command>
    <platform>gbc</platform>
    <theme>gbc</theme>
  </system>
@ -411,7 +411,7 @@
    <fullname>Nintendo GameCube</fullname>
    <path>%ROMPATH%/gc</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 -L %COREPATH%/dolphin_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%</command>
    <platform>gc</platform>
    <theme>gc</theme>
  </system>
@ -420,7 +420,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 -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM%</command>
    <platform>genesis, megadrive</platform>
    <theme>genesis</theme>
  </system>
@ -438,7 +438,7 @@
    <fullname>Mattel Electronics Intellivision</fullname>
    <path>%ROMPATH%/intellivision</path>
    <extension>.int .INT .bin .BIN .rom .ROM .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/freeintv_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freeintv_libretro.so %ROM%</command>
    <platform>intellivision</platform>
    <theme>intellivision</theme>
  </system>
@ -465,7 +465,7 @@
    <fullname>Lutro game engine</fullname>
    <path>%ROMPATH%/lutro</path>
    <extension>.lua .LUA .lutro .LUTRO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/lutro_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/lutro_libretro.so %ROM%</command>
    <platform>lutro</platform>
    <theme>lutro</theme>
  </system>
@ -483,7 +483,7 @@
    <fullname>Multiple Arcade Machine Emulator</fullname>
    <path>%ROMPATH%/mame</path>
    <extension>.zip .ZIP .7z .7Z</extension>
-    <command>retroarch -L %COREPATH%/mame2003_plus_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM%</command>
    <platform>arcade</platform>
    <theme>mame</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 -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %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 -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %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 -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %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 -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %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 -L %COREPATH%/mess2015_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mess2015_libretro.so %ROM%</command>
    <platform>mess</platform>
    <theme>mess</theme>
  </system>
@ -564,7 +564,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>retroarch -L %COREPATH%/theodore_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM%</command>
    <platform>moto</platform>
    <theme>moto</theme>
  </system>
@ -573,7 +573,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 -L %COREPATH%/bluemsx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
    <platform>msx</platform>
    <theme>msx</theme>
  </system>
@ -582,7 +582,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 -L %COREPATH%/bluemsx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
    <platform>msx</platform>
    <theme>msx1</theme>
  </system>
@ -591,7 +591,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 -L %COREPATH%/bluemsx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
    <platform>msx2</platform>
    <theme>msx2</theme>
  </system>
@ -600,7 +600,7 @@
    <fullname>MSX Turbo R</fullname>
    <path>%ROMPATH%/msxturbor</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 -L %COREPATH%/bluemsx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
    <platform>msxturbor</platform>
    <theme>msxturbor</theme>
  </system>
@ -609,7 +609,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>retroarch -L %COREPATH%/gearsystem_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM%</command>
    <platform>sg-1000</platform>
    <theme>multivision</theme>
  </system>
@ -618,7 +618,7 @@
    <fullname>Nintendo 3DS</fullname>
    <path>%ROMPATH%/n3ds</path>
    <extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/citra_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM%</command>
    <platform>n3ds</platform>
    <theme>n3ds</theme>
  </system>
@ -627,7 +627,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 -L %COREPATH%/mupen64plus_next_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM%</command>
    <platform>n64</platform>
    <theme>n64</theme>
  </system>
@ -636,7 +636,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 -L %COREPATH%/flycast_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
    <platform>naomi</platform>
    <theme>naomi</theme>
  </system>
@ -645,7 +645,7 @@
    <fullname>Sega NAOMI GD-ROM</fullname>
    <path>%ROMPATH%/naomigd</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 -L %COREPATH%/flycast_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%</command>
    <platform>naomi</platform>
    <theme>naomigd</theme>
  </system>
@ -654,7 +654,7 @@
    <fullname>Nintendo DS</fullname>
    <path>%ROMPATH%/nds</path>
    <extension>.nds .NDS .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/melonds_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/melonds_libretro.so %ROM%</command>
    <platform>nds</platform>
    <theme>nds</theme>
  </system>
@ -663,7 +663,7 @@
    <fullname>SNK Neo Geo</fullname>
    <path>%ROMPATH%/neogeo</path>
    <extension>.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/fbneo_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
    <platform>neogeo</platform>
    <theme>neogeo</theme>
  </system>
@ -672,7 +672,7 @@
    <fullname>SNK Neo Geo CD</fullname>
    <path>%ROMPATH%/neogeocd</path>
    <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/neocd_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM%</command>
    <platform>neogeocd</platform>
    <theme>neogeocd</theme>
  </system>
@ -681,7 +681,7 @@
    <fullname>SNK Neo Geo CD</fullname>
    <path>%ROMPATH%/neogeocdjp</path>
    <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/neocd_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM%</command>
    <platform>neogeocd</platform>
    <theme>neogeocdjp</theme>
  </system>
@ -690,7 +690,7 @@
    <fullname>Nintendo Entertainment System</fullname>
    <path>%ROMPATH%/nes</path>
    <extension>.nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/nestopia_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%</command>
    <platform>nes</platform>
    <theme>nes</theme>
  </system>
@ -699,7 +699,7 @@
    <fullname>SNK Neo Geo Pocket</fullname>
    <path>%ROMPATH%/ngp</path>
    <extension>.ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/mednafen_ngp_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_ngp_libretro.so %ROM%</command>
    <platform>ngp</platform>
    <theme>ngp</theme>
  </system>
@ -708,7 +708,7 @@
    <fullname>SNK 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 -L %COREPATH%/mednafen_ngp_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_ngp_libretro.so %ROM%</command>
    <platform>ngpc</platform>
    <theme>ngpc</theme>
  </system>
@ -717,7 +717,7 @@
    <fullname>Magnavox Odyssey2</fullname>
    <path>%ROMPATH%/odyssey2</path>
    <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/o2em_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM%</command>
    <platform>odyssey2</platform>
    <theme>odyssey2</theme>
  </system>
@ -744,7 +744,7 @@
    <fullname>Palm OS</fullname>
    <path>%ROMPATH%/palm</path>
    <extension>.prc .PRC .pqa .PQA .img .IMG .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/mu_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mu_libretro.so %ROM%</command>
    <platform>palm</platform>
    <theme>palm</theme>
  </system>
@ -753,7 +753,7 @@
    <fullname>IBM PC</fullname>
    <path>%ROMPATH%/pc</path>
    <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/dosbox_core_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM%</command>
    <platform>pc</platform>
    <theme>pc</theme>
  </system>
@ -762,7 +762,7 @@
    <fullname>NEC PC-8800 series</fullname>
    <path>%ROMPATH%/pc88</path>
    <extension>.d88 .D88 .u88 .U88 .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/quasi88_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quasi88_libretro.so %ROM%</command>
    <platform>pc88</platform>
    <theme>pc88</theme>
  </system>
@ -771,7 +771,7 @@
    <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>retroarch -L %COREPATH%/np2kai_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/np2kai_libretro.so %ROM%</command>
    <platform>pc98</platform>
    <theme>pc98</theme>
  </system>
@ -780,7 +780,7 @@
    <fullname>NEC PC Engine</fullname>
    <path>%ROMPATH%/pcengine</path>
    <extension>.pce .PCE .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/mednafen_pce_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%</command>
    <platform>pcengine</platform>
    <theme>pcengine</theme>
  </system>
@ -789,7 +789,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 -L %COREPATH%/mednafen_pce_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%</command>
    <platform>pcenginecd</platform>
    <theme>pcenginecd</theme>
  </system>
@ -798,7 +798,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 -L %COREPATH%/mednafen_pcfx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pcfx_libretro.so %ROM%</command>
    <platform>pcfx</platform>
    <theme>pcfx</theme>
  </system>
@ -807,7 +807,7 @@
    <fullname>Nintendo Pokémon Mini</fullname>
    <path>%ROMPATH%/pokemini</path>
    <extension>.min .MIN .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/pokemini_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pokemini_libretro.so %ROM%</command>
    <platform>pokemini</platform>
    <theme>pokemini</theme>
  </system>
@ -825,7 +825,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 -L %COREPATH%/play_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/play_libretro.so %ROM%</command>
    <platform>ps2</platform>
    <theme>ps2</theme>
  </system>
@ -852,7 +852,7 @@
    <fullname>Sony 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 -L %COREPATH%/ppsspp_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/ppsspp_libretro.so %ROM%</command>
    <platform>psp</platform>
    <theme>psp</theme>
  </system>
@ -870,7 +870,7 @@
    <fullname>Sony PlayStation</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 -L %COREPATH%/mednafen_psx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_libretro.so %ROM%</command>
    <platform>psx</platform>
    <theme>psx</theme>
  </system>
@ -888,7 +888,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 -L %COREPATH%/simcp_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/simcp_libretro.so %ROM%</command>
    <platform>samcoupe</platform>
    <theme>samcoupe</theme>
  </system>
@ -897,7 +897,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 -L %COREPATH%/snes9x_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%</command>
    <platform>satellaview</platform>
    <theme>satellaview</theme>
  </system>
@ -906,7 +906,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 -L %COREPATH%/mednafen_saturn_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_saturn_libretro.so %ROM%</command>
    <platform>saturn</platform>
    <theme>saturn</theme>
  </system>
@ -915,7 +915,7 @@
    <fullname>Sega Saturn</fullname>
    <path>%ROMPATH%/saturnjp</path>
    <extension>.ccd .CCD .chd .CHD .cue .CUE .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/mednafen_saturn_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_saturn_libretro.so %ROM%</command>
    <platform>saturn</platform>
    <theme>saturnjp</theme>
  </system>
@ -924,7 +924,7 @@
    <fullname>ScummVM game engine</fullname>
    <path>%ROMPATH%/scummvm</path>
    <extension>.scummvm .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/scummvm_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.so %ROM%</command>
    <platform>scummvm</platform>
    <theme>scummvm</theme>
  </system>
@ -933,7 +933,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 -L %COREPATH%/picodrive_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command>
    <platform>sega32x</platform>
    <theme>sega32x</theme>
  </system>
@ -942,7 +942,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 -L %COREPATH%/picodrive_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command>
    <platform>sega32x</platform>
    <theme>sega32xjp</theme>
  </system>
@ -951,7 +951,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 -L %COREPATH%/picodrive_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM%</command>
    <platform>sega32x</platform>
    <theme>sega32xna</theme>
  </system>
@ -960,7 +960,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 -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM%</command>
    <platform>segacd</platform>
    <theme>segacd</theme>
  </system>
@ -969,7 +969,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 -L %COREPATH%/genesis_plus_gx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM%</command>
    <platform>sg-1000</platform>
    <theme>sg-1000</theme>
  </system>
@ -978,7 +978,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 -L %COREPATH%/snes9x_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%</command>
    <platform>snes</platform>
    <theme>snes</theme>
  </system>
@ -987,7 +987,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 -L %COREPATH%/snes9x_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%</command>
    <platform>snes</platform>
    <theme>snesna</theme>
  </system>
@ -1005,7 +1005,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 -L %COREPATH%/bluemsx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%</command>
    <platform>spectravideo</platform>
    <theme>spectravideo</theme>
  </system>
@ -1032,7 +1032,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 -L %COREPATH%/snes9x_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%</command>
    <platform>sufami</platform>
    <theme>sufami</theme>
  </system>
@ -1041,7 +1041,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 -L %COREPATH%/mednafen_supergrafx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supergrafx_libretro.so %ROM%</command>
    <platform>supergrafx</platform>
    <theme>supergrafx</theme>
  </system>
@ -1059,7 +1059,7 @@
    <fullname>NEC TurboGrafx-16</fullname>
    <path>%ROMPATH%/tg16</path>
    <extension>.pce .PCE .bin .BIN .chd .CHD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/mednafen_pce_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%</command>
    <platform>pcengine</platform>
    <theme>tg16</theme>
  </system>
@ -1068,7 +1068,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 -L %COREPATH%/mednafen_pce_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%</command>
    <platform>pcenginecd</platform>
    <theme>tg-cd</theme>
  </system>
@ -1095,7 +1095,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>retroarch -L %COREPATH%/theodore_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM%</command>
    <platform>moto</platform>
    <theme>to8</theme>
  </system>
@ -1113,7 +1113,7 @@
    <fullname>Uzebox</fullname>
    <path>%ROMPATH%/uzebox</path>
    <extension>.uze .UZE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/uzem_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/uzem_libretro.so %ROM%</command>
    <platform>uzebox</platform>
    <theme>uzebox</theme>
  </system>
@ -1122,7 +1122,7 @@
    <fullname>Vectrex</fullname>
    <path>%ROMPATH%/vectrex</path>
    <extension>.bin .BIN .vec .VEC .gam .GAM .vc .VC .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/vecx_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vecx_libretro.so %ROM%</command>
    <platform>vectrex</platform>
    <theme>vectrex</theme>
  </system>
@ -1131,7 +1131,7 @@
    <fullname>Philips Videopac G7000 (Magnavox Odyssey2)</fullname>
    <path>%ROMPATH%/videopac</path>
    <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/o2em_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM%</command>
    <platform>videopac</platform>
    <theme>videopac</theme>
  </system>
@ -1140,7 +1140,7 @@
    <fullname>Nintendo Virtual Boy</fullname>
    <path>%ROMPATH%/virtualboy</path>
    <extension>.vb .VB .vboy .VBOY .bin .BIN .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/mednafen_vb_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_vb_libretro.so %ROM%</command>
    <platform>virtualboy</platform>
    <theme>virtualboy</theme>
  </system>
@ -1149,7 +1149,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 -L %COREPATH%/dolphin_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%</command>
    <platform>wii</platform>
    <theme>wii</theme>
  </system>
@ -1167,7 +1167,7 @@
    <fullname>Bandai WonderSwan</fullname>
    <path>%ROMPATH%/wonderswan</path>
    <extension>.ws .WS .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/mednafen_wswan_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.so %ROM%</command>
    <platform>wonderswan</platform>
    <theme>wonderswan</theme>
  </system>
@ -1176,7 +1176,7 @@
    <fullname>Bandai WonderSwan Color</fullname>
    <path>%ROMPATH%/wonderswancolor</path>
    <extension>.ws .WS .wsc .WSC .pc2 .PC2 .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/mednafen_wswan_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.so %ROM%</command>
    <platform>wonderswancolor</platform>
    <theme>wonderswancolor</theme>
  </system>
@ -1185,7 +1185,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>retroarch -L %COREPATH%/x1_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/x1_libretro.so %ROM%</command>
    <platform>x1</platform>
    <theme>x1</theme>
  </system>
@ -1194,7 +1194,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 -L %COREPATH%/px68k_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.so %ROM%</command>
    <platform>x68000</platform>
    <theme>x68000</theme>
  </system>
@ -1230,7 +1230,7 @@
    <fullname>Sinclair ZX81</fullname>
    <path>%ROMPATH%/zx81</path>
    <extension>.tzx .TZX .p .P .7z .7Z .zip .ZIP</extension>
-    <command>retroarch -L %COREPATH%/81_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/81_libretro.so %ROM%</command>
    <platform>zx81</platform>
    <theme>zx81</theme>
  </system>
@ -1239,7 +1239,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 -L %COREPATH%/fuse_libretro.so %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fuse_libretro.so %ROM%</command>
    <platform>zxspectrum</platform>
    <theme>zxspectrum</theme>
  </system>
--- a/resources/systems/unix/es_systems_flatpak.xml
+++ b/resources/systems/unix/es_systems_flatpak.xml
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!-- This is the ES-DE find rules configuration file for Windows. -->
+<ruleList>
+  <emulator name="RETROARCH">
+    <rule type="systempath">
+      <!-- This requires that the user has manually updated the system path variable -->
+      <entry>retroarch.exe</entry>
+    </rule>
+    <rule type="staticpath">
+      <!-- Some reasonable installation locations -->
+      <entry>C:\RetroArch-Win64\retroarch.exe</entry>
+      <entry>C:\RetroArch\retroarch.exe</entry>
+      <entry>C:\Program Files\RetroArch-Win64\retroarch.exe</entry>
+      <entry>C:\Program Files\RetroArch\retroarch.exe</entry>
+      <entry>C:\Program Files (x86)\RetroArch-Win64\retroarch.exe</entry>
+      <entry>C:\Program Files (x86)\RetroArch\retroarch.exe</entry>
+      <!-- Portable installation -->
+      <entry>%ESPATH%\..\RetroArch\retroarch.exe</entry>
+    </rule>
+  </emulator>
+  <core name="RETROARCH">
+    <rule type="corepath">
+      <entry>%EMUPATH%\cores</entry>
+    </rule>
+  </core>
+</ruleList>
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@ -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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\4do_libretro.dll %ROM%</command>
    <platform>3do</platform>
    <theme>3do</theme>
  </system>
@ -15,7 +15,7 @@
    <fullname>Nintendo 64DD</fullname>
    <path>%ROMPATH%\64dd</path>
    <extension>.n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L %EMUPATH%\cores\mupen64plus_next_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mupen64plus_next_libretro.dll %ROM%</command>
    <platform>n64</platform>
    <theme>64dd</theme>
  </system>
@ -33,7 +33,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\puae_libretro.dll %ROM%</command>
    <platform>amiga</platform>
    <theme>amiga</theme>
  </system>
@ -42,7 +42,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\puae_libretro.dll %ROM%</command>
    <platform>amiga</platform>
    <theme>amiga600</theme>
  </system>
@ -51,7 +51,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\puae_libretro.dll %ROM%</command>
    <platform>amiga</platform>
    <theme>amiga1200</theme>
  </system>
@ -60,7 +60,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\puae_libretro.dll %ROM%</command>
    <platform>amigacd32</platform>
    <theme>amigacd32</theme>
  </system>
@ -69,7 +69,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\cap32_libretro.dll %ROM%</command>
    <platform>amstradcpc</platform>
    <theme>amstradcpc</theme>
  </system>
@ -96,7 +96,7 @@
    <fullname>Arcade</fullname>
    <path>%ROMPATH%\arcade</path>
    <extension>.cmd .CMD .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L %EMUPATH%\cores\mame_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame_libretro.dll %ROM%</command>
    <platform>arcade</platform>
    <theme>arcade</theme>
  </system>
@ -114,7 +114,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\stella_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\stella_libretro.dll %ROM%</command>
    <platform>atari2600</platform>
    <theme>atari2600</theme>
  </system>
@ -123,7 +123,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\atari800_libretro.dll %ROM%</command>
    <platform>atari5200</platform>
    <theme>atari5200</theme>
  </system>
@ -132,7 +132,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\prosystem_libretro.dll %ROM%</command>
    <platform>atari7800</platform>
    <theme>atari7800</theme>
  </system>
@ -141,7 +141,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\atari800_libretro.dll %ROM%</command>
    <platform>atari800</platform>
    <theme>atari800</theme>
  </system>
@ -150,7 +150,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\virtualjaguar_libretro.dll %ROM%</command>
    <platform>atarijaguar, atarijaguarcd</platform>
    <theme>atarijaguar</theme>
  </system>
@ -159,7 +159,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\virtualjaguar_libretro.dll %ROM%</command>
    <platform>atarijaguarcd</platform>
    <theme>atarijaguarcd</theme>
  </system>
@ -168,7 +168,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_lynx_libretro.dll %ROM%</command>
    <platform>atarilynx</platform>
    <theme>atarilynx</theme>
  </system>
@ -177,7 +177,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\hatari_libretro.dll %ROM%</command>
    <platform>atarist</platform>
    <theme>atarist</theme>
  </system>
@ -186,7 +186,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\atari800_libretro.dll %ROM%</command>
    <platform>atarixe</platform>
    <theme>atarixe</theme>
  </system>
@ -195,7 +195,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%</command>
    <platform>atomiswave</platform>
    <theme>atomiswave</theme>
  </system>
@ -213,7 +213,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_x64sc_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_x64sc_libretro.dll %ROM%</command>
    <platform>c64</platform>
    <theme>c64</theme>
  </system>
@ -222,7 +222,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\nxengine_libretro.dll %ROM%</command>
    <platform>cavestory</platform>
    <theme>cavestory</theme>
  </system>
@ -240,7 +240,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\chailove_libretro.dll %ROM%</command>
    <platform>love</platform>
    <theme>chailove</theme>
  </system>
@ -249,7 +249,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\freechaf_libretro.dll %ROM%</command>
    <platform>channelf</platform>
    <theme>channelf</theme>
  </system>
@ -267,7 +267,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bluemsx_libretro.dll %ROM%</command>
    <platform>colecovision</platform>
    <theme>colecovision</theme>
  </system>
@ -276,7 +276,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\daphne_libretro.dll %ROM%</command>
    <platform>daphne</platform>
    <theme>daphne</theme>
  </system>
@ -294,7 +294,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\prboom_libretro.dll %ROM%</command>
    <platform>pc</platform>
    <theme>doom</theme>
  </system>
@ -303,7 +303,7 @@
    <fullname>DOS (PC)</fullname>
    <path>%ROMPATH%\dos</path>
    <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L %EMUPATH%\cores\dosbox_core_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_core_libretro.dll %ROM%</command>
    <platform>dos</platform>
    <theme>dos</theme>
  </system>
@ -321,7 +321,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%</command>
    <platform>dreamcast</platform>
    <theme>dreamcast</theme>
  </system>
@ -330,7 +330,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\nestopia_libretro.dll %ROM%</command>
    <platform>nes, famicom</platform>
    <theme>famicom</theme>
  </system>
@ -339,7 +339,7 @@
    <fullname>FinalBurn Alpha</fullname>
    <path>%ROMPATH%\fba</path>
    <extension>.iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L %EMUPATH%\cores\fbalpha2012_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_libretro.dll %ROM%</command>
    <platform>arcade</platform>
    <theme>fba</theme>
  </system>
@ -348,7 +348,7 @@
    <fullname>FinalBurn Neo</fullname>
    <path>%ROMPATH%\fbneo</path>
    <extension>.ccd .CCD .cue .CUE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L %EMUPATH%\cores\fbneo_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbneo_libretro.dll %ROM%</command>
    <platform>arcade</platform>
    <theme>fbneo</theme>
  </system>
@ -357,7 +357,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\nestopia_libretro.dll %ROM%</command>
    <platform>fds</platform>
    <theme>fds</theme>
  </system>
@ -366,7 +366,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\gw_libretro.dll %ROM%</command>
    <platform>gameandwatch</platform>
    <theme>gameandwatch</theme>
  </system>
@ -375,7 +375,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_libretro.dll %ROM%</command>
    <platform>gamegear</platform>
    <theme>gamegear</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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bsnes_libretro.dll %ROM%</command>
    <platform>gbc</platform>
    <theme>gbc</theme>
  </system>
@ -411,7 +411,7 @@
    <fullname>Nintendo GameCube</fullname>
    <path>%ROMPATH%\gc</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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dolphin_libretro.dll %ROM%</command>
    <platform>gc</platform>
    <theme>gc</theme>
  </system>
@ -420,7 +420,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_libretro.dll %ROM%</command>
    <platform>genesis, megadrive</platform>
    <theme>genesis</theme>
  </system>
@ -438,7 +438,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\freeintv_libretro.dll %ROM%</command>
    <platform>intellivision</platform>
    <theme>intellivision</theme>
  </system>
@ -465,7 +465,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\lutro_libretro.dll %ROM%</command>
    <platform>lutro</platform>
    <theme>lutro</theme>
  </system>
@ -483,7 +483,7 @@
    <fullname>Multiple Arcade Machine Emulator</fullname>
    <path>%ROMPATH%\mame</path>
    <extension>.zip .ZIP .7z .7Z</extension>
-    <command>retroarch.exe -L %EMUPATH%\cores\mame2003_plus_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame2003_plus_libretro.dll %ROM%</command>
    <platform>arcade</platform>
    <theme>mame</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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mess2015_libretro.dll %ROM%</command>
    <platform>mess</platform>
    <theme>mess</theme>
  </system>
@ -564,7 +564,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>retroarch.exe -L %EMUPATH%\cores\theodore_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\theodore_libretro.dll %ROM%</command>
    <platform>moto</platform>
    <theme>moto</theme>
  </system>
@ -573,7 +573,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bluemsx_libretro.dll %ROM%</command>
    <platform>msx</platform>
    <theme>msx</theme>
  </system>
@ -582,7 +582,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bluemsx_libretro.dll %ROM%</command>
    <platform>msx</platform>
    <theme>msx1</theme>
  </system>
@ -591,7 +591,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bluemsx_libretro.dll %ROM%</command>
    <platform>msx2</platform>
    <theme>msx2</theme>
  </system>
@ -600,7 +600,7 @@
    <fullname>MSX Turbo R</fullname>
    <path>%ROMPATH%\msxturbor</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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bluemsx_libretro.dll %ROM%</command>
    <platform>msxturbor</platform>
    <theme>msxturbor</theme>
  </system>
@ -609,7 +609,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>retroarch.exe -L %EMUPATH%\cores\gearsystem_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\gearsystem_libretro.dll %ROM%</command>
    <platform>sg-1000</platform>
    <theme>multivision</theme>
  </system>
@ -618,7 +618,7 @@
    <fullname>Nintendo 3DS</fullname>
    <path>%ROMPATH%\n3ds</path>
    <extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L %EMUPATH%\cores\citra_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\citra_libretro.dll %ROM%</command>
    <platform>n3ds</platform>
    <theme>n3ds</theme>
  </system>
@ -627,7 +627,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\mupen64plus_next_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mupen64plus_next_libretro.dll %ROM%</command>
    <platform>n64</platform>
    <theme>n64</theme>
  </system>
@ -636,7 +636,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%</command>
    <platform>naomi</platform>
    <theme>naomi</theme>
  </system>
@ -645,7 +645,7 @@
    <fullname>Sega NAOMI GD-ROM</fullname>
    <path>%ROMPATH%\naomigd</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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%</command>
    <platform>naomi</platform>
    <theme>naomigd</theme>
  </system>
@ -654,7 +654,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\melonds_libretro.dll %ROM%</command>
    <platform>nds</platform>
    <theme>nds</theme>
  </system>
@ -663,7 +663,7 @@
    <fullname>SNK 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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbneo_libretro.dll %ROM%</command>
    <platform>neogeo</platform>
    <theme>neogeo</theme>
  </system>
@ -672,7 +672,7 @@
    <fullname>SNK 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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\neocd_libretro.dll %ROM%</command>
    <platform>neogeocd</platform>
    <theme>neogeocd</theme>
  </system>
@ -681,7 +681,7 @@
    <fullname>SNK Neo Geo CD</fullname>
    <path>%ROMPATH%\neogeocdjp</path>
    <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L %EMUPATH%\cores\neocd_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\neocd_libretro.dll %ROM%</command>
    <platform>neogeocd</platform>
    <theme>neogeocdjp</theme>
  </system>
@ -690,7 +690,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\nestopia_libretro.dll %ROM%</command>
    <platform>nes</platform>
    <theme>nes</theme>
  </system>
@ -699,7 +699,7 @@
    <fullname>SNK 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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_ngp_libretro.dll %ROM%</command>
    <platform>ngp</platform>
    <theme>ngp</theme>
  </system>
@ -708,7 +708,7 @@
    <fullname>SNK 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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_ngp_libretro.dll %ROM%</command>
    <platform>ngpc</platform>
    <theme>ngpc</theme>
  </system>
@ -717,7 +717,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\o2em_libretro.dll %ROM%</command>
    <platform>odyssey2</platform>
    <theme>odyssey2</theme>
  </system>
@ -744,7 +744,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mu_libretro.dll %ROM%</command>
    <platform>palm</platform>
    <theme>palm</theme>
  </system>
@ -753,7 +753,7 @@
    <fullname>IBM PC</fullname>
    <path>%ROMPATH%\pc</path>
    <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L %EMUPATH%\cores\dosbox_core_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_core_libretro.dll %ROM%</command>
    <platform>pc</platform>
    <theme>pc</theme>
  </system>
@ -762,7 +762,7 @@
    <fullname>NEC PC-8800 series</fullname>
    <path>%ROMPATH%\pc88</path>
    <extension>.d88 .D88 .u88 .U88 .m3u .M3U .7z .7Z .zip .ZIP</extension>
-    <command>retroarch.exe -L %EMUPATH%\cores\quasi88_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\quasi88_libretro.dll %ROM%</command>
    <platform>pc88</platform>
    <theme>pc88</theme>
  </system>
@ -771,7 +771,7 @@
    <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>retroarch.exe -L %EMUPATH%\cores\np2kai_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\np2kai_libretro.dll %ROM%</command>
    <platform>pc98</platform>
    <theme>pc98</theme>
  </system>
@ -780,7 +780,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_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_libretro.dll %ROM%</command>
    <platform>pcengine</platform>
    <theme>pcengine</theme>
  </system>
@ -789,7 +789,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_libretro.dll %ROM%</command>
    <platform>pcenginecd</platform>
    <theme>pcenginecd</theme>
  </system>
@ -798,7 +798,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pcfx_libretro.dll %ROM%</command>
    <platform>pcfx</platform>
    <theme>pcfx</theme>
  </system>
@ -807,7 +807,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\pokemini_libretro.dll %ROM%</command>
    <platform>pokemini</platform>
    <theme>pokemini</theme>
  </system>
@ -825,7 +825,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\play_libretro.dll %ROM%</command>
    <platform>ps2</platform>
    <theme>ps2</theme>
  </system>
@ -852,7 +852,7 @@
    <fullname>Sony 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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\ppsspp_libretro.dll %ROM%</command>
    <platform>psp</platform>
    <theme>psp</theme>
  </system>
@ -870,7 +870,7 @@
    <fullname>Sony PlayStation</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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_psx_libretro.dll %ROM%</command>
    <platform>psx</platform>
    <theme>psx</theme>
  </system>
@ -888,7 +888,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\simcp_libretro.dll %ROM%</command>
    <platform>samcoupe</platform>
    <theme>samcoupe</theme>
  </system>
@ -897,7 +897,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\snes9x_libretro.dll %ROM%</command>
    <platform>satellaview</platform>
    <theme>satellaview</theme>
  </system>
@ -906,7 +906,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_saturn_libretro.dll %ROM%</command>
    <platform>saturn</platform>
    <theme>saturn</theme>
  </system>
@ -915,7 +915,7 @@
    <fullname>Sega Saturn</fullname>
    <path>%ROMPATH%\saturnjp</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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_saturn_libretro.dll %ROM%</command>
    <platform>saturn</platform>
    <theme>saturnjp</theme>
  </system>
@ -924,7 +924,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\scummvm_libretro.dll %ROM%</command>
    <platform>scummvm</platform>
    <theme>scummvm</theme>
  </system>
@ -933,7 +933,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\picodrive_libretro.dll %ROM%</command>
    <platform>sega32x</platform>
    <theme>sega32x</theme>
  </system>
@ -942,7 +942,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\picodrive_libretro.dll %ROM%</command>
    <platform>sega32x</platform>
    <theme>sega32xjp</theme>
  </system>
@ -951,7 +951,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\picodrive_libretro.dll %ROM%</command>
    <platform>sega32x</platform>
    <theme>sega32xna</theme>
  </system>
@ -960,7 +960,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_libretro.dll %ROM%</command>
    <platform>segacd</platform>
    <theme>segacd</theme>
  </system>
@ -969,7 +969,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_libretro.dll %ROM%</command>
    <platform>sg-1000</platform>
    <theme>sg-1000</theme>
  </system>
@ -978,7 +978,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\snes9x_libretro.dll %ROM%</command>
    <platform>snes</platform>
    <theme>snes</theme>
  </system>
@ -987,7 +987,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\snes9x_libretro.dll %ROM%</command>
    <platform>snes</platform>
    <theme>snesna</theme>
  </system>
@ -1005,7 +1005,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bluemsx_libretro.dll %ROM%</command>
    <platform>spectravideo</platform>
    <theme>spectravideo</theme>
  </system>
@ -1032,7 +1032,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\snes9x_libretro.dll %ROM%</command>
    <platform>sufami</platform>
    <theme>sufami</theme>
  </system>
@ -1041,7 +1041,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_supergrafx_libretro.dll %ROM%</command>
    <platform>supergrafx</platform>
    <theme>supergrafx</theme>
  </system>
@ -1059,7 +1059,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_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_libretro.dll %ROM%</command>
    <platform>pcengine</platform>
    <theme>tg16</theme>
  </system>
@ -1068,7 +1068,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_libretro.dll %ROM%</command>
    <platform>pcenginecd</platform>
    <theme>tg-cd</theme>
  </system>
@ -1095,7 +1095,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>retroarch.exe -L %EMUPATH%\cores\theodore_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\theodore_libretro.dll %ROM%</command>
    <platform>moto</platform>
    <theme>to8</theme>
  </system>
@ -1113,7 +1113,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\uzem_libretro.dll %ROM%</command>
    <platform>uzebox</platform>
    <theme>uzebox</theme>
  </system>
@ -1122,7 +1122,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vecx_libretro.dll %ROM%</command>
    <platform>vectrex</platform>
    <theme>vectrex</theme>
  </system>
@ -1131,7 +1131,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\o2em_libretro.dll %ROM%</command>
    <platform>videopac</platform>
    <theme>videopac</theme>
  </system>
@ -1140,7 +1140,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_vb_libretro.dll %ROM%</command>
    <platform>virtualboy</platform>
    <theme>virtualboy</theme>
  </system>
@ -1149,7 +1149,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dolphin_libretro.dll %ROM%</command>
    <platform>wii</platform>
    <theme>wii</theme>
  </system>
@ -1167,7 +1167,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_wswan_libretro.dll %ROM%</command>
    <platform>wonderswan</platform>
    <theme>wonderswan</theme>
  </system>
@ -1176,7 +1176,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_wswan_libretro.dll %ROM%</command>
    <platform>wonderswancolor</platform>
    <theme>wonderswancolor</theme>
  </system>
@ -1185,7 +1185,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>retroarch.exe -L %EMUPATH%\cores\x1_libretro.dll %ROM%</command>
+    <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\x1_libretro.dll %ROM%</command>
    <platform>x1</platform>
    <theme>x1</theme>
  </system>
@ -1194,7 +1194,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\px68k_libretro.dll %ROM%</command>
    <platform>x68000</platform>
    <theme>x68000</theme>
  </system>
@ -1230,7 +1230,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\81_libretro.dll %ROM%</command>
    <platform>zx81</platform>
    <theme>zx81</theme>
  </system>
@ -1239,7 +1239,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>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fuse_libretro.dll %ROM%</command>
    <platform>zxspectrum</platform>
    <theme>zxspectrum</theme>
  </system>