diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index d40e8fe38..fb9ceb0c2 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -111,6 +111,14 @@
             <entry>/usr/local/bin/fs-uae</entry>
         </rule>
     </emulator>
+    <emulator name="GEARBOY">
+        <!-- Nintendo Game Boy / Color emulator Gearboy -->
+        <rule type="staticpath">
+            <entry>/Applications/gearboy</entry>
+            <entry>/opt/homebrew/bin/gearboy</entry>
+            <entry>/usr/local/bin/gearboy</entry>
+        </rule>
+    </emulator>
     <emulator name="HYPSEUS-SINGE">
         <!-- Hypseus Singe, fork of arcade LaserDisc emulator Daphne -->
         <rule type="systempath">
@@ -210,6 +218,14 @@
             <entry>/Applications/Ruffle.app/Contents/MacOS/ruffle</entry>
         </rule>
     </emulator>
+    <emulator name="SAMEBOY">
+        <!-- Nintendo Game Boy / Color emulator SameBoy -->
+        <rule type="staticpath">
+            <entry>/Applications/sameboy</entry>
+            <entry>/opt/homebrew/bin/sameboy</entry>
+            <entry>/usr/local/bin/sameboy</entry>
+        </rule>
+    </emulator>
     <emulator name="SIMCOUPE">
         <!-- SAM Coupé emulator SimCoupé -->
         <rule type="staticpath">
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index f8c899a87..8ccbc59f9 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -516,7 +516,9 @@
         <extension>.bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP</extension>
         <command label="Gambatte">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gambatte_libretro.dylib %ROM%</command>
         <command label="SameBoy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.dylib %ROM%</command>
+        <command label="SameBoy (Standalone)">%EMULATOR_SAMEBOY% -f %ROM%</command>
         <command label="Gearboy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.dylib %ROM%</command>
+        <command label="Gearboy (Standalone)">%EMULATOR_GEARBOY% %ROM%</command>
         <command label="TGB Dual">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.dylib %ROM%</command>
         <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.dylib %ROM%</command>
         <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.dylib %ROM%</command>
@@ -548,7 +550,9 @@
         <extension>.bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP</extension>
         <command label="Gambatte">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gambatte_libretro.dylib %ROM%</command>
         <command label="SameBoy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.dylib %ROM%</command>
+        <command label="SameBoy (Standalone)">%EMULATOR_SAMEBOY% -f %ROM%</command>
         <command label="Gearboy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.dylib %ROM%</command>
+        <command label="Gearboy (Standalone)">%EMULATOR_GEARBOY% %ROM%</command>
         <command label="TGB Dual">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.dylib %ROM%</command>
         <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.dylib %ROM%</command>
         <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.dylib %ROM%</command>
@@ -1102,6 +1106,7 @@
         <extension>.p8 .P8 .png .PNG</extension>
         <command label="PICO-8 (Standalone)">%EMULATOR_PICO-8% -root_path %GAMEDIR% -run %ROM%</command>
         <command label="PICO-8 Splore (Standalone)">%EMULATOR_PICO-8% -root_path %GAMEDIR% -splore</command>
+        <command label="retro8">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/retro8_libretro.dylib %ROM%</command>
         <platform>pico8</platform>
         <theme>pico8</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 0dcf8d711..680b34cee 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -446,7 +446,7 @@
             <entry>~/.local/share/flatpak/exports/bin/io.github.shiiion.primehack</entry>
         </rule>
     </emulator>
-        <emulator name="PUNES">
+    <emulator name="PUNES">
         <!-- NES/Famicom emulator puNES -->
         <rule type="systempath">
             <entry>punes</entry>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 47feb85bf..e80952930 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -261,6 +261,17 @@
             <entry>%ESPATH%\..\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
         </rule>
     </emulator>
+    <emulator name="GEARBOY">
+        <!-- Nintendo Game Boy / Color emulator Gearboy -->
+        <rule type="systempath">
+            <entry>sameboy.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\gearboy\gearboy.exe</entry>
+            <entry>%ESPATH%\gearboy\gearboy.exe</entry>
+            <entry>%ESPATH%\..\gearboy\gearboy.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="HYPSEUS-SINGE">
         <!-- Hypseus Singe, fork of arcade LaserDisc emulator Daphne -->
         <rule type="systempath">
@@ -469,6 +480,17 @@
             <entry>%ESPATH%\..\Project64\Project64.exe</entry>
         </rule>
     </emulator>
+    <emulator name="PUNES">
+        <!-- NES/Famicom emulator puNES -->
+        <rule type="systempath">
+            <entry>punes64.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\punes\punes64.exe</entry>
+            <entry>%ESPATH%\punes\punes64.exe</entry>
+            <entry>%ESPATH%\..\punes\punes64.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="REDREAM">
         <!-- Sega Dreamcast emulator Redream -->
         <rule type="systempath">
