diff --git a/emu-configs/retroarch-core-options.cfg b/emu-configs/retroarch-core-options.cfg
index 3ef89aa7..6be315ae 100644
--- a/emu-configs/retroarch-core-options.cfg
+++ b/emu-configs/retroarch-core-options.cfg
@@ -159,6 +159,110 @@ dolphin_wait_for_shaders = "disabled"
 dolphin_widescreen = "enabled"
 dolphin_widescreen_hack = "disabled"
 dolphin_wiimote_continuous_scanning = "disabled"
+duckstation_BIOS.PatchFastBoot = "true"
+duckstation_BIOS.PathNTSCJ = "scph5500.bin"
+duckstation_BIOS.PathNTSCU = "scph5501.bin"
+duckstation_BIOS.PathPAL = "scph5502.bin"
+duckstation_CDROM.LoadImagePatches = "false"
+duckstation_CDROM.LoadImageToRAM = "false"
+duckstation_CDROM.MuteCDAudio = "false"
+duckstation_CDROM.PreCacheCHD = "false"
+duckstation_CDROM.ReadaheadSectors = "8"
+duckstation_CDROM.ReadSpeedup = "1"
+duckstation_CDROM.ReadThread = "true"
+duckstation_CDROM.RegionCheck = "false"
+duckstation_CDROM.SeekSpeedup = "1"
+duckstation_Console.Enable8MBRAM = "false"
+duckstation_Console.Region = "Auto"
+duckstation_Controller1.AnalogDPadInDigitalMode = "true"
+duckstation_Controller1.AxisScale = "1.00f"
+duckstation_Controller1.ForceAnalogOnReset = "false"
+duckstation_Controller1.SteeringDeadzone = "0.10"
+duckstation_Controller1.TwistResponse = "linear"
+duckstation_Controller1.VibrationBias = "8"
+duckstation_Controller1.XScale = "1.00"
+duckstation_Controller2.AnalogDPadInDigitalMode = "true"
+duckstation_Controller2.AxisScale = "1.00f"
+duckstation_Controller2.ForceAnalogOnReset = "false"
+duckstation_Controller2.SteeringDeadzone = "0.00"
+duckstation_Controller2.TwistResponse = "linear"
+duckstation_Controller2.VibrationBias = "8"
+duckstation_Controller2.XScale = "1.00"
+duckstation_Controller3.AnalogDPadInDigitalMode = "true"
+duckstation_Controller3.AxisScale = "1.00f"
+duckstation_Controller3.ForceAnalogOnReset = "false"
+duckstation_Controller3.SteeringDeadzone = "0.10"
+duckstation_Controller3.TwistResponse = "linear"
+duckstation_Controller3.VibrationBias = "8"
+duckstation_Controller4.AnalogDPadInDigitalMode = "true"
+duckstation_Controller4.AxisScale = "1.00f"
+duckstation_Controller4.ForceAnalogOnReset = "false"
+duckstation_Controller4.SteeringDeadzone = "0.10"
+duckstation_Controller4.TwistResponse = "linear"
+duckstation_Controller4.VibrationBias = "8"
+duckstation_Controller5.AnalogDPadInDigitalMode = "true"
+duckstation_Controller5.AxisScale = "1.00f"
+duckstation_Controller5.ForceAnalogOnReset = "false"
+duckstation_Controller5.VibrationBias = "8"
+duckstation_Controller6.AnalogDPadInDigitalMode = "true"
+duckstation_Controller6.AxisScale = "1.00f"
+duckstation_Controller6.ForceAnalogOnReset = "false"
+duckstation_Controller6.VibrationBias = "8"
+duckstation_Controller7.AnalogDPadInDigitalMode = "true"
+duckstation_Controller7.AxisScale = "1.00f"
+duckstation_Controller7.ForceAnalogOnReset = "false"
+duckstation_Controller7.VibrationBias = "8"
+duckstation_Controller8.AnalogDPadInDigitalMode = "true"
+duckstation_Controller8.AxisScale = "1.00f"
+duckstation_Controller8.ForceAnalogOnReset = "false"
+duckstation_Controller8.VibrationBias = "8"
+duckstation_ControllerPorts.MultitapMode = "Disabled"
+duckstation_CPU.ExecutionMode = "Recompiler"
+duckstation_CPU.FastmemMode = "MMap"
+duckstation_CPU.FastmemRewrite = "false"
+duckstation_CPU.Overclock = "100"
+duckstation_CPU.RecompilerBlockLinking = "true"
+duckstation_CPU.RecompilerICache = "false"
+duckstation_Display.ActiveEndOffset = "0"
+duckstation_Display.ActiveStartOffset = "0"
+duckstation_Display.AspectRatio = "Auto"
+duckstation_Display.CropMode = "Borders"
+duckstation_Display.CustomAspectRatioDenominator = "3"
+duckstation_Display.CustomAspectRatioNumerator = "4"
+duckstation_Display.Force4_3For24Bit = "false"
+duckstation_Display.LineEndOffset = "0"
+duckstation_Display.LineStartOffset = "0"
+duckstation_Display.ShowOSDMessages = "true"
+duckstation_GPU.ChromaSmoothing24Bit = "false"
+duckstation_GPU.DisableInterlacing = "true"
+duckstation_GPU.DownsampleMode = "Disabled"
+duckstation_GPU.ForceNTSCTimings = "false"
+duckstation_GPU.MSAA = "4"
+duckstation_GPU.PGXPCPU = "false"
+duckstation_GPU.PGXPCulling = "true"
+duckstation_GPU.PGXPDepthBuffer = "false"
+duckstation_GPU.PGXPEnable = "true"
+duckstation_GPU.PGXPPreserveProjFP = "false"
+duckstation_GPU.PGXPTextureCorrection = "true"
+duckstation_GPU.PGXPTolerance = "-1.0"
+duckstation_GPU.PGXPVertexCache = "false"
+duckstation_GPU.Renderer = "Vulkan"
+duckstation_GPU.ResolutionScale = "3"
+duckstation_GPU.ScaledDithering = "true"
+duckstation_GPU.TextureFilter = "Bilinear"
+duckstation_GPU.TrueColor = "false"
+duckstation_GPU.UseSoftwareRendererForReadbacks = "false"
+duckstation_GPU.UseThread = "true"
+duckstation_GPU.WidescreenHack = "false"
+duckstation_Logging.LogLevel = "Info"
+duckstation_Main.ApplyGameSettings = "true"
+duckstation_Main.LoadDevicesFromSaveStates = "false"
+duckstation_Main.RunaheadFrameCount = "0"
+duckstation_MemoryCards.Card1Type = "Libretro"
+duckstation_MemoryCards.Card2Type = "None"
+duckstation_MemoryCards.UsePlaylistTitle = "true"
+duckstation_TextureReplacements.EnableVRAMWriteReplacements = "false"
+duckstation_TextureReplacements.PreloadTextures = "false"
 gambatte_audio_resampler = "sinc"
 gambatte_dark_filter_level = "0"
 gambatte_gb_bootloader = "enabled"
diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml
index 4991cd56..4899e218 100644
--- a/es-configs/es_systems.xml
+++ b/es-configs/es_systems.xml
@@ -1123,10 +1123,10 @@
         <fullname>Sony PlayStation</fullname>
         <path>%ROMPATH%/psx</path>
         <extension>.bin .BIN .cbn .CBN .ccd .CCD .chd .CHD .cue .CUE .ecm .ECM .exe .EXE .img .IMG .iso .ISO .m3u .M3U .mdf .MDF .mds .MDS .pbp .PBP .psexe .PSEXE .psf .PSF .toc .TOC .z .Z .znx .ZNX .7z .7Z .zip .ZIP</extension>
+        <command label="SwanStation">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/swanstation_libretro.so %ROM%</command>
         <command label="Beetle PSX">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_libretro.so %ROM%</command>
         <command label="Beetle PSX HW">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_hw_libretro.so %ROM%</command>
         <command label="PCSX ReARMed">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx_rearmed_libretro.so %ROM%</command>
-        <command label="SwanStation">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/swanstation_libretro.so %ROM%</command>
         <command label="DuckStation (Standalone)">%EMULATOR_DUCKSTATION% -batch %ROM%</command>
 <!--        <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module psx %ROM%</command> -->
         <platform>psx</platform>