diff --git a/emu-configs/PCSX2/GS.ini b/emu-configs/PCSX2/GS.ini
new file mode 100644
index 00000000..d91aa444
--- /dev/null
+++ b/emu-configs/PCSX2/GS.ini
@@ -0,0 +1,89 @@
+CaptureHeight = 480
+CaptureWidth = 640
+DisableDualSourceBlend = 0
+DisableFramebufferFetch = 0
+DumpReplaceableMipmaps = 0
+DumpReplaceableTextures = 0
+DumpTexturesWithFMVActive = 0
+HWDisableReadbacks = 0
+IntegerScaling = 0
+LoadTextureReplacements = 0
+LoadTextureReplacementsAsync = 1
+MaxAnisotropy = 0
+NTSC_Saturation = 1
+OsdScale = 100
+OsdShowCPU = 0
+OsdShowFPS = 0
+OsdShowGPU = 0
+OsdShowGSStats = 0
+OsdShowIndicators = 1
+OsdShowMessages = 1
+OsdShowResolution = 0
+OsdShowSpeed = 0
+OverrideGeometryShaders = -1
+OverrideTextureBarriers = -1
+PrecacheTextureReplacements = 0
+Renderer = 14
+ShadeBoost = 0
+ShadeBoost_Brightness = 50
+ShadeBoost_Contrast = 50
+ShadeBoost_Saturation = 50
+TVShader = 0
+ThreadedPresentation = 0
+UseBlitSwapChain = 0
+UseDebugDevice = 0
+UserHacks = 1
+UserHacks_AutoFlush = 0
+UserHacks_CPU_FB_Conversion = 0
+UserHacks_DisableDepthSupport = 0
+UserHacks_DisablePartialInvalidation = 1
+UserHacks_Disable_Safe_Features = 0
+UserHacks_HalfPixelOffset = 0
+UserHacks_Half_Bottom_Override = -1
+UserHacks_SkipDraw_End = 0
+UserHacks_SkipDraw_Start = 0
+UserHacks_TCOffsetX = 0
+UserHacks_TCOffsetY = 0
+UserHacks_TextureInsideRt = 0
+UserHacks_TriFilter = 0
+UserHacks_WildHack = 0
+UserHacks_align_sprite_X = 0
+UserHacks_merge_pp_sprite = 0
+UserHacks_round_sprite_offset = 0
+aa1 = 1
+accurate_blending_unit = 1
+accurate_date = 1
+autoflush_sw = 1
+capture_enabled = 0
+capture_out_dir = /tmp/GS_Capture
+capture_threads = 4
+conservative_framebuffer = 1
+crc_hack_level = -1
+disable_shader_cache = 0
+dithering_ps2 = 2
+dump = 0
+extrathreads = 2
+extrathreads_height = 4
+filter = 2
+fxaa = 0
+interlace = 7
+linear_present = 1
+mipmap = 1
+mipmap_hw = -1
+override_GL_ARB_shader_image_load_store = -1
+override_GL_ARB_sparse_texture = -1
+paltex = 0
+png_compression_level = 1
+preload_frame_with_gs_data = 0
+save = 0
+savef = 0
+savel = 5000
+saven = 0
+savet = 0
+savez = 0
+shaderfx = 0
+shaderfx_conf = shaders/GS_FX_Settings.ini
+shaderfx_glsl = shaders/GS.fx
+texture_preloading = 0
+upscale_multiplier = 2
+wrap_gs_mem = 0
diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini
new file mode 100644
index 00000000..26bb2f01
--- /dev/null
+++ b/emu-configs/PCSX2/PCSX2.ini
@@ -0,0 +1,449 @@
+[UI]
+SettingsVersion = 1
+MainWindowGeometry = AdnQywADAAAAAAAAAAAAAAAAA7UAAAJ/AAAAAAAAAAAAAAO1AAACfwAAAAAAAAAABQAAAAAAAAAAAAAAA7UAAAJ/
+MainWindowState = AAAA/wAAAAD9AAAAAAAAA7YAAAJXAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAHQAbwBvAGwAQgBhAHIAAAAAAP////8AAAAAAAAAAA==
+PauseOnFocusLoss = true
+StartFullscreen = true
+
+
+[EmuCore]
+CdvdVerboseReads = false
+CdvdDumpBlocks = false
+CdvdShareWrite = false
+EnablePatches = true
+EnableCheats = false
+EnablePINE = false
+EnableWideScreenPatches = false
+EnableNoInterlacingPatches = false
+EnableRecordingTools = true
+EnableGameFixes = true
+SaveStateOnShutdown = true
+ConsoleToStdio = false
+HostFs = false
+PatchBios = false
+PatchRegion = 
+BackupSavestate = true
+SavestateZstdCompression = true
+McdEnableEjection = true
+McdFolderAutoManage = true
+GzipIsoIndexTemplate = $(f).pindex.tmp
+BlockDumpSaveDirectory = 
+
+
+[EmuCore/Speedhacks]
+EECycleRate = 0
+EECycleSkip = 0
+fastCDVD = false
+IntcStat = true
+WaitLoop = true
+vuFlagHack = true
+vuThread = true
+vu1Instant = true
+
+
+[EmuCore/CPU]
+FPU.DenormalsAreZero = true
+FPU.FlushToZero = true
+FPU.Roundmode = 3
+AffinityControlMode = 0
+VU.DenormalsAreZero = true
+VU.FlushToZero = true
+VU.Roundmode = 3
+
+
+[EmuCore/CPU/Recompiler]
+EnableEE = true
+EnableIOP = true
+EnableEECache = false
+EnableVU0 = true
+EnableVU1 = true
+vuOverflow = true
+vuExtraOverflow = false
+vuSignOverflow = false
+vuUnderflow = false
+fpuOverflow = true
+fpuExtraOverflow = false
+fpuFullMode = false
+StackFrameChecks = false
+PreBlockCheckEE = false
+PreBlockCheckIOP = false
+
+
+[EmuCore/GS]
+VsyncQueueSize = 2
+FrameLimitEnable = true
+VsyncEnable = 0
+FramerateNTSC = 59.940000
+FrameratePAL = 50.000000
+SyncToHostRefreshRate = false
+AspectRatio = Auto 4:3/3:2
+FMVAspectRatioSwitch = Off
+Zoom = 100.000000
+StretchY = 100.000000
+CropLeft = 0
+CropTop = 0
+CropRight = 0
+CropBottom = 0
+pcrtc_antiblur = true
+disable_interlace_offset = false
+pcrtc_offsets = false
+pcrtc_overscan = false
+IntegerScaling = false
+linear_present = true
+UseDebugDevice = false
+UseBlitSwapChain = false
+disable_shader_cache = false
+DisableDualSourceBlend = false
+DisableFramebufferFetch = false
+ThreadedPresentation = false
+SkipDuplicateFrames = false
+OsdShowMessages = true
+OsdShowSpeed = false
+OsdShowFPS = false
+OsdShowCPU = false
+OsdShowGPU = false
+OsdShowResolution = false
+OsdShowGSStats = false
+OsdShowIndicators = true
+HWDisableReadbacks = false
+accurate_date = true
+paltex = false
+autoflush_sw = true
+preload_frame_with_gs_data = false
+wrap_gs_mem = false
+mipmap = true
+UserHacks = false
+UserHacks_align_sprite_X = false
+UserHacks_AutoFlush = false
+UserHacks_CPU_FB_Conversion = false
+UserHacks_DisableDepthSupport = false
+UserHacks_DisablePartialInvalidation = false
+UserHacks_Disable_Safe_Features = false
+UserHacks_merge_pp_sprite = false
+UserHacks_WildHack = false
+UserHacks_TextureInsideRt = false
+fxaa = false
+ShadeBoost = false
+shaderfx = false
+dump = false
+save = false
+savef = false
+savet = false
+savez = false
+DumpReplaceableTextures = false
+DumpReplaceableMipmaps = false
+DumpTexturesWithFMVActive = false
+DumpDirectTextures = true
+DumpPaletteTextures = true
+LoadTextureReplacements = false
+LoadTextureReplacementsAsync = true
+PrecacheTextureReplacements = false
+deinterlace = 7
+OsdScale = 100
+Renderer = -1
+upscale_multiplier = 1
+mipmap_hw = -1
+accurate_blending_unit = 1
+crc_hack_level = -1
+filter = 2
+texture_preloading = 2
+GSDumpCompression = 1
+dithering_ps2 = 2
+MaxAnisotropy = 0
+extrathreads = 2
+extrathreads_height = 4
+TVShader = 0
+UserHacks_SkipDraw_Start = 0
+UserHacks_SkipDraw_End = 0
+UserHacks_Half_Bottom_Override = -1
+UserHacks_HalfPixelOffset = 0
+UserHacks_round_sprite_offset = 0
+UserHacks_TCOffsetX = 0
+UserHacks_TCOffsetY = 0
+UserHacks_CPUSpriteRenderBW = 0
+UserHacks_TriFilter = -1
+OverrideTextureBarriers = -1
+OverrideGeometryShaders = -1
+ShadeBoost_Brightness = 50
+ShadeBoost_Contrast = 50
+ShadeBoost_Saturation = 50
+saven = 0
+savel = 5000
+Adapter = 
+shaderfx_conf = shaders/GS_FX_Settings.ini
+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
+
+
+[SPU2/Output]
+OutputModule = cubeb
+Latency = 100
+SynchMode = 0
+SpeakerConfiguration = 0
+DplDecodingLevel = 0
+
+
+[DEV9/Eth]
+EthEnable = false
+EthApi = Unset
+EthDevice = 
+EthLogDNS = false
+InterceptDHCP = false
+PS2IP = 0.0.0.0
+Mask = 0.0.0.0
+Gateway = 0.0.0.0
+DNS1 = 0.0.0.0
+DNS2 = 0.0.0.0
+AutoMask = true
+AutoGateway = true
+ModeDNS1 = Auto
+ModeDNS2 = Auto
+
+
+[DEV9/Eth/Hosts]
+Count = 0
+
+
+[DEV9/Hdd]
+HddEnable = false
+HddFile = DEV9hdd.raw
+HddSizeSectors = 83886080
+
+
+[EmuCore/Gamefixes]
+VuAddSubHack = false
+FpuMulHack = false
+FpuNegDivHack = false
+XgKickHack = false
+EETimingHack = false
+SoftwareRendererFMVHack = false
+SkipMPEGHack = false
+OPHFlagHack = false
+DMABusyHack = false
+VIFFIFOHack = false
+VIF1StallHack = false
+GIFFIFOHack = false
+GoemonTlbHack = false
+IbitHack = false
+VUSyncHack = false
+VUOverflowHack = false
+BlitInternalFPSHack = false
+
+
+[EmuCore/Profiler]
+Enabled = false
+RecBlocks_EE = true
+RecBlocks_IOP = true
+RecBlocks_VU0 = true
+RecBlocks_VU1 = true
+
+
+[EmuCore/Debugger]
+ShowDebuggerOnStart = false
+AlignMemoryWindowStart = true
+FontWidth = 8
+FontHeight = 12
+WindowWidth = 0
+WindowHeight = 0
+MemoryViewBytesPerRow = 16
+
+
+[EmuCore/TraceLog]
+Enabled = false
+EE.bitset = 0
+IOP.bitset = 0
+
+
+[Filenames]
+BIOS = 
+
+
+[Framerate]
+NominalScalar = 1.000000
+TurboScalar = 2.000000
+SlomoScalar = 0.500000
+
+
+[MemoryCards]
+Slot1_Enable = true
+Slot1_Filename = Mcd001.ps2
+Slot2_Enable = true
+Slot2_Filename = Mcd002.ps2
+Multitap1_Slot2_Enable = false
+Multitap1_Slot2_Filename = Mcd-Multitap1-Slot02.ps2
+Multitap1_Slot3_Enable = false
+Multitap1_Slot3_Filename = Mcd-Multitap1-Slot03.ps2
+Multitap1_Slot4_Enable = false
+Multitap1_Slot4_Filename = Mcd-Multitap1-Slot04.ps2
+Multitap2_Slot2_Enable = false
+Multitap2_Slot2_Filename = Mcd-Multitap2-Slot02.ps2
+Multitap2_Slot3_Enable = false
+Multitap2_Slot3_Filename = Mcd-Multitap2-Slot03.ps2
+Multitap2_Slot4_Enable = false
+Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2
+
+
+[Folders]
+Bios = ../../../../../retrodeck/bios/pcsx2
+Snapshots = ../../../../../retrodeck/screenshots
+SaveStates = ../../../../../retrodeck/states
+MemoryCards = ../../../../../retrodeck/saves/pcsx2
+Logs = logs
+Cheats = cheats
+CheatsWS = cheats_ws
+CheatsNI = cheats_ni
+Cache = cache
+Textures = textures
+InputProfiles = inputprofiles
+
+
+[InputSources]
+SDL = true
+SDLControllerEnhancedMode = false
+XInput = false
+RawInput = false
+
+
+[Hotkeys]
+ToggleFullscreen = Keyboard/Alt & Keyboard/Return
+CycleAspectRatio = Keyboard/F6
+CycleInterlaceMode = Keyboard/F5
+CycleMipmapMode = Keyboard/Insert
+GSDumpMultiFrame = Keyboard/Control & Keyboard/Shift & Keyboard/F8
+Screenshot = SDL-0/Back & SDL-0/A
+GSDumpSingleFrame = Keyboard/Shift & Keyboard/F8
+ToggleSoftwareRendering = Keyboard/F9
+InputRecToggleMode = Keyboard/Shift & Keyboard/R
+LoadStateFromSlot = SDL-0/Back & SDL-0/LeftShoulder
+SaveStateToSlot = SDL-0/Back & SDL-0/RightShoulder
+NextSaveStateSlot = SDL-0/Back & SDL-0/DPadUp
+PreviousSaveStateSlot = SDL-0/Back & SDL-0/DPadDown
+OpenPauseMenu = SDL-0/Back & SDL-0/Y
+ToggleFrameLimit = Keyboard/F4
+TogglePause = SDL-0/Back & SDL-0/B
+ToggleSlowMotion = Keyboard/Shift & Keyboard/Backtab
+ToggleTurbo = Keyboard/Tab
+HoldTurbo = Keyboard/L
+
+
+[Pad]
+MultitapPort1 = false
+MultitapPort2 = false
+PointerXScale = 8.000000
+PointerYScale = 8.000000
+PointerXInvert = false
+PointerYInvert = false
+
+
+[Pad1]
+Type = DualShock2
+Deadzone = 0.000000
+AxisScale = 1.330000
+LargeMotorScale = 1.000000
+SmallMotorScale = 1.000000
+PressureModifier = 0.500000
+Up = SDL-0/-RightY
+Right = SDL-0/DPadRight
+Down = SDL-0/DPadDown
+Left = SDL-0/DPadLeft
+Triangle = SDL-0/Y
+Circle = SDL-0/B
+Cross = SDL-0/A
+Square = SDL-0/X
+Select = SDL-0/Back
+Start = SDL-0/Start
+L1 = SDL-0/LeftShoulder
+L2 = SDL-0/+LeftTrigger
+R1 = SDL-0/RightShoulder
+R2 = SDL-0/+RightTrigger
+L3 = SDL-0/LeftStick
+R3 = SDL-0/RightStick
+LUp = SDL-0/-LeftY
+LRight = SDL-0/+LeftX
+LDown = SDL-0/+LeftY
+LLeft = SDL-0/-LeftX
+RUp = SDL-0/-RightY
+RRight = SDL-0/+RightX
+RDown = SDL-0/+RightY
+RLeft = SDL-0/-RightX
+SmallMotor = SDL-0/SmallMotor
+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 = /home/deck/retrodeck/roms/ps2
diff --git a/emu-configs/PCSX2_ui.ini b/emu-configs/PCSX2/PCSX2_ui.ini
similarity index 98%
rename from emu-configs/PCSX2_ui.ini
rename to emu-configs/PCSX2/PCSX2_ui.ini
index 00f098ce..891b6cab 100644
--- a/emu-configs/PCSX2_ui.ini
+++ b/emu-configs/PCSX2/PCSX2_ui.ini
@@ -40,7 +40,7 @@ UseDefaultLangs=enabled
 UseDefaultCheats=enabled
 UseDefaultCheatsWS=enabled
 UseDefaultTextures=enabled
-Bios=~/retrodeck/bios
+Bios=/run/media/deck/DeckSD/retrodeck/roms/bios
 Snapshots=/var/config/PCSX2/snaps
 Savestates=/var/config/PCSX2/sstates
 MemoryCards=/var/config/PCSX2/memcards
diff --git a/emu-configs/PCSX2_vm.ini b/emu-configs/PCSX2/PCSX2_vm.ini
similarity index 100%
rename from emu-configs/PCSX2_vm.ini
rename to emu-configs/PCSX2/PCSX2_vm.ini