diff --git a/emu-configs/PCSX2-legacy/PCSX2.ini b/emu-configs/PCSX2-QT/PCSX2.ini
similarity index 78%
rename from emu-configs/PCSX2-legacy/PCSX2.ini
rename to emu-configs/PCSX2-QT/PCSX2.ini
index 56981725..6923a916 100644
--- a/emu-configs/PCSX2-legacy/PCSX2.ini
+++ b/emu-configs/PCSX2-QT/PCSX2.ini
@@ -1,9 +1,30 @@
 [UI]
 SettingsVersion = 1
-MainWindowGeometry = AdnQywADAAAAAAAAAAAAAAAAA7UAAAJ/AAAAAAAAAAAAAAO1AAACfwAAAAAAAAAABQAAAAAAAAAAAAAAA7UAAAJ/
-MainWindowState = AAAA/wAAAAD9AAAAAAAAA7YAAAJXAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAHQAbwBvAGwAQgBhAHIAAAAAAP////8AAAAAAAAAAA==
-PauseOnFocusLoss = true
+InhibitScreensaver = true
+ConfirmShutdown = true
+StartPaused = false
+PauseOnFocusLoss = false
 StartFullscreen = true
+DoubleClickTogglesFullscreen = true
+HideMouseCursor = false
+RenderToSeparateWindow = false
+HideMainWindowWhenRunning = false
+DisableWindowResize = false
+Theme = darkfusion
+
+
+[Folders]
+Bios = ~/retrodeck/roms/bios
+Snapshots = ~/retrodeck/screenshots
+Savestates = ~/retrodeck/states/ps2/pcsx2
+MemoryCards = ~/retrodeck/saves/ps2/memcards
+Logs = ~/retrodeck/.logs
+Cheats = /var/config/PCSX2/cheats
+CheatsWS = /var/config/PCSX2/cheats_ws
+CheatsNI = cheats_ni
+Cache = /var/config/PCSX2/cache
+Textures = /var/config/PCSX2/textures
+InputProfiles = inputprofiles
 
 
 [EmuCore]
@@ -17,7 +38,9 @@ EnableWideScreenPatches = false
 EnableNoInterlacingPatches = false
 EnableRecordingTools = true
 EnableGameFixes = true
-SaveStateOnShutdown = true
+SaveStateOnShutdown = false
+EnableDiscordPresence = false
+InhibitScreensaver = true
 ConsoleToStdio = false
 HostFs = false
 PatchBios = false
@@ -26,8 +49,10 @@ BackupSavestate = true
 SavestateZstdCompression = true
 McdEnableEjection = true
 McdFolderAutoManage = true
+WarnAboutUnsafeSettings = true
 GzipIsoIndexTemplate = $(f).pindex.tmp
 BlockDumpSaveDirectory =
+EnableFastBoot = true
 
 
 [EmuCore/Speedhacks]
@@ -37,7 +62,7 @@ fastCDVD = false
 IntcStat = true
 WaitLoop = true
 vuFlagHack = true
-vuThread = true
+vuThread = false
 vu1Instant = true
 
 
@@ -73,13 +98,13 @@ PreBlockCheckIOP = false
 VsyncQueueSize = 2
 FrameLimitEnable = true
 VsyncEnable = 0
-FramerateNTSC = 59.940000
-FrameratePAL = 50.000000
+FramerateNTSC = 59.94
+FrameratePAL = 50
 SyncToHostRefreshRate = false
 AspectRatio = Auto 4:3/3:2
 FMVAspectRatioSwitch = Off
-Zoom = 100.000000
-StretchY = 100.000000
+Zoom = 100
+StretchY = 100
 CropLeft = 0
 CropTop = 0
 CropRight = 0
@@ -105,8 +130,10 @@ OsdShowGPU = false
 OsdShowResolution = false
 OsdShowGSStats = false
 OsdShowIndicators = true
-HWDisableReadbacks = false
-accurate_date = true
+OsdShowSettings = false
+OsdShowInputs = false
+HWSpinGPUForReadbacks = false
+HWSpinCPUForReadbacks = false
 paltex = false
 autoflush_sw = true
 preload_frame_with_gs_data = false
