diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 9f0fe6adc..0a0af192d 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -72,4 +72,5 @@ Emulators\VBA-M\visualboyadvance-m.exe
 Emulators\Vita3K\Vita3K.exe
 Emulators\xemu\xemu.exe
 Emulators\xenia\xenia.exe
+Emulators\xroar\xroar.exe
 Emulators\yuzu\yuzu-windows-msvc\yuzu.exe
diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index d235e2a88..23f134bf7 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -246,4 +246,10 @@
             <entry>/Applications/xemu.app/Contents/MacOS/xemu</entry>
         </rule>
     </emulator>
+    <emulator name="XROAR">
+        <!-- Dragon and Tandy 8-bit computer emulator XRoar -->
+        <rule type="staticpath">
+            <entry>/Applications/XRoar.app/Contents/MacOS/xroar</entry>
+        </rule>
+    </emulator>
 </ruleList>
\ No newline at end of file
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index efe626add..80b3366d2 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -306,8 +306,9 @@
         <name>coco</name>
         <fullname>Tandy Color Computer</fullname>
         <path>%ROMPATH%/coco</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.cas .CAS .ccc .CCC .dsk .DSK .rom .ROM</extension>
+        <command label="XRoar CoCo 2 NTSC (Standalone)">%EMULATOR_XROAR% -fs -default-machine coco2bus %ROM%</command>
+        <command label="XRoar CoCo 2 PAL (Standalone)">%EMULATOR_XROAR% -fs -default-machine coco2b %ROM%</command>
         <platform>coco</platform>
         <theme>coco</theme>
     </system>
@@ -385,8 +386,9 @@
         <name>dragon32</name>
         <fullname>Dragon 32</fullname>
         <path>%ROMPATH%/dragon32</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.cas .CAS .ccc .CCC .dsk .DSK .rom .ROM</extension>
+        <command label="XRoar Dragon 32 (Standalone)">%EMULATOR_XROAR% -fs -default-machine dragon32 %ROM%</command>
+        <command label="XRoar Dragon 64 (Standalone)">%EMULATOR_XROAR% -fs -default-machine dragon64 %ROM%</command>
         <platform>dragon32</platform>
         <theme>dragon32</theme>
     </system>
@@ -1387,8 +1389,8 @@
         <name>tanodragon</name>
         <fullname>Tano Dragon</fullname>
         <path>%ROMPATH%/tanodragon</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.cas .CAS .ccc .CCC .dsk .DSK .rom .ROM</extension>
+        <command label="XRoar (Standalone)">%EMULATOR_XROAR% -fs -default-machine tano %ROM%</command>
         <platform>dragon32</platform>
         <theme>tanodragon</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 8e5698d40..c17be30c0 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -513,6 +513,17 @@
             <entry>~/bin/Xemu*.AppImage</entry>
         </rule>
     </emulator>
+    <emulator name="XROAR">
+        <!-- Dragon and Tandy 8-bit computer emulator XRoar -->
+        <rule type="systempath">
+            <entry>xroar</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/xroar/xroar</entry>
+            <entry>~/.local/bin/xroar/xroar</entry>
+            <entry>~/bin/xroar/xroar</entry>
+        </rule>
+    </emulator>
     <emulator name="YUZU">
         <!-- Nintendo Switch emulator Yuzu -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 17ba82141..a38a12a64 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -308,8 +308,9 @@
         <name>coco</name>
         <fullname>Tandy Color Computer</fullname>
         <path>%ROMPATH%/coco</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.cas .CAS .ccc .CCC .dsk .DSK .rom .ROM</extension>
+        <command label="XRoar CoCo 2 NTSC (Standalone)">%EMULATOR_XROAR% -fs -default-machine coco2bus %ROM%</command>
+        <command label="XRoar CoCo 2 PAL (Standalone)">%EMULATOR_XROAR% -fs -default-machine coco2b %ROM%</command>
         <platform>coco</platform>
         <theme>coco</theme>
     </system>
