diff --git a/incconfigs/PCSX2/PCSX2.ini b/incconfigs/PCSX2/PCSX2.ini
new file mode 100644
index 00000000..54cbd12f
--- /dev/null
+++ b/incconfigs/PCSX2/PCSX2.ini
@@ -0,0 +1,566 @@
+[UI]
+SettingsVersion = 1
+InhibitScreensaver = true
+MainWindowGeometry = AdnQywADAAAAAAaHAAADIQAACqAAAAXWAAAGhwAAAz0AAAqgAAAF1gAAAAAAAAAADwAAAAaHAAADPQAACqAAAAXW
+MainWindowState = AAAA/wAAAAD9AAAAAAAABBoAAAJxAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAHQAbwBvAGwAQgBhAHIAAAAAAP////8AAAAAAAAAAA==
+PauseOnFocusLoss = true
+StartFullscreen = true
+StartPaused = false
+ConfirmShutdown = false
+HideMouseCursor = false
+RenderToSeparateWindow = false
+HideMainWindowWhenRunning = false
+DisableWindowResize = false
+
+[EmuCore]
+CdvdVerboseReads = false
+CdvdDumpBlocks = false
+CdvdShareWrite = false
+EnablePatches = true
+EnableCheats = false
+EnablePINE = false
+EnableWideScreenPatches = false
+EnableNoInterlacingPatches = false
+EnableRecordingTools = true
+EnableGameFixes = true
+SaveStateOnShutdown = false
+EnableDiscordPresence = false
+InhibitScreensaver = true
+ConsoleToStdio = false
+HostFs = false
+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 = 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
+EnableFastmem = true
+PauseOnTLBMiss = false
+vu0Overflow = true
+vu0ExtraOverflow = false
+vu0SignOverflow = false
+vu0Underflow = false
+vu1Overflow = true
+vu1ExtraOverflow = false
+vu1SignOverflow = false
+vu1Underflow = false
+fpuOverflow = true
+fpuExtraOverflow = false
+fpuFullMode = false
+
+
+[EmuCore/GS]
+VsyncQueueSize = 2
+FrameLimitEnable = true
+VsyncEnable = 0
+FramerateNTSC = 59.94
+FrameratePAL = 50
+SyncToHostRefreshRate = false
+AspectRatio = Auto 4:3/3:2
+FMVAspectRatioSwitch = Off
+ScreenshotSize = 0
+ScreenshotFormat = 0
+ScreenshotQuality = 50
+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
+UseDebugDevice = false
+UseBlitSwapChain = false
+disable_shader_cache = false
+DisableDualSourceBlend = false
+DisableFramebufferFetch = false
+DisableThreadedPresentation = false
+SkipDuplicateFrames = false
+OsdShowMessages = true
+OsdShowSpeed = false
+OsdShowFPS = false
+OsdShowCPU = false
+OsdShowGPU = false
+OsdShowResolution = false
+OsdShowGSStats = false
+OsdShowIndicators = true
+OsdShowSettings = false
+OsdShowInputs = false
+OsdShowFrameTimes = false
+HWSpinGPUForReadbacks = false
+HWSpinCPUForReadbacks = false
+paltex = false
+autoflush_sw = true
+preload_frame_with_gs_data = false
+mipmap = true
+UserHacks = false
+UserHacks_align_sprite_X = false
+UserHacks_AutoFlush = false
+UserHacks_CPU_FB_Conversion = false
+UserHacks_ReadTCOnClose = false
+UserHacks_DisableDepthSupport = false
+UserHacks_DisablePartialInvalidation = false
+UserHacks_Disable_Safe_Features = false
+UserHacks_merge_pp_sprite = false
+UserHacks_WildHack = false
+UserHacks_TextureInsideRt = 0
+UserHacks_TargetPartialInvalidation = false
+UserHacks_EstimateTextureRegion = false
+fxaa = false
+ShadeBoost = 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
+EnableVideoCapture = true
+EnableVideoCaptureParameters = false
+VideoCaptureAutoResolution = false
+EnableAudioCapture = true
+EnableAudioCaptureParameters = false
+linear_present_mode = 1
+deinterlace_mode = 0
+OsdScale = 100
+Renderer = 14
+upscale_multiplier = 1
+mipmap_hw = -1
+accurate_blending_unit = 1
+crc_hack_level = -1
+filter = 2
+texture_preloading = 2
+GSDumpCompression = 2
+HWDownloadMode = 0
+CASMode = 0
+CASSharpness = 50
+dithering_ps2 = 2
+MaxAnisotropy = 0
+extrathreads = 3
+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_CPUCLUTRender = 0
+UserHacks_GPUTargetCLUTMode = 0
+TriFilter = -1
+OverrideTextureBarriers = -1
+OverrideGeometryShaders = -1
+ShadeBoost_Brightness = 50
+ShadeBoost_Contrast = 50
+ShadeBoost_Saturation = 50
+png_compression_level = 1
+saven = 0
+savel = 5000
+CaptureContainer = mp4
+VideoCaptureCodec =
+VideoCaptureParameters =
+AudioCaptureCodec =
+AudioCaptureParameters =
+VideoCaptureBitrate = 6000
+VideoCaptureWidth = 640
+VideoCaptureHeight = 480
+AudioCaptureBitrate = 160
+Adapter = (Default)
+HWDumpDirectory =
+SWDumpDirectory =
+
+[SPU2/Debug]
+Global_Enable = false
+Show_Messages = false
+Show_Messages_Key_On_Off = false
+Show_Messages_Voice_Off = false
+Show_Messages_DMA_Transfer = false
+Show_Messages_AutoDMA = false
+Show_Messages_Overruns = false
+Show_Messages_CacheStats = false
+Log_Register_Access = false
+Log_DMA_Transfers = false
+Log_WAVE_Output = false
+Dump_Info = false
+Dump_Memory = false
+Dump_Regs = false
+
+
+[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
+BackendName =
+DeviceName =
+Latency = 60
+OutputLatency = 20
+OutputLatencyMinimal = false
+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
+InstantDMAHack = 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
+FullVU0SyncHack = 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
+
+[USB1]
+Type = None
+
+
+[USB2]
+Type = None
+
+
+[Achievements]
+Enabled = false
+TestMode = false
+UnofficialTestMode = false
+RichPresence = true
+ChallengeMode = false
+Leaderboards = true
+Notifications = 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
+
+
+[Folders]
+Bios = /home/laz/retrodeck/bios
+Snapshots = /home/laz/retrodeck/screenshots
+SaveStates = /home/laz/retrodeck/states/ps2/pcsx2
+MemoryCards = /home/laz/retrodeck/saves/ps2/pcsx2/memcards
+Logs = logs
+Cheats = cheats
+Covers = covers
+CheatsWS = cheats_ws
+CheatsNI = cheats_ni
+Cache = cache
+Textures = textures
+InputProfiles = inputprofiles
+Videos = videos
+
+
+[InputSources]
+Keyboard = true
+Mouse = true
+SDL = true
+SDLControllerEnhancedMode = false
+XInput = false
+RawInput = false
+
+
+[Hotkeys]
+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
+ShutdownVM = Keyboard/Control & Keyboard/Q
+ResetVM = Keyboard/Control & Keyboard/R
+
+
+[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/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
+Analog = SDL-0/Guide
+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 = DualShock2
+Deadzone = 0.000000
+AxisScale = 1.330000
+LargeMotorScale = 1.000000
+SmallMotorScale = 1.000000
+PressureModifier = 0.300000
+Up = SDL-1/DPadUp
+Right = SDL-1/DPadRight
+Down = SDL-1/DPadDown
+Left = SDL-1/DPadLeft
+Triangle = SDL-1/Y
+Circle = SDL-1/B
+Cross = SDL-1/A
+Square = SDL-1/X
+Select = SDL-1/Back
+Start = SDL-1/Start
+L1 = SDL-1/LeftShoulder
+L2 = SDL-1/+LeftTrigger
+R1 = SDL-1/RightShoulder
+R2 = SDL-1/+RightTrigger
+L3 = SDL-1/LeftStick
+R3 = SDL-1/RightStick
+Analog = SDL-1/Guide
+LUp = SDL-1/-LeftY
+LRight = SDL-1/+LeftX
+LDown = SDL-1/+LeftY
+LLeft = SDL-1/-LeftX
+RUp = SDL-1/-RightY
+RRight = SDL-1/+RightX
+RDown = SDL-1/+RightY
+RLeft = SDL-1/-RightX
+LargeMotor = SDL-1/LargeMotor
+SmallMotor = SDL-1/SmallMotor
+
+
+[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/laz/retrodeck/roms/ps2
+
+
+[Achievements]
+Enabled = false
+ChallengeMode = false
+Username = 
+Token = 
+LoginTimestamp = 
diff --git a/incconfigs/PCSX2/GS.ini b/incconfigs/PCSX2/inis/GS.ini
similarity index 100%
rename from incconfigs/PCSX2/GS.ini
rename to incconfigs/PCSX2/inis/GS.ini
diff --git a/incconfigs/todo.readme b/incconfigs/todo.readme
index 1c9f01bc..9045c8c8 100644
--- a/incconfigs/todo.readme
+++ b/incconfigs/todo.readme
@@ -1,4 +1,3 @@
-Cemu
 MAME
 Primehack
 Vita3K
diff --git a/incconfigs/whatis.readme b/incconfigs/whatis.readme
index e258242e..0d1e46e7 100644
--- a/incconfigs/whatis.readme
+++ b/incconfigs/whatis.readme
@@ -19,6 +19,7 @@ MelonDS (Minor changes)
 PCXS2 (Minor Changes)
 
 - Graphical tweaks
+- General tweaks
 
 Ryujinx  (New)