diff --git a/INSTALL-DEV.md b/INSTALL-DEV.md
index 8a11fe366..a926925e1 100644
--- a/INSTALL-DEV.md
+++ b/INSTALL-DEV.md
@@ -1466,11 +1466,11 @@ For reference, here are also example es_find_rules.xml files for macOS and Windo
             <entry>/Applications/RetroArch.app/Contents/Resources/cores</entry>
         </rule>
     </core>
-    <emulator name="DOSBOX_STAGING">
+    <emulator name="DOSBOX-STAGING">
         <!-- DOS emulator DOSBox Staging -->
         <rule type="staticpath">
             <entry>/Applications/dosbox-staging.app/Contents/MacOS/dosbox</entry>
-            <!-- Homebrew version -->
+            <entry>/opt/homebrew/bin/dosbox-staging</entry>
             <entry>/usr/local/bin/dosbox-staging</entry>
         </rule>
     </emulator>
@@ -1478,7 +1478,6 @@ For reference, here are also example es_find_rules.xml files for macOS and Windo
         <!-- Nintendo 64 emulator Mupen64Plus -->
         <rule type="staticpath">
             <entry>/Applications/mupen64plus.app/Contents/MacOS/mupen64plus</entry>
-            <!-- Homebrew version -->
             <entry>/usr/local/bin/mupen64plus</entry>
         </rule>
     </emulator>
@@ -1541,7 +1540,6 @@ For reference, here are also example es_find_rules.xml files for macOS and Windo
         <rule type="staticpath">
             <entry>C:\Program Files (x86)\PCSX2\pcsx2.exe</entry>
             <entry>D:\Program Files (x86)\PCSX2\pcsx2.exe</entry>
-            <!-- Portable installation -->
             <entry>%ESPATH%\PCSX2\pcsx2.exe</entry>
             <entry>%ESPATH%\..\PCSX2\pcsx2.exe</entry>
         </rule>
@@ -1553,7 +1551,6 @@ For reference, here are also example es_find_rules.xml files for macOS and Windo
         </rule>
         <rule type="staticpath">
             <entry>~\AppData\Local\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
-            <!-- Portable installation -->
             <entry>%ESPATH%\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
             <entry>%ESPATH%\..\yuzu\yuzu-windows-msvc\yuzu.exe</entry>
         </rule>
@@ -1754,8 +1751,12 @@ Citra\nightly-mingw\citra.exe
 Dolphin-x64\Dolphin.exe
 dosbox-staging\dosbox.exe
 mame\mame.exe
+mGBA\mGBA.exe
+mupen64plus\mupen64plus-ui-console.exe
 PCSX2\pcsx2.exe
+PPSSPP\PPSSPPWindows64.exe
 RPCS3\rpcs3.exe
+VBA-M\visualboyadvance-m.exe
 xemu\xemu.exe
 xenia\xenia.exe
 yuzu\yuzu-windows-msvc\yuzu.exe
@@ -1766,8 +1767,12 @@ yuzu\yuzu-windows-msvc\yuzu.exe
 ..\Dolphin-x64\Dolphin.exe
 ..\dosbox-staging\dosbox.exe
 ..\mame\mame.exe
+..\mGBA\mGBA.exe
+..\mupen64plus\mupen64plus-ui-console.exe
 ..\PCSX2\pcsx2.exe
+..\PPSSPP\PPSSPPWindows64.exe
 ..\RPCS3\rpcs3.exe
+..\VBA-M\visualboyadvance-m.exe
 ..\xemu\xemu.exe
 ..\xenia\xenia.exe
 ..\yuzu\yuzu-windows-msvc\yuzu.exe
diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md
index 0980f2e50..0ff4014c1 100644
--- a/USERGUIDE-DEV.md
+++ b/USERGUIDE-DEV.md
@@ -497,6 +497,7 @@ At the moment the following emulators are supported in AppImage format when usin
 | System name  | Emulator  | Filename configuration          |
 | :----------- | :-------- | :------------------------------ |
 | _Multiple_   | RetroArch | RetroArch-Linux-x86_64.AppImage |
+| gba          | mGBA      | mGBA*.AppImage                  |
 | gc           | Dolphin   | Dolphin_Emulator*.AppImage      |
 | ps3          | RPCS3     | rpcs3*.AppImage                 |
 | xbox         | xemu      | Xemu*.AppImage                  |
@@ -1997,7 +1998,7 @@ All emulators are RetroArch cores unless marked as **(Standalone**)
 | System name           | Full name                                      | Default emulator                  | Alternative emulators             | Needs BIOS   | Recommended game setup               |
 | :-------------------- | :--------------------------------------------- | :-------------------------------- | :-------------------------------- | :----------- | :----------------------------------- |
 | 3do                   | 3DO                                            | 4DO                               |                                   |              |                                      |