@@ -139,7 +166,7 @@ LoadTextureReplacements = false
 LoadTextureReplacementsAsync = true
 PrecacheTextureReplacements = false
 deinterlace = 7
-OsdScale = 250
+OsdScale = 100
 Renderer = -1
 upscale_multiplier = 1
 mipmap_hw = -1
@@ -148,6 +175,7 @@ crc_hack_level = -1
 filter = 2
 texture_preloading = 2
 GSDumpCompression = 1
+HWDownloadMode = 0
 dithering_ps2 = 2
 MaxAnisotropy = 0
 extrathreads = 2
@@ -161,7 +189,7 @@ UserHacks_round_sprite_offset = 0
 UserHacks_TCOffsetX = 0
 UserHacks_TCOffsetY = 0
 UserHacks_CPUSpriteRenderBW = 0
-UserHacks_TriFilter = -1
+TriFilter = -1
 OverrideTextureBarriers = -1
 OverrideGeometryShaders = -1
 ShadeBoost_Brightness = 50
@@ -177,18 +205,19 @@ shaderfx_glsl = shaders/GS.fx
 [SPU2/Mixing]
 Interpolation = 5
 FinalVolume = 100
-VolumeAdjustC = 0.000000
-VolumeAdjustFL = 0.000000
-VolumeAdjustFR = 0.000000
-VolumeAdjustBL = 0.000000
-VolumeAdjustBR = 0.000000
-VolumeAdjustSL = 0.000000
-VolumeAdjustSR = 0.000000
-VolumeAdjustLFE = 0.000000
+VolumeAdjustC = 0
+VolumeAdjustFL = 0
+VolumeAdjustFR = 0
+VolumeAdjustBL = 0
+VolumeAdjustBR = 0
+VolumeAdjustSL = 0
+VolumeAdjustSR = 0
+VolumeAdjustLFE = 0
 
 
 [SPU2/Output]
 OutputModule = cubeb
+BackendName =
 Latency = 100
 SynchMode = 0
 SpeakerConfiguration = 0
@@ -266,14 +295,25 @@ EE.bitset = 0
 IOP.bitset = 0
 
 
+[Achievements]
+Enabled = false
+TestMode = false
+UnofficialTestMode = false
+RichPresence = true
+ChallengeMode = false
+Leaderboards = true
+SoundEffects = true
+PrimedIndicators = true
+
+
 [Filenames]
 BIOS =
 
 
 [Framerate]
-NominalScalar = 1.000000
-TurboScalar = 2.000000
-SlomoScalar = 0.500000
+NominalScalar = 1
+TurboScalar = 2
+SlomoScalar = 0.5
 
 
 [MemoryCards]
@@ -295,25 +335,22 @@ Multitap2_Slot4_Enable = false
 Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2
 
 
-[Folders]
-Bios = ~/retrodeck/bios
-Snapshots = ~/retrodeck/screenshots
-SaveStates = ~/retrodeck/states/ps2/pcsx2
-MemoryCards = ~/retrodeck/saves/ps2/pcsx2/memcards
-Logs = logs
-Cheats = cheats
-CheatsWS = cheats_ws
-CheatsNI = cheats_ni
-Cache = cache
-Textures = textures
-InputProfiles = inputprofiles
+[Logging]
+EnableSystemConsole = false
+EnableFileLogging = false
+EnableTimestamps = true
+EnableVerbose = false
+EnableEEConsole = false
+EnableIOPConsole = false
+EnableInputRecordingLogs = true
+EnableControllerLogs = false
 
 
 [InputSources]
+Keyboard = true
+Mouse = true
 SDL = true
 SDLControllerEnhancedMode = false
-XInput = false
-RawInput = false
 
 
 [Hotkeys]
@@ -342,10 +379,8 @@ ShutdownVM = SDL-0/Start & SDL-0/Back
 [Pad]
 MultitapPort1 = false
 MultitapPort2 = false
-PointerXScale = 8.000000
-PointerYScale = 8.000000
-PointerXInvert = false
-PointerYInvert = false
+PointerXScale = 8
+PointerYScale = 8
 
 
 [Pad1]
