diff --git a/emu-configs/PCSX2-QT/PCSX2.ini b/emu-configs/PCSX2-QT/PCSX2.ini
deleted file mode 100644
index 7e428798..00000000
--- a/emu-configs/PCSX2-QT/PCSX2.ini
+++ /dev/null
@@ -1,446 +0,0 @@
-[UI]
-SettingsVersion = 1
-InhibitScreensaver = true
-ConfirmShutdown = false
-StartPaused = false
-PauseOnFocusLoss = false
-StartFullscreen = true
-DoubleClickTogglesFullscreen = true
-HideMouseCursor = false
-RenderToSeparateWindow = false
-HideMainWindowWhenRunning = false
-DisableWindowResize = false
-Theme = darkfusion
-
-
-[Folders]
-Bios = RETRODECKHOMEDIR/roms/bios
-Snapshots = RETRODECKHOMEDIR/screenshots
-Savestates = RETRODECKHOMEDIR/states/ps2/pcsx2
-MemoryCards = RETRODECKHOMEDIR/saves/ps2/memcards
-Logs = RETRODECKHOMEDIR/.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]
-CdvdVerboseReads = false
-CdvdDumpBlocks = false
-CdvdShareWrite = false
-EnablePatches = true
-EnableCheats = false
-EnablePINE = false
-EnableWideScreenPatches = false
-EnableNoInterlacingPatches = false
-EnableRecordingTools = true
-EnableGameFixes = true
-SaveStateOnShutdown = true
-EnableDiscordPresence = false
-InhibitScreensaver = true
-ConsoleToStdio = false
-HostFs = false
-PatchBios = false
-PatchRegion =
-BackupSavestate = true
-SavestateZstdCompression = true
-McdEnableEjection = true
-McdFolderAutoManage = true
-WarnAboutUnsafeSettings = true
-GzipIsoIndexTemplate = $(f).pindex.tmp
-BlockDumpSaveDirectory =
-EnableFastBoot = true
-
-
-[EmuCore/Speedhacks]
-EECycleRate = 0
-EECycleSkip = 0
-fastCDVD = false
-IntcStat = true
-WaitLoop = true
-vuFlagHack = true
-vuThread = false
-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.94
-FrameratePAL = 50
-SyncToHostRefreshRate = false
-AspectRatio = Auto 4:3/3:2
-FMVAspectRatioSwitch = Off
-Zoom = 100
-StretchY = 100
-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
-OsdShowSettings = false
-OsdShowInputs = false
-HWSpinGPUForReadbacks = false
-HWSpinCPUForReadbacks = false
-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
-HWDownloadMode = 0
-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
-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
-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
-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
-
-
-[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
-
-
-[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
-
-
-[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
-
-
-[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
-ShutdownVM = SDL-0/Start & SDL-0/Back
-
-
-[Pad]
-MultitapPort1 = false
-MultitapPort2 = false
-PointerXScale = 8
-PointerYScale = 8
-
-
-[Pad1]
-Type = DualShock2
-Deadzone = 0.000000
-AxisScale = 1.330000
-LargeMotorScale = 1.000000
-SmallMotorScale = 1.000000
-PressureModifier = 0.500000
-Up = SDL-0/DPadUp
-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
-
-
-[Pad3]
-Type = None
-
-
-[Pad4]
-Type = None
-
-
-[Pad5]
-Type = None
-
-
-[Pad6]
-Type = None
-
-
-[Pad7]
-Type = None
-
-
-[Pad8]
-Type = None
diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini
index abeccf07..e33bec82 100644
--- a/emu-configs/PCSX2/PCSX2.ini
+++ b/emu-configs/PCSX2/PCSX2.ini
@@ -318,26 +318,23 @@ 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
-ShutdownVM = SDL-0/Start & SDL-0/Back
+OpenPauseMenu = Keyboard/Control & Keyboard/M
+PreviousSaveStateSlot = Keyboard/Control & Keyboard/J
+NextSaveStateSlot = Keyboard/Control & Keyboard/K
+TogglePause = Keyboard/Control & Keyboard/P
+SaveStateToSlot = Keyboard/Control & Keyboard/S
+LoadStateFromSlot = Keyboard/Control & Keyboard/A
+ToggleFullscreen = Keyboard/Control & Keyboard/Return
+ToggleFrameLimit = Keyboard/Control & Keyboard/Z
+HoldTurbo = Keyboard/Control & Keyboard/NumpadPlus
+IncreaseSpeed = Keyboard/Control & Keyboard/1
+DecreaseSpeed = Keyboard/Control & Keyboard/2
+Screenshot = Keyboard/Control & Keyboard/X
+ToggleVideoCapture = Keyboard/Control & Keyboard/V
+IncreaseUpscaleMultiplier = Keyboard/Control & Keyboard/U
+DecreaseUpscaleMultiplier = Keyboard/Control & Keyboard/Y
+CycleAspectRatio = Keyboard/Control & Keyboard/W
+ResetVM = Keyboard/Control & Keyboard/R
 
 
 [Pad]
diff --git a/emu-configs/citra/qt-config.ini b/emu-configs/citra/qt-config.ini
index f0c98ac9..cc5e86cd 100644
--- a/emu-configs/citra/qt-config.ini
+++ b/emu-configs/citra/qt-config.ini
@@ -199,10 +199,14 @@ LLE\SSL\default=true
 gdbstub_port=@Variant(\0\0\0\x85`q)
 gdbstub_port\default=true
 record_frame_times=false
+renderer_debug=false
+renderer_debug\default=true
 use_gdbstub=false
 use_gdbstub\default=true
 
 [Layout]
+anaglyph_shader_name=dubois (builtin)
+anaglyph_shader_name\default=true
 custom_bottom_bottom=@Variant(\0\0\0\x85\x1\xe0)
 custom_bottom_bottom\default=true
 custom_bottom_left=@Variant(\0\0\0\x85\0()
@@ -253,9 +257,11 @@ bg_green=0
 bg_green\default=true
 bg_red=0
 bg_red\default=true
-frame_limit=@Variant(\0\0\0\x85\0\x64)
+frame_limit=100
 frame_limit\default=true
-resolution_factor=@Variant(\0\0\0\x85\0\x1)
+graphics_api=1
+graphics_api\default=true
+resolution_factor=1
 resolution_factor\default=true
 shaders_accurate_mul=true
 shaders_accurate_mul\default=true
@@ -353,104 +359,104 @@ Shortcuts\Main%20Window\Advance%20Frame\KeySeq=
 Shortcuts\Main%20Window\Advance%20Frame\KeySeq\default=true
 Shortcuts\Main%20Window\Capture%20Screenshot\Context=3
 Shortcuts\Main%20Window\Capture%20Screenshot\Context\default=true
-Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq=Ctrl+P
-Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq\default=true
+Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq=Ctrl+X
+Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq\default=false
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context=1
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context\default=true
-Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq=F4
-Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq\default=true
-Shortcuts\Main%20Window\Decrease%203D%20Factor\Context=2
-Shortcuts\Main%20Window\Decrease%203D%20Factor\Context\default=true
-Shortcuts\Main%20Window\Decrease%203D%20Factor\KeySeq=Ctrl+-
-Shortcuts\Main%20Window\Decrease%203D%20Factor\KeySeq\default=true
+Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq=Ctrl+P
+Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq\default=false
+Shortcuts\Main%20Window\Decrease%203D%20Factor\Context=1
+Shortcuts\Main%20Window\Decrease%203D%20Factor\Context\default=false
+Shortcuts\Main%20Window\Decrease%203D%20Factor\KeySeq=
+Shortcuts\Main%20Window\Decrease%203D%20Factor\KeySeq\default=false
 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context=2
 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context\default=true
-Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq=-
-Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq\default=true
+Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq=Ctrl+2
+Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq\default=false
 Shortcuts\Main%20Window\Exit%20Citra\Context=1
 Shortcuts\Main%20Window\Exit%20Citra\Context\default=true
-Shortcuts\Main%20Window\Exit%20Citra\KeySeq=Ctrl+Q
-Shortcuts\Main%20Window\Exit%20Citra\KeySeq\default=true
+Shortcuts\Main%20Window\Exit%20Citra\KeySeq=Ctrl+Esc
+Shortcuts\Main%20Window\Exit%20Citra\KeySeq\default=false
 Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1
 Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true
-Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Y
+Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Ctrl+O
 Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=false
 Shortcuts\Main%20Window\Fullscreen\Context=1
 Shortcuts\Main%20Window\Fullscreen\Context\default=true
-Shortcuts\Main%20Window\Fullscreen\KeySeq=F11
-Shortcuts\Main%20Window\Fullscreen\KeySeq\default=true
-Shortcuts\Main%20Window\Increase%203D%20Factor\Context=2
-Shortcuts\Main%20Window\Increase%203D%20Factor\Context\default=true
-Shortcuts\Main%20Window\Increase%203D%20Factor\KeySeq=Ctrl++
-Shortcuts\Main%20Window\Increase%203D%20Factor\KeySeq\default=true
+Shortcuts\Main%20Window\Fullscreen\KeySeq=Ctrl+Return
+Shortcuts\Main%20Window\Fullscreen\KeySeq\default=false
+Shortcuts\Main%20Window\Increase%203D%20Factor\Context=1
+Shortcuts\Main%20Window\Increase%203D%20Factor\Context\default=false
+Shortcuts\Main%20Window\Increase%203D%20Factor\KeySeq=
+Shortcuts\Main%20Window\Increase%203D%20Factor\KeySeq\default=false
 Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context=2
 Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context\default=true
-Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq=+
-Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq\default=true
+Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq=Ctrl+1
+Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq\default=false
 Shortcuts\Main%20Window\Load%20Amiibo\Context=3
 Shortcuts\Main%20Window\Load%20Amiibo\Context\default=true
-Shortcuts\Main%20Window\Load%20Amiibo\KeySeq=F2
-Shortcuts\Main%20Window\Load%20Amiibo\KeySeq\default=true
-Shortcuts\Main%20Window\Load%20File\Context=3
-Shortcuts\Main%20Window\Load%20File\Context\default=true
-Shortcuts\Main%20Window\Load%20File\KeySeq=Ctrl+O
-Shortcuts\Main%20Window\Load%20File\KeySeq\default=true
+Shortcuts\Main%20Window\Load%20Amiibo\KeySeq=Ctrl+M
+Shortcuts\Main%20Window\Load%20Amiibo\KeySeq\default=false
+Shortcuts\Main%20Window\Load%20File\Context=1
+Shortcuts\Main%20Window\Load%20File\Context\default=false
+Shortcuts\Main%20Window\Load%20File\KeySeq=
+Shortcuts\Main%20Window\Load%20File\KeySeq\default=false
 Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context=1
 Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context\default=true
-Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq=R
+Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq=Ctrl+A
 Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq\default=false
 Shortcuts\Main%20Window\Mute%20Audio\Context=1
 Shortcuts\Main%20Window\Mute%20Audio\Context\default=true
-Shortcuts\Main%20Window\Mute%20Audio\KeySeq=Ctrl+M
-Shortcuts\Main%20Window\Mute%20Audio\KeySeq\default=true
+Shortcuts\Main%20Window\Mute%20Audio\KeySeq=
+Shortcuts\Main%20Window\Mute%20Audio\KeySeq\default=false
 Shortcuts\Main%20Window\Remove%20Amiibo\Context=2
 Shortcuts\Main%20Window\Remove%20Amiibo\Context\default=true
-Shortcuts\Main%20Window\Remove%20Amiibo\KeySeq=F3
-Shortcuts\Main%20Window\Remove%20Amiibo\KeySeq\default=true
+Shortcuts\Main%20Window\Remove%20Amiibo\KeySeq=Alt+N
+Shortcuts\Main%20Window\Remove%20Amiibo\KeySeq\default=false
 Shortcuts\Main%20Window\Restart%20Emulation\Context=1
 Shortcuts\Main%20Window\Restart%20Emulation\Context\default=true
-Shortcuts\Main%20Window\Restart%20Emulation\KeySeq=F6
-Shortcuts\Main%20Window\Restart%20Emulation\KeySeq\default=true
+Shortcuts\Main%20Window\Restart%20Emulation\KeySeq=Ctrl+R
+Shortcuts\Main%20Window\Restart%20Emulation\KeySeq\default=false
 Shortcuts\Main%20Window\Rotate%20Screens%20Upright\Context=1
 Shortcuts\Main%20Window\Rotate%20Screens%20Upright\Context\default=true
-Shortcuts\Main%20Window\Rotate%20Screens%20Upright\KeySeq=F8
-Shortcuts\Main%20Window\Rotate%20Screens%20Upright\KeySeq\default=true
+Shortcuts\Main%20Window\Rotate%20Screens%20Upright\KeySeq=
+Shortcuts\Main%20Window\Rotate%20Screens%20Upright\KeySeq\default=false
 Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\Context=1
 Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\Context\default=true
-Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\KeySeq=L
+Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\KeySeq=Ctrl+S
 Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\KeySeq\default=false
 Shortcuts\Main%20Window\Stop%20Emulation\Context=1
 Shortcuts\Main%20Window\Stop%20Emulation\Context\default=true
-Shortcuts\Main%20Window\Stop%20Emulation\KeySeq=F5
-Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=true
+Shortcuts\Main%20Window\Stop%20Emulation\KeySeq=
+Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=false
 Shortcuts\Main%20Window\Swap%20Screens\Context=1
 Shortcuts\Main%20Window\Swap%20Screens\Context\default=true
-Shortcuts\Main%20Window\Swap%20Screens\KeySeq=T
+Shortcuts\Main%20Window\Swap%20Screens\KeySeq=Ctrl+Tab
 Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=false
-Shortcuts\Main%20Window\Toggle%203D\Context=2
-Shortcuts\Main%20Window\Toggle%203D\Context\default=true
-Shortcuts\Main%20Window\Toggle%203D\KeySeq=Ctrl+3
-Shortcuts\Main%20Window\Toggle%203D\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%203D\Context=1
+Shortcuts\Main%20Window\Toggle%203D\Context\default=false
+Shortcuts\Main%20Window\Toggle%203D\KeySeq=
+Shortcuts\Main%20Window\Toggle%203D\KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context=1
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context\default=false
-Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq=Ctrl+F
+Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq=
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=false
-Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context=2
-Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context\default=false
-Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq=Ctrl+A
+Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context=1
+Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context\default=true
+Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq=
 Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq\default=false
-Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\Context=2
-Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\Context\default=true
-Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq=Ctrl+Z
+Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\Context=1
+Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\Context\default=false
+Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq=
 Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context=1
 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context\default=true
-Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=F10
-Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=Alt+0
+Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context=1
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context\default=true
-Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq=Ctrl+S
-Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq=
+Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context=1
 Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context\default=false
 Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq=
@@ -482,7 +488,7 @@ hideInactiveMouse=false
 hideInactiveMouse\default=true
 pauseWhenInBackground=false
 pauseWhenInBackground\default=true
-screenshot_resolution_factor=@Variant(\0\0\0\x85\0\0)
+screenshot_resolution_factor=0
 screenshot_resolution_factor\default=true
 showConsole=false
 showConsole\default=true
diff --git a/emu-configs/defaults/duckstation/settings.ini b/emu-configs/defaults/duckstation/settings.ini
index 43f1ef6e..8466ff35 100644
--- a/emu-configs/defaults/duckstation/settings.ini
+++ b/emu-configs/defaults/duckstation/settings.ini
@@ -119,7 +119,7 @@ DumpOnBoot = false
 
 
 [BIOS]
-SearchDirectory = /home/deck/retrodeck/bios
+SearchDirectory = RETRODECKHOMEDIR/bios
 PathNTSCU =
 PathNTSCJ =
 PathPAL =
diff --git a/emu-configs/defaults/ppsspp/ppsspp.ini b/emu-configs/defaults/ppsspp/ppsspp.ini
index 60d69f50..17d5ed5c 100644
--- a/emu-configs/defaults/ppsspp/ppsspp.ini
+++ b/emu-configs/defaults/ppsspp/ppsspp.ini
@@ -5,7 +5,7 @@ Enable Logging = True
 AutoRun = True
 Browse = False
 IgnoreBadMemAccess = True
-CurrentDirectory = /home/deck/retrodeck/roms/psp
+CurrentDirectory = RETRODECKHOMEDIR/roms/psp
 ShowDebuggerOnLoad = False
 CheckForNewVersion = True
 Language = en_US
diff --git a/emu-configs/defaults/xemu/xemu.toml b/emu-configs/defaults/xemu/xemu.toml
index b2a54171..7b4775dc 100644
--- a/emu-configs/defaults/xemu/xemu.toml
+++ b/emu-configs/defaults/xemu/xemu.toml
@@ -1,6 +1,6 @@
 [general]
 show_welcome = false
-screenshot_dir = '/home/deck/retrodeck/screenshots'
+screenshot_dir = 'RETRODECKHOMEDIR/screenshots'
 
 [input.bindings]
 port1 = '03000000de280000ff11000001000000'
diff --git a/emu-configs/dolphin/FreeLookController.ini b/emu-configs/dolphin/FreeLookController.ini
new file mode 100644
index 00000000..804043f6
--- /dev/null
+++ b/emu-configs/dolphin/FreeLookController.ini
@@ -0,0 +1,22 @@
+[FreeLook1]
+Device = XInput2/0/Virtual core pointer
+Move/Up = @(Shift+E)
+Move/Down = @(Shift+Q)
+Move/Left = @(Shift+A)
+Move/Right = @(Shift+D)
+Move/Forward = @(Shift+W)
+Move/Backward = @(Shift+S)
+Speed/Decrease = @(Shift+`1`)
+Speed/Increase = @(Shift+`2`)
+Speed/Reset = @(Shift+F)
+Other/Reset View = @(Shift+R)
+Field of View/Increase X = @(Shift+`Axis Z+`)
+Field of View/Decrease X = @(Shift+`Axis Z-`)
+Field of View/Increase Y = @(Shift+`Axis Z+`)
+Field of View/Decrease Y = @(Shift+`Axis Z-`)
+Incremental Rotation/Pitch Up = if(`Click 3`,`RelativeMouse Y-` * 0.10, 0)
+Incremental Rotation/Pitch Down = if(`Click 3`,`RelativeMouse Y+` * 0.10, 0)
+Incremental Rotation/Roll Left = if(`Click 2`,`RelativeMouse X-` * 0.10, 0)
+Incremental Rotation/Roll Right = if(`Click 2`,`RelativeMouse X+` * 0.10, 0)
+Incremental Rotation/Yaw Left = if(`Click 3`,`RelativeMouse X-` * 0.10, 0)
+Incremental Rotation/Yaw Right = if(`Click 3`,`RelativeMouse X+` * 0.10, 0)
\ No newline at end of file
diff --git a/emu-configs/dolphin/GCKeyNew.ini b/emu-configs/dolphin/GCKeyNew.ini
new file mode 100644
index 00000000..27c54afc
--- /dev/null
+++ b/emu-configs/dolphin/GCKeyNew.ini
@@ -0,0 +1,93 @@
+[GCKeyboard1]
+Device = XInput2/0/Virtual core pointer
+Keys/HOME = Home
+Keys/END = End
+Keys/PGUP = Prior
+Keys/PGDN = Next
+Keys/SCR LK = Scroll_Lock
+Keys/A = A
+Keys/B = B
+Keys/C = C
+Keys/D = D
+Keys/E = E
+Keys/F = F
+Keys/G = G
+Keys/H = H
+Keys/I = I
+Keys/J = J
+Keys/K = K
+Keys/L = L
+Keys/M = M
+Keys/N = N
+Keys/O = O
+Keys/P = P
+Keys/Q = Q
+Keys/R = R
+Keys/S = S
+Keys/T = T
+Keys/U = U
+Keys/V = V
+Keys/W = W
+Keys/X = X
+Keys/Y = Y
+Keys/Z = Z
+Keys/1 = `1`
+Keys/2 = `2`
+Keys/3 = `3`
+Keys/4 = `4`
+Keys/5 = `5`
+Keys/6 = `6`
+Keys/7 = `7`
+Keys/8 = `8`
+Keys/9 = `9`
+Keys/0 = `0`
+Keys/- = minus
+Keys/` = grave
+Keys/PRT SC = Print
+Keys/' = apostrophe
+Keys/[ = bracketleft
+Keys/EQUALS = equal
+Keys/* = KP_Multiply
+Keys/] = bracketright
+Keys/, = comma
+Keys/. = period
+Keys// = slash
+Keys/\ = backslash
+Keys/F1 = F1
+Keys/F2 = F2
+Keys/F3 = F3
+Keys/F4 = F4
+Keys/F5 = F5
+Keys/F6 = F6
+Keys/F7 = F7
+Keys/F8 = F8
+Keys/F9 = F9
+Keys/F10 = F10
+Keys/F11 = F11
+Keys/F12 = F12
+Keys/ESC = Escape
+Keys/INSERT = Insert
+Keys/DELETE = Delete
+Keys/; = semicolon
+Keys/BACKSPACE = BackSpace
+Keys/TAB = Tab
+Keys/CAPS LOCK = Caps_Lock
+Keys/L SHIFT = Shift_L
+Keys/R SHIFT = Shift_R
+Keys/L CTRL = Control_L
+Keys/R ALT = Alt_R
+Keys/L WIN = Super_L
+Keys/SPACE = space
+Keys/R WIN = Super_R
+Keys/MENU = Menu
+Keys/LEFT = Left
+Keys/DOWN = Down
+Keys/UP = Up
+Keys/RIGHT = Right
+Keys/ENTER = Return
+[GCKeyboard2]
+Device = XInput2/0/Virtual core pointer
+[GCKeyboard3]
+Device = XInput2/0/Virtual core pointer
+[GCKeyboard4]
+Device = XInput2/0/Virtual core pointer
\ No newline at end of file
diff --git a/emu-configs/dolphin/GCPadNew.ini b/emu-configs/dolphin/GCPadNew.ini
index 2aa18517..bb81f4ac 100644
--- a/emu-configs/dolphin/GCPadNew.ini
+++ b/emu-configs/dolphin/GCPadNew.ini
@@ -11,14 +11,14 @@ Main Stick/Down = `Axis 1+`
 Main Stick/Left = `Axis 0-`
 Main Stick/Right = `Axis 0+`
 Main Stick/Modifier = `Shift`
-Main Stick/Modifier/Range = 50.000000000000000
+Main Stick/Modifier/Range = 50.0
 Main Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
 C-Stick/Up = `Axis 4-`
 C-Stick/Down = `Axis 4+`
 C-Stick/Left = `Axis 3-`
 C-Stick/Right = `Axis 3+`
 C-Stick/Modifier = `Ctrl`
-C-Stick/Modifier/Range = 50.000000000000000
+C-Stick/Modifier/Range = 50.0
 C-Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
 Triggers/L = TL
 Triggers/R = TR
@@ -29,13 +29,13 @@ D-Pad/Right = `Axis 6+`
 Rumble/Motor = Strong
 [GCPad2]
 Device = XInput2/0/Virtual core pointer
-Main Stick/Modifier/Range = 50.000000000000000
-C-Stick/Modifier/Range = 50.000000000000000
+Main Stick/Modifier/Range = 50.0
+C-Stick/Modifier/Range = 50.0
 [GCPad3]
 Device = XInput2/0/Virtual core pointer
-Main Stick/Modifier/Range = 50.000000000000000
-C-Stick/Modifier/Range = 50.000000000000000
+Main Stick/Modifier/Range = 50.0
+C-Stick/Modifier/Range = 50.0
 [GCPad4]
 Device = XInput2/0/Virtual core pointer
-Main Stick/Modifier/Range = 50.000000000000000
-C-Stick/Modifier/Range = 50.000000000000000
+Main Stick/Modifier/Range = 50.0
+C-Stick/Modifier/Range = 50.0
\ No newline at end of file
diff --git a/emu-configs/dolphin/Hotkeys.ini b/emu-configs/dolphin/Hotkeys.ini
index c333ab08..0ea602d5 100644
--- a/emu-configs/dolphin/Hotkeys.ini
+++ b/emu-configs/dolphin/Hotkeys.ini
@@ -1,8 +1,22 @@
 [Hotkeys]
-Device = evdev/0/Microsoft X-Box 360 pad 0
-Save State/Save State Slot 1 = TR&SELECT
-Load State/Load State Slot 1 = TL&SELECT
-General/Take Screenshot = SELECT&SOUTH&`SDL/0/Microsoft X-Box 360 pad 0:Button 0`&`SDL/0/Microsoft X-Box 360 pad 0:Button 6`
-General/Exit = SELECT&START&`SDL/0/Microsoft X-Box 360 pad 0:Button 6`&`SDL/0/Microsoft X-Box 360 pad 0:Button 7`
-Emulation Speed/Increase Emulation Speed = SELECT&l
-Emulation Speed/Decrease Emulation Speed = SELECT&r
+Device = XInput2/0/Virtual core pointer
+General/Change Disc = @(Ctrl+D)
+General/Toggle Pause = @(Ctrl+P)
+General/Reset = @(Ctrl+R)
+General/Take Screenshot = @(Ctrl+X)
+General/Exit = @(Ctrl+Escape)
+General/Control NetPlay Golf Mode = @(Alt+G)
+Emulation Speed/Decrease Emulation Speed = @(Ctrl+`2`)
+Emulation Speed/Increase Emulation Speed = @(Ctrl+`1`)
+Emulation Speed/Disable Emulation Speed Limit = @(Ctrl+`0`)
+Movie/Start Recording = @(Ctrl+V)
+Graphics Toggles/Toggle Aspect Ratio = @(Ctrl+W)
+Freelook/Freelook Toggle = @(Alt+Y)
+Internal Resolution/Increase IR = @(Ctrl+U)
+Internal Resolution/Decrease IR = @(Ctrl+Y)
+Save State/Save to Selected Slot = @(Ctrl+S)
+Load State/Load from Selected Slot = @(Ctrl+A)
+Other State Hotkeys/Undo Load State = @(Ctrl+`8`)
+Other State Hotkeys/Undo Save State = @(Ctrl+`9`)
+Other State Hotkeys/Increase Selected State Slot = @(Ctrl+K)
+Other State Hotkeys/Decrease Selected State Slot = @(Ctrl+J)
\ No newline at end of file
diff --git a/emu-configs/duckstation/settings.ini b/emu-configs/duckstation/settings.ini
index 15f6b28d..0404446d 100644
--- a/emu-configs/duckstation/settings.ini
+++ b/emu-configs/duckstation/settings.ini
@@ -118,7 +118,7 @@ DumpOnBoot = false
 
 
 [BIOS]
-SearchDirectory = /home/deck/retrodeck/bios
+SearchDirectory = RETRODECKHOMEDIR/bios
 PathNTSCU = 
 PathNTSCJ = 
 PathPAL = 
@@ -220,7 +220,27 @@ GPUMaxRunAhead = 128
 
 
 [Hotkeys]
-PowerOff = Keyboard/R
+OpenQuickMenu = Keyboard/Control+M
+FastForward = Keyboard/Control+Keypad+Plus
+ToggleTurbo = Keyboard/Control+T
+ToggleFullscreen = Keyboard/Control+Return
+TogglePause = Keyboard/Control+P
+Screenshot = Keyboard/Control+X
+Reset = Keyboard/Control+R
+ChangeDisc = Keyboard/Control+D
+Rewind = Keyboard/Control+Keypad+Minus
+ToggleCheats = Keyboard/Control+C
+IncreaseEmulationSpeed = Keyboard/Control+1
+DecreaseEmulationSpeed = Keyboard/Control+2
+ResetEmulationSpeed = Keyboard/Control+3
+IncreaseResolutionScale = Keyboard/Control+U
+DecreaseResolutionScale = Keyboard/Control+Y
+ToggleWidescreen = Keyboard/Control+W
+LoadSelectedSaveState = Keyboard/Control+A
+SaveSelectedSaveState = Keyboard/Control+S
+SelectPreviousSaveStateSlot = Keyboard/Control+J
+SelectNextSaveStateSlot = Keyboard/Control+K
+UndoLoadState = Keyboard/Control+9
 
 
 [Cheevos]
@@ -231,9 +251,9 @@ UseFirstDiscFromPlaylist = true
 
 
 [UI]
-MainWindowGeometry = AdnQywADAAAAAAAAAAAAAAAAAx8AAALYAAAAAAAAAB0AAAMfAAAC2AAAAAAAAAAABQAAAAAAAAAAHQAAAx8AAALY
+MainWindowGeometry = AdnQywADAAAAAAAlAAAAHAAAA0QAAAL0AAAAJQAAADkAAANEAAAC9AAAAAAAAAAAB4AAAAAlAAAAOQAAA0QAAAL0
 MainWindowState = AAAA/wAAAAD9AAAAAAAAAyAAAAI9AAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAHQAbwBvAGwAQgBhAHIBAAAAAP////8AAAAAAAAAAA==
 
 
 [GameList]
-RecursivePaths = /home/deck/retrodeck/roms/psx
+RecursivePaths = RETRODECKHOMEDIR/roms/psx
\ No newline at end of file
diff --git a/emu-configs/melonDS.ini b/emu-configs/melonds/melonDS.ini
similarity index 82%
rename from emu-configs/melonDS.ini
rename to emu-configs/melonds/melonDS.ini
index 4235bc1f..12e7e3a8 100644
--- a/emu-configs/melonDS.ini
+++ b/emu-configs/melonds/melonDS.ini
@@ -22,16 +22,16 @@ Joy_R=5
 Joy_L=4
 Joy_X=2
 Joy_Y=3
-HKKey_Lid=-1
-HKKey_Mic=-1
-HKKey_Pause=82
-HKKey_Reset=-1
-HKKey_FastForward=76
+HKKey_Lid=134217804
+HKKey_Mic=134217808
+HKKey_Pause=67108944
+HKKey_Reset=67108946
+HKKey_FastForward=603979819
 HKKey_FastForwardToggle=-1
-HKKey_FullscreenToggle=-1
-HKKey_SwapScreens=89
-HKKey_SolarSensorDecrease=-1
-HKKey_SolarSensorIncrease=-1
+HKKey_FullscreenToggle=83886084
+HKKey_SwapScreens=83886081
+HKKey_SolarSensorDecrease=671088685
+HKKey_SolarSensorIncrease=671088683
 HKKey_FrameStep=-1
 HKJoy_Lid=-1
 HKJoy_Mic=-1
@@ -103,6 +103,8 @@ FirmwareFavouriteColour=0
 FirmwareMessage=
 FirmwareMAC=
 RandomizeMAC=0
+MPAudioMode=1
+MPRecvTimeout=25
 SockBindAnyAddr=0
 LANDevice=
 DirectLAN=0
@@ -132,4 +134,12 @@ MouseHideSeconds=5
 PauseLostFocus=1
 DSBatteryLevelOkay=1
 DSiBatteryLevel=15
-DSiBatteryCharging=1
\ No newline at end of file
+DSiBatteryCharging=1
+Camera0_InputType=0
+Camera0_ImagePath=
+Camera0_CamDeviceName=
+Camera0_XFlip=0
+Camera1_InputType=0
+Camera1_ImagePath=
+Camera1_CamDeviceName=
+Camera1_XFlip=0
\ No newline at end of file
diff --git a/emu-configs/ppssppsdl/controls.ini b/emu-configs/ppssppsdl/controls.ini
index 010c77da..bf29c377 100644
--- a/emu-configs/ppssppsdl/controls.ini
+++ b/emu-configs/ppssppsdl/controls.ini
@@ -24,3 +24,4 @@ Rewind = 10-4008
 Save State = 1-53
 Load State = 1-48
 Screenshot = 1-46
+Home = 1-111
\ No newline at end of file
diff --git a/emu-configs/ppssppsdl/ppsspp.ini b/emu-configs/ppssppsdl/ppsspp.ini
index b4aac34d..b1a74835 100644
--- a/emu-configs/ppssppsdl/ppsspp.ini
+++ b/emu-configs/ppssppsdl/ppsspp.ini
@@ -5,7 +5,7 @@ Enable Logging = True
 AutoRun = True
 Browse = False
 IgnoreBadMemAccess = True
-CurrentDirectory = /home/deck/retrodeck/roms/psp
+CurrentDirectory = RETRODECKHOMEDIR/roms/psp
 ShowDebuggerOnLoad = False
 CheckForNewVersion = False
 Language = en_US
@@ -67,6 +67,11 @@ PauseWhenMinimized = False
 DumpDecryptedEboots = False
 MemStickInserted = True
 EnablePlugins = True
+TransparentBackground = True
+UITint = 0.000000
+UISaturation = 1.000000
+ShowMenuBar = True
+IgnoreCompatSettings = 
 [CPU]
 CPUCore = 1
 SeparateSASThread = True
@@ -137,6 +142,22 @@ FragmentTestCache = True
 LogFrameDrops = False
 InflightFrames = 2
 RenderDuplicateFrames = False
+UseGeometryShader = False
+SkipBufferEffects = False
+SoftwareRendererJit = True
+StereoRendering = False
+StereoToMonoShader = RedBlue
+AnalogFrameRate = 240
+AnalogFrameRateMode = 0
+MultiSampleLevel = 0
+DisplayOffsetX = 0.500000
+DisplayOffsetY = 0.500000
+DisplayScale = 1.000000
+DisplayAspectRatio = 1.000000
+DisplayStretch = False
+ReplaceTexturesAllowLate = True
+SkipGPUReadbacks = False
+GpuLogProfiler = False
 [Sound]
 Enable = True
 AudioBackend = 0
@@ -294,6 +315,16 @@ ConfineMap = False
 MouseSensitivity = 0.100000
 MouseSmoothing = 0.900000
 SystemControls = True
+Custom0Repeat = False
+Custom1Repeat = False
+Custom2Repeat = False
+Custom3Repeat = False
+Custom4Repeat = False
+Custom5Repeat = False
+Custom6Repeat = False
+Custom7Repeat = False
+Custom8Repeat = False
+Custom9Repeat = False
 [Network]
 EnableWlan = False
 EnableAdhocServer = False
@@ -349,6 +380,9 @@ SkipDeadbeefFilling = False
 FuncHashMap = False
 MemInfoDetailed = False
 DrawFrameGraph = False
+GEWindowTabsBL = 0x00000000
+GEWindowTabsBR = 0x00000000
+GEWindowTabsTR = 0x00000000
 [Upgrade]
 UpgradeMessage = 
 UpgradeVersion = 
@@ -380,6 +414,7 @@ InfoStyleBg = 0x00000000
 PopupTitleStyleFg = 0xffe3be59
 PopupStyleFg = 0xffffffff
 PopupStyleBg = 0xff303030
+ThemeName = Default
 [Recent]
 MaxRecent = 60
 [Log]
@@ -454,3 +489,16 @@ ColorCorrectionSettingValue4 = 1.000000
 ScanlinesSettingValue1 = 1.000000
 ScanlinesSettingValue2 = 0.500000
 SharpenSettingValue1 = 1.500000
+[VR]
+VREnable = True
+VREnable6DoF = True
+VREnableStereo = False
+VREnableMotions = True
+VRbForce72Hz = True
+VRCameraDistance = 0.000000
+VRCameraHeight = 0.000000
+VRCameraSide = 0.000000
+VRCanvasDistance = 12.000000
+VRFieldOfView = 100.000000
+VRHeadUpDisplayScale = 0.300000
+VRMotionLength = 0.500000
\ No newline at end of file
diff --git a/emu-configs/primehack/Dolphin.ini b/emu-configs/primehack/Dolphin.ini
index 89358dd0..89663dd0 100644
--- a/emu-configs/primehack/Dolphin.ini
+++ b/emu-configs/primehack/Dolphin.ini
@@ -41,7 +41,7 @@ UseDiscordPresence = True
 HotkeysRequireFocus = True
 UseGameCovers = False
 RecursiveISOPaths = False
-ISOPath0 = /home/deck/retrodeck/roms/gc
+ISOPath0 = RETRODECKHOMEDIR/roms/gc
 ISOPaths = 1
 [Display]
 DisableScreenSaver = True
diff --git a/emu-configs/primehack/Hotkeys.ini b/emu-configs/primehack/Hotkeys.ini
index d53efc35..0ea602d5 100644
--- a/emu-configs/primehack/Hotkeys.ini
+++ b/emu-configs/primehack/Hotkeys.ini
@@ -1,3 +1,22 @@
 [Hotkeys]
-Device = SDL/0/Microsoft X-Box 360 pad 0
-General/Stop = `Button 6`&`Button 7`
\ No newline at end of file
+Device = XInput2/0/Virtual core pointer
+General/Change Disc = @(Ctrl+D)
+General/Toggle Pause = @(Ctrl+P)
+General/Reset = @(Ctrl+R)
+General/Take Screenshot = @(Ctrl+X)
+General/Exit = @(Ctrl+Escape)
+General/Control NetPlay Golf Mode = @(Alt+G)
+Emulation Speed/Decrease Emulation Speed = @(Ctrl+`2`)
+Emulation Speed/Increase Emulation Speed = @(Ctrl+`1`)
+Emulation Speed/Disable Emulation Speed Limit = @(Ctrl+`0`)
+Movie/Start Recording = @(Ctrl+V)
+Graphics Toggles/Toggle Aspect Ratio = @(Ctrl+W)
+Freelook/Freelook Toggle = @(Alt+Y)
+Internal Resolution/Increase IR = @(Ctrl+U)
+Internal Resolution/Decrease IR = @(Ctrl+Y)
+Save State/Save to Selected Slot = @(Ctrl+S)
+Load State/Load from Selected Slot = @(Ctrl+A)
+Other State Hotkeys/Undo Load State = @(Ctrl+`8`)
+Other State Hotkeys/Undo Save State = @(Ctrl+`9`)
+Other State Hotkeys/Increase Selected State Slot = @(Ctrl+K)
+Other State Hotkeys/Decrease Selected State Slot = @(Ctrl+J)
\ No newline at end of file
diff --git a/emu-configs/retroarch/retroarch.cfg b/emu-configs/retroarch/retroarch.cfg
index 78a223f0..22bb36ba 100644
--- a/emu-configs/retroarch/retroarch.cfg
+++ b/emu-configs/retroarch/retroarch.cfg
@@ -21,6 +21,7 @@ audio_enable_menu_bgm = "false"
 audio_enable_menu_cancel = "false"
 audio_enable_menu_notice = "false"
 audio_enable_menu_ok = "false"
+audio_enable_menu_scroll = "false"
 audio_fastforward_mute = "false"
 audio_filter_dir = "/app/lib/retroarch/filters/audio"
 audio_latency = "64"
@@ -56,6 +57,10 @@ camera_device = ""
 camera_driver = "video4linux2"
 cheat_database_path = "/app/share/libretro/database/cht"
 check_firmware_before_loading = "false"
+cheevos_appearance_anchor = "0"
+cheevos_appearance_padding_auto = "true"
+cheevos_appearance_padding_h = "0.000000"
+cheevos_appearance_padding_v = "0.000000"
 cheevos_auto_screenshot = "true"
 cheevos_badges_enable = "false"
 cheevos_challenge_indicators = "true"
@@ -71,6 +76,10 @@ cheevos_token = ""
 cheevos_unlock_sound_enable = "true"
 cheevos_username = ""
 cheevos_verbose_enable = "true"
+cheevos_visibility_account = "true"
+cheevos_visibility_mastery = "true"
+cheevos_visibility_summary = "1"
+cheevos_visibility_unlock = "true"
 config_save_on_exit = "false"
 content_database_path = "/app/share/libretro/database/rdb"
 content_favorites_directory = "default"
@@ -101,7 +110,8 @@ content_show_video = "true"
 content_video_directory = "default"
 content_video_history_path = "/var/config/retroarch/content_video_history.lpl"
 core_assets_directory = "/var/config/retroarch/downloads"
-core_info_cache_enable = "true"
+core_info_cache_enable = "false"
+core_info_savestate_bypass = "false"
 core_option_category_enable = "true"
 core_options_path = ""
 core_set_supports_no_game_enable = "true"
@@ -149,13 +159,13 @@ gamemode_enable = "false"
 gamma_correction = "0"
 global_core_options = "true"
 history_list_enable = "true"
-input_ai_service = "nul"
+input_ai_service = "i"
 input_ai_service_axis = "nul"
 input_ai_service_btn = "nul"
 input_ai_service_mbtn = "nul"
 input_analog_deadzone = "0.000000"
 input_analog_sensitivity = "1.000000"
-input_audio_mute = "f9"
+input_audio_mute = "nul"
 input_audio_mute_axis = "nul"
 input_audio_mute_btn = "nul"
 input_audio_mute_mbtn = "nul"
@@ -165,15 +175,15 @@ input_autodetect_enable = "true"
 input_axis_threshold = "0.500000"
 input_bind_hold = "2"
 input_bind_timeout = "5"
-input_cheat_index_minus = "t"
+input_cheat_index_minus = "f"
 input_cheat_index_minus_axis = "nul"
 input_cheat_index_minus_btn = "nul"
 input_cheat_index_minus_mbtn = "nul"
-input_cheat_index_plus = "y"
+input_cheat_index_plus = "g"
 input_cheat_index_plus_axis = "nul"
 input_cheat_index_plus_btn = "nul"
 input_cheat_index_plus_mbtn = "nul"
-input_cheat_toggle = "u"
+input_cheat_toggle = "c"
 input_cheat_toggle_axis = "nul"
 input_cheat_toggle_btn = "nul"
 input_cheat_toggle_mbtn = "nul"
@@ -183,7 +193,7 @@ input_close_content_btn = "nul"
 input_close_content_mbtn = "nul"
 input_descriptor_hide_unbound = "false"
 input_descriptor_label_show = "true"
-input_desktop_menu_toggle = "f5"
+input_desktop_menu_toggle = "nul"
 input_desktop_menu_toggle_axis = "nul"
 input_desktop_menu_toggle_btn = "nul"
 input_desktop_menu_toggle_mbtn = "nul"
@@ -207,7 +217,7 @@ input_disk_eject_toggle = "nul"
 input_disk_eject_toggle_axis = "nul"
 input_disk_eject_toggle_btn = "nul"
 input_disk_eject_toggle_mbtn = "nul"
-input_disk_next = "nul"
+input_disk_next = "d"
 input_disk_next_axis = "nul"
 input_disk_next_btn = "nul"
 input_disk_next_mbtn = "nul"
@@ -217,49 +227,53 @@ input_disk_prev_btn = "nul"
 input_disk_prev_mbtn = "nul"
 input_driver = "x"
 input_duty_cycle = "3"
-input_enable_hotkey = "nul"
+input_enable_hotkey = "ctrl"
 input_enable_hotkey_axis = "nul"
-input_enable_hotkey_btn = "4"
+input_enable_hotkey_btn = "nul"
 input_enable_hotkey_mbtn = "nul"
 input_exit_emulator = "escape"
 input_exit_emulator_axis = "nul"
 input_exit_emulator_btn = "nul"
 input_exit_emulator_mbtn = "nul"
-input_fps_toggle = "f3"
+input_fps_toggle = "nul"
 input_fps_toggle_axis = "nul"
 input_fps_toggle_btn = "nul"
 input_fps_toggle_mbtn = "nul"
-input_frame_advance = "k"
+input_frame_advance = "nul"
 input_frame_advance_axis = "nul"
 input_frame_advance_btn = "nul"
 input_frame_advance_mbtn = "nul"
-input_game_focus_toggle = "scroll_lock"
+input_game_focus_toggle = "nul"
 input_game_focus_toggle_axis = "nul"
 input_game_focus_toggle_btn = "nul"
 input_game_focus_toggle_mbtn = "nul"
-input_grab_mouse_toggle = "f11"
+input_grab_mouse_toggle = "nul"
 input_grab_mouse_toggle_axis = "nul"
 input_grab_mouse_toggle_btn = "nul"
 input_grab_mouse_toggle_mbtn = "nul"
-input_hold_fast_forward = "l"
-input_hold_fast_forward_axis = "+5"
+input_halt_replay = "nul"
+input_halt_replay_axis = "nul"
+input_halt_replay_btn = "nul"
+input_halt_replay_mbtn = "nul"
+input_hold_fast_forward = "add"
+input_hold_fast_forward_axis = "nul"
 input_hold_fast_forward_btn = "nul"
 input_hold_fast_forward_mbtn = "nul"
-input_hold_slowmotion = "e"
+input_hold_slowmotion = "nul"
 input_hold_slowmotion_axis = "nul"
 input_hold_slowmotion_btn = "nul"
 input_hold_slowmotion_mbtn = "nul"
 input_hotkey_block_delay = "5"
 input_joypad_driver = "sdl2"
 input_keyboard_layout = ""
-input_load_state = "f4"
+input_load_state = "a"
 input_load_state_axis = "nul"
-input_load_state_btn = "9"
+input_load_state_btn = "nul"
 input_load_state_mbtn = "nul"
 input_max_users = "8"
-input_menu_toggle = "f1"
+input_menu_toggle = "m"
 input_menu_toggle_axis = "nul"
-input_menu_toggle_btn = "3"
+input_menu_toggle_btn = "nul"
 input_menu_toggle_gamepad_combo = "2"
 input_menu_toggle_mbtn = "nul"
 input_movie_record_toggle = "o"
@@ -270,11 +284,11 @@ input_netplay_fade_chat_toggle = "nul"
 input_netplay_fade_chat_toggle_axis = "nul"
 input_netplay_fade_chat_toggle_btn = "nul"
 input_netplay_fade_chat_toggle_mbtn = "nul"
-input_netplay_game_watch = "i"
+input_netplay_game_watch = "nul"
 input_netplay_game_watch_axis = "nul"
 input_netplay_game_watch_btn = "nul"
 input_netplay_game_watch_mbtn = "nul"
-input_netplay_host_toggle = "nul"
+input_netplay_host_toggle = "h"
 input_netplay_host_toggle_axis = "nul"
 input_netplay_host_toggle_btn = "nul"
 input_netplay_host_toggle_mbtn = "nul"
@@ -282,7 +296,7 @@ input_netplay_ping_toggle = "nul"
 input_netplay_ping_toggle_axis = "nul"
 input_netplay_ping_toggle_btn = "nul"
 input_netplay_ping_toggle_mbtn = "nul"
-input_netplay_player_chat = "tilde"
+input_netplay_player_chat = "nul"
 input_netplay_player_chat_axis = "nul"
 input_netplay_player_chat_btn = "nul"
 input_netplay_player_chat_mbtn = "nul"
@@ -292,11 +306,13 @@ input_osk_toggle_axis = "nul"
 input_osk_toggle_btn = "nul"
 input_osk_toggle_mbtn = "nul"
 input_overlay = ""
+input_overlay_abxy_diagonal_sensitivity = "50"
 input_overlay_aspect_adjust_landscape = "0.000000"
 input_overlay_aspect_adjust_portrait = "0.000000"
 input_overlay_auto_rotate = "false"
 input_overlay_auto_scale = "false"
 input_overlay_behind_menu = "true"
+input_overlay_dpad_diagonal_sensitivity = "80"
 input_overlay_enable = "true"
 input_overlay_enable_autopreferred = "true"
 input_overlay_hide_in_menu = "false"
@@ -321,8 +337,12 @@ input_overlay_y_separation_landscape = "0.000000"
 input_overlay_y_separation_portrait = "0.000000"
 input_pause_toggle = "p"
 input_pause_toggle_axis = "nul"
-input_pause_toggle_btn = "1"
+input_pause_toggle_btn = "nul"
 input_pause_toggle_mbtn = "nul"
+input_play_replay = "nul"
+input_play_replay_axis = "nul"
+input_play_replay_btn = "nul"
+input_play_replay_mbtn = "nul"
 input_player10_a = "nul"
 input_player10_a_axis = "nul"
 input_player10_a_btn = "nul"
@@ -2676,19 +2696,35 @@ input_player9_y_axis = "nul"
 input_player9_y_btn = "nul"
 input_player9_y_mbtn = "nul"
 input_poll_type_behavior = "2"
+input_preempt_toggle = "nul"
+input_preempt_toggle_axis = "nul"
+input_preempt_toggle_btn = "nul"
+input_preempt_toggle_mbtn = "nul"
 input_quit_gamepad_combo = "4"
-input_recording_toggle = "nul"
+input_record_replay = "nul"
+input_record_replay_axis = "nul"
+input_record_replay_btn = "nul"
+input_record_replay_mbtn = "nul"
+input_recording_toggle = "v"
 input_recording_toggle_axis = "nul"
 input_recording_toggle_btn = "nul"
 input_recording_toggle_mbtn = "nul"
 input_remap_binds_enable = "true"
 input_remapping_directory = "/var/config/retroarch/config/remaps"
-input_reset = "h"
+input_replay_slot_decrease = "nul"
+input_replay_slot_decrease_axis = "nul"
+input_replay_slot_decrease_btn = "nul"
+input_replay_slot_decrease_mbtn = "nul"
+input_replay_slot_increase = "nul"
+input_replay_slot_increase_axis = "nul"
+input_replay_slot_increase_btn = "nul"
+input_replay_slot_increase_mbtn = "nul"
+input_reset = "nul"
 input_reset_axis = "nul"
 input_reset_btn = "nul"
 input_reset_mbtn = "nul"
-input_rewind = "r"
-input_rewind_axis = "+4"
+input_rewind = "subtract"
+input_rewind_axis = "nul"
 input_rewind_btn = "nul"
 input_rewind_mbtn = "nul"
 input_rumble_gain = "100"
@@ -2696,40 +2732,44 @@ input_runahead_toggle = "nul"
 input_runahead_toggle_axis = "nul"
 input_runahead_toggle_btn = "nul"
 input_runahead_toggle_mbtn = "nul"
-input_save_state = "f2"
+input_save_state = "s"
 input_save_state_axis = "nul"
-input_save_state_btn = "10"
+input_save_state_btn = "nul"
 input_save_state_mbtn = "nul"
-input_screenshot = "f8"
+input_screenshot = "x"
 input_screenshot_axis = "nul"
-input_screenshot_btn = "0"
+input_screenshot_btn = "nul"
 input_screenshot_mbtn = "nul"
 input_send_debug_info = "f10"
 input_send_debug_info_axis = "nul"
 input_send_debug_info_btn = "nul"
 input_send_debug_info_mbtn = "nul"
 input_sensors_enable = "true"
-input_shader_next = "m"
+input_shader_next = "nul"
 input_shader_next_axis = "nul"
 input_shader_next_btn = "nul"
 input_shader_next_mbtn = "nul"
-input_shader_prev = "n"
+input_shader_prev = "nul"
 input_shader_prev_axis = "nul"
 input_shader_prev_btn = "nul"
 input_shader_prev_mbtn = "nul"
-input_state_slot_decrease = "f6"
+input_shader_toggle = "nul"
+input_shader_toggle_axis = "nul"
+input_shader_toggle_btn = "nul"
+input_shader_toggle_mbtn = "nul"
+input_state_slot_decrease = "j"
 input_state_slot_decrease_axis = "nul"
-input_state_slot_decrease_btn = "12"
+input_state_slot_decrease_btn = "nul"
 input_state_slot_decrease_mbtn = "nul"
-input_state_slot_increase = "f7"
+input_state_slot_increase = "k"
 input_state_slot_increase_axis = "nul"
-input_state_slot_increase_btn = "11"
+input_state_slot_increase_btn = "nul"
 input_state_slot_increase_mbtn = "nul"
 input_streaming_toggle = "nul"
 input_streaming_toggle_axis = "nul"
 input_streaming_toggle_btn = "nul"
 input_streaming_toggle_mbtn = "nul"
-input_toggle_fast_forward = "space"
+input_toggle_fast_forward = "nul"
 input_toggle_fast_forward_axis = "nul"
 input_toggle_fast_forward_btn = "nul"
 input_toggle_fast_forward_mbtn = "nul"
@@ -2753,11 +2793,11 @@ input_touch_scale = "1"
 input_turbo_default_button = "0"
 input_turbo_mode = "0"
 input_turbo_period = "6"
-input_volume_down = "subtract"
+input_volume_down = "nul"
 input_volume_down_axis = "nul"
 input_volume_down_btn = "nul"
 input_volume_down_mbtn = "nul"
-input_volume_up = "add"
+input_volume_up = "nul"
 input_volume_up_axis = "nul"
 input_volume_up_btn = "nul"
 input_volume_up_mbtn = "nul"
@@ -2785,6 +2825,7 @@ materialui_menu_color_theme = "9"
 materialui_menu_transition_animation = "0"
 materialui_playlist_icons_enable = "true"
 materialui_show_nav_bar = "true"
+materialui_switch_icons = "true"
 materialui_thumbnail_background_enable = "true"
 materialui_thumbnail_view_landscape = "2"
 materialui_thumbnail_view_portrait = "1"
@@ -2812,6 +2853,7 @@ menu_navigation_browser_filter_supported_extensions_enable = "true"
 menu_navigation_wraparound_enable = "true"
 menu_pause_libretro = "true"
 menu_pointer_enable = "true"
+menu_remember_selection = "1"
 menu_rgui_full_width_layout = "true"
 menu_rgui_shadows = "false"
 menu_rgui_transparency = "true"
@@ -2845,6 +2887,7 @@ menu_show_shutdown = "true"
 menu_show_sublabels = "true"
 menu_show_video_layout = "true"
 menu_swap_ok_cancel_buttons = "true"
+menu_swap_scroll_buttons = "false"
 menu_throttle_framerate = "true"
 menu_thumbnail_upscale_threshold = "0"
 menu_thumbnails = "3"
@@ -2870,8 +2913,8 @@ menu_xmb_title_margin = "5"
 menu_xmb_title_margin_horizontal_offset = "0"
 menu_xmb_vertical_fade_factor = "100"
 midi_driver = "alsa"
-midi_input = "Off"
-midi_output = "Off"
+midi_input = "OFF"
+midi_output = "OFF"
 midi_volume = "100"
 netplay_allow_pausing = "false"
 netplay_allow_slaves = "true"
@@ -2960,6 +3003,7 @@ ozone_sort_after_truncate_playlist_name = "true"
 ozone_thumbnail_scale_factor = "1.000000"
 ozone_truncate_playlist_name = "true"
 pause_nonactive = "true"
+pause_on_disconnect = "false"
 perfcnt_enable = "false"
 playlist_compression = "false"
 playlist_directory = "/var/config/retroarch/playlists"
@@ -2975,6 +3019,8 @@ playlist_sort_alphabetical = "true"
 playlist_sublabel_last_played_style = "0"
 playlist_sublabel_runtime_type = "0"
 playlist_use_old_format = "false"
+preemptive_frames_enable = "false"
+preemptive_frames_hide_warnings = "false"
 quick_menu_show_add_to_favorites = "true"
 quick_menu_show_cheats = "true"
 quick_menu_show_close_content = "true"
@@ -2984,6 +3030,7 @@ quick_menu_show_download_thumbnails = "true"
 quick_menu_show_information = "true"
 quick_menu_show_options = "true"
 quick_menu_show_recording = "true"
+quick_menu_show_replay = "true"
 quick_menu_show_reset_core_association = "true"
 quick_menu_show_restart_content = "true"
 quick_menu_show_resume_content = "true"
@@ -3005,6 +3052,10 @@ record_driver = "ffmpeg"
 recording_config_directory = "/var/config/retroarch/records_config"
 recording_output_directory = "/var/config/retroarch/records"
 remap_save_on_exit = "true"
+replay_auto_index = "true"
+replay_checkpoint_interval = "0"
+replay_max_keep = "0"
+replay_slot = "0"
 resampler_directory = ""
 rewind_buffer_size = "20971520"
 rewind_buffer_size_step = "10"
@@ -3136,6 +3187,7 @@ video_layout_directory = "/var/config/retroarch/layouts"
 video_layout_enable = "true"
 video_layout_path = ""
 video_layout_selected_view = "0"
+video_max_frame_latency = "1"
 video_max_swapchain_images = "3"
 video_message_color = "ffff00"
 video_message_pos_x = "0.050000"
@@ -3154,7 +3206,7 @@ video_record_scale_factor = "1"
 video_record_threads = "2"
 video_refresh_rate = "60.000000"
 video_rotation = "0"
-video_scale = "3.000000"
+video_scale = "3"
 video_scale_integer = "false"
 video_scale_integer_overscale = "false"
 video_shader_delay = "0"
@@ -3194,6 +3246,7 @@ xmb_font = ""
 xmb_layout = "0"
 xmb_menu_color_theme = "4"
 xmb_shadows_enable = "true"
+xmb_switch_icons = "true"
 xmb_theme = "0"
 xmb_vertical_thumbnails = "false"
 youtube_stream_key = ""
\ No newline at end of file
diff --git a/emu-configs/rpcs3/GuiConfigs/CurrentSettings.ini b/emu-configs/rpcs3/GuiConfigs/CurrentSettings.ini
new file mode 100644
index 00000000..f9931541
--- /dev/null
+++ b/emu-configs/rpcs3/GuiConfigs/CurrentSettings.ini
@@ -0,0 +1,30 @@
+[Config]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x1P\0\0\0}\0\0\x5\xb9\0\0\x3I\0\0\x1P\0\0\0\x9a\0\0\x5\xb9\0\0\x3I\0\0\0\0\0\0\0\0\a\x80\0\0\x1P\0\0\0\x9a\0\0\x5\xb9\0\0\x3I)
+
+[GameList]
+hidden_list=@Invalid()
+iconColor=@Variant(\0\0\0\x43\x1\xff\xff\xf0\xf0\xf0\xf0\xf0\xf0\0\0)
+marginFactor=0.09
+textFactor=2
+
+[Localization]
+language=en
+
+[Logger]
+ANSI_code=true
+ERR_stack=true
+level=4
+stack=true
+
+[Meta]
+checkUpdateStart=false
+currentStylesheet=Skyline (Nightfall)
+discordState=
+showDebugTab=false
+useRichPresence=true
+
+[PadSettings]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\xb3\0\0\0\0\0\0\x4\xbf\0\0\x3\x7f\0\0\0\xb3\0\0\0\x1d\0\0\x4\xbf\0\0\x3\x7f\0\0\0\0\0\0\0\0\a\x80\0\0\0\xb3\0\0\0\x1d\0\0\x4\xbf\0\0\x3\x7f)
+
+[main_window]
+infoBoxEnabledWelcome=false
diff --git a/emu-configs/rpcs3/config.yml b/emu-configs/rpcs3/config.yml
index b8555168..433d5c60 100644
--- a/emu-configs/rpcs3/config.yml
+++ b/emu-configs/rpcs3/config.yml
@@ -75,8 +75,10 @@ Video:
   Resolution: 1280x720
   Aspect ratio: 16:9
   Frame limit: Auto
+  Second Frame Limit: 0
   MSAA: Auto
   Shader Mode: Async Shader Recompiler
+  Shader Precision: High
   Write Color Buffers: false
   Write Depth Buffer: false
   Read Color Buffers: false
@@ -100,7 +102,6 @@ Video:
   Disable Vulkan Memory Allocator: false
   Use full RGB output range: true
   Strict Texture Flushing: false
-  Disable native float16 support: true
   Multithreaded RSX: false
   Relaxed ZCULL Sync: false
   Enable 3D: false
@@ -120,14 +121,13 @@ Video:
   DECR memory layout: false
   Allow Host GPU Labels: false
   Disable MSL Fast Math: false
-  Software VkSemaphore: false
+  Output Scaling Mode: Bilinear
   Vulkan:
-    Adapter: llvmpipe (LLVM 12.0.1, 256 bits)
+    Adapter: AMD RADV VANGOGH
     Force FIFO present mode: false
     Force primitive restart flag: false
-    Force Disable Exclusive Fullscreen Mode: false
+    Exclusive Fullscreen Mode: Automatic
     Asynchronous Texture Streaming 2: false
-    Enable FidelityFX Super Resolution Upscaling: false
     FidelityFX CAS Sharpening Intensity: 50
     Asynchronous Queue Scheduler: Fast
   Performance Overlay:
@@ -152,51 +152,58 @@ Video:
     Body Background (hex): "#002339FF"
     Title Color (hex): "#F26C24FF"
     Title Background (hex): "#00000000"
-  Shader Compilation Hint:
-    Position X (px): 20
-    Position Y (px): 690
   Shader Loading Dialog:
     Allow custom background: true
     Darkening effect strength: 30
     Blur effect strength: 0
 Audio:
   Renderer: Cubeb
-  Audio provider: CellAudio
+  Audio Provider: CellAudio
+  RSXAudio Avport: HDMI 0
   Dump to file: false
   Convert to 16 bit: false
-  Audio Channels: Downmix to Stereo
+  Audio Format: Stereo
+  Audio Formats: 0
+  Audio Device: "@@@default@@@"
   Master Volume: 100
   Enable Buffering: true
   Desired Audio Buffer Duration: 100
   Enable Time Stretching: true
+  Disable Sampling Skip: false
   Time Stretching Threshold: 75
   Microphone Type: "Null"
   Microphone Devices: "@@@@@@@@@@@@"
   Music Handler: Qt
 Input/Output:
-  Keyboard: "Null"
+  Keyboard: Basic
   Mouse: Basic
   Camera: "Null"
   Camera type: Unknown
   Camera flip: None
   Camera ID: Default
-  Move: "Null"
+  Move: Mouse
   Buzz emulated controller: "Null"
   Turntable emulated controller: "Null"
   GHLtar emulated controller: "Null"
   Pad handler mode: Single-threaded
   Pad handler sleep (microseconds): 1000
+  Background input enabled: true
+  Show move cursor: false
 System:
   License Area: SCEE
   Language: English (US)
   Keyboard Type: English keyboard (US standard)
   Enter button assignment: Enter with cross
   Console time offset (s): 0
+  PSID high: 0
+  PSID low: 0
 Net:
   Internet enabled: Disconnected
   IP address: 0.0.0.0
+  Bind address: 0.0.0.0
   DNS address: 8.8.8.8
   IP swap list: ""
+  UPNP Enabled: false
   PSN status: Disconnected
 Savestate:
   Start Paused: false
@@ -213,4 +220,6 @@ Miscellaneous:
   Use native user interface: true
   GDB Server: 127.0.0.1:2345
   Silence All Logs: false
-  Window Title Format: "FPS: %F | %R | %V | %T [%t]"
\ No newline at end of file
+  Window Title Format: "FPS: %F | %R | %V | %T [%t]"
+  Pause Emulation During Home Menu: true
+Log: {}
\ No newline at end of file
diff --git a/emu-configs/rpcs3/evdev_positive_axis.yml b/emu-configs/rpcs3/evdev_positive_axis.yml
new file mode 100644
index 00000000..61406623
--- /dev/null
+++ b/emu-configs/rpcs3/evdev_positive_axis.yml
@@ -0,0 +1,41 @@
+ABS_X: false
+ABS_Y: false
+ABS_Z: false
+ABS_RX: false
+ABS_RY: false
+ABS_RZ: false
+ABS_THROTTLE: false
+ABS_RUDDER: false
+ABS_WHEEL: false
+ABS_GAS: false
+ABS_BRAKE: false
+ABS_HAT0X: false
+ABS_HAT0Y: false
+ABS_HAT1X: false
+ABS_HAT1Y: false
+ABS_HAT2X: false
+ABS_HAT2Y: false
+ABS_HAT3X: false
+ABS_HAT3Y: false
+ABS_PRESSURE: false
+ABS_DISTANCE: false
+ABS_TILT_X: false
+ABS_TILT_Y: false
+ABS_TOOL_WIDTH: false
+ABS_VOLUME: false
+ABS_MISC: false
+ABS_MT_SLOT: false
+ABS_MT_TOUCH_MAJOR: false
+ABS_MT_TOUCH_MINOR: false
+ABS_MT_WIDTH_MAJOR: false
+ABS_MT_WIDTH_MINOR: false
+ABS_MT_ORIENTATION: false
+ABS_MT_POSITION_X: false
+ABS_MT_POSITION_Y: false
+ABS_MT_TOOL_TYPE: false
+ABS_MT_BLOB_ID: false
+ABS_MT_TRACKING_ID: false
+ABS_MT_PRESSURE: false
+ABS_MT_DISTANCE: false
+ABS_MT_TOOL_X: false
+ABS_MT_TOOL_Y: false
\ No newline at end of file
diff --git a/emu-configs/rpcs3/vfs.yml b/emu-configs/rpcs3/vfs.yml
index f5b89a9f..375a6af2 100644
--- a/emu-configs/rpcs3/vfs.yml
+++ b/emu-configs/rpcs3/vfs.yml
@@ -1,10 +1,11 @@
-$(EmulatorDir): "/home/deck/retrodeck/roms/ps3/emudir"
+$(EmulatorDir): RETRODECKHOMEDIR/bios/rpcs3/emudir/
 /dev_hdd0/: $(EmulatorDir)dev_hdd0/
 /dev_hdd1/: $(EmulatorDir)dev_hdd1/
 /dev_flash/: $(EmulatorDir)dev_flash/
 /dev_flash2/: $(EmulatorDir)dev_flash2/
 /dev_flash3/: $(EmulatorDir)dev_flash3/
 /dev_bdvd/: $(EmulatorDir)dev_bdvd/
+/games/: RETRODECKHOMEDIR/roms/ps3/
 /app_home/: ""
 /dev_usb***/:
   /dev_usb000:
diff --git a/emu-configs/ryujinx/Config.json b/emu-configs/ryujinx/Config.json
index 3018fa9b..15cbf4e2 100644
--- a/emu-configs/ryujinx/Config.json
+++ b/emu-configs/ryujinx/Config.json
@@ -56,7 +56,7 @@
     "sort_ascending": false
   },
   "game_dirs": [
-    "/home/deck/retrodeck/roms/switch"
+    "RETRODECKHOMEDIR/roms/switch"
   ],
   "language_code": "en_US",
   "enable_custom_theme": false,
diff --git a/emu-configs/xemu.toml b/emu-configs/xemu/xemu.toml
similarity index 54%
rename from emu-configs/xemu.toml
rename to emu-configs/xemu/xemu.toml
index fb196502..15f6c1b4 100644
--- a/emu-configs/xemu.toml
+++ b/emu-configs/xemu/xemu.toml
@@ -1,6 +1,6 @@
 [general]
 show_welcome = false
-screenshot_dir = '/home/deck/retrodeck/screenshots'
+screenshot_dir = 'RETRODECKHOMEDIR/screenshots'
 
 [input.bindings]
 port1 = '03000000de280000ff11000001000000'
@@ -23,7 +23,7 @@ auto_scale = false
 mem_limit = '128'
 
 [sys.files]
-bootrom_path = '/home/deck/retrodeck/bios/mcpx_1.0.bin'
-flashrom_path = '/home/deck/retrodeck/bios/Complex.bin'
-eeprom_path = '/home/deck/retrodeck/saves/xbox/xemu/xbox-eeprom.bin'
-hdd_path = '/home/deck/retrodeck/bios/xbox_hdd.qcow2'
\ No newline at end of file
+bootrom_path = 'RETRODECKHOMEDIR/bios/mcpx_1.0.bin'
+flashrom_path = 'RETRODECKHOMEDIR/bios/Complex.bin'
+eeprom_path = 'RETRODECKHOMEDIR/saves/xbox/xemu/xbox-eeprom.bin'
+hdd_path = 'RETRODECKHOMEDIR/bios/xbox_hdd.qcow2'
\ No newline at end of file
diff --git a/emu-configs/yuzu/qt-config.ini b/emu-configs/yuzu/qt-config.ini
index efdcce84..aca503df 100644
--- a/emu-configs/yuzu/qt-config.ini
+++ b/emu-configs/yuzu/qt-config.ini
@@ -1007,178 +1007,178 @@ Screenshots\enable_screenshot_save_as\default=true
 Screenshots\screenshot_path=RETRODECKHOMEDIR/screenshots/
 Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context=1
 Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context\default=true
-Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq=Home+Dpad_Right
-Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\Audio%20Mute\Unmute\KeySeq=Ctrl+M
-Shortcuts\Main%20Window\Audio%20Mute\Unmute\KeySeq\default=true
+Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq=
+Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq\default=false
+Shortcuts\Main%20Window\Audio%20Mute\Unmute\KeySeq=
+Shortcuts\Main%20Window\Audio%20Mute\Unmute\KeySeq\default=false
 Shortcuts\Main%20Window\Audio%20Mute\Unmute\Repeat=false
 Shortcuts\Main%20Window\Audio%20Mute\Unmute\Repeat\default=true
-Shortcuts\Main%20Window\Audio%20Volume%20Down\Context=2
-Shortcuts\Main%20Window\Audio%20Volume%20Down\Context\default=true
-Shortcuts\Main%20Window\Audio%20Volume%20Down\Controller_KeySeq=Home+Dpad_Down
-Shortcuts\Main%20Window\Audio%20Volume%20Down\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\Audio%20Volume%20Down\KeySeq=-
-Shortcuts\Main%20Window\Audio%20Volume%20Down\KeySeq\default=true
+Shortcuts\Main%20Window\Audio%20Volume%20Down\Context=1
+Shortcuts\Main%20Window\Audio%20Volume%20Down\Context\default=false
+Shortcuts\Main%20Window\Audio%20Volume%20Down\Controller_KeySeq=
+Shortcuts\Main%20Window\Audio%20Volume%20Down\Controller_KeySeq\default=false
+Shortcuts\Main%20Window\Audio%20Volume%20Down\KeySeq=
+Shortcuts\Main%20Window\Audio%20Volume%20Down\KeySeq\default=false
 Shortcuts\Main%20Window\Audio%20Volume%20Down\Repeat=true
 Shortcuts\Main%20Window\Audio%20Volume%20Down\Repeat\default=true
-Shortcuts\Main%20Window\Audio%20Volume%20Up\Context=2
-Shortcuts\Main%20Window\Audio%20Volume%20Up\Context\default=true
-Shortcuts\Main%20Window\Audio%20Volume%20Up\Controller_KeySeq=Home+Dpad_Up
-Shortcuts\Main%20Window\Audio%20Volume%20Up\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\Audio%20Volume%20Up\KeySeq="="
-Shortcuts\Main%20Window\Audio%20Volume%20Up\KeySeq\default=true
+Shortcuts\Main%20Window\Audio%20Volume%20Up\Context=1
+Shortcuts\Main%20Window\Audio%20Volume%20Up\Context\default=false
+Shortcuts\Main%20Window\Audio%20Volume%20Up\Controller_KeySeq=
+Shortcuts\Main%20Window\Audio%20Volume%20Up\Controller_KeySeq\default=false
+Shortcuts\Main%20Window\Audio%20Volume%20Up\KeySeq=
+Shortcuts\Main%20Window\Audio%20Volume%20Up\KeySeq\default=false
 Shortcuts\Main%20Window\Audio%20Volume%20Up\Repeat=true
 Shortcuts\Main%20Window\Audio%20Volume%20Up\Repeat\default=true
 Shortcuts\Main%20Window\Capture%20Screenshot\Context=3
 Shortcuts\Main%20Window\Capture%20Screenshot\Context\default=true
-Shortcuts\Main%20Window\Capture%20Screenshot\Controller_KeySeq=Screenshot
-Shortcuts\Main%20Window\Capture%20Screenshot\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq=Ctrl+P
-Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq\default=true
+Shortcuts\Main%20Window\Capture%20Screenshot\Controller_KeySeq=
+Shortcuts\Main%20Window\Capture%20Screenshot\Controller_KeySeq\default=false
+Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq=Ctrl+X
+Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq\default=false
 Shortcuts\Main%20Window\Capture%20Screenshot\Repeat=false
 Shortcuts\Main%20Window\Capture%20Screenshot\Repeat\default=true
-Shortcuts\Main%20Window\Change%20Adapting%20Filter\Context=2
-Shortcuts\Main%20Window\Change%20Adapting%20Filter\Context\default=true
-Shortcuts\Main%20Window\Change%20Adapting%20Filter\Controller_KeySeq=Home+L
-Shortcuts\Main%20Window\Change%20Adapting%20Filter\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\Change%20Adapting%20Filter\KeySeq=F8
-Shortcuts\Main%20Window\Change%20Adapting%20Filter\KeySeq\default=true
+Shortcuts\Main%20Window\Change%20Adapting%20Filter\Context=1
+Shortcuts\Main%20Window\Change%20Adapting%20Filter\Context\default=false
+Shortcuts\Main%20Window\Change%20Adapting%20Filter\Controller_KeySeq=
+Shortcuts\Main%20Window\Change%20Adapting%20Filter\Controller_KeySeq\default=false
+Shortcuts\Main%20Window\Change%20Adapting%20Filter\KeySeq=
+Shortcuts\Main%20Window\Change%20Adapting%20Filter\KeySeq\default=false
 Shortcuts\Main%20Window\Change%20Adapting%20Filter\Repeat=false
 Shortcuts\Main%20Window\Change%20Adapting%20Filter\Repeat\default=true
 Shortcuts\Main%20Window\Change%20Docked%20Mode\Context=2
 Shortcuts\Main%20Window\Change%20Docked%20Mode\Context\default=true
-Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq=Home+X
-Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\Change%20Docked%20Mode\KeySeq=F10
-Shortcuts\Main%20Window\Change%20Docked%20Mode\KeySeq\default=true
+Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq=
+Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq\default=false
+Shortcuts\Main%20Window\Change%20Docked%20Mode\KeySeq=Alt+D
+Shortcuts\Main%20Window\Change%20Docked%20Mode\KeySeq\default=false
 Shortcuts\Main%20Window\Change%20Docked%20Mode\Repeat=false
 Shortcuts\Main%20Window\Change%20Docked%20Mode\Repeat\default=true
 Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Context=2
 Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Context\default=true
-Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Controller_KeySeq=Home+R
-Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\Change%20GPU%20Accuracy\KeySeq=F9
-Shortcuts\Main%20Window\Change%20GPU%20Accuracy\KeySeq\default=true
+Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Controller_KeySeq=
+Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Controller_KeySeq\default=false
+Shortcuts\Main%20Window\Change%20GPU%20Accuracy\KeySeq=Alt+G
+Shortcuts\Main%20Window\Change%20GPU%20Accuracy\KeySeq\default=false
 Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Repeat=false
 Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Repeat\default=true
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context=1
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context\default=true
-Shortcuts\Main%20Window\Continue\Pause%20Emulation\Controller_KeySeq=Home+B
+Shortcuts\Main%20Window\Continue\Pause%20Emulation\Controller_KeySeq=
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Controller_KeySeq\default=false
-Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq=F4
-Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq\default=true
+Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq=
+Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq\default=false
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Repeat=false
 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Repeat\default=true
 Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1
 Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true
-Shortcuts\Main%20Window\Exit%20Fullscreen\Controller_KeySeq=Home+A
-Shortcuts\Main%20Window\Exit%20Fullscreen\Controller_KeySeq\default=false
-Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Esc
-Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=true
+Shortcuts\Main%20Window\Exit%20Fullscreen\Controller_KeySeq=
+Shortcuts\Main%20Window\Exit%20Fullscreen\Controller_KeySeq\default=true
+Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Ctrl+O
+Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=false
 Shortcuts\Main%20Window\Exit%20Fullscreen\Repeat=false
 Shortcuts\Main%20Window\Exit%20Fullscreen\Repeat\default=true
 Shortcuts\Main%20Window\Exit%20yuzu\Context=1
 Shortcuts\Main%20Window\Exit%20yuzu\Context\default=true
-Shortcuts\Main%20Window\Exit%20yuzu\Controller_KeySeq=Home+Minus
-Shortcuts\Main%20Window\Exit%20yuzu\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\Exit%20yuzu\KeySeq=Ctrl+Q
-Shortcuts\Main%20Window\Exit%20yuzu\KeySeq\default=true
+Shortcuts\Main%20Window\Exit%20yuzu\Controller_KeySeq=
+Shortcuts\Main%20Window\Exit%20yuzu\Controller_KeySeq\default=false
+Shortcuts\Main%20Window\Exit%20yuzu\KeySeq=Ctrl+Esc
+Shortcuts\Main%20Window\Exit%20yuzu\KeySeq\default=false
 Shortcuts\Main%20Window\Exit%20yuzu\Repeat=false
 Shortcuts\Main%20Window\Exit%20yuzu\Repeat\default=true
 Shortcuts\Main%20Window\Fullscreen\Context=1
 Shortcuts\Main%20Window\Fullscreen\Context\default=true
 Shortcuts\Main%20Window\Fullscreen\Controller_KeySeq=
 Shortcuts\Main%20Window\Fullscreen\Controller_KeySeq\default=false
-Shortcuts\Main%20Window\Fullscreen\KeySeq=F11
-Shortcuts\Main%20Window\Fullscreen\KeySeq\default=true
+Shortcuts\Main%20Window\Fullscreen\KeySeq=Ctrl+Return
+Shortcuts\Main%20Window\Fullscreen\KeySeq\default=false
 Shortcuts\Main%20Window\Fullscreen\Repeat=false
 Shortcuts\Main%20Window\Fullscreen\Repeat\default=true
-Shortcuts\Main%20Window\Load%20File\Context=3
-Shortcuts\Main%20Window\Load%20File\Context\default=true
+Shortcuts\Main%20Window\Load%20File\Context=1
+Shortcuts\Main%20Window\Load%20File\Context\default=false
 Shortcuts\Main%20Window\Load%20File\Controller_KeySeq=
 Shortcuts\Main%20Window\Load%20File\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\Load%20File\KeySeq=Ctrl+O
-Shortcuts\Main%20Window\Load%20File\KeySeq\default=true
+Shortcuts\Main%20Window\Load%20File\KeySeq=
+Shortcuts\Main%20Window\Load%20File\KeySeq\default=false
 Shortcuts\Main%20Window\Load%20File\Repeat=false
 Shortcuts\Main%20Window\Load%20File\Repeat\default=true
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context=3
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context\default=true
-Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq=Home+Y
+Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq=
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq\default=false
-Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq=F2
-Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq\default=true
+Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq=Ctrl+M
+Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq\default=false
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Repeat=false
 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Repeat\default=true
 Shortcuts\Main%20Window\Restart%20Emulation\Context=1
 Shortcuts\Main%20Window\Restart%20Emulation\Context\default=true
 Shortcuts\Main%20Window\Restart%20Emulation\Controller_KeySeq=
 Shortcuts\Main%20Window\Restart%20Emulation\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\Restart%20Emulation\KeySeq=F6
-Shortcuts\Main%20Window\Restart%20Emulation\KeySeq\default=true
+Shortcuts\Main%20Window\Restart%20Emulation\KeySeq=Ctrl+R
+Shortcuts\Main%20Window\Restart%20Emulation\KeySeq\default=false
 Shortcuts\Main%20Window\Restart%20Emulation\Repeat=false
 Shortcuts\Main%20Window\Restart%20Emulation\Repeat\default=true
 Shortcuts\Main%20Window\Stop%20Emulation\Context=1
 Shortcuts\Main%20Window\Stop%20Emulation\Context\default=true
 Shortcuts\Main%20Window\Stop%20Emulation\Controller_KeySeq=
 Shortcuts\Main%20Window\Stop%20Emulation\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\Stop%20Emulation\KeySeq=F5
-Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=true
+Shortcuts\Main%20Window\Stop%20Emulation\KeySeq=
+Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=false
 Shortcuts\Main%20Window\Stop%20Emulation\Repeat=false
 Shortcuts\Main%20Window\Stop%20Emulation\Repeat\default=true
-Shortcuts\Main%20Window\TAS%20Record\Context=2
-Shortcuts\Main%20Window\TAS%20Record\Context\default=true
+Shortcuts\Main%20Window\TAS%20Record\Context=1
+Shortcuts\Main%20Window\TAS%20Record\Context\default=false
 Shortcuts\Main%20Window\TAS%20Record\Controller_KeySeq=
 Shortcuts\Main%20Window\TAS%20Record\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\TAS%20Record\KeySeq=Ctrl+F7
-Shortcuts\Main%20Window\TAS%20Record\KeySeq\default=true
+Shortcuts\Main%20Window\TAS%20Record\KeySeq=
+Shortcuts\Main%20Window\TAS%20Record\KeySeq\default=false
 Shortcuts\Main%20Window\TAS%20Record\Repeat=false
 Shortcuts\Main%20Window\TAS%20Record\Repeat\default=true
-Shortcuts\Main%20Window\TAS%20Reset\Context=2
-Shortcuts\Main%20Window\TAS%20Reset\Context\default=true
+Shortcuts\Main%20Window\TAS%20Reset\Context=1
+Shortcuts\Main%20Window\TAS%20Reset\Context\default=false
 Shortcuts\Main%20Window\TAS%20Reset\Controller_KeySeq=
 Shortcuts\Main%20Window\TAS%20Reset\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\TAS%20Reset\KeySeq=Ctrl+F6
-Shortcuts\Main%20Window\TAS%20Reset\KeySeq\default=true
+Shortcuts\Main%20Window\TAS%20Reset\KeySeq=
+Shortcuts\Main%20Window\TAS%20Reset\KeySeq\default=false
 Shortcuts\Main%20Window\TAS%20Reset\Repeat=false
 Shortcuts\Main%20Window\TAS%20Reset\Repeat\default=true
-Shortcuts\Main%20Window\TAS%20Start\Stop\Context=2
-Shortcuts\Main%20Window\TAS%20Start\Stop\Context\default=true
+Shortcuts\Main%20Window\TAS%20Start\Stop\Context=1
+Shortcuts\Main%20Window\TAS%20Start\Stop\Context\default=false
 Shortcuts\Main%20Window\TAS%20Start\Stop\Controller_KeySeq=
 Shortcuts\Main%20Window\TAS%20Start\Stop\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\TAS%20Start\Stop\KeySeq=Ctrl+F5
-Shortcuts\Main%20Window\TAS%20Start\Stop\KeySeq\default=true
+Shortcuts\Main%20Window\TAS%20Start\Stop\KeySeq=
+Shortcuts\Main%20Window\TAS%20Start\Stop\KeySeq\default=false
 Shortcuts\Main%20Window\TAS%20Start\Stop\Repeat=false
 Shortcuts\Main%20Window\TAS%20Start\Stop\Repeat\default=true
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context=1
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context\default=true
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Controller_KeySeq=
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq=Ctrl+F
-Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq=
+Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Repeat=false
 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Repeat\default=true
 Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Context=2
 Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Context\default=true
 Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Controller_KeySeq=
 Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Controller_KeySeq\default=false
-Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\KeySeq=Ctrl+U
-Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\KeySeq=Ctrl+Z
+Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Repeat=false
 Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Repeat\default=true
-Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Context=2
-Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Context\default=true
+Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Context=1
+Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Context\default=false
 Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Controller_KeySeq=
 Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\KeySeq=Ctrl+F9
-Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\KeySeq=
+Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Repeat=false
 Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Repeat\default=true
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context=1
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context\default=true
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Controller_KeySeq=
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Controller_KeySeq\default=true
-Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq=Ctrl+S
-Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq=
+Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq\default=false
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Repeat=false
 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Repeat\default=true
 UIGameList\cache_game_list=true
@@ -1250,4 +1250,4 @@ web_api_url\default=true
 yuzu_token=
 yuzu_token\default=true
 yuzu_username=RetroDECK
-yuzu_username\default=true
+yuzu_username\default=true
\ No newline at end of file
diff --git a/functions.sh b/functions.sh
index 2f843e24..80d40e13 100644
--- a/functions.sh
+++ b/functions.sh
@@ -1302,13 +1302,13 @@ melonds_init() {
   if [[ $multi_user_mode == "true" ]]; then
     rm -rf "$multi_user_data_folder/$SteamAppUser/config/melonDS"
     mkdir -pv "$multi_user_data_folder/$SteamAppUser/config/melonDS/"
-    cp -fvr $emuconfigs/melonDS.ini "$multi_user_data_folder/$SteamAppUser/config/melonDS/"
+    cp -fvr $emuconfigs/melonds/melonDS.ini "$multi_user_data_folder/$SteamAppUser/config/melonDS/"
     sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$multi_user_data_folder/$SteamAppUser/config/melonDS/melonDS.ini"
     dir_prep "$multi_user_data_folder/$SteamAppUser/config/melonDS" "/var/config/melonDS"
   else
     rm -rf /var/config/melonDS
     mkdir -pv /var/config/melonDS/
-    cp -fvr $emuconfigs/melonDS.ini /var/config/melonDS/
+    cp -fvr $emuconfigs/melonds/melonDS.ini /var/config/melonDS/
     sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/melonDS/melonDS.ini
   fi
   # removing config directory to wipe legacy files
@@ -1370,7 +1370,7 @@ xemu_init() {
     mkdir -pv "$multi_user_data_folder/$SteamAppUser/config/xemu/"
     dir_prep "$multi_user_data_folder/$SteamAppUser/config/xemu" "/var/config/xemu" # Creating config folder in /var/config for consistentcy and linking back to original location where emulator will look
     dir_prep "$multi_user_data_folder/$SteamAppUser/config/xemu" "/var/data/xemu"
-    cp -fv $emuconfigs/xemu.toml "$multi_user_data_folder/$SteamAppUser/config/xemu/xemu.toml"
+    cp -fv $emuconfigs/xemu/* "$multi_user_data_folder/$SteamAppUser/config/xemu"
     sed -i 's#/home/deck/retrodeck#'$rdhome'#g' "$multi_user_data_folder/$SteamAppUser/config/xemu/xemu.toml"
   else
     # removing config directory to wipe legacy files