-| 64dd                  | Nintendo 64DD                                  | Mupen64Plus-Next [UW],<br>ParaLLEl N64 [M] | ParaLLEl N64 [UW],<br>Mupen64Plus **(Standalone)** [M] |              |                                      |
+| 64dd                  | Nintendo 64DD                                  | Mupen64Plus-Next [UW],<br>ParaLLEl N64 [M] | ParaLLEl N64 [UW],<br>Mupen64Plus **(Standalone)** [UMW*] |              |                                      |
 | ags                   | Adventure Game Studio Game Engine              | _Placeholder_                     |                                   |              |                                      |
 | amiga                 | Commodore Amiga                                | PUAE                              |                                   | Yes          | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disc, or in separate folder with .m3u playlist if multi-disc |
 | amiga600              | Commodore Amiga 600                            | PUAE                              |                                   | Yes          | WHDLoad hard disk image in .hdf or .hdz format in root folder, or diskette image in .adf format in root folder if single-disc, or in separate folder with .m3u playlist if multi-disc |
@@ -2042,7 +2043,7 @@ All emulators are RetroArch cores unless marked as **(Standalone**)
 | gameandwatch          | Nintendo Game and Watch                        | GW                                |                                   |              |                                      |
 | gamegear              | Sega Game Gear                                 | Gearsystem                        | SMS Plus GX,<br>Genesis Plus GX,<br>Genesis Plus GX Wide |              |                                      |
 | gb                    | Nintendo Game Boy                              | SameBoy                           | Gambatte,<br>Gearboy,<br>TGB Dual,<br>Mesen-S,<br>bsnes |              |                                      |
-| gba                   | Nintendo Game Boy Advance                      | mGBA                              | VBA-M,<br>VBA Next,<br>gpSP       |              |                                      |
+| gba                   | Nintendo Game Boy Advance                      | mGBA                              | mGBA **(Standalone)**,<br>VBA-M,<br>VBA-M **(Standalone)**,<br>VBA Next,<br>gpSP       | No           | Single archive or ROM file in root folder |
 | gbc                   | Nintendo Game Boy Color                        | SameBoy                           | Gambatte,<br>Gearboy,<br>TGB Dual,<br>Mesen-S,<br>bsnes |              |                                      |
 | gc                    | Nintendo GameCube                              | Dolphin                           | Dolphin **(Standalone)** [UMW*]   | No           | Single ISO file in root folder       |
 | genesis               | Sega Genesis                                   | Genesis Plus GX                   | Genesis Plus GX Wide,<br>PicoDrive,<br>BlastEm | No           | Single archive or ROM file in root folder |
@@ -2071,7 +2072,7 @@ All emulators are RetroArch cores unless marked as **(Standalone**)
 | naomi                 | Sega NAOMI                                     | Flycast                           |                                   |              |                                      |
 | naomigd               | Sega NAOMI GD-ROM                              | Flycast                           |                                   |              |                                      |
 | n3ds                  | Nintendo 3DS                                   | Citra [UW],<br>Citra **(Standalone)** [M] | Citra 2018 [UW],<br>Citra **(Standalone)** [UW*] | No           | Single ROM file in root folder       |
-| n64                   | Nintendo 64                                    | Mupen64Plus-Next [UW],<br>ParaLLEl N64 [M] | ParaLLEl N64 [UW],<br>Mupen64Plus **(Standalone)** [M] | No           | Single archive or ROM file in root folder |
+| n64                   | Nintendo 64                                    | Mupen64Plus-Next [UW],<br>ParaLLEl N64 [M] | ParaLLEl N64 [UW],<br>Mupen64Plus **(Standalone)** [UMW*] | No           | Single archive or ROM file in root folder |
 | nds                   | Nintendo DS                                    | DeSmuME                           | DeSmuME 2015,<br>melonDS          |              |                                      |
 | neogeo                | SNK Neo Geo                                    | FinalBurn Neo                     |                                   | Yes          | Single archive file following MAME name standard in root folder |
 | neogeocd              | SNK Neo Geo CD                                 | NeoCD                             |                                   | Yes          | Single archive in root folder (which includes the CD image and ripped audio) |
@@ -2094,7 +2095,7 @@ All emulators are RetroArch cores unless marked as **(Standalone**)
 | ps2                   | Sony PlayStation 2                             | PCSX2 [UW],<br>PCSX2 **(Standalone)** [M] | PCSX2 **(Standalone)** [UW] | Yes          |                                      |
 | ps3                   | Sony PlayStation 3                             | RPCS3 **(Standalone)** [UMW*]     |                                   | Yes          | In separate folder (one folder per game with complete file structure retained, renamed to the .ps3dir extension) |
 | ps4                   | Sony PlayStation 4                             | _Placeholder_                     |                                   |              |                                      |
-| psp                   | Sony PlayStation Portable                      | PPSSPP                            |                                   |              |                                      |
+| psp                   | Sony PlayStation Portable                      | PPSSPP                            | PPSSPP **(Standalone)**           | No           | Single ISO file in root folder       |
 | psvita                | Sony PlayStation Vita                          | _Placeholder_                     |                                   |              |                                      |
 | psx                   | Sony PlayStation                               | Beetle PSX                        | Beetle PSX HW,<br>PCSX ReARMed,<br>DuckStation | Yes          | .chd file in root folder for single-disc games, .m3u playlist in root folder for multi-disc games |
 | samcoupe              | SAM Coupé                                      | SimCoupe                          |                                   |              |                                      |