diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 0a0af192d..ed2a30c76 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -52,7 +52,7 @@ Emulators\mupen64plus\mupen64plus-ui-console.exe
Emulators\Oricutron\oricutron.exe
Emulators\PCSX2\pcsx2.exe
Emulators\PCSX2-Qt\pcsx2-qtx64.exe
-Emulators\PCSX2-wxWidgets\pcsx2x64.exe
+Emulators\PCSX2-Qt\pcsx2-qtx64-avx2.exe
Emulators\PICO-8\pico8.exe
Emulators\Play\Play.exe
Emulators\PPSSPP\PPSSPPWindows64.exe
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 80b3366d2..2142dfdb6 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -1088,8 +1088,8 @@
Sony PlayStation 2
%ROMPATH%/ps2
.bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG
- %EMULATOR_PCSX2% --nogui %ROM%
- %EMULATOR_PCSX2% -batch %ROM%
+ %EMULATOR_PCSX2% -batch %ROM%
+ %EMULATOR_PCSX2% --nogui %ROM%
%EMULATOR_AETHERSX2% -batch %ROM%
%EMULATOR_PLAY!% --disc %ROM%
ps2
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index c17be30c0..5e67cd476 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -288,6 +288,17 @@
+
+
+ pcsx2-qt
+
+
+ ~/Applications/pcsx2-*-linux-AppImage-64bit-Qt.AppImage
+ ~/.local/bin/pcsx2-*-linux-AppImage-64bit-Qt.AppImage
+ ~/bin/pcsx2-*-linux-AppImage-64bit-Qt.AppImage
+
+
+
PCSX2
@@ -299,17 +310,6 @@
~/.local/share/flatpak/exports/bin/net.pcsx2.PCSX2
-
-
-
- pcsx2-qt
-
-
- ~/Applications/pcsx2-*-linux-AppImage-64bit-Qt.AppImage
- ~/.local/bin/pcsx2-*-linux-AppImage-64bit-Qt.AppImage
- ~/bin/pcsx2-*-linux-AppImage-64bit-Qt.AppImage
-
-
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index a38a12a64..2a3da2d12 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1101,8 +1101,8 @@
%ROMPATH%/ps2
.bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM%
- %EMULATOR_PCSX2% --nogui %ROM%
- %EMULATOR_PCSX2-QT% -batch %ROM%
+ %EMULATOR_PCSX2% -batch %ROM%
+ %EMULATOR_PCSX2-LEGACY% --nogui %ROM%
%EMULATOR_PLAY!% --disc %ROM%
ps2
ps2
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index a7b61abd2..89a04cfcc 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -326,6 +326,18 @@
+
+
+ pcsx2-qtx64.exe
+ pcsx2-qtx64-avx2.exe
+
+
+ %ESPATH%\Emulators\PCSX2-Qt\pcsx2-qtx64*.exe
+ %ESPATH%\PCSX2-Qt\pcsx2-qtx64*.exe
+ %ESPATH%\..\PCSX2-Qt\pcsx2-qtx64*.exe
+
+
+
SOFTWARE\PCSX2\Install_Dir|\pcsx2.exe
@@ -341,30 +353,6 @@
%ESPATH%\..\PCSX2\pcsx2.exe
-
-
-
- pcsx2-qtx64.exe
- pcsx2-qtx64-avx2.exe
-
-
- %ESPATH%\Emulators\PCSX2-Qt\pcsx2-qtx64*.exe
- %ESPATH%\PCSX2-Qt\pcsx2-qtx64*.exe
- %ESPATH%\..\PCSX2-Qt\pcsx2-qtx64*.exe
-
-
-
-
-
- pcsx2x64.exe
- pcsx2x64-avx2.exe
-
-
- %ESPATH%\Emulators\PCSX2-wxWidgets\pcsx2x64*.exe
- %ESPATH%\PCSX2-wxWidgets\pcsx2x64*.exe
- %ESPATH%\..\PCSX2-wxWidgets\pcsx2x64*.exe
-
-
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 654064814..cc7a801c4 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -225,27 +225,19 @@
-
-
- %ESPATH%\Emulators\PCSX2\pcsx2.exe
- %ESPATH%\PCSX2\pcsx2.exe
- %ESPATH%\..\PCSX2\pcsx2.exe
-
-
-
-
+
%ESPATH%\Emulators\PCSX2-Qt\pcsx2-qtx64*.exe
%ESPATH%\PCSX2-Qt\pcsx2-qtx64*.exe
%ESPATH%\..\PCSX2-Qt\pcsx2-qtx64*.exe
-
-
+
+
- %ESPATH%\Emulators\PCSX2-wxWidgets\pcsx2x64*.exe
- %ESPATH%\PCSX2-wxWidgets\pcsx2x64*.exe
- %ESPATH%\..\PCSX2-wxWidgets\pcsx2x64*.exe
+ %ESPATH%\Emulators\PCSX2\pcsx2.exe
+ %ESPATH%\PCSX2\pcsx2.exe
+ %ESPATH%\..\PCSX2\pcsx2.exe
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 95752dc30..e8a19169f 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1103,9 +1103,8 @@
%ROMPATH%\ps2
.bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\pcsx2_libretro.dll %ROM%
- %EMULATOR_PCSX2% --nogui %ROM%
- %EMULATOR_PCSX2-QT% -batch %ROM%
- %EMULATOR_PCSX2-WXWIDGETS% --nogui %ROM%
+ %EMULATOR_PCSX2% -batch %ROM%
+ %EMULATOR_PCSX2-LEGACY% --nogui %ROM%
%EMULATOR_PLAY!% --disc %ROM%
ps2
ps2