@@ -387,8 +388,9 @@
         <name>dragon32</name>
         <fullname>Dragon 32</fullname>
         <path>%ROMPATH%/dragon32</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.cas .CAS .ccc .CCC .dsk .DSK .rom .ROM</extension>
+        <command label="XRoar Dragon 32 (Standalone)">%EMULATOR_XROAR% -fs -default-machine dragon32 %ROM%</command>
+        <command label="XRoar Dragon 64 (Standalone)">%EMULATOR_XROAR% -fs -default-machine dragon64 %ROM%</command>
         <platform>dragon32</platform>
         <theme>dragon32</theme>
     </system>
@@ -1412,8 +1414,8 @@
         <name>tanodragon</name>
         <fullname>Tano Dragon</fullname>
         <path>%ROMPATH%/tanodragon</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.cas .CAS .ccc .CCC .dsk .DSK .rom .ROM</extension>
+        <command label="XRoar (Standalone)">%EMULATOR_XROAR% -fs -default-machine tano %ROM%</command>
         <platform>dragon32</platform>
         <theme>tanodragon</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 407c53b0c..a7b61abd2 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -604,6 +604,17 @@
             <entry>%ESPATH%\..\xenia\xenia.exe</entry>
         </rule>
     </emulator>
+    <emulator name="XROAR">
+        <!-- Dragon and Tandy 8-bit computer emulator XRoar -->
+        <rule type="systempath">
+            <entry>xroar.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\xroar\xroar.exe</entry>
+            <entry>%ESPATH%\xroar\xroar.exe</entry>
+            <entry>%ESPATH%\..\xroar\xroar.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="YUZU">
         <!-- Nintendo Switch emulator Yuzu -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 2061d382d..654064814 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -415,6 +415,14 @@
             <entry>%ESPATH%\..\xenia\xenia.exe</entry>
         </rule>
     </emulator>
+    <emulator name="XROAR">
+        <!-- Dragon and Tandy 8-bit computer emulator XRoar -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\xroar\xroar.exe</entry>
+            <entry>%ESPATH%\xroar\xroar.exe</entry>
+            <entry>%ESPATH%\..\xroar\xroar.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="YUZU">
         <!-- Nintendo Switch emulator Yuzu -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 2994fd929..95752dc30 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -311,8 +311,9 @@
         <name>coco</name>
         <fullname>Tandy Color Computer</fullname>
         <path>%ROMPATH%\coco</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.cas .CAS .ccc .CCC .dsk .DSK .rom .ROM</extension>
+        <command label="XRoar CoCo 2 NTSC (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_XROAR% -fs -default-machine coco2bus %ROM%</command>
+        <command label="XRoar CoCo 2 PAL (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_XROAR% -fs -default-machine coco2b %ROM%</command>
         <platform>coco</platform>
         <theme>coco</theme>
     </system>
@@ -390,8 +391,9 @@
         <name>dragon32</name>
         <fullname>Dragon 32</fullname>
         <path>%ROMPATH%\dragon32</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.cas .CAS .ccc .CCC .dsk .DSK .rom .ROM</extension>
+        <command label="XRoar Dragon 32 (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_XROAR% -fs -default-machine dragon32 %ROM%</command>
+        <command label="XRoar Dragon 64 (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_XROAR% -fs -default-machine dragon64 %ROM%</command>
         <platform>dragon32</platform>
         <theme>dragon32</theme>
     </system>
@@ -1415,8 +1417,8 @@
         <name>tanodragon</name>
         <fullname>Tano Dragon</fullname>
         <path>%ROMPATH%\tanodragon</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.cas .CAS .ccc .CCC .dsk .DSK .rom .ROM</extension>
+        <command label="XRoar (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_XROAR% -fs -default-machine tano %ROM%</command>
         <platform>dragon32</platform>
         <theme>tanodragon</theme>
     </system>