diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72f0d1ff0..8dfbe2f11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,10 @@
* (Windows) Made game launching more seamless by making the application window one pixel wider instead of one pixel less in height
* Added ares standalone as an alternative emulator for many systems
* Added VICE standalone as an alternative emulator for the c64 (x64sc only) and vic20 systems
+* (Windows) Added PrimeHack as an alternative emulator for the gc and wii systems
+* Added CPCemu standalone as an alternative emulator for the amstradcpc system
+* Added MAME standalone as an alternative emulator for the gx4000 system
+* Added the .bin file extension to the gx4000 system
* (Linux) Added Flatpak support for Mednafen using the Mednaffe package
* (Linux) Added Flatpak support for Solarus using the Solarus Launcher package
* Added support for folder links, used for launching game files inside folders without having to enter them
@@ -123,7 +127,7 @@
* Removed the deprecated VideoVlcComponent
* Removed the deprecated tools/update_theme_formatversion.sh script
* Lots of general code cleanup and refactoring
-* (Windows) Added error handling to StringUtil::stringToWideString() and StringUtil::wideStringToString() to avoid crashes caused by invalid characters
+* (Windows) Added error handling to StringUtil::stringToWideString() and StringUtil::wideStringToString() to perform an emergency shutdown if needed
* Changed tools/create_AppImage.sh to not include version information in the AppImage filename
* Updated and improved the theming documentation
diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md
index 1ebcb6ef7..375abc088 100644
--- a/USERGUIDE-DEV.md
+++ b/USERGUIDE-DEV.md
@@ -662,6 +662,7 @@ The following manually downloaded emulators are supported when using the bundled
| System name | Emulator | Filename configuration |
| :----------------------- | :------------ | :------------------------------ |
+| amstradcpc | CPCemu | cpcemu/cpcemu |
| apple2 | LinApple | linapple/linapple |
| coco/dragon32/tanodragon | XRoar | xroar/xroar |
| daphne | Hypseus Singe | hypseus-singe/hypseus.bin |
@@ -2890,7 +2891,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| amiga1200 | Commodore Amiga 1200 | PUAE | PUAE 2021 | Yes | See the specific _Commodore Amiga_ section elsewhere in this guide |
| amiga600 | Commodore Amiga 600 | PUAE | PUAE 2021 | Yes | See the specific _Commodore Amiga_ section elsewhere in this guide |
| amigacd32 | Commodore Amiga CD32 | PUAE | PUAE 2021 | Yes | |
-| amstradcpc | Amstrad CPC | Caprice32 | CrocoDS | No | |
+| amstradcpc | Amstrad CPC | Caprice32 | CrocoDS,
CPCemu **(Standalone)** | No | |
| android | Google Android | BlueStacks **(Standalone)** [W] | | No | Shortcut (.lnk) file in root folder |
| apple2 | Apple II | LinApple **(Standalone)** [U],
Mednafen **(Standalone)** [M],
AppleWin **(Standalone)** [W*] | Mednafen **(Standalone)** [UW*],
MAME **(Standalone)** [UMW*] | Yes for Mednafen and MAME | See the specific _Apple II_ section elsewhere in this guide |
| apple2gs | Apple IIGS | MAME **(Standalone)** [UMW*] | | Yes | See the specific _Apple IIGS_ section elsewhere in this guide |
@@ -2935,9 +2936,9 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| gb | Nintendo Game Boy | Gambatte | SameBoy,
Gearboy,
TGB Dual,
Mesen-S,
bsnes,
mGBA,
mGBA **(Standalone)**,
VBA-M,
VBA-M **(Standalone)** | No | Single archive or ROM file in root folder |
| gba | Nintendo Game Boy Advance | mGBA | mGBA **(Standalone)**,
VBA-M,
VBA-M **(Standalone)** [UMW*],
VBA Next,
gpSP | No | Single archive or ROM file in root folder |
| gbc | Nintendo Game Boy Color | Gambatte | SameBoy,
Gearboy,
TGB Dual,
Mesen-S,
bsnes,
mGBA,
mGBA **(Standalone)**,
VBA-M,
VBA-M **(Standalone)** | No | Single archive or ROM file in root folder |
-| gc | Nintendo GameCube | Dolphin | Dolphin **(Standalone)** [UMW*], PrimeHack **(Standalone)** [U] | No | Single .iso file in root folder |
+| gc | Nintendo GameCube | Dolphin | Dolphin **(Standalone)** [UMW*], PrimeHack **(Standalone)** [UW*] | No | Single .iso file in root folder |
| genesis | Sega Genesis | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
BlastEm,
BlastEm **(Standalone)** [U],
Mednafen **(Standalone)** [UMW*],
ares **(Standalone)** [UMW*] | No | Single archive or ROM file in root folder |
-| gx4000 | Amstrad GX4000 | Caprice32 | CrocoDS | No | |
+| gx4000 | Amstrad GX4000 | Caprice32 | CrocoDS,
MAME **(Standalone)** [UMW*] | No | Single archive or ROM file in root folder |
| intellivision | Mattel Electronics Intellivision | FreeIntv | | | |
| j2me | Java 2 Micro Edition (J2ME) | SquirrelJME | KEmulator **(Standalone)** [W*] | No | Single .jar file in root folder |
| kodi | Kodi Home Theatre Software | N/A | | No | Shortcut in root folder |
@@ -2976,7 +2977,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| ngp | SNK Neo Geo Pocket | Beetle NeoPop | RACE,
Mednafen **(Standalone)** [UMW*],
ares **(Standalone)** [UMW*] | | |
| ngpc | SNK Neo Geo Pocket Color | Beetle NeoPop | RACE,
Mednafen **(Standalone)** [UMW*],
ares **(Standalone)** [UMW*] | | |
| odyssey2 | Magnavox Odyssey2 | O2EM | | | |
-| openbor | OpenBOR Game Engine | OpenBOR **(Standalone)** [UW] | | | See the specific _OpenBOR_ section elsewhere in this guide |
+| openbor | OpenBOR Game Engine | OpenBOR **(Standalone)** [UW] | | No | See the specific _OpenBOR_ section elsewhere in this guide |
| oric | Tangerine Computer Systems Oric | Oricutron **(Standalone)** [UW*] | | | See the specific _Tangerine Computer Systems Oric_ section elsewhere in this guide |
| palm | Palm OS | Mu | | | |
| pc | IBM PC | DOSBox-Pure | DOSBox-Core,
DOSBox-SVN,
DOSBox-X **(Standalone)**,
DOSBox Staging **(Standalone)** [UMW*] | No | See the specific _DOS / PC_ section elsewhere in this guide |
@@ -3029,7 +3030,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| vic20 | Commodore VIC-20 | VICE xvic | VICE xvic **(Standalone)** [UMW*] | No | Single disk, tape or cartridge image in root folder |
| videopac | Philips Videopac G7000 | O2EM | | | |
| virtualboy | Nintendo Virtual Boy | Beetle VB | Mednafen **(Standalone)** [UMW*] | No | |
-| wii | Nintendo Wii | Dolphin | Dolphin **(Standalone)** [UMW*],
PrimeHack **(Standalone)** [U] | | |
+| wii | Nintendo Wii | Dolphin | Dolphin **(Standalone)** [UMW*],
PrimeHack **(Standalone)** [UW*] | No | |
| wiiu | Nintendo Wii U | Cemu **(Standalone)** [W*] | | No | See the specific _Nintendo Wii U_ section elsewhere in this guide |
| wonderswan | Bandai WonderSwan | Beetle Cygne | Mednafen **(Standalone)** [UMW*],
ares **(Standalone)** [UMW*] | No | |
| wonderswancolor | Bandai WonderSwan Color | Beetle Cygne | Mednafen **(Standalone)** [UMW*],
ares **(Standalone)** [UMW*] | No | |