diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 0401d373b..83d7c11a0 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -4,19 +4,38 @@
   <emulator name="RETROARCH">
     <rule type="systempath">
       <entry>retroarch</entry>
+      <entry>org.libretro.RetroArch</entry>
+      <entry>RetroArch-Linux-x86_64.AppImage</entry>
     </rule>
     <rule type="staticpath">
       <entry>/var/lib/flatpak/exports/bin/org.libretro.RetroArch</entry>
+      <entry>~/Applications/RetroArch-Linux-x86_64.AppImage</entry>
+      <entry>~/.local/bin/RetroArch-Linux-x86_64.AppImage</entry>
+      <entry>~/bin/RetroArch-Linux-x86_64.AppImage</entry>
+    </rule>
+  </emulator>
+  <emulator name="YUZU">
+    <!-- Nintendo Switch emulator Yuzu. -->
+    <rule type="systempath">
+      <entry>yuzu</entry>
+      <entry>org.yuzu_emu.yuzu</entry>
+      <entry>yuzu.AppImage</entry>
+    </rule>
+    <rule type="staticpath">
+      <entry>/var/lib/flatpak/exports/bin/org.yuzu_emu.yuzu</entry>
+      <entry>~/Applications/yuzu.AppImage</entry>
+      <entry>~/.local/bin/yuzu.AppImage</entry>
+      <entry>~/bin/yuzu.AppImage</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>
+      <!-- AppImage and compiled from source -->
+      <entry>~/.config/retroarch/cores</entry>
       <!-- Ubuntu and Linux Mint repository -->
       <entry>/usr/lib/x86_64-linux-gnu/libretro</entry>
       <!-- Fedora repository -->
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 88219f349..b3f6dc384 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -18,6 +18,15 @@
       <entry>%ESPATH%\..\RetroArch\retroarch.exe</entry>
     </rule>
   </emulator>
+  <emulator name="YUZU">
+    <!-- Nintendo Switch emulator Yuzu. -->
+    <rule type="systempath">
+      <entry>yuzu.exe</entry>
+    </rule>
+    <rule type="staticpath">
+      <entry>~\AppData\Local\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
+    </rule>
+  </emulator>
   <core name="RETROARCH">
     <rule type="corepath">
       <entry>%EMUPATH%\cores</entry>