@@ -385,66 +420,27 @@ LargeMotor = SDL-0/LargeMotor
 
 [Pad2]
 Type = None
-Deadzone = 0.000000
-AxisScale = 1.330000
-LargeMotorScale = 1.000000
-SmallMotorScale = 1.000000
-PressureModifier = 0.500000
 
 
 [Pad3]
 Type = None
-Deadzone = 0.000000
-AxisScale = 1.330000
-LargeMotorScale = 1.000000
-SmallMotorScale = 1.000000
-PressureModifier = 0.500000
 
 
 [Pad4]
 Type = None
-Deadzone = 0.000000
-AxisScale = 1.330000
-LargeMotorScale = 1.000000
-SmallMotorScale = 1.000000
-PressureModifier = 0.500000
 
 
 [Pad5]
 Type = None
-Deadzone = 0.000000
-AxisScale = 1.330000
-LargeMotorScale = 1.000000
-SmallMotorScale = 1.000000
-PressureModifier = 0.500000
 
 
 [Pad6]
 Type = None
-Deadzone = 0.000000
-AxisScale = 1.330000
-LargeMotorScale = 1.000000
-SmallMotorScale = 1.000000
-PressureModifier = 0.500000
 
 
 [Pad7]
 Type = None
-Deadzone = 0.000000
-AxisScale = 1.330000
-LargeMotorScale = 1.000000
-SmallMotorScale = 1.000000
-PressureModifier = 0.500000
 
 
 [Pad8]
 Type = None
-Deadzone = 0.000000
-AxisScale = 1.330000
-LargeMotorScale = 1.000000
-SmallMotorScale = 1.000000
-PressureModifier = 0.500000
-
-
-[GameList]
-RecursivePaths = ~/retrodeck/roms/ps2
\ No newline at end of file
diff --git a/emu-configs/PCSX2-legacy/GS.ini b/emu-configs/PCSX2/GS.ini
similarity index 100%
rename from emu-configs/PCSX2-legacy/GS.ini
rename to emu-configs/PCSX2/GS.ini
diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini
index 6923a916..56981725 100644
--- a/emu-configs/PCSX2/PCSX2.ini
+++ b/emu-configs/PCSX2/PCSX2.ini
@@ -1,30 +1,9 @@
 [UI]
 SettingsVersion = 1
-InhibitScreensaver = true
-ConfirmShutdown = true
-StartPaused = false
-PauseOnFocusLoss = false
+MainWindowGeometry = AdnQywADAAAAAAAAAAAAAAAAA7UAAAJ/AAAAAAAAAAAAAAO1AAACfwAAAAAAAAAABQAAAAAAAAAAAAAAA7UAAAJ/
+MainWindowState = AAAA/wAAAAD9AAAAAAAAA7YAAAJXAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAHQAbwBvAGwAQgBhAHIAAAAAAP////8AAAAAAAAAAA==
+PauseOnFocusLoss = true
 StartFullscreen = true
-DoubleClickTogglesFullscreen = true
-HideMouseCursor = false
-RenderToSeparateWindow = false
-HideMainWindowWhenRunning = false
-DisableWindowResize = false
-Theme = darkfusion
-
-
-[Folders]
-Bios = ~/retrodeck/roms/bios
-Snapshots = ~/retrodeck/screenshots
-Savestates = ~/retrodeck/states/ps2/pcsx2
-MemoryCards = ~/retrodeck/saves/ps2/memcards
-Logs = ~/retrodeck/.logs
-Cheats = /var/config/PCSX2/cheats
-CheatsWS = /var/config/PCSX2/cheats_ws
-CheatsNI = cheats_ni
-Cache = /var/config/PCSX2/cache
-Textures = /var/config/PCSX2/textures
-InputProfiles = inputprofiles
 
 
 [EmuCore]
@@ -38,9 +17,7 @@ EnableWideScreenPatches = false
 EnableNoInterlacingPatches = false
 EnableRecordingTools = true
 EnableGameFixes = true
-SaveStateOnShutdown = false
-EnableDiscordPresence = false
-InhibitScreensaver = true
+SaveStateOnShutdown = true
 ConsoleToStdio = false
 HostFs = false
 PatchBios = false