@@ -513,6 +535,17 @@
             <entry>%ESPATH%\..\ryujinx\Ryujinx.exe</entry>
         </rule>
     </emulator>
+    <emulator name="SAMEBOY">
+        <!-- Nintendo Game Boy / Color emulator SameBoy -->
+        <rule type="systempath">
+            <entry>sameboy.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\sameboy\sameboy.exe</entry>
+            <entry>%ESPATH%\sameboy\sameboy.exe</entry>
+            <entry>%ESPATH%\..\sameboy\sameboy.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="SCUMMVM">
         <!-- ScummVM game engine -->
         <rule type="winregistryvalue">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 644b778c9..8d455c56c 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -176,6 +176,14 @@
             <entry>%ESPATH%\..\FS-UAE\Windows\x86-64\fs-uae.exe</entry>
         </rule>
     </emulator>
+    <emulator name="GEARBOY">
+        <!-- Nintendo Game Boy / Color emulator Gearboy -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\gearboy\gearboy.exe</entry>
+            <entry>%ESPATH%\gearboy\gearboy.exe</entry>
+            <entry>%ESPATH%\..\gearboy\gearboy.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="HYPSEUS-SINGE">
         <!-- Hypseus Singe, fork of arcade LaserDisc emulator Daphne -->
         <rule type="staticpath">
@@ -315,6 +323,14 @@
             <entry>%ESPATH%\..\Project64\Project64.exe</entry>
         </rule>
     </emulator>
+    <emulator name="PUNES">
+        <!-- NES/Famicom emulator puNES -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\punes\punes64.exe</entry>
+            <entry>%ESPATH%\punes\punes64.exe</entry>
+            <entry>%ESPATH%\..\punes\punes64.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="REDREAM">
         <!-- Sega Dreamcast emulator Redream -->
         <rule type="staticpath">
@@ -347,6 +363,14 @@
             <entry>%ESPATH%\..\ryujinx\Ryujinx.exe</entry>
         </rule>
     </emulator>
+    <emulator name="SAMEBOY">
+        <!-- Nintendo Game Boy / Color emulator SameBoy -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\sameboy\sameboy.exe</entry>
+            <entry>%ESPATH%\sameboy\sameboy.exe</entry>
+            <entry>%ESPATH%\..\sameboy\sameboy.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="SCUMMVM">
         <!-- ScummVM game engine -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 61d569808..886acab35 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -525,7 +525,9 @@
         <extension>.bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP</extension>
         <command label="Gambatte">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\gambatte_libretro.dll %ROM%</command>
         <command label="SameBoy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\sameboy_libretro.dll %ROM%</command>
+        <command label="SameBoy (Standalone)">%EMULATOR_SAMEBOY% -f %ROM%</command>
         <command label="Gearboy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\gearboy_libretro.dll %ROM%</command>
+        <command label="Gearboy (Standalone)">%EMULATOR_GEARBOY% %ROM%</command>
         <command label="TGB Dual">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\tgbdual_libretro.dll %ROM%</command>
         <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mesen-s_libretro.dll %ROM%</command>
         <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bsnes_libretro.dll %ROM%</command>
@@ -557,7 +559,9 @@
         <extension>.bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP</extension>
         <command label="Gambatte">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\gambatte_libretro.dll %ROM%</command>
         <command label="SameBoy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\sameboy_libretro.dll %ROM%</command>
+        <command label="SameBoy (Standalone)">%EMULATOR_SAMEBOY% -f %ROM%</command>
         <command label="Gearboy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\gearboy_libretro.dll %ROM%</command>
+        <command label="Gearboy (Standalone)">%EMULATOR_GEARBOY% %ROM%</command>
         <command label="TGB Dual">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\tgbdual_libretro.dll %ROM%</command>
         <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mesen-s_libretro.dll %ROM%</command>
         <command label="bsnes">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bsnes_libretro.dll %ROM%</command>
@@ -990,6 +994,7 @@
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command>
         <command label="ares (Standalone)">%EMULATOR_ARES% --fullscreen --system "Famicom" %ROM%</command>
         <command label="ares FDS (Standalone)">%EMULATOR_ARES% --fullscreen --system "Famicom Disk System" %ROM%</command>
+        <command label="puNES (Standalone)">%EMULATOR_PUNES% %ROM% -u yes</command>
         <platform>nes</platform>
         <theme>nes</theme>
     </system>
@@ -1126,6 +1131,7 @@
         <extension>.p8 .P8 .png .PNG</extension>
         <command label="PICO-8 (Standalone)">%EMULATOR_PICO-8% -root_path %GAMEDIR% -run %ROM%</command>
         <command label="PICO-8 Splore (Standalone)">%EMULATOR_PICO-8% -root_path %GAMEDIR% -splore</command>
+        <command label="retro8">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\retro8_libretro.dll %ROM%</command>
         <platform>pico8</platform>
         <theme>pico8</theme>
     </system>