@@ -49,10 +26,8 @@ BackupSavestate = true
 SavestateZstdCompression = true
 McdEnableEjection = true
 McdFolderAutoManage = true
-WarnAboutUnsafeSettings = true
 GzipIsoIndexTemplate = $(f).pindex.tmp
 BlockDumpSaveDirectory =
-EnableFastBoot = true
 
 
 [EmuCore/Speedhacks]
@@ -62,7 +37,7 @@ fastCDVD = false
 IntcStat = true
 WaitLoop = true
 vuFlagHack = true
-vuThread = false
+vuThread = true
 vu1Instant = true
 
 
@@ -98,13 +73,13 @@ PreBlockCheckIOP = false
 VsyncQueueSize = 2
 FrameLimitEnable = true
 VsyncEnable = 0
-FramerateNTSC = 59.94
-FrameratePAL = 50
+FramerateNTSC = 59.940000
+FrameratePAL = 50.000000
 SyncToHostRefreshRate = false
 AspectRatio = Auto 4:3/3:2
 FMVAspectRatioSwitch = Off
-Zoom = 100
-StretchY = 100
+Zoom = 100.000000
+StretchY = 100.000000
 CropLeft = 0
 CropTop = 0
 CropRight = 0
@@ -130,10 +105,8 @@ OsdShowGPU = false
 OsdShowResolution = false
 OsdShowGSStats = false
 OsdShowIndicators = true
-OsdShowSettings = false
-OsdShowInputs = false
-HWSpinGPUForReadbacks = false
-HWSpinCPUForReadbacks = false
+HWDisableReadbacks = false
+accurate_date = true
 paltex = false
 autoflush_sw = true
 preload_frame_with_gs_data = false
@@ -166,7 +139,7 @@ LoadTextureReplacements = false
 LoadTextureReplacementsAsync = true
 PrecacheTextureReplacements = false
 deinterlace = 7
-OsdScale = 100
+OsdScale = 250
 Renderer = -1
 upscale_multiplier = 1
 mipmap_hw = -1
@@ -175,7 +148,6 @@ crc_hack_level = -1
 filter = 2
 texture_preloading = 2
 GSDumpCompression = 1
-HWDownloadMode = 0
 dithering_ps2 = 2
 MaxAnisotropy = 0
 extrathreads = 2
@@ -189,7 +161,7 @@ UserHacks_round_sprite_offset = 0
 UserHacks_TCOffsetX = 0
 UserHacks_TCOffsetY = 0
 UserHacks_CPUSpriteRenderBW = 0
-TriFilter = -1
+UserHacks_TriFilter = -1
 OverrideTextureBarriers = -1
 OverrideGeometryShaders = -1
 ShadeBoost_Brightness = 50
@@ -205,19 +177,18 @@ shaderfx_glsl = shaders/GS.fx
 [SPU2/Mixing]
 Interpolation = 5
 FinalVolume = 100
-VolumeAdjustC = 0
-VolumeAdjustFL = 0
-VolumeAdjustFR = 0
-VolumeAdjustBL = 0
-VolumeAdjustBR = 0
-VolumeAdjustSL = 0
-VolumeAdjustSR = 0
-VolumeAdjustLFE = 0
+VolumeAdjustC = 0.000000
+VolumeAdjustFL = 0.000000
+VolumeAdjustFR = 0.000000
+VolumeAdjustBL = 0.000000
+VolumeAdjustBR = 0.000000
+VolumeAdjustSL = 0.000000
+VolumeAdjustSR = 0.000000
+VolumeAdjustLFE = 0.000000
 
 
 [SPU2/Output]
 OutputModule = cubeb
-BackendName =
 Latency = 100
 SynchMode = 0
 SpeakerConfiguration = 0
@@ -295,25 +266,14 @@ EE.bitset = 0
 IOP.bitset = 0
 
 
-[Achievements]
-Enabled = false
-TestMode = false
-UnofficialTestMode = false
-RichPresence = true
-ChallengeMode = false
-Leaderboards = true
-SoundEffects = true
-PrimedIndicators = true
-
-
 [Filenames]
 BIOS =
 
 
 [Framerate]
-NominalScalar = 1
-TurboScalar = 2
-SlomoScalar = 0.5
+NominalScalar = 1.000000
+TurboScalar = 2.000000
+SlomoScalar = 0.500000
 
 
 [MemoryCards]
@@ -335,22 +295,25 @@ Multitap2_Slot4_Enable = false
 Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2
 
 
-[Logging]
-EnableSystemConsole = false
-EnableFileLogging = false
-EnableTimestamps = true
-EnableVerbose = false
-EnableEEConsole = false
-EnableIOPConsole = false
-EnableInputRecordingLogs = true
-EnableControllerLogs = false
+[Folders]
+Bios = ~/retrodeck/bios
+Snapshots = ~/retrodeck/screenshots
+SaveStates = ~/retrodeck/states/ps2/pcsx2
+MemoryCards = ~/retrodeck/saves/ps2/pcsx2/memcards
+Logs = logs
+Cheats = cheats
+CheatsWS = cheats_ws
+CheatsNI = cheats_ni
+Cache = cache
+Textures = textures
+InputProfiles = inputprofiles
 
 
 [InputSources]
-Keyboard = true
-Mouse = true
 SDL = true
 SDLControllerEnhancedMode = false
+XInput = false
+RawInput = false
 
 
 [Hotkeys]
@@ -379,8 +342,10 @@ ShutdownVM = SDL-0/Start & SDL-0/Back
 [Pad]
 MultitapPort1 = false
 MultitapPort2 = false
-PointerXScale = 8
-PointerYScale = 8
+PointerXScale = 8.000000
+PointerYScale = 8.000000
+PointerXInvert = false
+PointerYInvert = false
 
 
 [Pad1]
@@ -420,27 +385,66 @@ LargeMotor = SDL-0/LargeMotor
 
 [Pad2]
 Type = None
+Deadzone = 0.000000
+AxisScale = 1.330000
+LargeMotorScale = 1.000000
+SmallMotorScale = 1.000000
+PressureModifier = 0.500000
 
 
 [Pad3]
 Type = None
+Deadzone = 0.000000
+AxisScale = 1.330000
+LargeMotorScale = 1.000000
+SmallMotorScale = 1.000000
+PressureModifier = 0.500000
 
 
 [Pad4]
 Type = None
+Deadzone = 0.000000
+AxisScale = 1.330000
+LargeMotorScale = 1.000000
+SmallMotorScale = 1.000000
+PressureModifier = 0.500000
 
 
 [Pad5]
 Type = None
+Deadzone = 0.000000
+AxisScale = 1.330000
+LargeMotorScale = 1.000000
+SmallMotorScale = 1.000000
+PressureModifier = 0.500000
 
 
 [Pad6]
 Type = None
+Deadzone = 0.000000
+AxisScale = 1.330000
+LargeMotorScale = 1.000000
+SmallMotorScale = 1.000000
+PressureModifier = 0.500000
 
 
 [Pad7]
 Type = None
+Deadzone = 0.000000
+AxisScale = 1.330000
+LargeMotorScale = 1.000000
+SmallMotorScale = 1.000000
+PressureModifier = 0.500000
 
 
 [Pad8]
 Type = None
+Deadzone = 0.000000
+AxisScale = 1.330000
+LargeMotorScale = 1.000000
+SmallMotorScale = 1.000000
+PressureModifier = 0.500000
+
+
+[GameList]
+RecursivePaths = ~/retrodeck/roms/ps2
\ No newline at end of file
diff --git a/emu-configs/PCSX2-legacy/PCSX2_ui.ini b/emu-configs/PCSX2/PCSX2_ui.ini
similarity index 100%
rename from emu-configs/PCSX2-legacy/PCSX2_ui.ini
rename to emu-configs/PCSX2/PCSX2_ui.ini
diff --git a/emu-configs/PCSX2-legacy/PCSX2_vm.ini b/emu-configs/PCSX2/PCSX2_vm.ini
similarity index 100%
rename from emu-configs/PCSX2-legacy/PCSX2_vm.ini
rename to emu-configs/PCSX2/PCSX2_vm.ini